Packman Build Service PMBS

Changes of Revision 4

deadbeef.changes Changed

@@ -1,4 +1,60 @@
 -------------------------------------------------------------------
+Mon Mar 26 18:37:50 UTC 2012 - pascal.bleser@opensuse.org
+
+- update to 0.5.2:
+  * fixed reading id3v2 and apev2 tags from raw AAC files
+  * fixed proxy authentication bug in vfs_curl plugin
+  * added OpenIndian b148 support
+  * improved APE performance
+  * fixed freeze bug in alsa plugin on x86_64
+  * added automatic creation of directory structure to the converter plugin
+  * few fixes in random and shuffle modes
+  * improved automatic config saving
+  * added support for ffmpeg-0.8
+  * fixed rename/remove playlist crash when no playlist was selected
+  * last.fm plugin will now split multiline fields when scrobbling
+  * few bug fixes / improvements in cuesheet support
+  * fixed writing non-ascii id3v1 tags
+  * pressing enter/play in paused state will now play selected track (bugfix)
+  * fixed content-length handling after redirects in vfs_curl plugin
+  * artwork plugin now supports png by default
+  * fixed rdb check in aac adts parser, this means improved aac support
+  * fixed rare aac crash
+  * added EXTM3U support
+  * m3u and pls files are now supported only via Load Playlist menu
+  * fix off-by-one error in convstr_id3v2 (gohai)
+  * improved support for the case when an M3U file contains URIs of other M3Us
+  * improved volumebar tooltip (xent)
+  * replaygain preamp improvements
+  * ignore embedded album cuesheets in single-track files
+  * vorbis plugin will now try to open .OGA files
+  * GME plugin: added fadeout support, fixed intro/looping, fixed headerless
+    files support (e.g. some GYM), improved gzipped files detection
+  * added auto-resizing support to playlist columns
+  * DUMB, AudioOverload, SHN, Mono2Stereo plugins are now back in the main
+    tarball
+  * default PulseAudio buffer is set to 8K
+  * added FLAC embedded album covers
+  * added "Album Artist" support to shuffle albums mode
+  * fixed several memory leaks
+  * config file parser now supports blank values
+  * added %L %X %Z to title formatting for "selected playback length",
+    "selected track count", "current channel configuration" respectively
+  * added new commandline switch --gui to select GUI plugin
+  * added WM/Year field support to ffmpeg plugin
+  * fixed reading embedded covers from id3v2.4
+  * added optional "Album Artist" support to last.fm
+  * aac: improved duration scanner, fixed infinite loop in mp4ff ATOM_UNKNOWN
+    handler
+  * improvements in the command line handling code
+  * shellexec now supports quoting strings for more flexibility
+  * fixed resampler dsp plugin auto-configuration when the player is started
+    for the 1st time
+  * plugin API now allows to extend playlist context menu
+  * added "audio/ogg" mime-type support
+  * fixed playing mp4/aac files with id3v2 tags
+
+-------------------------------------------------------------------
 Sat Jun  4 16:16:16 UTC 2011 - andrea@opensuse.org
 
 - New upstream version 0.5.1

deadbeef.spec Changed

@@ -1,25 +1,36 @@
-# norootforbuild
+# vim: set ts=4 sw=4 et:
+# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 %bcond_with restricted
 
-Name:		deadbeef
-Version:	0.5.1
-Release: 	1
-Summary: 	GTK2 audio player
-Group:		Productivity/Multimedia/Sound/Players
-License: 	GPL
-URL: 		http://deadbeef.sourceforge.net/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
-Source0: 	%name-%version.tar.bz2
-Patch1:		%{name}-0.5.0-fix-return-values.patch
-Patch2:		%{name}-0.5.0-fix-strcmp.patch
-BuildRequires: 	gtk2-devel libsamplerate-devel alsa-devel libvorbis-devel libcurl-devel
-BuildRequires: 	flac-devel wavpack-devel libsndfile-devel libcddb-devel libcdio-devel
-BuildRequires: 	xorg-x11-libs pkg-config gcc-c++ libpulse-devel libnotify-devel dbus-1-devel
-BuildRequires:	intltool update-desktop-files libzip-devel imlib2-devel libjpeg-devel
-
+Name: deadbeef
+Version: 0.5.2
+Release: 1
+Summary: Lightweight Music Player
+Group: Productivity/Multimedia/Sound/Players
+License: GNU General Public License version 2 or later (GPLv2 or later)
+URL: http://deadbeef.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: http://prdownloads.sourceforge.net/deadbeef/deadbeef-%{version}.tar.bz2
+Patch1: deadbeef-add_missing_return_in_nonvoid_functions.patch
+BuildRequires: gtk2-devel libsamplerate-devel alsa-devel libvorbis-devel libcurl-devel
+BuildRequires: flac-devel wavpack-devel libsndfile-devel libcddb-devel libcdio-devel
+BuildRequires: xorg-x11-libs pkg-config gcc-c++ libpulse-devel libnotify-devel dbus-1-devel
+BuildRequires: intltool update-desktop-files libzip-devel imlib2-devel libjpeg-devel
 %if %{with restricted}
-BuildRequires:	libmad-devel libffmpeg_oldabi-devel libfaad-devel
+# BuildRequires: libmad-devel libffmpeg_oldabi-devel libfaad-devel
+BuildRequires: libmad-devel libffmpeg-devel libfaad-devel
 %endif
 
 %description
@@ -55,21 +66,20 @@
 Group: Development/Libraries/C and C++
 Summary: Devel files for %name
 Requires: pkg-config
-Requires:	%name
+Requires: %name
 
 %description devel
 This package provides headers to develop deadbeef plugins
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure --enable-static=no
-%__make %{?jobs:-j%{jobs}}
+%__make %{?_smp_flags}
 
 %install
 %makeinstall
@@ -78,7 +88,7 @@
 %find_lang %name
 
 %clean
-%__rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %if 0%{?suse_version} >= 1140
 %post
@@ -98,6 +108,10 @@
 %_libdir/%name/alsa.so*
 %_libdir/%name/artwork.so*
 %_libdir/%name/cdda.so*
+%_libdir/%name/ddb_ao.so*
+%_libdir/%name/ddb_dumb.so*
+%_libdir/%name/ddb_mono2stereo.so*
+%_libdir/%name/ddb_shn.so*
 %_libdir/%name/ffap.so*
 %_libdir/%name/flac.so*
 %_libdir/%name/gme.so*
@@ -121,7 +135,7 @@
 %_libdir/%name/tta.so*
 %_libdir/%name/wildmidi.so*
 %_libdir/%name/converter.so*
-%_libdir/%name/converter_gtkui.so*
+%_libdir/%name/converter_gtk2.so*
 %_libdir/%name/ddb_gui_GTK2.so*
 %_libdir/%name/dsp_libsrc.so*
 %_libdir/%name/m3u.so*

deadbeef-0.5.0-fix-return-values.patch Deleted

@@ -1,93 +0,0 @@
-diff -uNr old-deadbeef-0.5.0/junklib.c deadbeef-0.5.0/junklib.c
---- old-deadbeef-0.5.0/junklib.c	2011-05-14 12:45:26.000000000 +0200
-+++ deadbeef-0.5.0/junklib.c	2011-05-22 10:17:07.878709111 +0200
-@@ -1129,6 +1129,7 @@
-             }
-         }
-     }
-+    return 0;
- }
- 
- int
-diff -uNr old-deadbeef-0.5.0/playlist.c deadbeef-0.5.0/playlist.c
---- old-deadbeef-0.5.0/playlist.c	2011-05-14 22:06:55.000000000 +0200
-+++ deadbeef-0.5.0/playlist.c	2011-05-22 10:20:34.323709112 +0200
-@@ -2017,6 +2017,7 @@
-     LOCK;
-     plt_delete_selected (playlist);
-     UNLOCK;
-+    return 0;
- }
- 
- void
-@@ -2771,6 +2772,7 @@
-     case DDB_REPLAYGAIN_TRACKPEAK:
-         return pl_find_meta_float (it, rg_keys[idx], 1);
-     }
-+    return 0;
- }
- 
- int
-diff -uNr old-deadbeef-0.5.0/plugins/cdda/cdda.c deadbeef-0.5.0/plugins/cdda/cdda.c
---- old-deadbeef-0.5.0/plugins/cdda/cdda.c	2011-05-09 09:00:07.000000000 +0200
-+++ deadbeef-0.5.0/plugins/cdda/cdda.c	2011-05-22 10:15:31.082709112 +0200
-@@ -597,6 +597,7 @@
-         deadbeef->plt_unref (plt);
-     }
-     deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-+    return 0;
- }
- 
- static DB_plugin_action_t add_cd_action = {
-diff -uNr old-deadbeef-0.5.0/plugins/dsp_libsrc/src.c deadbeef-0.5.0/plugins/dsp_libsrc/src.c
---- old-deadbeef-0.5.0/plugins/dsp_libsrc/src.c	2011-05-14 12:45:26.000000000 +0200
-+++ deadbeef-0.5.0/plugins/dsp_libsrc/src.c	2011-05-22 10:21:43.362709111 +0200
-@@ -197,6 +197,7 @@
-     default:
-         fprintf (stderr, "ddb_src_get_param_name: invalid param index (%d)\n", p);
-     }
-+    return 0;
- }
- 
- void
-diff -uNr old-deadbeef-0.5.0/plugins/gtkui/trkproperties.c deadbeef-0.5.0/plugins/gtkui/trkproperties.c
---- old-deadbeef-0.5.0/plugins/gtkui/trkproperties.c	2011-05-14 12:45:27.000000000 +0200
-+++ deadbeef-0.5.0/plugins/gtkui/trkproperties.c	2011-05-22 10:23:31.996709112 +0200
-@@ -492,6 +492,7 @@
-     const char *fname = deadbeef->pl_find_meta (track, ":URI");
-     gtk_entry_set_text (GTK_ENTRY (progressitem), fname);
-     deadbeef->pl_item_unref (track);
-+    return TRUE;
- }
- 
- static void
-diff -uNr old-deadbeef-0.5.0/plugins/lastfm/lastfm.c deadbeef-0.5.0/plugins/lastfm/lastfm.c
---- old-deadbeef-0.5.0/plugins/lastfm/lastfm.c	2011-05-08 22:23:07.000000000 +0200
-+++ deadbeef-0.5.0/plugins/lastfm/lastfm.c	2011-05-22 10:19:05.563709109 +0200
-@@ -874,12 +874,15 @@
-         return 0;
-     system (command);
-     free (command);
-+
-+    return 0;
- }
- 
- static int
- lfm_action_love (DB_plugin_action_t *act, DB_playItem_t *it)
- {
-     printf ("Love starts here\n");
-+    return 0;
- }
- 
- static DB_plugin_action_t love_action = {
-diff -uNr old-deadbeef-0.5.0/streamer.c deadbeef-0.5.0/streamer.c
---- old-deadbeef-0.5.0/streamer.c	2011-05-15 17:56:42.000000000 +0200
-+++ deadbeef-0.5.0/streamer.c	2011-05-22 10:22:18.471709111 +0200
-@@ -1649,6 +1649,7 @@
-             return -1;
-         }
-     }
-+    return 0;
- }
- 
- // decodes data and converts to current output format

deadbeef-0.5.0-fix-strcmp.patch Deleted

deadbeef-add_missing_return_in_nonvoid_functions.patch Added

@@ -0,0 +1,37 @@
+--- plugins/lastfm/lastfm.c.orig	2012-03-26 20:28:38.064247117 +0200
++++ plugins/lastfm/lastfm.c	2012-03-26 20:29:01.771246273 +0200
+@@ -896,12 +896,14 @@
+         return 0;
+     system (command);
+     free (command);
++    return 0;
+ }
+ 
+ static int
+ lfm_action_love (DB_plugin_action_t *act, DB_playItem_t *it)
+ {
+     printf ("Love starts here\n");
++    return 0;
+ }
+ 
+ static DB_plugin_action_t love_action = {
+--- plugins/dsp_libsrc/src.c.orig	2012-03-26 20:29:03.044246228 +0200
++++ plugins/dsp_libsrc/src.c	2012-03-26 20:29:23.426245503 +0200
+@@ -222,6 +222,7 @@
+     default:
+         fprintf (stderr, "ddb_src_get_param_name: invalid param index (%d)\n", p);
+     }
++    return (const char*) NULL;
+ }
+ 
+ void
+--- plugins/cdda/cdda.c.orig	2012-03-26 20:28:01.450248418 +0200
++++ plugins/cdda/cdda.c	2012-03-26 20:28:18.153247825 +0200
+@@ -597,6 +597,7 @@
+         deadbeef->plt_unref (plt);
+     }
+     deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
++    return 0;
+ }
+ 
+ static DB_plugin_action_t add_cd_action = {

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5 Deleted

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/changes.txt Deleted

@@ -1,225 +0,0 @@
-Game_Music_Emu Change Log
--------------------------
-
-Game_Music_Emu 0.5.5
---------------------
-- CMake build support has been added.  You can build Game_Music_Emu as
-a shared library and install it so that you do not have to include your
-own copy if you know libgme will be present on your target system.
-Requires CMake 2.6 or higher.
-
-Game_Music_Emu 0.5.2
---------------------
-- *TONS* of changes and improvements. You should re-read the new header
-files and documentation as the changes will allow you to simplify your
-code a lot (it might even be simpler to just rewrite it). Existing code
-should continue to work without changes in most cases (see Deprecated
-features in gme.txt).
-
-- New file formats: AY, HES, KSS, SAP, NSFE
-
-- All-new comprehensive C interface (also usable from C++). Simplifies
-many things, especially file loading, and brings everything together in
-one header file (gme.h).
-
-- Information tags and track names and times can be accessed for all
-game music formats
-
-- New features supported by all emulators: end of track fading,
-automatic silence detection, adjustable song tempo, seek to new time in
-track
-
-- Updated mini player example to support track names and times, echo,
-tempo, and channel muting, and added visual waveform display
-
-- Improved configuration to use blargg_config.h, which you can modify
-and keep when you update to a newer libary version. Includes flag for
-library to automatically handle gzipped files using zlib (so you don't
-need to use Gzip_File_Reader anymore).
-
-- GBS: Fixed wave channel to not reset waveform when APU is powered off
-(affected Garfield). Also improved invalid bank selection (affected Game
-& Watch and others).
-
-- VGM: Added support for alternate noise shifter register
-configurations, used by other systems like the BBC Micro.
-
-- SPC: Removed IPL ROM dump from emulator, as none of the SPC files I
-scanned needed it, and an SPC file can include a copy if necessary. Also
-re-enabled supposed clamping in gaussian interpolation between the third
-and fourth lookups, though I don't know whether it matters
-
-- Added Music_Emu::load_mem() to use music data already in memory
-(without copying it)
-
-- Added Music_Emu::warning(), which reports minor problems when loading
-and playing a music file
-
-- Added Music_Emu::set_gain() for uniform adjustment of gain. Can only
-be set during initialization, so not useful as a general volume control.
-
-- Added custom operator new to ensure that no exceptions are thrown in
-the library (I'd use std::nothrow if it were part of pre-ISO (ARM) C++)
-
-- Added BLIP_BUFFER_FAST flag to blargg_config.h to use a lower quality
-bandlimited synthesis in "classic" emulators, which might help
-performance on ancient processors (measure first!). Don't use this
-unless absolutely necessary, as quality suffers.
-
-- Improved performance a bit for x86 platforms
-
-- Text files now in DOS newline format so they will open in Notepad
-properly
-
-- Removed requirement that file header structures not have any padding
-added to the end
-
-- Fixed common bug in all CPU emulators where negative program counter
-could crash emulator (occurred during a negative branch from the
-beginning of memory). Also fixed related bug in Z80 emulator for
-IX/IY+displacement mode.
-
-- Eliminated all warnings when compiling on gcc 4.0. The following
-generates no diagnostics:
-
-	gcc -S gme/*.cpp -o /dev/null -ansi -fno-gnu-keywords
-	-fno-nonansi-builtins -pedantic -W -Wabi -Wall -Wcast-align
-	-Wcast-qual -Wchar-subscripts -Wdisabled-optimization -Werror
-	-Winline -Wlong-long -Wmultichar -Winvalid-offsetof
-	-Wnon-virtual-dtor -Woverloaded-virtual -Wparentheses
-	-Wpointer-arith -Wredundant-decls -Wreorder -Wsign-compare
-	-Wsign-promo -Wunknown-pragmas -Wwrite-strings
-
-
-Game_Music_Emu 0.3.0
---------------------
-- Added more demos, including music player using the SDL multimedia
-library for sound, and improved documentation
-
-- All: Improved interface to emulators to allow simpler setup and
-loading. Instead of various init() functions, all now support
-set_sample_rate( long rate ) and load( const char* file_path ).
-
-- All: Removed error return from start_track() and play(), and added
-error_count() to get the total number of emulation errors since the
-track was last started. See demos for examples of new usage.
-
-- All: Fixed mute_voices() muting to be preserved after loading files
-and starting tracks, instead of being cleared as it was whenever a track
-was started
-
-- VGM: Rewrote Vgm_Emu to support Sega Genesis/Mega Drive FM sound at
-any sample rate with optional FM oversampling, support for alternate
-YM2612 sound cores, and support for optional YM2413
-
-- VGM: Added tempo control, useful for slowing 60Hz NTSC Sega Genesis
-music to 50Hz PAL
-
-- VGM: Removed Vgm_Emu::track_data(), since I realized that this
-information is already present in the VGM header (oops!)
-
-- GYM: Changed Gym_Emu::track_length() operation (see Gym_Emu.h)
-
-- NSF: Added support for Sunsoft FME-7 sound chip used by Gimmick
-soundtrack
-
-- NSF: Fixed Namco 106 problems with Final Lap and others
-
-- Moved library sources to gme/ directory to reduce clutter, and merged
-boost/ functionality into blargg_common.h
-
-- Added Gzip_File_Reader for transparently using gzipped files
-
-
-Game_Music_Emu 0.2.4
---------------------
-- Created a discussion forum for problems and feedback:
-http://groups-beta.google.com/group/blargg-sound-libs
-
-- Changed error return value of Blip_Buffer::sample_rate() (also for
-Stereo_Buffer, Effects_Buffer, etc.) to blargg_err_t (defined in
-blargg_common.h), to make error reporting consistent with other
-functions. This means the "no error" return value is the opposite of
-what it was before, which will break current code which checks the error
-return value:
-
-	// current code (broken)
-	if ( !buf.sample_rate( samples_per_sec ) )
-		out_of_memory();
-	
-	// quick-and-dirty fix (just remove the ! operation)
-	if ( buf.sample_rate( samples_per_sec ) )
-		out_of_memory();
-	
-	// proper fix
-	blargg_err_t error = buf.sample_rate( samples_per_sec );
-	if ( error )
-		report_error( error );
-
-- Implemented workaround for MSVC++ 6 compiler limitations, allowing it
-to work on that compiler again
-
-- Added sample clamping to avoid wrap-around at high volumes, allowing
-higher volume with little distortion
-
-- Added to-do list and design notes
-
-- Added Music_Emu::skip( long sample_count ) to skip ahead in current
-track
-
-- Added Gym_Emu::track_length() and Vgm_Emu::track_length() for
-determining the length of non-looped GYM and VGM files
-
-- Partially implemented DMC non-linearity when its value is directly set
-using $4011, which reduces previously over-emphasized "popping" of
-percussion on some games (TMNT II in particular)
-
-- Fixed Fir_Resampler, used for SPC and GYM playback (was incorrectly
-using abs() instead of fabs()...argh)
-
-- Fixed SPC emulation bugs: eliminated clicks in Plok! soundtrack and
-now stops sample slightly earlier than the end, as the SNES does. Fixed
-a totally broken CPU addressing mode.
-
-- Fixed Konami VRC6 saw wave (was very broken before). Now VRC6 music
-sounds decent
-
-- Fixed a minor GBS emulation bug
-
-- Fixed GYM loop point bug when track was restarted before loop point
-had been reached
-
-- Made default GBS frequency equalization less muffled
-
-- Added pseudo-surround effect removal for SPC files
-
-- Added Music_Emu::voice_names() which returns names for each voice.
-
-- Added BLARGG_SOURCE_BEGIN which allows custom compiler options to be
-easily set for library sources
-
-- Changed assignment of expansion sound chips in Nsf_Emu to be spread
-more evenly when using Effects_Buffer
-
-- Changed 'size_t' values in Blip_Buffer interface to 'long'
-
-- Changed demo to generate a WAVE sound file rather than an AIFF file
-
-
-Game_Music_Emu 0.2.0
---------------------
-- Redid framework and rewrote/cleaned up emulators
-
-- Changed licensing to GNU Lesser General Public License (LGPL)
-
-- Added Sega Genesis GYM and Super Nintendo SPC emulators
-
-- Added Namco-106 and Konami VRC6 sound chip support to NSF emulator
-
-- Eliminated use of static mutable data in emulators, allowing
-multi-instance safety
-
-
-Game_Music_Emu 0.1.0
---------------------
-- First release

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/design.txt Deleted

@@ -1,194 +0,0 @@
-Game_Music_Emu 0.5.2 Design
----------------------------
-This might be slightly out-of-date at times, but will be a big help in
-understanding the library implementation.
-
-
-Architecture
-------------
-The library is essentially a bunch of independent game music file
-emulators unified with a common interface.
-
-Gme_File and Music_Emu provide a common interface to the emulators. The
-virtual functions are protected rather than public to allow pre- and
-post-processing of arguments and data in one place. This allows the
-emulator classes to assume that everything is set up properly when
-starting a track and playing samples.
-
-All file input is done with the Data_Reader interface. Many derived
-classes are present, for the usual disk-based file and block of memory,
-to specialized adaptors for things like reading a subset of data or
-combining a block of memory with a Data_Reader to the remaining data.
-This makes the library much more flexible with regard to the source of
-game music file data. I still added a specialized load_mem() function to
-have the emulator keep a pointer to data already read in memory, for
-those formats whose files can be absolutely huge (GYM, some VGMs). This
-is important if for some reason the caller must load the data ahead of
-time, but doesn't want the emulator needlessly making a copy.
-
-Since silence checking and fading are relatively complex, they are kept
-separate from basic file loading and track information, which are
-handled in the base class Gme_File. My original intent was to use
-Gme_File as the common base class for full emulators and track
-information-only readers, but implementing the C interface was much
-simpler if both derived from Music_Emu. User C++ code can still benefit
-from static checking by using Gme_File where only track information will
-be accessed.
-
-Each emulator generally has three components: main emulator, CPU
-emulator, and sound chip emulator(s). Each component has minimal
-coupling, so use in a full emulator or stand alone is fairly easy. This
-modularity really helps reduce complexity. Blip_Buffer helps a lot with
-simplifying the APU interfaces and implementation.
-
-The "classic" emulators derive from Classic_Emu, which handles
-Blip_Buffer filling and multiple channels. It uses Multi_Buffer for
-output, allowing you to derive a custom buffer that could output each
-voice to a separate sound channel and do different processing on each.
-At some point I'm going to implement a better Effects_Buffer that allows
-individual control of every channel.
-
-In implementing the C interface, I wanted a way to specify an emulator
-type that didn't require linking in all the emulators. For each emulator
-type there is a global object with pointers to functions to create the
-emulator or a track information reader. The emulator type is thus a
-pointer to this, which conveniently allows for a NULL value. The user
-referencing this emulator type object is what ultimately links the
-emulator in (unless new Foo_Emu is used in C++, of course). This type
-also serves as a useful substitute for RTTI on older C++ compilers.
-
-Addendum: I have since added gme_type_list(), which causes all listed
-emulators to be linked in. To avoid this, I make the list itself
-editable in blargg_config.h. Having a built-in list allows
-gme_load_file() to take a path and give back an emulator with the file
-loaded, which is extremely useful for new users.
-
-
-Interface conventions
-----------------------
-If a function retains a pointer to or replaces the value of an object
-passed, it takes a pointer so that it will be clear in the caller's
-source code that care is required.
-
-Multi-word names have an underscore '_' separator between individual
-words.
-
-Functions are named with lowercase words. Functions which perform an
-action with side-effects are named with a verb phrase (i.e. load, move,
-run). Functions which return the value of a piece of state are named
-using a noun phrase (i.e. loaded, moved, running).
-
-Classes are named with capitalized words. Only the first letter of an
-acronym is capitalized. Class names are nouns, sometimes suggestive of
-what they do (i.e. File_Scanner).
-
-Structure, enumeration, and typedefs to these and built-in types are
-named using lowercase words with a _t suffix.
-
-Macros are named with all-uppercase words.
-
-Internal names which can't be hidden due to technical reasons have an
-underscore '_' suffix.
-
-
-Managing Complexity
--------------------
-Complexity has been a factor in most library decisions. Many features
-have been passed by due to the complexity they would add. Once
-complexity goes past a certain level, it mentally grasping the library
-in its entirety, at which point more defects will occur and be hard to
-find.
-
-I chose 16-bit signed samples because it seems to be the most common
-format. Supporting multiple formats would add too much complexity to be
-worth it. Other formats can be obtained via conversion.
-
-I've kept interfaces fairly lean, leaving many possible features
-untapped but easy to add if necessary. For example the classic emulators
-could have volume and frequency equalization adjusted separately for
-each channel, since they each have an associated Blip_Synth.
-
-Source files of 400 lines or less seem to be the best size to limit
-complexity. In a few cases there is no reasonable way to split longer
-files, or there is benefit from having the source together in one file.
-
-
-Preventing Bugs
----------------
-I've done many things to reduce the opportunity for defects. A general
-principle is to write code so that defects will be as visible as
-possible. I've used several techniques to achieve this.
-
-I put assertions at key points where defects seem likely or where
-corruption due to a defect is likely to be visible. I've also put
-assertions where violations of the interface are likely. In emulators
-where I am unsure of exact hardware operation in a particular case, I
-output a debug-only message noting that this has occurred; many times I
-haven't implemented a hardware feature because nothing uses it. I've
-made code brittle where there is no clear reason flexibility; code
-written to handle every possibility sacrifices quality and reliability
-to handle vaguely defined situations.
-
-
-Flexibility through indirection
--------------------------------
-I've tried to allow the most flexibility of modules by using indirection
-to allow extension by the user. This keeps each module simpler and more
-focused on its unique task.
-
-The classic emulators use Multi_Buffer, which potentially allows a
-separate Blip_Buffer for each channel. This keeps emulators free of
-typical code to allow output in mono, stereo, panning, etc.
-
-All emulators use a reader object to access file data, allowing it to be
-stored in a regular file, compressed archive, memory, or generated
-on-the-fly. Again, the library can be kept free of the particulars of
-file access and changes required to support new formats.
-
-
-Emulators in general
---------------------
-When I wrote the first NES sound emulator, I stored most of the state in
-an emulator-specific format, with significant redundancy. In the
-register write function I decoded everything into named variables. I
-became tired of the verbosity and wanted to more closely model the
-hardware, so I moved to a style of storing the last written value to
-each register, along with as little other state as possible, mostly the
-internal hardware registers. While this involves slightly more
-recalculation, in most cases the emulation code is of comparable size.
-It also makes state save/restore (for use in a full emulator) much
-simpler. Finally, it makes debugging easier since the hardware registers
-used in emulation are obvious.
-
-
-CPU Cores
----------
-I've spent lots of time coming up with techniques to optimize the CPU
-cores. Some of the most important: execute multiple instructions during
-an emulation call, keep state in local variables to allow register
-assignment, optimize state representation for most common instructions,
-defer status flag calculation until actually needed, read program code
-directly without a call to the memory read function, always pre-fetch
-the operand byte before decoding instruction, and emulate instructions
-using common blocks of code.
-
-I've successfully used Nes_Cpu in a fairly complete NES emulator, and
-I'd like to make all the CPU emulators suitable for use in emulators. It
-seems a waste for them to be used only for the small amount of emulation
-necessary for game music files.
-
-I debugged the CPU cores by writing a test shell that ran them in
-parallel with other CPU cores and compared all memory accesses and
-processor states at each step. This provided good value at little cost.
-
-The CPU mapping page size is adjustable to allow the best tradeoff
-between memory/cache usage and handler granularity. The interface allows
-code to be somewhat independent of the page size.
-
-I optimize program memory accesses to direct reads rather than calls to
-the memory read function. My assumption is that it would be difficult to
-get useful code out of hardware I/O addresses, so no software will
-intentionally execute out of I/O space. Since the page size can be
-changed easily, most program memory mapping schemes can be accommodated.
-This greatly reduces memory access function calls.
-

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme Deleted

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme.txt Deleted

@@ -1,464 +0,0 @@
-Game_Music_Emu 0.5.5
---------------------
-Author : Shay Green <gblargg@gmail.com>
-Website: http://www.slack.net/~ant/libs/
-Forum : http://groups.google.com/group/blargg-sound-libs
-License: GNU Lesser General Public License (LGPL)
-
-Contents
---------
-* Overview
-* C and C++ interfaces
-* Function reference
-* Error handling
-* Emulator types
-* M3U playlist support
-* Information fields
-* Track length
-* Loading file data
-* Sound parameters
-* VGM/GYM YM2413 & YM2612 FM sound
-* Modular construction
-* Obscure features
-* Solving problems
-* Deprecated features
-* Thanks
-
-
-Overview
---------
-This library can open game music files, play tracks, and read game and
-track information tags. To play a game music file, do the following:
-
-* Open the file with gme_open_file()
-* Start a track with gme_start_track();
-* Generate samples as needed with gme_play()
-* Play samples through speaker using your operating system
-* Delete emulator when done with gme_delete()
-
-Your code must arrange for the generated samples to be played through
-the computer's speaker using whatever method your operating system
-requires.
-
-There are many additional features available; you can:
-
-* Determine of the type of a music file without opening it with
-gme_identify_*()
-* Load just the file's information tags with gme_info_only
-* Load from a block of memory rather than a file with gme_load_data()
-* Arrange for a fade-out at a particular time with gme_set_fade
-* Find when a track has ended with gme_track_ended()
-* Seek to a new time in the track with gme_seek()
-* Load an extended m3u playlist with gme_load_m3u()
-* Get a list of the voices (channels) and mute them individually with
-gme_voice_names() and gme_mute_voice()
-* Change the playback tempo without affecting pitch with gme_set_tempo()
-* Adjust treble/bass equalization with gme_set_equalizer()
-* Associate your own data with an emulator and later get it back with
-gme_set_user_data()
-* Register a function of yours to be called back when the emulator is
-deleted with gme_set_user_cleanup()
-
-Refer to gme.h for a comprehensive summary of features.
-
-
-C and C++ interfaces
---------------------
-While the library is written in C++, an extensive C interface is
-provided in gme.h. This C interface will be referred to throughout this
-documentation unless a feature is only available in the full C++
-interface. All C interface functions and other names have the gme_
-prefix, so you can recognize a C++-only feature by the lack of gme_ in
-the names used (contact me if you'd like a feature added to the C
-interface). If you're building a shared library, I highly recommend
-sticking to the C interface only, because it will be more stable between
-releases of the library than the C++ interface. Finally, the C and C++
-interfaces can be freely mixed without problems. Compare demo/basics.c
-with demo/cpp_basics.cpp to see how the C and C++ interfaces translate
-between each other.
-
-
-Function reference
-------------------
-Read the following header files for a complete reference to functions
-and features. The second group of header files can only be used in C++.
-
-blargg_config.h Library configuration
-gme.h C interface (also usable from C++)
-
-Gme_File.h File loading and track information
-Music_Emu.h Track playback and adjustments
-Data_Reader.h Custom data readers
-Effects_Buffer.h Sound buffer with adjustable stereo echo and panning
-M3u_Playlist.h M3U playlist support
-Gbs_Emu.h GBS equalizer settings
-Nsf_Emu.h NSF equalizer settings
-Spc_Emu.h SPC surround disable
-Vgm_Emu.h VGM oversampling disable and custom buffer query
-
-
-Error handling
---------------
-Functions which can fail have a return type of gme_err_t (blargg_err_t
-in the C++ interfaces), which is a pointer to an error string (const
-char*). If a function is successful it returns NULL. Errors that you can
-easily avoid are checked with debug assertions; gme_err_t return values
-are only used for genuine run-time errors that can't be easily predicted
-in advance (out of memory, I/O errors, incompatible file data). Your
-code should check all error values.
-
-To improve usability for C programmers, C++ programmers unfamiliar with
-exceptions, and compatibility with older C++ compilers, the library does
-*not* throw any C++ exceptions and uses malloc() instead of the standard
-operator new. This means that you *must* check for NULL when creating a
-library object with the new operator.
-
-When loading a music file in the wrong emulator or trying to load a
-non-music file, gme_wrong_file_type is returned. You can check for this
-error in C++ like this:
-
-	gme_err_t err = gme_open_file( path, &emu );
-	if ( err == gme_wrong_file_type )
-		...
-
-To check for minor problems, call gme_warning() to get a string
-describing the last warning. Your player should allow the user some way
-of knowing when this is the case, since these minor errors could affect
-playback. Without this information the user can't solve problems as
-well. When playing a track, gme_warning() returns minor playback-related
-problems (major playback problems end the track immediately and set the
-warning string).
-
-
-Emulator types
---------------
-The library includes several game music emulators that each support a
-different file type. Each is identified by a gme_type_t constant defined
-in gme.h, for example gme_nsf_emu is for the NSF emulator. If you use
-gme_open_file() or gme_open_data(), the library does the work of
-determining the file type and creating an appropriate emulator. If you
-want more control over this process, read on.
-
-There are two basic ways to identify a game music file's type: look at
-its file extension, or read the header data. The library includes
-functions to help with both methods. The first is preferable because it
-is fast and the most common way to identify files. Sometimes the
-extension is lost or wrong, so the header must be read.
-
-Use gme_identify_extension() to find the correct game music type based
-on a filename. To identify a file based on its extension and header
-contents, use gme_identify_file(). If you read the header data yourself,
-use gme_identify_header().
-
-If you want to remove support for some music types to reduce your
-executable size, edit GME_TYPE_LIST in blargg_config.h. For example, to
-support just NSF and GBS, use this:
-
-	#define GME_TYPE_LIST gme_nsf_type, gme_gbs_type
-
-
-M3U playlist support
---------------------
-The library supports playlists in an extended m3u format with
-gme_load_m3u() to give track names and times to multi-song formats: AY,
-GBS, HES, KSS, NSF, NSFE, and SAP. Some aspects of the file format
-itself is not well-defined so some m3u files won't work properly
-(particularly those provided with KSS files). Only m3u files referencing
-a single file are supported; your code must handle m3u files covering
-more than one game music file, though it can use the built-in m3u
-parsing provided by the library.
-
-
-Information fields
-------------------
-Support is provided for the various text fields and length information
-in a file with gme_track_info(). If you just need track information for
-a file (for example, building a playlist), use gme_new_info() in place
-of gme_new_emu(), load the file normally, then you can access the track
-count and info, but nothing else.
-
- M3U VGM GYM SPC SAP NSFE NSF AY GBS HES KSS
- -------------------------------------------------------
-Track Count | * * * * * * * * *
- |
-System | * * * * * * * * * *
- |
-Game | * * * * * * *
- |
-Song | * * * * * * *
- |
-Author | * * * * * * * *
- |
-Copyright | * * * * * * * *
- |
-Comment | * * * *
- |
-Dumper | * * * *
- |
-Length | * * * * * *
- |
-Intro Length| * * *
- |
-Loop Length | * * *
-
-As listed above, the HES and KSS file formats don't include a track
-count, and tracks are often scattered over the 0-255 range, so an m3u
-playlist for these is a must.
-
-Unavailable text fields are set to an empty string and times to -1. Your
-code should be prepared for any combination of available and unavailable
-fields, as a particular music file might not use all of the supported
-fields listed above.
-
-Currently text fields are truncated to 255 characters. Obscure fields of
-some formats are not currently decoded; contact me if you want one
-added.
-
-
-Track length
-------------
-The library leaves it up to you as to when to stop playing a track. You
-can ask for available length information and then tell the library what
-time it should start fading the track with gme_set_fade(). By default it
-also continually checks for 6 or more seconds of silence to mark the end
-of a track. Here is a reasonable algorithm you can use to decide how
-long to play a track:
-
-* If the track length is > 0, use it
-* If the loop length > 0, play for intro + loop * 2
-* Otherwise, default to 2.5 minutes (150000 msec)
-
-If you want to play a track longer than normal, be sure the loop length
-isn't zero. See Music_Player.cpp around line 145 for example code.
-
-By default, the library skips silence at the beginning of a track. It
-also continually checks for the end of a non-looping track by watching
-for 6 seconds of unbroken silence. When doing this is scans *ahead* by
-several seconds so it can report the end of the track after only one
-second of silence has actually played. This feature can be disabled with
-gme_ignore_silence().
-
-
-Loading file data
------------------
-The library allows file data to be loaded in many different ways. All
-load functions return an error which you should check. The following
-examples assume these variables:
-
-	Music_Emu* emu;
-	gme_err_t error;
-
-If you're letting the library determine a file's type, you can use
-either gme_open_file() or gme_open_data():
-	
-	error = gme_open_file( pathname, &emu );
-	error = gme_open_data( pointer, size, &emu );
-
-If you're manually determining file type and using used gme_new_emu() to
-create an emulator, you can use the following methods of loading:
-
-* From a block of memory:
-
-	error = gme_load_data( emu, pointer, size );
-
-* Have library call your function to read data:
-
-	gme_err_t my_read( void* my_data, void* out, long count )
-	{
-		// code that reads 'count' bytes into 'out' buffer
-		// and return 0 if no error
-	}
-	
-	error = gme_load_custom( emu, my_read, file_size, my_data );
-
-* If you must load the file data into memory yourself, you can have the
-library use your data directly *without* making a copy. If you do this,
-you must not free the data until you're done playing the file.
-
-	error = emu->load_mem( pointer, size );
-
-* If you've already read the first bytes of a file (perhaps to determine
-the file type) and want to avoid seeking back to the beginning for
-performance reasons, use Remaining_Reader:
-
-	Std_File_Reader in;
-	error = in.open( file_path );
-	
-	char header [4];
-	error = in.read( &header, sizeof header );
-	...
-	
-	Remaining_Reader rem( &header, sizeof header, &in );
-	error = emu->load( rem );
-
-If you merely need access to a file's header after loading, use the
-emulator-specific header() functions, after casting the Music_Emu
-pointer to the specific emulator's type. This example examines the
-chip_flags field of the header if it's an NSF file:
-
-	if ( music_emu->type() == gme_nsf_type )
-	{
-		Nsf_Emu* nsf_emu = (Nsf_Emu*) music_emu;
-		if ( nsf_emu->header().chip_flags & 0x01 )
-			...
-	}
-
-Contact me if you want more information about loading files.
-
-
-Sound parameters
-----------------
-All emulators support an arbitrary output sampling rate. A rate of 44100
-Hz should work well on most systems. Since band-limited synthesis is
-used, a sampling rate above 48000 Hz is not necessary and will actually
-reduce sound quality and performance.
-
-All emulators also support adjustable gain, mainly for the purpose of
-getting consistent volume between different music formats and avoiding
-excessive modulation. The gain can only be set *before* setting the
-emulator's sampling rate, so it's not useful as a general volume
-control. The default gains of emulators are set so that they give
-generally similar volumes, though some soundtracks are significantly
-louder or quieter than normal.
-
-Some emulators support adjustable treble and bass frequency equalization
-(AY, GBS, HES, KSS, NSF, NSFE, SAP, VGM) using set_equalizer().
-Parameters are specified using gme_equalizer_t eq = { treble_dB,
-bass_freq }. Treble_dB sets the treble level (in dB), where 0.0 dB gives
-normal treble; -200.0 dB is quite muffled, and 5.0 dB emphasizes treble
-for an extra crisp sound. Bass_freq sets the frequency where bass
-response starts to diminish; 15 Hz is normal, 0 Hz gives maximum bass,
-and 15000 Hz removes all bass. For example, the following makes the
-sound extra-crisp but lacking bass:
-
-	gme_equalizer_t eq = { 5.0, 1000 };
-	gme_set_equalizer( music_emu, &eq );
-
-Each emulator's equalization defaults to approximate the particular
-console's sound quality; this default can be determined by calling
-equalizer() just after creating the emulator. The Music_Emu::tv_eq
-profile gives sound as if coming from a TV speaker, and some emulators
-include other profiles for different versions of the system. For
-example, to use Famicom sound equalization with the NSF emulator, do the
-following:
-
-	music_emu->set_equalizer( Nsf_Emu::famicom_eq );
-
-
-VGM/GYM YM2413 & YM2612 FM sound
---------------------------------
-The library plays Sega Genesis/Mega Drive music using a YM2612 FM sound
-chip emulator based on the Gens project. Because this has some
-inaccuracies, other YM2612 emulators can be used in its place by
-re-implementing the interface in YM2612_Emu.h. Available on my website
-is a modified version of MAME's YM2612 emulator, which sounds better in
-some ways and whose author is still making improvements.
-
-VGM music files using the YM2413 FM sound chip are also supported, but a
-YM2413 emulator isn't included with the library due to technical
-reasons. I have put one of the available YM2413 emulators on my website
-that can be used directly.
-
-
-Modular construction
---------------------
-The library is made of many fairly independent modules. If you're using
-only one music file emulator, you can eliminate many of the library
-sources from your program. Refer to the files list in readme.txt to get
-a general idea of what can be removed, and be sure to edit GME_TYPE_LIST
-(see "Emulator types" above). Post to the forum if you'd like me to put
-together a smaller version for a particular use, as this only takes me a
-few minutes to do.
-
-If you want to use one of the individual sound chip emulators (or CPU
-cores) in your own console emulator, first check the libraries page on
-my website since I have released several of them as stand alone
-libraries with included documentation and examples on their use. If you
-don't find it as a standalone library, contact me and I'll consider
-separating it.
-
-The "classic" sound chips use my Blip_Buffer library, which greatly
-simplifies their implementation and efficiently handles band-limited
-synthesis. It is also available as a stand alone library with
-documentation and many examples.
-
-
-Obscure features
-----------------
-The library's flexibility allows many possibilities. Contact me if you
-want help implementing ideas or removing limitations.
-
-* Uses no global/static variables, allowing multiple instances of any
-emulator. This is useful in a music player if you want to allow
-simultaneous recording or scanning of other tracks while one is already
-playing. This will also be useful if your platform disallows global
-data.
-
-* Emulators that support a custom sound buffer can have *every* voice
-routed to a different Blip_Buffer, allowing custom processing on each
-voice. For example you could record a Game Boy track as a 4-channel
-sound file.
-
-* Defining BLIP_BUFFER_FAST uses lower quality, less-multiply-intensive
-synthesis on "classic" emulators, which might help on some really old
-processors. This significantly lowers sound quality and prevents treble
-equalization. Try this if your platform's processor isn't fast enough
-for normal quality. Even on my ten-year-old 400 MHz Mac, this reduces
-processor usage at most by about 0.6% (from 4% to 3.4%), hardly worth
-the quality loss.
-
-
-Solving problems
-----------------
-If you're having problems, try the following:
-
-* If you're getting garbled sound, try this simple siren generator in
-place of your call to play(). This will quickly tell whether the problem
-is in the library or in your code.
-
-	static void play_siren( long count, short* out )
-	{
-		static double a, a2;
-		while ( count-- )
-			*out++ = 0x2000 * sin( a += .1 + .05*sin( a2+=.00005 ) );
-	}
-
-* Enable debugging support in your environment. This enables assertions
-and other run-time checks.
-
-* Turn the compiler's optimizer is off. Sometimes an optimizer generates
-bad code.
-
-* If multiple threads are being used, ensure that only one at a time is
-accessing a given set of objects from the library. This library is not
-in general thread-safe, though independent objects can be used in
-separate threads.
-
-* If all else fails, see if the demos work.
-
-
-Deprecated features
--------------------
-The following functions and other features have been deprecated and will
-be removed in a future release of the library. Alternatives to the
-deprecated features are listed to the right.
-
-Music_Emu::error_count() warning()
-load( header, reader ) see "Loading file data" above
-Spc_Emu::trailer() track_info()
-Spc_Emu::trailer_size()
-Gym_Emu::track_length() track_info()
-Vgm_Emu::gd3_data() track_info()
-Nsfe_Emu::disable_playlist() clear_playlist()
-
-
-Thanks
-------
-Big thanks to Chris Moeller (kode54) for help with library testing and
-feedback, for maintaining the Foobar2000 plugin foo_gep based on it, and
-for original work on openspc++ that was used when developing Spc_Emu.
-Brad Martin's excellent OpenSPC SNES DSP emulator worked well from the
-start. Also thanks to Richard Bannister, Mahendra Tallur, Shazz,
-nenolod, theHobbit, Johan Samuelsson, and nes6502 for testing, using,
-and giving feedback for the library in their respective game music
-players.

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Ay_Emu.cpp Deleted

@@ -1,410 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Ay_Emu.h"
-
-#include "blargg_endian.h"
-#include <string.h>
-
-/* Copyright (C) 2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-#include <stdio.h>
-
-long const spectrum_clock = 3546900;
-long const cpc_clock = 2000000;
-
-unsigned const ram_start = 0x4000;
-int const osc_count = Ay_Apu::osc_count + 1;
-
-Ay_Emu::Ay_Emu()
-{
-	beeper_output = 0;
-	set_type( gme_ay_type );
-	
-	static const char* const names [osc_count] = {
-		"Wave 1", "Wave 2", "Wave 3", "Beeper"
-	};
-	set_voice_names( names );
-	
-	static int const types [osc_count] = {
-		wave_type | 0, wave_type | 1, wave_type | 2, mixed_type | 0
-	};
-	set_voice_types( types );
-	set_silence_lookahead( 6 );
-}
-
-Ay_Emu::~Ay_Emu() { }
-
-// Track info
-
-static byte const* get_data( Ay_Emu::file_t const& file, byte const* ptr, int min_size )
-{
-	long pos = ptr - (byte const*) file.header;
-	long file_size = file.end - (byte const*) file.header;
-	assert( (unsigned long) pos <= (unsigned long) file_size - 2 );
-	int offset = (BOOST::int16_t) get_be16( ptr );
-	if ( !offset || blargg_ulong (pos + offset) > blargg_ulong (file_size - min_size) )
-		return 0;
-	return ptr + offset;
-}
-
-static blargg_err_t parse_header( byte const* in, long size, Ay_Emu::file_t* out )
-{
-	typedef Ay_Emu::header_t header_t;
-	out->header = (header_t const*) in;
-	out->end = in + size;
-	
-	if ( size < Ay_Emu::header_size )
-		return gme_wrong_file_type;
-	
-	header_t const& h = *(header_t const*) in;
-	if ( memcmp( h.tag, "ZXAYEMUL", 8 ) )
-		return gme_wrong_file_type;
-	
-	out->tracks = get_data( *out, h.track_info, (h.max_track + 1) * 4 );
-	if ( !out->tracks )
-		return "Missing track data";
-	
-	return 0;
-}
-
-static void copy_ay_fields( Ay_Emu::file_t const& file, track_info_t* out, int track )
-{
-	Gme_File::copy_field_( out->song, (char const*) get_data( file, file.tracks + track * 4, 1 ) );
-	byte const* track_info = get_data( file, file.tracks + track * 4 + 2, 6 );
-	if ( track_info )
-		out->length = get_be16( track_info + 4 ) * (1000L / 50); // frames to msec
-	
-	Gme_File::copy_field_( out->author, (char const*) get_data( file, file.header->author, 1 ) );
-	Gme_File::copy_field_( out->comment, (char const*) get_data( file, file.header->comment, 1 ) );
-}
-
-blargg_err_t Ay_Emu::track_info_( track_info_t* out, int track ) const
-{
-	copy_ay_fields( file, out, track );
-	return 0;
-}
-
-struct Ay_File : Gme_Info_
-{
-	Ay_Emu::file_t file;
-	
-	Ay_File() { set_type( gme_ay_type ); }
-	
-	blargg_err_t load_mem_( byte const* begin, long size )
-	{
-		RETURN_ERR( parse_header( begin, size, &file ) );
-		set_track_count( file.header->max_track + 1 );
-		return 0;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int track ) const
-	{
-		copy_ay_fields( file, out, track );
-		return 0;
-	}
-};
-
-static Music_Emu* new_ay_emu () { return BLARGG_NEW Ay_Emu ; }
-static Music_Emu* new_ay_file() { return BLARGG_NEW Ay_File; }
-
-static gme_type_t_ const gme_ay_type_ = { "ZX Spectrum", 0, &new_ay_emu, &new_ay_file, "AY", 1 };
-gme_type_t const gme_ay_type = &gme_ay_type_;
-
-// Setup
-
-blargg_err_t Ay_Emu::load_mem_( byte const* in, long size )
-{
-	assert( offsetof (header_t,track_info [2]) == header_size );
-	
-	RETURN_ERR( parse_header( in, size, &file ) );
-	set_track_count( file.header->max_track + 1 );
-	
-	if ( file.header->vers > 2 )
-		set_warning( "Unknown file version" );
-	
-	set_voice_count( osc_count );
-	apu.volume( gain() );
-	
-	return setup_buffer( spectrum_clock );
-}
-	
-void Ay_Emu::update_eq( blip_eq_t const& eq )
-{
-	apu.treble_eq( eq );
-}
-
-void Ay_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer*, Blip_Buffer* )
-{
-	if ( i >= Ay_Apu::osc_count )
-		beeper_output = center;
-	else
-		apu.osc_output( i, center );
-}
-
-// Emulation
-
-void Ay_Emu::set_tempo_( double t )
-{
-	play_period = blip_time_t (clock_rate() / 50 / t);
-}
-
-blargg_err_t Ay_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
-	memset( mem.ram + 0x0000, 0xC9, 0x100 ); // fill RST vectors with RET
-	memset( mem.ram + 0x0100, 0xFF, 0x4000 - 0x100 );
-	memset( mem.ram + ram_start, 0x00, sizeof mem.ram - ram_start );
-	memset( mem.padding1, 0xFF, sizeof mem.padding1 );
-	memset( mem.ram + 0x10000, 0xFF, sizeof mem.ram - 0x10000 );
-	
-	// locate data blocks
-	byte const* const data = get_data( file, file.tracks + track * 4 + 2, 14 );
-	if ( !data ) return "File data missing";
-	
-	byte const* const more_data = get_data( file, data + 10, 6 );
-	if ( !more_data ) return "File data missing";
-	
-	byte const* blocks = get_data( file, data + 12, 8 );
-	if ( !blocks ) return "File data missing";
-	
-	// initial addresses
-	cpu::reset( mem.ram );
-	r.sp = get_be16( more_data );
-	r.b.a = r.b.b = r.b.d = r.b.h = data [8];
-	r.b.flags = r.b.c = r.b.e = r.b.l = data [9];
-	r.alt.w = r.w;
-	r.ix = r.iy = r.w.hl;
-	
-	unsigned addr = get_be16( blocks );
-	if ( !addr ) return "File data missing";
-	
-	unsigned init = get_be16( more_data + 2 );
-	if ( !init )
-		init = addr;
-	
-	// copy blocks into memory
-	do
-	{
-		blocks += 2;
-		unsigned len = get_be16( blocks ); blocks += 2;
-		if ( addr + len > 0x10000 )
-		{
-			set_warning( "Bad data block size" );
-			len = 0x10000 - addr;
-		}
-		check( len );
-		byte const* in = get_data( file, blocks, 0 ); blocks += 2;
-		if ( len > blargg_ulong (file.end - in) )
-		{
-			set_warning( "Missing file data" );
-			len = file.end - in;
-		}
-		//debug_printf( "addr: $%04X, len: $%04X\n", addr, len );
-		if ( addr < ram_start && addr >= 0x400 ) // several tracks use low data
-			debug_printf( "Block addr in ROM\n" );
-
-		if (!in) {
- return "NULL in pointer\n";
- }
-		memcpy( mem.ram + addr, in, len );
-		
-		if ( file.end - blocks < 8 )
-		{
-			set_warning( "Missing file data" );
-			break;
-		}
-	}
-	while ( (addr = get_be16( blocks )) != 0 );
-	
-	// copy and configure driver
-	static byte const passive [] = {
-		0xF3, // DI
-		0xCD, 0, 0, // CALL init
-		0xED, 0x5E, // LOOP: IM 2
-		0xFB, // EI
-		0x76, // HALT
-		0x18, 0xFA // JR LOOP
-	};
-	static byte const active [] = {
-		0xF3, // DI
-		0xCD, 0, 0, // CALL init
-		0xED, 0x56, // LOOP: IM 1
-		0xFB, // EI
-		0x76, // HALT
-		0xCD, 0, 0, // CALL play
-		0x18, 0xF7 // JR LOOP
-	};
-	memcpy( mem.ram, passive, sizeof passive );
-	unsigned play_addr = get_be16( more_data + 4 );
-	//debug_printf( "Play: $%04X\n", play_addr );
-	if ( play_addr )
-	{
-		memcpy( mem.ram, active, sizeof active );
-		mem.ram [ 9] = play_addr;
-		mem.ram [10] = play_addr >> 8;
-	}
-	mem.ram [2] = init;
-	mem.ram [3] = init >> 8;
-	
-	mem.ram [0x38] = 0xFB; // Put EI at interrupt vector (followed by RET)
-	
-	memcpy( mem.ram + 0x10000, mem.ram, 0x80 ); // some code wraps around (ugh)
-	
-	beeper_delta = int (apu.amp_range * 0.65);
-	last_beeper = 0;
-	apu.reset();
-	next_play = play_period;
-	
-	// start at spectrum speed
-	change_clock_rate( spectrum_clock );
-	set_tempo( tempo() );
-	
-	spectrum_mode = false;
-	cpc_mode = false;
-	cpc_latch = 0;
-	
-	return 0;
-}
-
-// Emulation
-
-void Ay_Emu::cpu_out_misc( cpu_time_t time, unsigned addr, int data )
-{
-	if ( !cpc_mode )
-	{
-		switch ( addr & 0xFEFF )
-		{
-		case 0xFEFD:
-			spectrum_mode = true;
-			apu_addr = data & 0x0F;
-			return;
-		
-		case 0xBEFD:
-			spectrum_mode = true;
-			apu.write( time, apu_addr, data );
-			return;
-		}
-	}
-	
-	if ( !spectrum_mode )
-	{
-		switch ( addr >> 8 )
-		{
-		case 0xF6:
-			switch ( data & 0xC0 )
-			{
-			case 0xC0:
-				apu_addr = cpc_latch & 0x0F;
-				goto enable_cpc;
-			
-			case 0x80:
-				apu.write( time, apu_addr, cpc_latch );
-				goto enable_cpc;
-			}
-			break;
-		
-		case 0xF4:
-			cpc_latch = data;
-			goto enable_cpc;
-		}
-	}
-	
-	debug_printf( "Unmapped OUT: $%04X <- $%02X\n", addr, data );
-	return;
-	
-enable_cpc:
-	if ( !cpc_mode )
-	{
-		cpc_mode = true;
-		change_clock_rate( cpc_clock );
-		set_tempo( tempo() );
-	}
-}
-
-void ay_cpu_out( Ay_Cpu* cpu, cpu_time_t time, unsigned addr, int data )
-{
-	Ay_Emu& emu = STATIC_CAST(Ay_Emu&,*cpu);
-	
-	if ( (addr & 0xFF) == 0xFE && !emu.cpc_mode )
-	{
-		int delta = emu.beeper_delta;
-		data &= 0x10;
-		if ( emu.last_beeper != data )
-		{
-			emu.last_beeper = data;
-			emu.beeper_delta = -delta;
-			emu.spectrum_mode = true;
-			if ( emu.beeper_output )
-				emu.apu.synth_.offset( time, delta, emu.beeper_output );
-		}
-	}
-	else
-	{
-		emu.cpu_out_misc( time, addr, data );
-	}
-}
-
-int ay_cpu_in( Ay_Cpu*, unsigned addr )
-{
-	// keyboard read and other things
-	if ( (addr & 0xFF) == 0xFE )
-		return 0xFF; // other values break some beeper tunes
-	
-	debug_printf( "Unmapped IN : $%04X\n", addr );
-	return 0xFF;
-}
-
-blargg_err_t Ay_Emu::run_clocks( blip_time_t& duration, int )
-{
-	set_time( 0 );
-	if ( !(spectrum_mode | cpc_mode) )
-		duration /= 2; // until mode is set, leave room for halved clock rate
-	
-	while ( time() < duration )
-	{
-		cpu::run( min( duration, (blip_time_t) next_play ) );
-		
-		if ( time() >= next_play )
-		{
-			next_play += play_period;
-			
-			if ( r.iff1 )
-			{
-				if ( mem.ram [r.pc] == 0x76 )
-					r.pc++;
-				
-				r.iff1 = r.iff2 = 0;
-				
-				mem.ram [--r.sp] = uint8_t (r.pc >> 8);
-				mem.ram [--r.sp] = uint8_t (r.pc);
-				r.pc = 0x38;
-				cpu::adjust_time( 12 );
-				if ( r.im == 2 )
-				{
-					cpu::adjust_time( 6 );
-					unsigned addr = r.i * 0x100u + 0xFF;
-					r.pc = mem.ram [(addr + 1) & 0xFFFF] * 0x100u + mem.ram [addr];
-				}
-			}
-		}
-	}
-	duration = time();
-	next_play -= duration;
-	check( next_play >= 0 );
-	adjust_time( -duration );
-	
-	apu.end_frame( duration );
-	
-	return 0;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Blip_Buffer.cpp Deleted

@@ -1,446 +0,0 @@
-// Blip_Buffer 0.4.1. http://www.slack.net/~ant/
-
-#include "Blip_Buffer.h"
-
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-/* Copyright (C) 2003-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#ifdef BLARGG_ENABLE_OPTIMIZER
-	#include BLARGG_ENABLE_OPTIMIZER
-#endif
-
-int const silent_buf_size = 1; // size used for Silent_Blip_Buffer
-
-Blip_Buffer::Blip_Buffer()
-{
-	factor_ = (blip_ulong)-1 / 2;
-	offset_ = 0;
-	buffer_ = 0;
-	buffer_size_ = 0;
-	sample_rate_ = 0;
-	reader_accum_ = 0;
-	bass_shift_ = 0;
-	clock_rate_ = 0;
-	bass_freq_ = 16;
-	length_ = 0;
-	
-	// assumptions code makes about implementation-defined features
-	#ifndef NDEBUG
-		// right shift of negative value preserves sign
-		buf_t_ i = -0x7FFFFFFE;
-		assert( (i >> 1) == -0x3FFFFFFF );
-		
-		// casting to short truncates to 16 bits and sign-extends
-		i = 0x18000;
-		assert( (short) i == -0x8000 );
-	#endif
-}
-
-Blip_Buffer::~Blip_Buffer()
-{
-	if ( buffer_size_ != silent_buf_size )
-		free( buffer_ );
-}
-
-Silent_Blip_Buffer::Silent_Blip_Buffer()
-{
-	factor_ = 0;
-	buffer_ = buf;
-	buffer_size_ = silent_buf_size;
-	memset( buf, 0, sizeof buf ); // in case machine takes exception for signed overflow
-}
-
-void Blip_Buffer::clear( int entire_buffer )
-{
-	offset_ = 0;
-	reader_accum_ = 0;
-	modified_ = 0;
-	if ( buffer_ )
-	{
-		long count = (entire_buffer ? buffer_size_ : samples_avail());
-		memset( buffer_, 0, (count + blip_buffer_extra_) * sizeof (buf_t_) );
-	}
-}
-
-Blip_Buffer::blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, int msec )
-{
-	if ( buffer_size_ == silent_buf_size )
-	{
-		assert( 0 );
-		return "Internal (tried to resize Silent_Blip_Buffer)";
-	}
-	
-	// start with maximum length that resampled time can represent
-	long new_size = (UINT_MAX >> BLIP_BUFFER_ACCURACY) - blip_buffer_extra_ - 64;
-	if ( msec != blip_max_length )
-	{
-		long s = (new_rate * (msec + 1) + 999) / 1000;
-		if ( s < new_size )
-			new_size = s;
-		else
-			assert( 0 ); // fails if requested buffer length exceeds limit
-	}
-	
-	if ( buffer_size_ != new_size )
-	{
-		void* p = realloc( buffer_, (new_size + blip_buffer_extra_) * sizeof *buffer_ );
-		if ( !p )
-			return "Out of memory";
-		buffer_ = (buf_t_*) p;
-	}
-	
-	buffer_size_ = new_size;
-	assert( buffer_size_ != silent_buf_size );
-	
-	// update things based on the sample rate
-	sample_rate_ = new_rate;
-	length_ = new_size * 1000 / new_rate - 1;
-	if ( msec )
-		assert( length_ == msec ); // ensure length is same as that passed in
-	if ( clock_rate_ )
-		clock_rate( clock_rate_ );
-	bass_freq( bass_freq_ );
-	
-	clear();
-	
-	return 0; // success
-}
-
-blip_resampled_time_t Blip_Buffer::clock_rate_factor( long rate ) const
-{
-	double ratio = (double) sample_rate_ / rate;
-	blip_long factor = (blip_long) floor( ratio * (1L << BLIP_BUFFER_ACCURACY) + 0.5 );
-	assert( factor > 0 || !sample_rate_ ); // fails if clock/output ratio is too large
-	return (blip_resampled_time_t) factor;
-}
-
-void Blip_Buffer::bass_freq( int freq )
-{
-	bass_freq_ = freq;
-	int shift = 31;
-	if ( freq > 0 )
-	{
-		shift = 13;
-		long f = (freq << 16) / sample_rate_;
-		while ( (f >>= 1) && --shift ) { }
-	}
-	bass_shift_ = shift;
-}
-
-void Blip_Buffer::end_frame( blip_time_t t )
-{
-	offset_ += t * factor_;
-	assert( samples_avail() <= (long) buffer_size_ ); // time outside buffer length
-}
-
-void Blip_Buffer::remove_silence( long count )
-{
-	assert( count <= samples_avail() ); // tried to remove more samples than available
-	offset_ -= (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
-}
-
-long Blip_Buffer::count_samples( blip_time_t t ) const
-{
-	unsigned long last_sample = resampled_time( t ) >> BLIP_BUFFER_ACCURACY;
-	unsigned long first_sample = offset_ >> BLIP_BUFFER_ACCURACY;
-	return (long) (last_sample - first_sample);
-}
-
-blip_time_t Blip_Buffer::count_clocks( long count ) const
-{
-	if ( !factor_ )
-	{
-		assert( 0 ); // sample rate and clock rates must be set first
-		return 0;
-	}
-	
-	if ( count > buffer_size_ )
-		count = buffer_size_;
-	blip_resampled_time_t time = (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
-	return (blip_time_t) ((time - offset_ + factor_ - 1) / factor_);
-}
-
-void Blip_Buffer::remove_samples( long count )
-{
-	if ( count )
-	{
-		remove_silence( count );
-		
-		// copy remaining samples to beginning and clear old samples
-		long remain = samples_avail() + blip_buffer_extra_;
-		memmove( buffer_, buffer_ + count, remain * sizeof *buffer_ );
-		memset( buffer_ + remain, 0, count * sizeof *buffer_ );
-	}
-}
-
-// Blip_Synth_
-
-Blip_Synth_Fast_::Blip_Synth_Fast_()
-{
-	buf = 0;
-	last_amp = 0;
-	delta_factor = 0;
-}
-
-void Blip_Synth_Fast_::volume_unit( double new_unit )
-{
-	delta_factor = int (new_unit * (1L << blip_sample_bits) + 0.5);
-}
-
-#if !BLIP_BUFFER_FAST
-
-Blip_Synth_::Blip_Synth_( short* p, int w ) :
-	impulses( p ),
-	width( w )
-{
-	volume_unit_ = 0.0;
-	kernel_unit = 0;
-	buf = 0;
-	last_amp = 0;
-	delta_factor = 0;
-}
-
-#undef PI
-#define PI 3.1415926535897932384626433832795029
-
-static void gen_sinc( float* out, int count, double oversample, double treble, double cutoff )
-{
-	if ( cutoff >= 0.999 )
-		cutoff = 0.999;
-	
-	if ( treble < -300.0 )
-		treble = -300.0;
-	if ( treble > 5.0 )
-		treble = 5.0;
-	
-	double const maxh = 4096.0;
-	double const rolloff = pow( 10.0, 1.0 / (maxh * 20.0) * treble / (1.0 - cutoff) );
-	double const pow_a_n = pow( rolloff, maxh - maxh * cutoff );
-	double const to_angle = PI / 2 / maxh / oversample;
-	for ( int i = 0; i < count; i++ )
-	{
-		double angle = ((i - count) * 2 + 1) * to_angle;
-		double c = rolloff * cos( (maxh - 1.0) * angle ) - cos( maxh * angle );
-		double cos_nc_angle = cos( maxh * cutoff * angle );
-		double cos_nc1_angle = cos( (maxh * cutoff - 1.0) * angle );
-		double cos_angle = cos( angle );
-		
-		c = c * pow_a_n - rolloff * cos_nc1_angle + cos_nc_angle;
-		double d = 1.0 + rolloff * (rolloff - cos_angle - cos_angle);
-		double b = 2.0 - cos_angle - cos_angle;
-		double a = 1.0 - cos_angle - cos_nc_angle + cos_nc1_angle;
-		
-		out [i] = (float) ((a * d + c * b) / (b * d)); // a / b + c / d
-	}
-}
-
-void blip_eq_t::generate( float* out, int count ) const
-{
-	// lower cutoff freq for narrow kernels with their wider transition band
-	// (8 points->1.49, 16 points->1.15)
-	double oversample = blip_res * 2.25 / count + 0.85;
-	double half_rate = sample_rate * 0.5;
-	if ( cutoff_freq )
-		oversample = half_rate / cutoff_freq;
-	double cutoff = rolloff_freq * oversample / half_rate;
-	
-	gen_sinc( out, count, blip_res * oversample, treble, cutoff );
-	
-	// apply (half of) hamming window
-	double to_fraction = PI / (count - 1);
-	for ( int i = count; i--; )
-		out [i] *= 0.54f - 0.46f * (float) cos( i * to_fraction );
-}
-
-void Blip_Synth_::adjust_impulse()
-{
-	// sum pairs for each phase and add error correction to end of first half
-	int const size = impulses_size();
-	for ( int p = blip_res; p-- >= blip_res / 2; )
-	{
-		int p2 = blip_res - 2 - p;
-		long error = kernel_unit;
-		for ( int i = 1; i < size; i += blip_res )
-		{
-			error -= impulses [i + p ];
-			error -= impulses [i + p2];
-		}
-		if ( p == p2 )
-			error /= 2; // phase = 0.5 impulse uses same half for both sides
-		impulses [size - blip_res + p] += (short) error;
-		//printf( "error: %ld\n", error );
-	}
-	
-	//for ( int i = blip_res; i--; printf( "\n" ) )
-	// for ( int j = 0; j < width / 2; j++ )
-	// printf( "%5ld,", impulses [j * blip_res + i + 1] );
-}
-
-void Blip_Synth_::treble_eq( blip_eq_t const& eq )
-{
-	float fimpulse [blip_res / 2 * (blip_widest_impulse_ - 1) + blip_res * 2];
-	
-	int const half_size = blip_res / 2 * (width - 1);
-	eq.generate( &fimpulse [blip_res], half_size );
-	
-	int i;
-	
-	// need mirror slightly past center for calculation
-	for ( i = blip_res; i--; )
-		fimpulse [blip_res + half_size + i] = fimpulse [blip_res + half_size - 1 - i];
-	
-	// starts at 0
-	for ( i = 0; i < blip_res; i++ )
-		fimpulse [i] = 0.0f;
-	
-	// find rescale factor
-	double total = 0.0;
-	for ( i = 0; i < half_size; i++ )
-		total += fimpulse [blip_res + i];
-	
-	//double const base_unit = 44800.0 - 128 * 18; // allows treble up to +0 dB
-	//double const base_unit = 37888.0; // allows treble to +5 dB
-	double const base_unit = 32768.0; // necessary for blip_unscaled to work
-	double rescale = base_unit / 2 / total;
-	kernel_unit = (long) base_unit;
-	
-	// integrate, first difference, rescale, convert to int
-	double sum = 0.0;
-	double next = 0.0;
-	int const impulses_size = this->impulses_size();
-	for ( i = 0; i < impulses_size; i++ )
-	{
-		impulses [i] = (short) floor( (next - sum) * rescale + 0.5 );
-		sum += fimpulse [i];
-		next += fimpulse [i + blip_res];
-	}
-	adjust_impulse();
-	
-	// volume might require rescaling
-	double vol = volume_unit_;
-	if ( vol )
-	{
-		volume_unit_ = 0.0;
-		volume_unit( vol );
-	}
-}
-
-void Blip_Synth_::volume_unit( double new_unit )
-{
-	if ( new_unit != volume_unit_ )
-	{
-		// use default eq if it hasn't been set yet
-		if ( !kernel_unit )
-			treble_eq( -8.0 );
-		
-		volume_unit_ = new_unit;
-		double factor = new_unit * (1L << blip_sample_bits) / kernel_unit;
-		
-		if ( factor > 0.0 )
-		{
-			int shift = 0;
-			
-			// if unit is really small, might need to attenuate kernel
-			while ( factor < 2.0 )
-			{
-				shift++;
-				factor *= 2.0;
-			}
-			
-			if ( shift )
-			{
-				kernel_unit >>= shift;
-				assert( kernel_unit > 0 ); // fails if volume unit is too low
-				
-				// keep values positive to avoid round-towards-zero of sign-preserving
-				// right shift for negative values
-				long offset = 0x8000 + (1 << (shift - 1));
-				long offset2 = 0x8000 >> shift;
-				for ( int i = impulses_size(); i--; )
-					impulses [i] = (short) (((impulses [i] + offset) >> shift) - offset2);
-				adjust_impulse();
-			}
-		}
-		delta_factor = (int) floor( factor + 0.5 );
-		//printf( "delta_factor: %d, kernel_unit: %d\n", delta_factor, kernel_unit );
-	}
-}
-#endif
-
-long Blip_Buffer::read_samples( blip_sample_t* BLIP_RESTRICT out, long max_samples, int stereo )
-{
-	long count = samples_avail();
-	if ( count > max_samples )
-		count = max_samples;
-	
-	if ( count )
-	{
-		int const bass = BLIP_READER_BASS( *this );
-		BLIP_READER_BEGIN( reader, *this );
-		
-		if ( !stereo )
-		{
-			for ( blip_long n = count; n; --n )
-			{
-				blip_long s = BLIP_READER_READ( reader );
-				if ( (blip_sample_t) s != s )
-					s = 0x7FFF - (s >> 24);
-				*out++ = (blip_sample_t) s;
-				BLIP_READER_NEXT( reader, bass );
-			}
-		}
-		else
-		{
-			for ( blip_long n = count; n; --n )
-			{
-				blip_long s = BLIP_READER_READ( reader );
-				if ( (blip_sample_t) s != s )
-					s = 0x7FFF - (s >> 24);
-				*out = (blip_sample_t) s;
-				out += 2;
-				BLIP_READER_NEXT( reader, bass );
-			}
-		}
-		BLIP_READER_END( reader, *this );
-		
-		remove_samples( count );
-	}
-	return count;
-}
-
-void Blip_Buffer::mix_samples( blip_sample_t const* in, long count )
-{
-	if ( buffer_size_ == silent_buf_size )
-	{
-		assert( 0 );
-		return;
-	}
-	
-	buf_t_* out = buffer_ + (offset_ >> BLIP_BUFFER_ACCURACY) + blip_widest_impulse_ / 2;
-	
-	int const sample_shift = blip_sample_bits - 16;
-	int prev = 0;
-	while ( count-- )
-	{
-		blip_long s = (blip_long) *in++ << sample_shift;
-		*out += s - prev;
-		prev = s;
-		++out;
-	}
-	*out -= prev;
-}
-

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Gbs_Emu.cpp Deleted

@@ -1,289 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Gbs_Emu.h"
-
-#include "blargg_endian.h"
-#include <string.h>
-
-/* Copyright (C) 2003-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000 };
-Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300 };
-
-Gbs_Emu::Gbs_Emu()
-{
-	set_type( gme_gbs_type );
-	
-	static const char* const names [Gb_Apu::osc_count] = {
-		"Square 1", "Square 2", "Wave", "Noise"
-	};
-	set_voice_names( names );
-	
-	static int const types [Gb_Apu::osc_count] = {
-		wave_type | 1, wave_type | 2, wave_type | 0, mixed_type | 0
-	};
-	set_voice_types( types );
-	
-	set_silence_lookahead( 6 );
-	set_max_initial_silence( 21 );
-	set_gain( 1.2 );
-	
-	static equalizer_t const eq = { -1.0, 120 };
-	set_equalizer( eq );
-}
-
-Gbs_Emu::~Gbs_Emu() { }
-
-void Gbs_Emu::unload()
-{
-	rom.clear();
-	Music_Emu::unload();
-}
-
-// Track info
-
-static void copy_gbs_fields( Gbs_Emu::header_t const& h, track_info_t* out )
-{
-	GME_COPY_FIELD( h, out, game );
-	GME_COPY_FIELD( h, out, author );
-	GME_COPY_FIELD( h, out, copyright );
-}
-
-blargg_err_t Gbs_Emu::track_info_( track_info_t* out, int ) const
-{
-	copy_gbs_fields( header_, out );
-	return 0;
-}
-
-static blargg_err_t check_gbs_header( void const* header )
-{
-	if ( memcmp( header, "GBS", 3 ) )
-		return gme_wrong_file_type;
-	return 0;
-}
-
-struct Gbs_File : Gme_Info_
-{
-	Gbs_Emu::header_t h;
-	
-	Gbs_File() { set_type( gme_gbs_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		blargg_err_t err = in.read( &h, Gbs_Emu::header_size );
-		if ( err )
-			return (err == in.eof_error ? gme_wrong_file_type : err);
-		
-		set_track_count( h.track_count );
-		return check_gbs_header( &h );
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_gbs_fields( h, out );
-		return 0;
-	}
-};
-
-static Music_Emu* new_gbs_emu () { return BLARGG_NEW Gbs_Emu ; }
-static Music_Emu* new_gbs_file() { return BLARGG_NEW Gbs_File; }
-
-static gme_type_t_ const gme_gbs_type_ = { "Game Boy", 0, &new_gbs_emu, &new_gbs_file, "GBS", 1 };
-gme_type_t const gme_gbs_type = &gme_gbs_type_;
-
-// Setup
-
-blargg_err_t Gbs_Emu::load_( Data_Reader& in )
-{
-	assert( offsetof (header_t,copyright [32]) == header_size );
-	RETURN_ERR( rom.load( in, header_size, &header_, 0 ) );
-	
-	set_track_count( header_.track_count );
-	RETURN_ERR( check_gbs_header( &header_ ) );
-	
-	if ( header_.vers != 1 )
-		set_warning( "Unknown file version" );
-	
-	if ( header_.timer_mode & 0x78 )
-		set_warning( "Invalid timer mode" );
-	
-	unsigned load_addr = get_le16( header_.load_addr );
-	if ( (header_.load_addr [1] | header_.init_addr [1] | header_.play_addr [1]) > 0x7F ||
-			load_addr < 0x400 )
-		set_warning( "Invalid load/init/play address" );
-	
-	set_voice_count( Gb_Apu::osc_count );
-	
-	apu.volume( gain() );
-	
-	return setup_buffer( 4194304 );
-}
-
-void Gbs_Emu::update_eq( blip_eq_t const& eq )
-{
-	apu.treble_eq( eq );
-}
-
-void Gbs_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
-{
-	apu.osc_output( i, c, l, r );
-}
-
-// Emulation
-
-// see gb_cpu_io.h for read/write functions
-
-void Gbs_Emu::set_bank( int n )
-{
-	blargg_long addr = rom.mask_addr( n * (blargg_long) bank_size );
-	if ( addr == 0 && rom.size() > bank_size )
-	{
-		// TODO: what is the correct behavior? Current Game & Watch Gallery
-		// rip requires that this have no effect or set to bank 1.
-		//debug_printf( "Selected ROM bank 0\n" );
-		return;
-		//n = 1;
-	}
-	cpu::map_code( bank_size, bank_size, rom.at_addr( addr ) );
-}
-
-void Gbs_Emu::update_timer()
-{
-	if ( header_.timer_mode & 0x04 )
-	{
-		static byte const rates [4] = { 10, 4, 6, 8 };
-		int shift = rates [ram [hi_page + 7] & 3] - (header_.timer_mode >> 7);
-		play_period = (256L - ram [hi_page + 6]) << shift;
-	}
-	else
-	{
-		play_period = 70224; // 59.73 Hz
-	}
-	if ( tempo() != 1.0 )
-		play_period = blip_time_t (play_period / tempo());
-}
-
-static BOOST::uint8_t const sound_data [Gb_Apu::register_count] = {
-	0x80, 0xBF, 0x00, 0x00, 0xBF, // square 1
-	0x00, 0x3F, 0x00, 0x00, 0xBF, // square 2
-	0x7F, 0xFF, 0x9F, 0x00, 0xBF, // wave
-	0x00, 0xFF, 0x00, 0x00, 0xBF, // noise
-	0x77, 0xF3, 0xF1, // vin/volume, status, power mode
-	0, 0, 0, 0, 0, 0, 0, 0, 0, // unused
-	0xAC, 0xDD, 0xDA, 0x48, 0x36, 0x02, 0xCF, 0x16, // waveform data
-	0x2C, 0x04, 0xE5, 0x2C, 0xAC, 0xDD, 0xDA, 0x48
-};
-
-void Gbs_Emu::cpu_jsr( gb_addr_t addr )
-{
-	check( cpu::r.sp == get_le16( header_.stack_ptr ) );
-	cpu::r.pc = addr;
-	cpu_write( --cpu::r.sp, idle_addr >> 8 );
-	cpu_write( --cpu::r.sp, idle_addr&0xFF );
-}
-
-void Gbs_Emu::set_tempo_( double t )
-{
-	apu.set_tempo( t );
-	update_timer();
-}
-
-blargg_err_t Gbs_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
-	memset( ram, 0, 0x4000 );
-	memset( ram + 0x4000, 0xFF, 0x1F80 );
-	memset( ram + 0x5F80, 0, sizeof ram - 0x5F80 );
-	ram [hi_page] = 0; // joypad reads back as 0
-	
-	apu.reset();
-	for ( int i = 0; i < (int) sizeof sound_data; i++ )
-		apu.write_register( 0, i + apu.start_addr, sound_data [i] );
-	
-	cpu::reset( rom.unmapped() );
-	
-	unsigned load_addr = get_le16( header_.load_addr );
-	cpu::rst_base = load_addr;
-	rom.set_addr( load_addr );
-	
-	cpu::map_code( ram_addr, 0x10000 - ram_addr, ram );
-	cpu::map_code( 0, bank_size, rom.at_addr( 0 ) );
-	set_bank( rom.size() > bank_size );
-	
-	ram [hi_page + 6] = header_.timer_modulo;
-	ram [hi_page + 7] = header_.timer_mode;
-	update_timer();
-	next_play = play_period;
-	
-	cpu::r.a = track;
-	cpu::r.pc = idle_addr;
-	cpu::r.sp = get_le16( header_.stack_ptr );
-	cpu_time = 0;
-	cpu_jsr( get_le16( header_.init_addr ) );
-	
-	return 0;
-}
-
-blargg_err_t Gbs_Emu::run_clocks( blip_time_t& duration, int )
-{
-	cpu_time = 0;
-	while ( cpu_time < duration )
-	{
-		long count = duration - cpu_time;
-		cpu_time = duration;
-		bool result = cpu::run( count );
-		cpu_time -= cpu::remain();
-		
-		if ( result )
-		{
-			if ( cpu::r.pc == idle_addr )
-			{
-				if ( next_play > duration )
-				{
-					cpu_time = duration;
-					break;
-				}
-				
-				if ( cpu_time < next_play )
-					cpu_time = next_play;
-				next_play += play_period;
-				cpu_jsr( get_le16( header_.play_addr ) );
-				GME_FRAME_HOOK( this );
-				// TODO: handle timer rates different than 60 Hz
-			}
-			else if ( cpu::r.pc > 0xFFFF )
-			{
-				debug_printf( "PC wrapped around\n" );
-				cpu::r.pc &= 0xFFFF;
-			}
-			else
-			{
-				set_warning( "Emulation error (illegal/unsupported instruction)" );
-				debug_printf( "Bad opcode $%.2x at $%.4x\n",
-						(int) *cpu::get_code( cpu::r.pc ), (int) cpu::r.pc );
-				cpu::r.pc = (cpu::r.pc + 1) & 0xFFFF;
-				cpu_time += 6;
-			}
-		}
-	}
-	
-	duration = cpu_time;
-	next_play -= cpu_time;
-	if ( next_play < 0 ) // could go negative if routine is taking too long to return
-		next_play = 0;
-	apu.end_frame( cpu_time );
-	
-	return 0;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Gme_File.h Deleted

@@ -1,159 +0,0 @@
-// Common interface to game music file loading and information
-
-// Game_Music_Emu 0.5.5
-#ifndef GME_FILE_H
-#define GME_FILE_H
-
-#include "gme.h"
-#include "blargg_common.h"
-#include "Data_Reader.h"
-#include "M3u_Playlist.h"
-
-// Error returned if file is wrong type
-//extern const char gme_wrong_file_type []; // declared in gme.h
-
-struct gme_type_t_
-{
-	const char* system; /* name of system this music file type is generally for */
-	int track_count; /* non-zero for formats with a fixed number of tracks */
-	Music_Emu* (*new_emu)(); /* Create new emulator for this type (useful in C++ only) */
-	Music_Emu* (*new_info)(); /* Create new info reader for this type */
-	
-	/* internal */
-	const char* extension_;
-	int flags_;
-};
-
-enum { gme_max_field = 255 };
-
-struct Gme_File {
-public:
-// File loading
-	
-	// Each loads game music data from a file and returns an error if
-	// file is wrong type or is seriously corrupt. They also set warning
-	// string for minor problems.
-	
-	// Load from file on disk
-	blargg_err_t load_file( const char* path );
-	
-	// Load from custom data source (see Data_Reader.h)
-	blargg_err_t load( Data_Reader& );
-	
-	// Load from file already read into memory. Keeps pointer to data, so you
-	// must not free it until you're done with the file.
-	blargg_err_t load_mem( void const* data, long size );
-	
-	// Load an m3u playlist. Must be done after loading main music file.
-	blargg_err_t load_m3u( const char* path );
-	blargg_err_t load_m3u( Data_Reader& in );
-	
-	// Clears any loaded m3u playlist and any internal playlist that the music
-	// format supports (NSFE for example).
-	void clear_playlist();
-	
-// Informational
-	
-	// Type of emulator. For example if this returns gme_nsfe_type, this object
-	// is an NSFE emulator, and you can cast to an Nsfe_Emu* if necessary.
-	gme_type_t type() const;
-	
-	// Most recent warning string, or NULL if none. Clears current warning after
-	// returning.
-	const char* warning();
-	
-	// Number of tracks or 0 if no file has been loaded
-	int track_count() const;
-	
-	// Get information for a track (length, name, author, etc.)
-	// See gme.h for definition of struct track_info_t.
-	blargg_err_t track_info( track_info_t* out, int track ) const;
-	
-// User data/cleanup
-	
-	// Set/get pointer to data you want to associate with this emulator.
-	// You can use this for whatever you want.
-	void set_user_data( void* p ) { user_data_ = p; }
-	void* user_data() const { return user_data_; }
-	
-	// Register cleanup function to be called when deleting emulator, or NULL to
-	// clear it. Passes user_data to cleanup function.
-	void set_user_cleanup( gme_user_cleanup_t func ) { user_cleanup_ = func; }
-	
-public:
-	// deprecated
-	int error_count() const; // use warning()
-public:
-	Gme_File();
-	virtual ~Gme_File();
-	BLARGG_DISABLE_NOTHROW
-	typedef BOOST::uint8_t byte;
-protected:
-	// Services
-	void set_track_count( int n ) { track_count_ = raw_track_count_ = n; }
-	void set_warning( const char* s ) { warning_ = s; }
-	void set_type( gme_type_t t ) { type_ = t; }
-	blargg_err_t load_remaining_( void const* header, long header_size, Data_Reader& remaining );
-	
-	// Overridable
-	virtual void unload(); // called before loading file and if loading fails
-	virtual blargg_err_t load_( Data_Reader& ); // default loads then calls load_mem_()
-	virtual blargg_err_t load_mem_( byte const* data, long size ); // use data in memory
-	virtual blargg_err_t track_info_( track_info_t* out, int track ) const = 0;
-	virtual void pre_load();
-	virtual void post_load_();
-	virtual void clear_playlist_() { }
-	
-public:
-	blargg_err_t remap_track_( int* track_io ) const; // need by Music_Emu
-private:
-	// noncopyable
-	Gme_File( const Gme_File& );
-	Gme_File& operator = ( const Gme_File& );
-	
-	gme_type_t type_;
-	int track_count_;
-	int raw_track_count_;
-	const char* warning_;
-	void* user_data_;
-	gme_user_cleanup_t user_cleanup_;
-	M3u_Playlist playlist;
-	char playlist_warning [64];
-	blargg_vector<byte> file_data; // only if loaded into memory using default load
-	
-	blargg_err_t load_m3u_( blargg_err_t );
-	blargg_err_t post_load( blargg_err_t err );
-public:
-	// track_info field copying
-	enum { max_field_ = 255 };
-	static void copy_field_( char* out, const char* in );
-	static void copy_field_( char* out, const char* in, int len );
-};
-	
-Music_Emu* gme_new_( Music_Emu*, long sample_rate );
-
-#define GME_COPY_FIELD( in, out, name ) \
-	{ Gme_File::copy_field_( out->name, in.name, sizeof in.name ); }
-
-#ifndef GME_FILE_READER
-	#ifdef HAVE_ZLIB_H
-		#define GME_FILE_READER Gzip_File_Reader
-	#else
-		#define GME_FILE_READER Std_File_Reader
-	#endif
-#elif defined (GME_FILE_READER_INCLUDE)
-	#include GME_FILE_READER_INCLUDE
-#endif
-
-inline gme_type_t Gme_File::type() const { return type_; }
-inline int Gme_File::error_count() const { return warning_ != 0; }
-inline int Gme_File::track_count() const { return track_count_; }
-
-inline const char* Gme_File::warning()
-{
-	const char* s = warning_;
-	warning_ = 0;
-	return s;
-}
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/M3u_Playlist.cpp Deleted

@@ -1,426 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "M3u_Playlist.h"
-#include "Music_Emu.h"
-
-#include <string.h>
-
-/* Copyright (C) 2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-// gme functions defined here to avoid linking in m3u code unless it's used
-
-blargg_err_t Gme_File::load_m3u_( blargg_err_t err )
-{
-	require( raw_track_count_ ); // file must be loaded first
-	
-	if ( !err )
-	{
-		if ( playlist.size() )
-			track_count_ = playlist.size();
-		
-		int line = playlist.first_error();
-		if ( line )
-		{
-			// avoid using bloated printf()
-			char* out = &playlist_warning [sizeof playlist_warning];
-			*--out = 0;
-			do {
-				*--out = line % 10 + '0';
-			} while ( (line /= 10) > 0 );
-			
-			static const char str [] = "Problem in m3u at line ";
-			out -= sizeof str - 1;
-			memcpy( out, str, sizeof str - 1 );
-			set_warning( out );
-		}
-	}
-	return err;
-}
-
-blargg_err_t Gme_File::load_m3u( const char* path ) { return load_m3u_( playlist.load( path ) ); }
-
-blargg_err_t Gme_File::load_m3u( Data_Reader& in ) { return load_m3u_( playlist.load( in ) ); }
-
-gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
-
-gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
-{
-	Mem_File_Reader in( data, size );
-	return me->load_m3u( in );
-}
-
-
-
-static char* skip_white( char* in )
-{
-	while ( *in == ' ' )
-		in++;
-	return in;
-}
-
-inline unsigned from_dec( unsigned n ) { return n - '0'; }
-
-static char* parse_filename( char* in, M3u_Playlist::entry_t& entry )
-{
-	entry.file = in;
-	entry.type = "";
-	char* out = in;
-	while ( 1 )
-	{
-		int c = *in;
-		if ( !c ) break;
-		in++;
-		
-		if ( c == ',' ) // commas in filename
-		{
-			char* p = skip_white( in );
-			if ( *p == '$' || from_dec( *p ) <= 9 )
-			{
-				in = p;
-				break;
-			}
-		}
-		
-		if ( c == ':' && in [0] == ':' && in [1] && in [2] != ',' ) // ::type suffix
-		{
-			entry.type = ++in;
-			while ( (c = *in) != 0 && c != ',' )
-				in++;
-			if ( c == ',' )
-			{
-				*in++ = 0; // terminate type
-				in = skip_white( in );
-			}
-			break;
-		}
-		
-		if ( c == '\\' ) // \ prefix for special characters
-		{
-			c = *in;
-			if ( !c ) break;
-			in++;
-		}
-		*out++ = (char) c;
-	}
-	*out = 0; // terminate string
-	return in;
-}
-
-static char* next_field( char* in, int* result )
-{
-	while ( 1 )
-	{
-		in = skip_white( in );
-		
-		if ( !*in )
-			break;
-		
-		if ( *in == ',' )
-		{
-			in++;
-			break;
-		}
-		
-		*result = 1;
-		in++;
-	}
-	return skip_white( in );
-}
-
-static char* parse_int_( char* in, int* out )
-{
-	int n = 0;
-	while ( 1 )
-	{
-		unsigned d = from_dec( *in );
-		if ( d > 9 )
-			break;
-		in++;
-		n = n * 10 + d;
-		*out = n;
-	}
-	return in;
-}
-
-static char* parse_int( char* in, int* out, int* result )
-{
-	return next_field( parse_int_( in, out ), result );
-}
-
-// Returns 16 or greater if not hex
-inline int from_hex_char( int h )
-{
-	h -= 0x30;
-	if ( (unsigned) h > 9 )
-		h = ((h - 0x11) & 0xDF) + 10;
-	return h;
-}
-
-static char* parse_track( char* in, M3u_Playlist::entry_t& entry, int* result )
-{
-	if ( *in == '$' )
-	{
-		in++;
-		int n = 0;
-		while ( 1 )
-		{
-			int h = from_hex_char( *in );
-			if ( h > 15 )
-				break;
-			in++;
-			n = n * 16 + h;
-			entry.track = n;
-		}
-	}
-	else
-	{
-		in = parse_int_( in, &entry.track );
-		if ( entry.track >= 0 )
-			entry.decimal_track = 1;
-	}
-	return next_field( in, result );
-}
-
-static char* parse_time_( char* in, int* out )
-{
-	*out = -1;
-	int n = -1;
-	in = parse_int_( in, &n );
-	if ( n >= 0 )
-	{
-		*out = n;
-		if ( *in == ':' )
-		{
-			n = -1;
-			in = parse_int_( in + 1, &n );
-			if ( n >= 0 )
-				*out = *out * 60 + n;
-		}
-	}
-	return in;
-}
-
-static char* parse_time( char* in, int* out, int* result )
-{
-	return next_field( parse_time_( in, out ), result );
-}
-
-static char* parse_name( char* in )
-{
-	char* out = in;
-	while ( 1 )
-	{
-		int c = *in;
-		if ( !c ) break;
-		in++;
-		
-		if ( c == ',' ) // commas in string
-		{
-			char* p = skip_white( in );
-			if ( *p == ',' || *p == '-' || from_dec( *p ) <= 9 )
-			{
-				in = p;
-				break;
-			}
-		}
-		
-		if ( c == '\\' ) // \ prefix for special characters
-		{
-			c = *in;
-			if ( !c ) break;
-			in++;
-		}
-		*out++ = (char) c;
-	}
-	*out = 0; // terminate string
-	return in;
-}
-
-static int parse_line( char* in, M3u_Playlist::entry_t& entry )
-{
-	int result = 0;
-	
-	// file
-	entry.file = in;
-	entry.type = "";
-	in = parse_filename( in, entry );
-	
-	// track
-	entry.track = -1;
-	entry.decimal_track = 0;
-	in = parse_track( in, entry, &result );
-	
-	// name
-	entry.name = in;
-	in = parse_name( in );
-	
-	// time
-	entry.length = -1;
-	in = parse_time( in, &entry.length, &result );
-	
-	// loop
-	entry.intro = -1;
-	entry.loop = -1;
-	if ( *in == '-' )
-	{
-		entry.loop = entry.length;
-		in++;
-	}
-	else
-	{
-		in = parse_time_( in, &entry.loop );
-		if ( entry.loop >= 0 )
-		{
-			entry.intro = 0;
-			if ( *in == '-' ) // trailing '-' means that intro length was specified 
-			{
-				in++;
-				entry.intro = entry.loop;
-				entry.loop = entry.length - entry.intro;
-			}
-		}
-	}
-	in = next_field( in, &result );
-	
-	// fade
-	entry.fade = -1;
-	in = parse_time( in, &entry.fade, &result );
-	
-	// repeat
-	entry.repeat = -1;
-	in = parse_int( in, &entry.repeat, &result );
-	
-	return result;
-}
-
-static void parse_comment( char* in, M3u_Playlist::info_t& info, bool first )
-{
-	in = skip_white( in + 1 );
-	const char* field = in;
-	while ( *in && *in != ':' )
-		in++;
-	
-	if ( *in == ':' )
-	{
-		const char* text = skip_white( in + 1 );
-		if ( *text )
-		{
-			*in = 0;
-			 if ( !strcmp( "Composer", field ) ) info.composer = text;
-			else if ( !strcmp( "Engineer", field ) ) info.engineer = text;
-			else if ( !strcmp( "Ripping" , field ) ) info.ripping = text;
-			else if ( !strcmp( "Tagging" , field ) ) info.tagging = text;
-			else
-				text = 0;
-			if ( text )
-				return;
-			*in = ':';
-		}
-	}
-	
-	if ( first )
-		info.title = field;
-}
-
-blargg_err_t M3u_Playlist::parse_()
-{
-	info_.title = "";
-	info_.composer = "";
-	info_.engineer = "";
-	info_.ripping = "";
-	info_.tagging = "";
-	
-	int const CR = 13;
-	int const LF = 10;
-	
-	data.end() [-1] = LF; // terminate input
-	
-	first_error_ = 0;
-	bool first_comment = true;
-	int line = 0;
-	int count = 0;
-	char* in = data.begin();
-	while ( in < data.end() )
-	{
-		// find end of line and terminate it
-		line++;
-		char* begin = in;
-		while ( *in != CR && *in != LF )
-		{
-			if ( !*in )
-				return "Not an m3u playlist";
-			in++;
-		}
-		if ( in [0] == CR && in [1] == LF ) // treat CR,LF as a single line
-			*in++ = 0;
-		*in++ = 0;
-		
-		// parse line
-		if ( *begin == '#' )
-		{
-			parse_comment( begin, info_, first_comment );
-			first_comment = false;
-		}
-		else if ( *begin )
-		{
-			if ( (int) entries.size() <= count )
-				RETURN_ERR( entries.resize( count * 2 + 64 ) );
-			
-			if ( !parse_line( begin, entries [count] ) )
-				count++;
-			else if ( !first_error_ )
-				first_error_ = line;
-			first_comment = false;
-		}
-	}
-	if ( count <= 0 )
-		return "Not an m3u playlist";
-	
-	if ( !(info_.composer [0] | info_.engineer [0] | info_.ripping [0] | info_.tagging [0]) )
-		info_.title = "";
-	
-	return entries.resize( count );
-}
-
-blargg_err_t M3u_Playlist::parse()
-{
-	blargg_err_t err = parse_();
-	if ( err )
-	{
-		entries.clear();
-		data.clear();
-	}
-	return err;
-}
-
-blargg_err_t M3u_Playlist::load( Data_Reader& in )
-{
-	RETURN_ERR( data.resize( in.remain() + 1 ) );
-	RETURN_ERR( in.read( data.begin(), data.size() - 1 ) );
-	return parse();
-}
-
-blargg_err_t M3u_Playlist::load( const char* path )
-{
-	GME_FILE_READER in;
-	RETURN_ERR( in.open( path ) );
-	return load( in );
-}
-
-blargg_err_t M3u_Playlist::load( void const* in, long size )
-{
-	RETURN_ERR( data.resize( size + 1 ) );
-	memcpy( data.begin(), in, size );
-	return parse();
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Music_Emu.cpp Deleted

@@ -1,410 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Music_Emu.h"
-
-#include "Multi_Buffer.h"
-#include <string.h>
-
-/* Copyright (C) 2003-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-int const stereo = 2; // number of channels for stereo
-int const silence_max = 6; // seconds
-int const silence_threshold = 0x10;
-long const fade_block_size = 512;
-int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
-
-Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 };
-
-void Music_Emu::clear_track_vars()
-{
-	current_track_ = -1;
-	out_time = 0;
-	emu_time = 0;
-	emu_track_ended_ = true;
-	track_ended_ = true;
-	fade_start = INT_MAX / 2 + 1;
-	fade_step = 1;
-	silence_time = 0;
-	silence_count = 0;
-	buf_remain = 0;
-	warning(); // clear warning
-}
-
-void Music_Emu::unload()
-{
-	voice_count_ = 0;
-	clear_track_vars();
-	Gme_File::unload();
-}
-
-Music_Emu::Music_Emu()
-{
-	effects_buffer = 0;
-	
-	sample_rate_ = 0;
-	mute_mask_ = 0;
-	tempo_ = 1.0;
-	gain_ = 1.0;
-	
-	// defaults
-	max_initial_silence = 2;
-	silence_lookahead = 3;
-	ignore_silence_ = false;
-	equalizer_.treble = -1.0;
-	equalizer_.bass = 60;
-	
-	static const char* const names [] = {
-		"Voice 1", "Voice 2", "Voice 3", "Voice 4",
-		"Voice 5", "Voice 6", "Voice 7", "Voice 8"
-	};
-	set_voice_names( names );
-	Music_Emu::unload(); // non-virtual
-}
-
-Music_Emu::~Music_Emu() { delete effects_buffer; }
-
-blargg_err_t Music_Emu::set_sample_rate( long rate )
-{
-	require( !sample_rate() ); // sample rate can't be changed once set
-	RETURN_ERR( set_sample_rate_( rate ) );
-	RETURN_ERR( buf.resize( buf_size ) );
-	sample_rate_ = rate;
-	return 0;
-}
-
-void Music_Emu::pre_load()
-{
-	require( sample_rate() ); // set_sample_rate() must be called before loading a file
-	Gme_File::pre_load();
-}
-
-void Music_Emu::set_equalizer( equalizer_t const& eq )
-{
-	equalizer_ = eq;
-	set_equalizer_( eq );
-}
-
-void Music_Emu::mute_voice( int index, bool mute )
-{
-	require( (unsigned) index < (unsigned) voice_count() );
-	int bit = 1 << index;
-	int mask = mute_mask_ | bit;
-	if ( !mute )
-		mask ^= bit;
-	mute_voices( mask );
-}
-
-void Music_Emu::mute_voices( int mask )
-{
-	require( sample_rate() ); // sample rate must be set first
-	mute_mask_ = mask;
-	mute_voices_( mask );
-}
-
-void Music_Emu::set_tempo( double t )
-{
-	require( sample_rate() ); // sample rate must be set first
-	double const min = 0.02;
-	double const max = 4.00;
-	if ( t < min ) t = min;
-	if ( t > max ) t = max;
-	tempo_ = t;
-	set_tempo_( t );
-}
-
-void Music_Emu::post_load_()
-{
-	set_tempo( tempo_ );
-	remute_voices();
-}
-
-blargg_err_t Music_Emu::start_track( int track )
-{
-	clear_track_vars();
-	
-	int remapped = track;
-	RETURN_ERR( remap_track_( &remapped ) );
-	current_track_ = track;
-	RETURN_ERR( start_track_( remapped ) );
-	
-	emu_track_ended_ = false;
-	track_ended_ = false;
-	
-	if ( !ignore_silence_ )
-	{
-		// play until non-silence or end of track
-		for ( long end = max_initial_silence * stereo * sample_rate(); emu_time < end; )
-		{
-			fill_buf();
-			if ( buf_remain | (int) emu_track_ended_ )
-				break;
-		}
-		
-		emu_time = buf_remain;
-		out_time = 0;
-		silence_time = 0;
-		silence_count = 0;
-	}
-	return track_ended() ? warning() : 0;
-}
-
-void Music_Emu::end_track_if_error( blargg_err_t err )
-{
-	if ( err )
-	{
-		emu_track_ended_ = true;
-		set_warning( err );
-	}
-}
-
-// Tell/Seek
-
-blargg_long Music_Emu::msec_to_samples( blargg_long msec ) const
-{
-	blargg_long sec = msec / 1000;
-	msec -= sec * 1000;
-	return (sec * sample_rate() + msec * sample_rate() / 1000) * stereo;
-}
-
-long Music_Emu::tell() const
-{
-	blargg_long rate = sample_rate() * stereo;
-	blargg_long sec = out_time / rate;
-	return sec * 1000 + (out_time - sec * rate) * 1000 / rate;
-}
-
-blargg_err_t Music_Emu::seek( long msec )
-{
-	blargg_long time = msec_to_samples( msec );
-	if ( time < out_time )
-		RETURN_ERR( start_track( current_track_ ) );
-	return skip( time - out_time );
-}
-
-blargg_err_t Music_Emu::skip( long count )
-{
-	require( current_track() >= 0 ); // start_track() must have been called already
-	out_time += count;
-	
-	// remove from silence and buf first
-	{
-		long n = min( count, silence_count );
-		silence_count -= n;
-		count -= n;
-		
-		n = min( count, buf_remain );
-		buf_remain -= n;
-		count -= n;
-	}
-		
-	if ( count && !emu_track_ended_ )
-	{
-		emu_time += count;
-		end_track_if_error( skip_( count ) );
-	}
-	
-	if ( !(silence_count | buf_remain) ) // caught up to emulator, so update track ended
-		track_ended_ |= emu_track_ended_;
-	
-	return 0;
-}
-
-blargg_err_t Music_Emu::skip_( long count )
-{
-	// for long skip, mute sound
-	const long threshold = 30000;
-	if ( count > threshold )
-	{
-		int saved_mute = mute_mask_;
-		mute_voices( ~0 );
-		
-		while ( count > threshold / 2 && !emu_track_ended_ )
-		{
-			RETURN_ERR( play_( buf_size, buf.begin() ) );
-			count -= buf_size;
-		}
-		
-		mute_voices( saved_mute );
-	}
-	
-	while ( count && !emu_track_ended_ )
-	{
-		long n = buf_size;
-		if ( n > count )
-			n = count;
-		count -= n;
-		RETURN_ERR( play_( n, buf.begin() ) );
-	}
-	return 0;
-}
-
-// Fading
-
-void Music_Emu::set_fade( long start_msec, long length_msec )
-{
-	fade_step = sample_rate() * length_msec / (fade_block_size * fade_shift * 1000 / stereo);
-	fade_start = msec_to_samples( start_msec );
-}
-
-// unit / pow( 2.0, (double) x / step )
-static int int_log( blargg_long x, int step, int unit )
-{
-	int shift = x / step;
-	int fraction = (x - shift * step) * unit / step;
-	return ((unit - fraction) + (fraction >> 1)) >> shift;
-}
-
-void Music_Emu::handle_fade( long out_count, sample_t* out )
-{
-	for ( int i = 0; i < out_count; i += fade_block_size )
-	{
-		int const shift = 14;
-		int const unit = 1 << shift;
-		int gain = int_log( (out_time + i - fade_start) / fade_block_size,
-				fade_step, unit );
-		if ( gain < (unit >> fade_shift) )
-			track_ended_ = emu_track_ended_ = true;
-		
-		sample_t* io = &out [i];
-		for ( int count = min( fade_block_size, out_count - i ); count; --count )
-		{
-			*io = sample_t ((*io * gain) >> shift);
-			++io;
-		}
-	}
-}
-
-// Silence detection
-
-void Music_Emu::emu_play( long count, sample_t* out )
-{
-	check( current_track_ >= 0 );
-	emu_time += count;
-	if ( current_track_ >= 0 && !emu_track_ended_ )
-		end_track_if_error( play_( count, out ) );
-	else
-		memset( out, 0, count * sizeof *out );
-}
-
-// number of consecutive silent samples at end
-static long count_silence( Music_Emu::sample_t* begin, long size )
-{
-	Music_Emu::sample_t first = *begin;
-	*begin = silence_threshold; // sentinel
-	Music_Emu::sample_t* p = begin + size;
-	while ( (unsigned) (*--p + silence_threshold / 2) <= (unsigned) silence_threshold ) { }
-	*begin = first;
-	return size - (p - begin);
-}
-
-// fill internal buffer and check it for silence
-void Music_Emu::fill_buf()
-{
-	assert( !buf_remain );
-	if ( !emu_track_ended_ )
-	{
-		emu_play( buf_size, buf.begin() );
-		long silence = count_silence( buf.begin(), buf_size );
-		if ( silence < buf_size )
-		{
-			silence_time = emu_time - silence;
-			buf_remain = buf_size;
-			return;
-		}
-	}
-	silence_count += buf_size;
-}
-
-blargg_err_t Music_Emu::play( long out_count, sample_t* out )
-{
-	if ( track_ended_ )
-	{
-		memset( out, 0, out_count * sizeof *out );
-	}
-	else
-	{
-		require( current_track() >= 0 );
-		require( out_count % stereo == 0 );
-		
-		assert( emu_time >= out_time );
-		
-		// prints nifty graph of how far ahead we are when searching for silence
-		//debug_printf( "%*s \n", int ((emu_time - out_time) * 7 / sample_rate()), "*" );
-		
-		long pos = 0;
-		if ( silence_count )
-		{
-			// during a run of silence, run emulator at >=2x speed so it gets ahead
-			long ahead_time = silence_lookahead * (out_time + out_count - silence_time) + silence_time;
-			while ( emu_time < ahead_time && !(buf_remain | emu_track_ended_) )
-				fill_buf();
-			
-			// fill with silence
-			pos = min( silence_count, out_count );
-			memset( out, 0, pos * sizeof *out );
-			silence_count -= pos;
-			
-			if ( emu_time - silence_time > silence_max * stereo * sample_rate() )
-			{
-				track_ended_ = emu_track_ended_ = true;
-				silence_count = 0;
-				buf_remain = 0;
-			}
-		}
-		
-		if ( buf_remain )
-		{
-			// empty silence buf
-			long n = min( buf_remain, out_count - pos );
-			memcpy( &out [pos], buf.begin() + (buf_size - buf_remain), n * sizeof *out );
-			buf_remain -= n;
-			pos += n;
-		}
-		
-		// generate remaining samples normally
-		long remain = out_count - pos;
-		if ( remain )
-		{
-			emu_play( remain, out + pos );
-			track_ended_ |= emu_track_ended_;
-			
-			if ( !ignore_silence_ || out_time > fade_start )
-			{
-				// check end for a new run of silence
-				long silence = count_silence( out + pos, remain );
-				if ( silence < remain )
-					silence_time = emu_time - silence;
-				
-				if ( emu_time - silence_time >= buf_size )
-					fill_buf(); // cause silence detection on next play()
-			}
-		}
-		
-		if ( out_time > fade_start )
-			handle_fade( out_count, out );
-	}
-	out_time += out_count;
-	return 0;
-}
-
-// Gme_Info_
-
-blargg_err_t Gme_Info_::set_sample_rate_( long ) { return 0; }
-void Gme_Info_::pre_load() { Gme_File::pre_load(); } // skip Music_Emu
-void Gme_Info_::post_load_() { Gme_File::post_load_(); } // skip Music_Emu
-void Gme_Info_::set_equalizer_( equalizer_t const& ){ check( false ); }
-void Gme_Info_::mute_voices_( int ) { check( false ); }
-void Gme_Info_::set_tempo_( double ) { }
-blargg_err_t Gme_Info_::start_track_( int ) { return "Use full emulator for playback"; }
-blargg_err_t Gme_Info_::play_( long, sample_t* ) { return "Use full emulator for playback"; }

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Music_Emu.h Deleted

@@ -1,211 +0,0 @@
-// Common interface to game music file emulators
-
-// Game_Music_Emu 0.5.5
-#ifndef MUSIC_EMU_H
-#define MUSIC_EMU_H
-
-#include "Gme_File.h"
-class Multi_Buffer;
-
-struct Music_Emu : public Gme_File {
-public:
-// Basic functionality (see Gme_File.h for file loading/track info functions)
-
-	// 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;
-	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* ) { }
-	
-// 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();
-protected:
-	void set_max_initial_silence( int n ) { max_initial_silence = n; }
-	void set_silence_lookahead( int n ) { silence_lookahead = n; }
-	void set_voice_count( int n ) { voice_count_ = n; }
-	void set_voice_names( const char* const* names );
-	void set_track_ended() { emu_track_ended_ = true; }
-	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 mute_voices_( int mask ) = 0;
-	virtual void set_tempo_( double ) = 0;
-	virtual blargg_err_t start_track_( int ) = 0; // tempo is set before this
-	virtual blargg_err_t play_( long count, sample_t* out ) = 0;
-	virtual blargg_err_t skip_( long count );
-protected:
-	virtual void unload();
-	virtual void pre_load();
-	virtual void post_load_();
-private:
-	// general
-	equalizer_t equalizer_;
-	int max_initial_silence;
-	const char** voice_names_;
-	int voice_count_;
-	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
-	blargg_long emu_time; // number of samples emulator has generated since start of track
-	bool emu_track_ended_; // emulator has reached end of track
-	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_;
-	long silence_time; // number of samples where most recent silence began
-	long silence_count; // number of samples of silence to play before using buf
-	long buf_remain; // number of samples left in silence buffer
-	enum { buf_size = 2048 };
-	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 );
-};
-
-// base class for info-only derivations
-struct Gme_Info_ : Music_Emu
-{
-	virtual blargg_err_t set_sample_rate_( long sample_rate );
-	virtual void set_equalizer_( equalizer_t const& );
-	virtual void mute_voices_( int mask );
-	virtual void set_tempo_( double );
-	virtual blargg_err_t start_track_( int );
-	virtual blargg_err_t play_( long count, sample_t* out );
-	virtual void pre_load();
-	virtual void post_load_();
-};
-
-inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const
-{
-	return track_info( out, current_track_ );
-}
-
-inline long Music_Emu::sample_rate() const { return sample_rate_; }
-inline const char** Music_Emu::voice_names() const { return voice_names_; }
-inline int Music_Emu::voice_count() const { return voice_count_; }
-inline int Music_Emu::current_track() const { return current_track_; }
-inline bool Music_Emu::track_ended() const { return track_ended_; }
-inline const Music_Emu::equalizer_t& Music_Emu::equalizer() const { return equalizer_; }
-
-inline void Music_Emu::set_tempo_( double t ) { tempo_ = t; }
-inline void Music_Emu::remute_voices() { mute_voices( mute_mask_ ); }
-inline void Music_Emu::ignore_silence( bool b ) { ignore_silence_ = b; }
-inline blargg_err_t Music_Emu::start_track_( int ) { return 0; }
-
-inline void Music_Emu::set_voice_names( const char* const* names )
-{
-	// Intentional removal of const, so users don't have to remember obscure const in middle
-	voice_names_ = const_cast<const char**> (names);
-}
-
-inline void Music_Emu::mute_voices_( int ) { }
-
-inline void Music_Emu::set_gain( double g )
-{
-	assert( !sample_rate() ); // you must set gain before setting sample rate
-	gain_ = g;
-}
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Sap_Apu.cpp Deleted

@@ -1,334 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Sap_Apu.h"
-
-#include <string.h>
-
-/* Copyright (C) 2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-int const max_frequency = 12000; // pure waves above this frequency are silenced
-
-static void gen_poly( blargg_ulong mask, int count, byte* out )
-{
-	blargg_ulong n = 1;
-	do
-	{
-		int bits = 0;
-		int b = 0;
-		do
-		{
-			// implemented using "Galios configuration"
-			bits |= (n & 1) << b;
-			n = (n >> 1) ^ (mask & -(n & 1));
-		}
-		while ( b++ < 7 );
-		*out++ = bits;
-	}
-	while ( --count );
-}
-
-// poly5
-int const poly5_len = (1 << 5) - 1;
-blargg_ulong const poly5_mask = (1UL << poly5_len) - 1;
-blargg_ulong const poly5 = 0x167C6EA1;
-
-inline blargg_ulong run_poly5( blargg_ulong in, int shift )
-{
-	return (in << shift & poly5_mask) | (in >> (poly5_len - shift));
-}
-
-#define POLY_MASK( width, tap1, tap2 ) \
-	((1UL << (width - 1 - tap1)) | (1UL << (width - 1 - tap2)))
-
-Sap_Apu_Impl::Sap_Apu_Impl()
-{
-	gen_poly( POLY_MASK( 4, 1, 0 ), sizeof poly4, poly4 );
-	gen_poly( POLY_MASK( 9, 5, 0 ), sizeof poly9, poly9 );
-	gen_poly( POLY_MASK( 17, 5, 0 ), sizeof poly17, poly17 );
-	
-	if ( 0 ) // comment out to recauculate poly5 constant
-	{
-		byte poly5 [4];
-		gen_poly( POLY_MASK( 5, 2, 0 ), sizeof poly5, poly5 );
-		blargg_ulong n = poly5 [3] * 0x1000000L + poly5 [2] * 0x10000L + 
-				poly5 [1] * 0x100L + poly5 [0];
-		blargg_ulong rev = n & 1;
-		for ( int i = 1; i < poly5_len; i++ )
-			rev |= (n >> i & 1) << (poly5_len - i);
-		debug_printf( "poly5: 0x%08lX\n", rev );
-	}
-}
-
-Sap_Apu::Sap_Apu()
-{
-	impl = 0;
-	for ( int i = 0; i < osc_count; i++ )
-		osc_output( i, 0 );
-}
-
-void Sap_Apu::reset( Sap_Apu_Impl* new_impl )
-{
-	impl = new_impl;
-	last_time = 0;
-	poly5_pos = 0;
-	poly4_pos = 0;
-	polym_pos = 0;
-	control = 0;
-	
-	for ( int i = 0; i < osc_count; i++ )
-		memset( &oscs [i], 0, offsetof (osc_t,output) );
-}
-
-void Sap_Apu::calc_periods()
-{
-	 // 15/64 kHz clock
-	int divider = 28;
-	if ( this->control & 1 )
-		divider = 114;
-	
-	for ( int i = 0; i < osc_count; i++ )
-	{
-		osc_t* const osc = &oscs [i];
-		
-		int const osc_reload = osc->regs [0]; // cache
-		blargg_long period = (osc_reload + 1) * divider;
-		static byte const fast_bits [osc_count] = { 1 << 6, 1 << 4, 1 << 5, 1 << 3 };
-		if ( this->control & fast_bits [i] )
-		{
-			period = osc_reload + 4;
-			if ( i & 1 )
-			{
-				period = osc_reload * 0x100L + osc [-1].regs [0] + 7;
-				if ( !(this->control & fast_bits [i - 1]) )
-					period = (period - 6) * divider;
-				
-				if ( (osc [-1].regs [1] & 0x1F) > 0x10 )
-					debug_printf( "Use of slave channel in 16-bit mode not supported\n" );
-			}
-		}
-		osc->period = period;
-	}
-}
-
-void Sap_Apu::run_until( blip_time_t end_time )
-{
-	calc_periods();
-	Sap_Apu_Impl* const impl = this->impl; // cache
-	
-	// 17/9-bit poly selection
-	byte const* polym = impl->poly17;
-	int polym_len = poly17_len;
-	if ( this->control & 0x80 )
-	{
-		polym_len = poly9_len;
-		polym = impl->poly9;
-	}
-	polym_pos %= polym_len;
-	
-	for ( int i = 0; i < osc_count; i++ )
-	{
-		osc_t* const osc = &oscs [i];
-		blip_time_t time = last_time + osc->delay;
-		blip_time_t const period = osc->period;
-		
-		// output
-		Blip_Buffer* output = osc->output;
-		if ( output )
-		{
-			output->set_modified();
-			
-			int const osc_control = osc->regs [1]; // cache
-			int volume = (osc_control & 0x0F) * 2;
-			if ( !volume || osc_control & 0x10 || // silent, DAC mode, or inaudible frequency
-					((osc_control & 0xA0) == 0xA0 && period < 1789773 / 2 / max_frequency) )
-			{
-				if ( !(osc_control & 0x10) )
-					volume >>= 1; // inaudible frequency = half volume
-				
-				int delta = volume - osc->last_amp;
-				if ( delta )
-				{
-					osc->last_amp = volume;
-					impl->synth.offset( last_time, delta, output );
-				}
-				
-				// TODO: doesn't maintain high pass flip-flop (very minor issue)
-			}
-			else
-			{
-				// high pass
-				static byte const hipass_bits [osc_count] = { 1 << 2, 1 << 1, 0, 0 };
-				blip_time_t period2 = 0; // unused if no high pass
-				blip_time_t time2 = end_time;
-				if ( this->control & hipass_bits [i] )
-				{
-					period2 = osc [2].period;
-					time2 = last_time + osc [2].delay;
-					if ( osc->invert )
-					{
-						// trick inner wave loop into inverting output
-						osc->last_amp -= volume;
-						volume = -volume;
-					}
-				}
-				
-				if ( time < end_time || time2 < end_time )
-				{
-					// poly source
-					static byte const poly1 [] = { 0x55, 0x55 }; // square wave
-					byte const* poly = poly1;
-					int poly_len = 8 * sizeof poly1; // can be just 2 bits, but this is faster
-					int poly_pos = osc->phase & 1;
-					int poly_inc = 1;
-					if ( !(osc_control & 0x20) )
-					{
-						poly = polym;
-						poly_len = polym_len;
-						poly_pos = polym_pos;
-						if ( osc_control & 0x40 )
-						{
-							poly = impl->poly4;
-							poly_len = poly4_len;
-							poly_pos = poly4_pos;
-						}
-						poly_inc = period % poly_len;
-						poly_pos = (poly_pos + osc->delay) % poly_len;
-					}
-					poly_inc -= poly_len; // allows more optimized inner loop below
-					
-					// square/poly5 wave
-					blargg_ulong wave = poly5;
-					check( poly5 & 1 ); // low bit is set for pure wave
-					int poly5_inc = 0;
-					if ( !(osc_control & 0x80) )
-					{
-						wave = run_poly5( wave, (osc->delay + poly5_pos) % poly5_len );
-						poly5_inc = period % poly5_len;
-					}
-					
-					// Run wave and high pass interleved with each catching up to the other.
-					// Disabled high pass has no performance effect since inner wave loop
-					// makes no compromise for high pass, and only runs once in that case.
-					int osc_last_amp = osc->last_amp;
-					do
-					{
-						// run high pass
-						if ( time2 < time )
-						{
-							int delta = -osc_last_amp;
-							if ( volume < 0 )
-								delta += volume;
-							if ( delta )
-							{
-								osc_last_amp += delta - volume;
-								volume = -volume;
-								impl->synth.offset( time2, delta, output );
-							}
-						}
-						while ( time2 <= time ) // must advance *past* time to avoid hang
-							time2 += period2;
-						
-						// run wave
-						blip_time_t end = end_time;
-						if ( end > time2 )
-							end = time2;
-						while ( time < end )
-						{
-							if ( wave & 1 )
-							{
-								int amp = volume & -(poly [poly_pos >> 3] >> (poly_pos & 7) & 1);
-								if ( (poly_pos += poly_inc) < 0 )
-									poly_pos += poly_len;
-								int delta = amp - osc_last_amp;
-								if ( delta )
-								{
-									osc_last_amp = amp;
-									impl->synth.offset( time, delta, output );
-								}
-							}
-							wave = run_poly5( wave, poly5_inc );
-							time += period;
-						}
-					}
-					while ( time < end_time || time2 < end_time );
-					
-					osc->phase = poly_pos;
-					osc->last_amp = osc_last_amp;
-				}
-				
-				osc->invert = 0;
-				if ( volume < 0 )
-				{
-					// undo inversion trickery
-					osc->last_amp -= volume;
-					osc->invert = 1;
-				}
-			}
-		}
-		
-		// maintain divider
-		blip_time_t remain = end_time - time;
-		if ( remain > 0 )
-		{
-			blargg_long count = (remain + period - 1) / period;
-			osc->phase ^= count;
-			time += count * period;
-		}
-		osc->delay = time - end_time;
-	}
-	
-	// advance polies
-	blip_time_t duration = end_time - last_time;
-	last_time = end_time;
-	poly4_pos = (poly4_pos + duration) % poly4_len;
-	poly5_pos = (poly5_pos + duration) % poly5_len;
-	polym_pos += duration; // will get %'d on next call
-}
-
-void Sap_Apu::write_data( blip_time_t time, unsigned addr, int data )
-{
-	run_until( time );
-	int i = (addr ^ 0xD200) >> 1;
-	if ( i < osc_count )
-	{
-		oscs [i].regs [addr & 1] = data;
-	}
-	else if ( addr == 0xD208 )
-	{
-		control = data;
-	}
-	else if ( addr == 0xD209 )
-	{
-		oscs [0].delay = 0;
-		oscs [1].delay = 0;
-		oscs [2].delay = 0;
-		oscs [3].delay = 0;
-	}
-	/*
-	// TODO: are polynomials reset in this case?
-	else if ( addr == 0xD20F )
-	{
-		if ( (data & 3) == 0 )
-			polym_pos = 0;
-	}
-	*/
-}
-
-void Sap_Apu::end_frame( blip_time_t end_time )
-{
-	if ( end_time > last_time )
-		run_until( end_time );
-	
-	last_time -= end_time;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Snes_Spc.cpp Deleted

@@ -1,489 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Snes_Spc.h"
-
-#include <string.h>
-
-/* Copyright (C) 2004-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-// always in the future (CPU time can go over 0, but not by this much)
-int const timer_disabled_time = 127;
-
-Snes_Spc::Snes_Spc() : dsp( mem.ram ), cpu( this, mem.ram )
-{
-	set_tempo( 1.0 );
-	
-	// Put STOP instruction around memory to catch PC underflow/overflow.
-	memset( mem.padding1, 0xFF, sizeof mem.padding1 );
-	memset( mem.padding2, 0xFF, sizeof mem.padding2 );
-	
-	// A few tracks read from the last four bytes of IPL ROM
-	boot_rom [sizeof boot_rom - 2] = 0xC0;
-	boot_rom [sizeof boot_rom - 1] = 0xFF;
-	memset( boot_rom, 0, sizeof boot_rom - 2 );
-}
-
-void Snes_Spc::set_tempo( double t )
-{
-	int unit = (int) (16.0 / t + 0.5);
-	
-	timer [0].divisor = unit * 8; // 8 kHz
-	timer [1].divisor = unit * 8; // 8 kHz
-	timer [2].divisor = unit; // 64 kHz
-}
-
-// Load
-
-void Snes_Spc::set_ipl_rom( void const* in )
-{
-	memcpy( boot_rom, in, sizeof boot_rom );
-}
-
-blargg_err_t Snes_Spc::load_spc( const void* data, long size )
-{
-	struct spc_file_t {
-		char signature [27];
-		char unused [10];
-		uint8_t pc [2];
-		uint8_t a;
-		uint8_t x;
-		uint8_t y;
-		uint8_t status;
-		uint8_t sp;
-		char unused2 [212];
-		uint8_t ram [0x10000];
-		uint8_t dsp [128];
-		uint8_t ipl_rom [128];
-	};
-	assert( offsetof (spc_file_t,ipl_rom) == spc_file_size );
-	
-	const spc_file_t* spc = (spc_file_t const*) data;
-	
-	if ( size < spc_file_size )
-		return "Not an SPC file";
-	
-	if ( strncmp( spc->signature, "SNES-SPC700 Sound File Data", 27 ) != 0 )
-		return "Not an SPC file";
-	
-	registers_t regs;
-	regs.pc = spc->pc [1] * 0x100 + spc->pc [0];
-	regs.a = spc->a;
-	regs.x = spc->x;
-	regs.y = spc->y;
-	regs.status = spc->status;
-	regs.sp = spc->sp;
-	
-	if ( (unsigned long) size >= sizeof *spc )
-		set_ipl_rom( spc->ipl_rom );
-	
-	const char* error = load_state( regs, spc->ram, spc->dsp );
-	
-	echo_accessed = false;
-	
-	return error;
-}
-
-void Snes_Spc::clear_echo()
-{
-	if ( !(dsp.read( 0x6C ) & 0x20) )
-	{
-		unsigned addr = 0x100 * dsp.read( 0x6D );
-		size_t size = 0x800 * dsp.read( 0x7D );
-		memset( mem.ram + addr, 0xFF, min( size, sizeof mem.ram - addr ) );
-	}
-}
-
-// Handle other file formats (emulator save states) in user code, not here.
-
-blargg_err_t Snes_Spc::load_state( const registers_t& cpu_state, const void* new_ram,
-		const void* dsp_state )
-{
-	// cpu
-	cpu.r = cpu_state;
-	
-	// Allow DSP to generate one sample before code starts
-	// (Tengai Makyo Zero, Tenjin's Table Toss first notes are lost since it
-	// clears KON 31 cycles from starting execution. It works on the SNES
-	// since the SPC player adds a few extra cycles delay after restoring
-	// KON from the DSP registers at the end of an SPC file).
-	extra_cycles = 32; 
-	
-	// ram
-	memcpy( mem.ram, new_ram, sizeof mem.ram );
-	memcpy( extra_ram, mem.ram + rom_addr, sizeof extra_ram );
-	
-	// boot rom (have to force enable_rom() to update it)
-	rom_enabled = !(mem.ram [0xF1] & 0x80);
-	enable_rom( !rom_enabled );
-	
-	// dsp
-	dsp.reset();
-	int i;
-	for ( i = 0; i < Spc_Dsp::register_count; i++ )
-		dsp.write( i, ((uint8_t const*) dsp_state) [i] );
-	
-	// timers
-	for ( i = 0; i < timer_count; i++ )
-	{
-		Timer& t = timer [i];
-		
-		t.next_tick = 0;
-		t.enabled = (mem.ram [0xF1] >> i) & 1;
-		if ( !t.enabled )
-			t.next_tick = timer_disabled_time;
-		t.count = 0;
-		t.counter = mem.ram [0xFD + i] & 15;
-		
-		int p = mem.ram [0xFA + i];
-		t.period = p ? p : 0x100;
-	}
-	
-	// Handle registers which already give 0 when read by setting RAM and not changing it.
-	// Put STOP instruction in registers which can be read, to catch attempted CPU execution.
-	mem.ram [0xF0] = 0;
-	mem.ram [0xF1] = 0;
-	mem.ram [0xF3] = 0xFF;
-	mem.ram [0xFA] = 0;
-	mem.ram [0xFB] = 0;
-	mem.ram [0xFC] = 0;
-	mem.ram [0xFD] = 0xFF;
-	mem.ram [0xFE] = 0xFF;
-	mem.ram [0xFF] = 0xFF;
-	
-	return 0; // success
-}
-
-// Hardware
-
-// Current time starts negative and ends at 0
-inline spc_time_t Snes_Spc::time() const
-{
-	return -cpu.remain();
-}
-
-// Keep track of next time to run and avoid a function call if it hasn't been reached.
-
-// Timers
-
-void Snes_Spc::Timer::run_until_( spc_time_t time )
-{
-	if ( !enabled )
-		debug_printf( "next_tick: %ld, time: %ld", (long) next_tick, (long) time );
-	assert( enabled ); // when disabled, next_tick should always be in the future
-	
-	int elapsed = ((time - next_tick) / divisor) + 1;
-	next_tick += elapsed * divisor;
-	
-	elapsed += count;
-	if ( elapsed >= period ) // avoid unnecessary division
-	{
-		int n = elapsed / period;
-		elapsed -= n * period;
-		counter = (counter + n) & 15;
-	}
-	count = elapsed;
-}
-
-// DSP
-
-const int clocks_per_sample = 32; // 1.024 MHz CPU clock / 32000 samples per second
-
-void Snes_Spc::run_dsp_( spc_time_t time )
-{
-	int count = ((time - next_dsp) >> 5) + 1; // divide by clocks_per_sample
-	sample_t* buf = sample_buf;
-	if ( buf ) {
-		sample_buf = buf + count * 2; // stereo
-		assert( sample_buf <= buf_end );
-	}
-	next_dsp += count * clocks_per_sample;
-	dsp.run( count, buf );
-}
-
-inline void Snes_Spc::run_dsp( spc_time_t time )
-{
-	if ( time >= next_dsp )
-		run_dsp_( time );
-}
-
-// Debug-only check for read/write within echo buffer, since this might result in
-// inaccurate emulation due to the DSP not being caught up to the present.
-inline void Snes_Spc::check_for_echo_access( spc_addr_t addr )
-{
-	if ( !echo_accessed && !(dsp.read( 0x6C ) & 0x20) )
-	{
-		// ** If echo accesses are found that require running the DSP, cache
-		// the start and end address on DSP writes to speed up checking.
-		
-		unsigned start = 0x100 * dsp.read( 0x6D );
-		unsigned end = start + 0x800 * dsp.read( 0x7D );
-		if ( start <= addr && addr < end ) {
-			echo_accessed = true;
-			debug_printf( "Read/write at $%04X within echo buffer\n", (unsigned) addr );
-		}
-	}
-}
-
-// Read
-
-int Snes_Spc::read( spc_addr_t addr )
-{
-	int result = mem.ram [addr];
-	
-	if ( (rom_addr <= addr && addr < 0xFFFC || addr >= 0xFFFE) && rom_enabled )
-		debug_printf( "Read from ROM: %04X -> %02X\n", addr, result );
-	
-	if ( unsigned (addr - 0xF0) < 0x10 )
-	{
-		assert( 0xF0 <= addr && addr <= 0xFF );
-		
-		// counters
-		int i = addr - 0xFD;
-		if ( i >= 0 )
-		{
-			Timer& t = timer [i];
-			t.run_until( time() );
-			int old = t.counter;
-			t.counter = 0;
-			return old;
-		}
-		
-		// dsp
-		if ( addr == 0xF3 )
-		{
-			run_dsp( time() );
-			if ( mem.ram [0xF2] >= Spc_Dsp::register_count )
-				debug_printf( "DSP read from $%02X\n", (int) mem.ram [0xF2] );
-			return dsp.read( mem.ram [0xF2] & 0x7F );
-		}
-		
-		if ( addr == 0xF0 || addr == 0xF1 || addr == 0xF8 ||
-				addr == 0xF9 || addr == 0xFA )
-			debug_printf( "Read from register $%02X\n", (int) addr );
-		
-		// Registers which always read as 0 are handled by setting mem.ram [reg] to 0
-		// at startup then never changing that value.
-		
-		check(( check_for_echo_access( addr ), true ));
-	}
-	
-	return result;
-}
-
-
-// Write
-
-void Snes_Spc::enable_rom( bool enable )
-{
-	if ( rom_enabled != enable )
-	{
-		rom_enabled = enable;
-		memcpy( mem.ram + rom_addr, (enable ? boot_rom : extra_ram), rom_size );
-		// TODO: ROM can still get overwritten when DSP writes to echo buffer
-	}
-}
-
-void Snes_Spc::write( spc_addr_t addr, int data )
-{
-	// first page is very common
-	if ( addr < 0xF0 ) {
-		mem.ram [addr] = (uint8_t) data;
-	}
-	else switch ( addr )
-	{
-		// RAM
-		default:
-			check(( check_for_echo_access( addr ), true ));
-			if ( addr < rom_addr ) {
-				mem.ram [addr] = (uint8_t) data;
-			}
-			else {
-				extra_ram [addr - rom_addr] = (uint8_t) data;
-				if ( !rom_enabled )
-					mem.ram [addr] = (uint8_t) data;
-			}
-			break;
-		
-		// DSP
-		//case 0xF2: // mapped to RAM
-		case 0xF3: {
-			run_dsp( time() );
-			int reg = mem.ram [0xF2];
-			if ( next_dsp > 0 ) {
-				// skip mode
-				
-				// key press
-				if ( reg == 0x4C )
-					keys_pressed |= data & ~dsp.read( 0x5C );
-				
-				// key release
-				if ( reg == 0x5C ) {
-					keys_released |= data;
-					keys_pressed &= ~data;
-				}
-			}
-			if ( reg < Spc_Dsp::register_count ) {
-				dsp.write( reg, data );
-			}
-			else {
-				debug_printf( "DSP write to $%02X\n", (int) reg );
-			}
-			break;
-		}
-		
-		case 0xF0: // Test register
-			debug_printf( "Wrote $%02X to $F0\n", (int) data );
-			break;
-		
-		// Config
-		case 0xF1:
-		{
-			// timers
-			for ( int i = 0; i < timer_count; i++ )
-			{
-				Timer& t = timer [i];
-				if ( !(data & (1 << i)) ) {
-					t.enabled = 0;
-					t.next_tick = timer_disabled_time;
-				}
-				else if ( !t.enabled ) {
-					// just enabled
-					t.enabled = 1;
-					t.counter = 0;
-					t.count = 0;
-					t.next_tick = time();
-				}
-			}
-			
-			// port clears
-			if ( data & 0x10 ) {
-				mem.ram [0xF4] = 0;
-				mem.ram [0xF5] = 0;
-			}
-			if ( data & 0x20 ) {
-				mem.ram [0xF6] = 0;
-				mem.ram [0xF7] = 0;
-			}
-			
-			enable_rom( (data & 0x80) != 0 );
-			
-			break;
-		}
-		
-		// Ports
-		case 0xF4:
-		case 0xF5:
-		case 0xF6:
-		case 0xF7:
-			// to do: handle output ports
-			break;
-		
-		//case 0xF8: // verified on SNES that these are read/write (RAM)
-		//case 0xF9:
-		
-		// Timers
-		case 0xFA:
-		case 0xFB:
-		case 0xFC: {
-			Timer& t = timer [addr - 0xFA];
-			if ( (t.period & 0xFF) != data ) {
-				t.run_until( time() );
-				t.period = data ? data : 0x100;
-			}
-			break;
-		}
-		
-		// Counters (cleared on write)
-		case 0xFD:
-		case 0xFE:
-		case 0xFF:
-			debug_printf( "Wrote to counter $%02X\n", (int) addr );
-			timer [addr - 0xFD].counter = 0;
-			break;
-	}
-}
-
-// Play
-
-blargg_err_t Snes_Spc::skip( long count )
-{
-	if ( count > 4 * 32000L )
-	{
-		// don't run DSP for long durations (2-3 times faster)
-		
-		const long sync_count = 32000L * 2;
-		
-		// keep track of any keys pressed/released (and not subsequently released)
-		keys_pressed = 0;
-		keys_released = 0;
-		// sentinel tells play to ignore DSP
-		RETURN_ERR( play( count - sync_count, skip_sentinel ) );
-		
-		// press/release keys now
-		dsp.write( 0x5C, keys_released & ~keys_pressed );
-		dsp.write( 0x4C, keys_pressed );
-		
-		clear_echo();
-		
-		// play the last few seconds normally to help synchronize DSP
-		count = sync_count;
-	}
-	
-	return play( count );
-}
-
-blargg_err_t Snes_Spc::play( long count, sample_t* out )
-{
-	require( count % 2 == 0 ); // output is always in pairs of samples
-	
-	// CPU time() runs from -duration to 0
-	spc_time_t duration = (count / 2) * clocks_per_sample;
-	
-	// DSP output is made on-the-fly when the CPU reads/writes DSP registers
-	sample_buf = out;
-	buf_end = out + (out && out != skip_sentinel ? count : 0);
-	next_dsp = (out == skip_sentinel) ? clocks_per_sample : -duration + clocks_per_sample;
-	
-	// Localize timer next_tick times and run them to the present to prevent a running
-	// but ignored timer's next_tick from getting too far behind and overflowing.
-	for ( int i = 0; i < timer_count; i++ )
-	{
-		Timer& t = timer [i];
-		if ( t.enabled )
-		{
-			t.next_tick -= duration;
-			t.run_until( -duration );
-		}
-	}
-	
-	// Run CPU for duration, reduced by any extra cycles from previous run
-	int elapsed = cpu.run( duration - extra_cycles );
-	if ( elapsed > 0 )
-	{
-		debug_printf( "Unhandled instruction $%02X, pc = $%04X\n",
-				(int) cpu.read( cpu.r.pc ), (unsigned) cpu.r.pc );
-		return "Emulation error (illegal/unsupported instruction)";
-	}
-	extra_cycles = -elapsed;
-	
-	// Catch DSP up to present.
-	run_dsp( 0 );
-	if ( out ) {
-		assert( next_dsp == clocks_per_sample );
-		assert( out == skip_sentinel || sample_buf - out == count );
-	}
-	buf_end = 0;
-	
-	return 0;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Snes_Spc.h Deleted

@@ -1,121 +0,0 @@
-// Super Nintendo (SNES) SPC-700 APU Emulator
-
-// Game_Music_Emu 0.5.5
-#ifndef SNES_SPC_H
-#define SNES_SPC_H
-
-#include "blargg_common.h"
-#include "Spc_Cpu.h"
-#include "Spc_Dsp.h"
-
-class Snes_Spc {
-public:
-	
-	// Load copy of SPC data into emulator. Clear echo buffer if 'clear_echo' is true.
-	enum { spc_file_size = 0x10180 };
-	blargg_err_t load_spc( const void* spc, long spc_size );
-	
-	// Generate 'count' samples and optionally write to 'buf'. Count must be even.
-	// Sample output is 16-bit 32kHz, signed stereo pairs with the left channel first.
-	typedef short sample_t;
-	blargg_err_t play( long count, sample_t* buf = NULL );
-	
-// Optional functionality
-	
-	// Load copy of state into emulator.
-	typedef Spc_Cpu::registers_t registers_t;
-	blargg_err_t load_state( const registers_t& cpu_state, const void* ram_64k,
-		const void* dsp_regs_128 );
-	
-	// Clear echo buffer, useful because many tracks have junk in the buffer.
-	void clear_echo();
-	
-	// Mute voice n if bit n (1 << n) of mask is set
-	enum { voice_count = Spc_Dsp::voice_count };
-	void mute_voices( int mask );
-	
-	// Skip forward by the specified number of samples (64000 samples = 1 second)
-	blargg_err_t skip( long count );
-	
-	// Set gain, where 1.0 is normal. When greater than 1.0, output is clamped the
-	// 16-bit sample range.
-	void set_gain( double );
-	
-	// If true, prevent channels and global volumes from being phase-negated
-	void disable_surround( bool disable = true );
-	
-	// Set 128 bytes to use for IPL boot ROM. Makes copy. Default is zero filled,
-	// to avoid including copyrighted code from the SPC-700.
-	void set_ipl_rom( const void* );
-	
-	void set_tempo( double );
-	
-public:
-	Snes_Spc();
-	typedef BOOST::uint8_t uint8_t;
-private:
-	// timers
-	struct Timer
-	{
-		spc_time_t next_tick;
-		int period;
-		int count;
-		int divisor;
-		int enabled;
-		int counter;
-		
-		void run_until_( spc_time_t );
-		void run_until( spc_time_t time )
-		{
-			if ( time >= next_tick )
-				run_until_( time );
-		}
-	};
-	enum { timer_count = 3 };
-	Timer timer [timer_count];
-
-	// hardware
-	int extra_cycles;
-	spc_time_t time() const;
-	int read( spc_addr_t );
-	void write( spc_addr_t, int );
-	friend class Spc_Cpu;
-	
-	// dsp
-	sample_t* sample_buf;
-	sample_t* buf_end; // to do: remove this once possible bug resolved
-	spc_time_t next_dsp;
-	Spc_Dsp dsp;
-	int keys_pressed;
-	int keys_released;
-	sample_t skip_sentinel [1]; // special value for play() passed by skip()
-	void run_dsp( spc_time_t );
-	void run_dsp_( spc_time_t );
-	bool echo_accessed;
-	void check_for_echo_access( spc_addr_t );
-	
-	// boot rom
-	enum { rom_size = 64 };
-	enum { rom_addr = 0xFFC0 };
-	bool rom_enabled;
-	void enable_rom( bool );
-	
-	// CPU and RAM (at end because it's large)
-	Spc_Cpu cpu;
-	uint8_t extra_ram [rom_size];
-	struct {
-		// padding to catch jumps before beginning or past end
-		uint8_t padding1 [0x100];
-		uint8_t ram [0x10000];
-		uint8_t padding2 [0x100];
-	} mem;
-	uint8_t boot_rom [rom_size];
-};
-
-inline void Snes_Spc::disable_surround( bool disable ) { dsp.disable_surround( disable ); }
-
-inline void Snes_Spc::mute_voices( int mask ) { dsp.mute_voices( mask ); }
-
-inline void Snes_Spc::set_gain( double v ) { dsp.set_gain( v ); }
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Cpu.cpp Deleted

@@ -1,1062 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Spc_Cpu.h"
-
-#include "blargg_endian.h"
-#include "Snes_Spc.h"
-
-/* Copyright (C) 2004-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-// Several instructions are commented out (or not even implemented). These aren't
-// used by the SPC files tested.
-
-// Optimize performance for the most common instructions, and size for the rest:
-//
-// 15% 0xF0 BEQ rel
-// 8% 0xE4 MOV A,dp
-// 4% 0xF5 MOV A,abs+X
-// 4% 0xD0 BNE rel
-// 4% 0x6F RET
-// 4% 0x3F CALL addr
-// 4% 0xF4 MOV A,dp+X
-// 3% 0xC4 MOV dp,A
-// 2% 0xEB MOV Y,dp
-// 2% 0x3D INC X
-// 2% 0xF6 MOV A,abs+Y
-// (1% and below not shown)
-
-Spc_Cpu::Spc_Cpu( Snes_Spc* e, uint8_t* ram_in ) : ram( ram_in ), emu( *e )
-{
-	remain_ = 0;
-	assert( INT_MAX >= 0x7FFFFFFF ); // requires 32-bit int
-	blargg_verify_byte_order();
-}
-
-#define READ( addr ) (emu.read( addr ))
-#define WRITE( addr, value ) (emu.write( addr, value ))
-
-#define READ_DP( addr ) READ( (addr) + dp )
-#define WRITE_DP( addr, value ) WRITE( (addr) + dp, value )
-
-#define READ_PROG( addr ) (ram [addr])
-#define READ_PROG16( addr ) GET_LE16( &READ_PROG( addr ) )
-
-int Spc_Cpu::read( spc_addr_t addr )
-{
-	return READ( addr );
-}
-
-void Spc_Cpu::write( spc_addr_t addr, int data )
-{
-	WRITE( addr, data );
-}
-
-// Cycle table derived from text copy of SPC-700 manual (using regular expressions)
-static unsigned char const cycle_table [0x100] = {
-// 0 1 2 3 4 5 6 7 8 9 A B C D E F
-	2,8,4,5,3,4,3,6,2,6,5,4,5,4,6,8, // 0
-	2,8,4,5,4,5,5,6,5,5,6,5,2,2,4,6, // 1
-	2,8,4,5,3,4,3,6,2,6,5,4,5,4,5,4, // 2
-	2,8,4,5,4,5,5,6,5,5,6,5,2,2,3,8, // 3
-	2,8,4,5,3,4,3,6,2,6,4,4,5,4,6,6, // 4
-	2,8,4,5,4,5,5,6,5,5,4,5,2,2,4,3, // 5
-	2,8,4,5,3,4,3,6,2,6,4,4,5,4,5,5, // 6
-	2,8,4,5,4,5,5,6,5,5,5,5,2,2,3,6, // 7
-	2,8,4,5,3,4,3,6,2,6,5,4,5,2,4,5, // 8
-	2,8,4,5,4,5,5,6,5,5,5,5,2,2,12,5,// 9
-	3,8,4,5,3,4,3,6,2,6,4,4,5,2,4,4, // A
-	2,8,4,5,4,5,5,6,5,5,5,5,2,2,3,4, // B
-	3,8,4,5,4,5,4,7,2,5,6,4,5,2,4,9, // C
-	2,8,4,5,5,6,6,7,4,5,4,5,2,2,6,3, // D
-	2,8,4,5,3,4,3,6,2,4,5,3,4,3,4,3, // E
-	2,8,4,5,4,5,5,6,3,4,5,4,2,2,4,3 // F
-};
-
-// The C,mem instructions are hardly used, so a non-inline function is used for
-// the common access code.
-unsigned Spc_Cpu::mem_bit( spc_addr_t pc )
-{
-	unsigned addr = READ_PROG16( pc );
-	unsigned t = READ( addr & 0x1FFF ) >> (addr >> 13);
-	return (t << 8) & 0x100;
-}
-
-spc_time_t Spc_Cpu::run( spc_time_t cycle_count )
-{
-	remain_ = cycle_count;
-	
-	uint8_t* const ram = this->ram; // cache
-	
-	// Stack pointer is kept one greater than usual SPC stack pointer to allow
-	// common pre-decrement and post-increment memory instructions that some
-	// processors have. Address wrap-around isn't supported.
-	#define PUSH( v ) (*--sp = uint8_t (v))
-	#define PUSH16( v ) (sp -= 2, SET_LE16( sp, v ))
-	#define POP() (*sp++)
-	#define SET_SP( v ) (sp = ram + 0x101 + (v))
-	#define GET_SP() (sp - 0x101 - ram)
-
-	uint8_t* sp;
-	SET_SP( r.sp );
-	
-	// registers
-	unsigned pc = (unsigned) r.pc;
-	int a = r.a;
-	int x = r.x;
-	int y = r.y;
-	
-	// status flags
-	
-	const int st_n = 0x80;
-	const int st_v = 0x40;
-	const int st_p = 0x20;
-	const int st_b = 0x10;
-	const int st_h = 0x08;
-	const int st_i = 0x04;
-	const int st_z = 0x02;
-	const int st_c = 0x01;
-	
-	#define IS_NEG (nz & 0x880)
-	
-	#define CALC_STATUS( out ) do {\
-		out = status & ~(st_n | st_z | st_c);\
-		out |= (c >> 8) & st_c;\
-		out |= (dp >> 3) & st_p;\
-		if ( IS_NEG ) out |= st_n;\
-		if ( !(nz & 0xFF) ) out |= st_z;\
-	} while ( 0 ) 
-
-	#define SET_STATUS( in ) do {\
-		status = in & ~(st_n | st_z | st_c | st_p);\
-		c = in << 8;\
-		nz = (in << 4) & 0x800;\
-		nz |= ~in & st_z;\
-		dp = (in << 3) & 0x100;\
-	} while ( 0 )
-	
-	int status;
-	int c; // store C as 'c' & 0x100.
-	int nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x880) != 0
-	unsigned dp; // direct page base
-	{
-		int temp = r.status;
-		SET_STATUS( temp );
-	}
-
-	goto loop;
-	
-	unsigned data; // first operand of instruction and temporary across function calls
-	
-	// Common endings for instructions
-cbranch_taken_loop: // compare and branch
-	pc += (BOOST::int8_t) READ_PROG( pc );
-	remain_ -= 2;
-inc_pc_loop: // end of instruction with an operand
-	pc++;
-loop:
-	
-	check( (unsigned) pc < 0x10000 );
-	check( (unsigned) GET_SP() < 0x100 );
-	
-	check( (unsigned) a < 0x100 );
-	check( (unsigned) x < 0x100 );
-	check( (unsigned) y < 0x100 );
-	
-	unsigned opcode = READ_PROG( pc );
-	pc++;
-	// to do: if pc is at end of memory, this will get wrong byte
-	data = READ_PROG( pc );
-	
-	if ( remain_ <= 0 )
-		goto stop;
-	
-	remain_ -= cycle_table [opcode];
-	
-	// Use 'data' for temporaries whose lifetime crosses read/write calls, otherwise
-	// use a local temporary.
-	switch ( opcode )
-	{
-	
-	#define BRANCH( cond ) {\
-		pc++;\
-		int offset = (BOOST::int8_t) data;\
-		if ( cond ) {\
-			pc += offset;\
-			remain_ -= 2;\
-		}\
-		goto loop;\
-	}
-	
-// Most-Common
-
-	case 0xF0: // BEQ (most common)
-		BRANCH( !(uint8_t) nz )
-	
-	case 0xD0: // BNE
-		BRANCH( (uint8_t) nz )
-	
-	case 0x3F: // CALL
-		PUSH16( pc + 2 );
-		pc = READ_PROG16( pc );
-		goto loop;
-	
-	case 0x6F: // RET
-		pc = POP();
-		pc += POP() * 0x100;
-		goto loop;
-
-#define CASE( n ) case n:
-
-// Define common address modes based on opcode for immediate mode. Execution
-// ends with data set to the address of the operand.
-#define ADDR_MODES( op )\
-	CASE( op - 0x02 ) /* (X) */\
-		data = x + dp;\
-		pc--;\
-		goto end_##op;\
-	CASE( op + 0x0F ) /* (dp)+Y */\
-		data = READ_PROG16( data + dp ) + y;\
-		goto end_##op;\
-	CASE( op - 0x01 ) /* (dp+X) */\
-		data = READ_PROG16( uint8_t (data + x) + dp );\
-		goto end_##op;\
-	CASE( op + 0x0E ) /* abs+Y */\
-		data += y;\
-		goto abs_##op;\
-	CASE( op + 0x0D ) /* abs+X */\
-		data += x;\
-	CASE( op - 0x03 ) /* abs */\
-	abs_##op:\
-		pc++;\
-		data += 0x100 * READ_PROG( pc );\
-		goto end_##op;\
-	CASE( op + 0x0C ) /* dp+X */\
-		data = uint8_t (data + x);\
-	CASE( op - 0x04 ) /* dp */\
-		data += dp;\
-	end_##op:
-
-// 1. 8-bit Data Transmission Commands. Group I
-
-	ADDR_MODES( 0xE8 ) // MOV A,addr
-	// case 0xE4: // MOV a,dp (most common)
-	mov_a_addr:
-		a = nz = READ( data );
-		goto inc_pc_loop;
-	case 0xBF: // MOV A,(X)+
-		data = x + dp;
-		x = uint8_t (x + 1);
-		pc--;
-		goto mov_a_addr;
-	
-	case 0xE8: // MOV A,imm
-		a = data;
-		nz = data;
-		goto inc_pc_loop;
-	
-	case 0xF9: // MOV X,dp+Y
-		data = uint8_t (data + y);
-	case 0xF8: // MOV X,dp
-		data += dp;
-		goto mov_x_addr;
-	case 0xE9: // MOV X,abs
-		data = READ_PROG16( pc );
-		pc++;
-	mov_x_addr:
-		data = READ( data );
-	case 0xCD: // MOV X,imm
-		x = data;
-		nz = data;
-		goto inc_pc_loop;
-	
-	case 0xFB: // MOV Y,dp+X
-		data = uint8_t (data + x);
-	case 0xEB: // MOV Y,dp
-		data += dp;
-		goto mov_y_addr;
-	case 0xEC: // MOV Y,abs
-		data = READ_PROG16( pc );
-		pc++;
-	mov_y_addr:
-		data = READ( data );
-	case 0x8D: // MOV Y,imm
-		y = data;
-		nz = data;
-		goto inc_pc_loop;
-
-// 2. 8-BIT DATA TRANSMISSION COMMANDS, GROUP 2
-
-	ADDR_MODES( 0xC8 ) // MOV addr,A
-		WRITE( data, a );
-		goto inc_pc_loop;
-	
-	{
-		int temp;
-	case 0xCC: // MOV abs,Y
-		temp = y;
-		goto mov_abs_temp;
-	case 0xC9: // MOV abs,X
-		temp = x;
-	mov_abs_temp:
-		WRITE( READ_PROG16( pc ), temp );
-		pc += 2;
-		goto loop;
-	}
-	
-	case 0xD9: // MOV dp+Y,X
-		data = uint8_t (data + y);
-	case 0xD8: // MOV dp,X
-		WRITE( data + dp, x );
-		goto inc_pc_loop;
-	
-	case 0xDB: // MOV dp+X,Y
-		data = uint8_t (data + x);
-	case 0xCB: // MOV dp,Y
-		WRITE( data + dp, y );
-		goto inc_pc_loop;
-
-	case 0xFA: // MOV dp,dp
-		data = READ( data + dp );
-	case 0x8F: // MOV dp,#imm
-		pc++;
-		WRITE_DP( READ_PROG( pc ), data );
-		goto inc_pc_loop;
-	
-// 3. 8-BIT DATA TRANSMISSIN COMMANDS, GROUP 3.
-	
-	case 0x7D: // MOV A,X
-		a = x;
-		nz = x;
-		goto loop;
-	
-	case 0xDD: // MOV A,Y
-		a = y;
-		nz = y;
-		goto loop;
-	
-	case 0x5D: // MOV X,A
-		x = a;
-		nz = a;
-		goto loop;
-	
-	case 0xFD: // MOV Y,A
-		y = a;
-		nz = a;
-		goto loop;
-	
-	case 0x9D: // MOV X,SP
-		x = nz = GET_SP();
-		goto loop;
-	
-	case 0xBD: // MOV SP,X
-		SET_SP( x );
-		goto loop;
-	
-	//case 0xC6: // MOV (X),A (handled by MOV addr,A in group 2)
-	
-	case 0xAF: // MOV (X)+,A
-		WRITE_DP( x, a );
-		x++;
-		goto loop;
-	
-// 5. 8-BIT LOGIC OPERATION COMMANDS
-	
-#define LOGICAL_OP( op, func )\
-	ADDR_MODES( op ) /* addr */\
-		data = READ( data );\
-	case op: /* imm */\
-		nz = a func##= data;\
-		goto inc_pc_loop;\
-	{ unsigned addr;\
-	case op + 0x11: /* X,Y */\
-		data = READ_DP( y );\
-		addr = x + dp;\
-		pc--;\
-		goto addr_##op;\
-	case op + 0x01: /* dp,dp */\
-		data = READ_DP( data );\
-	case op + 0x10: /*dp,imm*/\
-		pc++;\
-		addr = READ_PROG( pc ) + dp;\
-	addr_##op:\
-		nz = data func READ( addr );\
-		WRITE( addr, nz );\
-		goto inc_pc_loop;\
-	}
-	
-	LOGICAL_OP( 0x28, & ); // AND
-	
-	LOGICAL_OP( 0x08, | ); // OR
-	
-	LOGICAL_OP( 0x48, ^ ); // EOR
-	
-// 4. 8-BIT ARITHMETIC OPERATION COMMANDS
-
-	ADDR_MODES( 0x68 ) // CMP addr
-		data = READ( data );
-	case 0x68: // CMP imm
-		nz = a - data;
-		c = ~nz;
-		nz &= 0xFF;
-		goto inc_pc_loop;
-	
-	case 0x79: // CMP (X),(Y)
-		data = READ_DP( x );
-		nz = data - READ_DP( y );
-		c = ~nz;
-		nz &= 0xFF;
-		goto loop;
-	
-	case 0x69: // CMP (dp),(dp)
-		data = READ_DP( data );
-	case 0x78: // CMP dp,imm
-		pc++;
-		nz = READ_DP( READ_PROG( pc ) ) - data;
-		c = ~nz;
-		nz &= 0xFF;
-		goto inc_pc_loop;
-	
-	case 0x3E: // CMP X,dp
-		data += dp;
-		goto cmp_x_addr;
-	case 0x1E: // CMP X,abs
-		data = READ_PROG16( pc );
-		pc++;
-	cmp_x_addr:
-		data = READ( data );
-	case 0xC8: // CMP X,imm
-		nz = x - data;
-		c = ~nz;
-		nz &= 0xFF;
-		goto inc_pc_loop;
-	
-	case 0x7E: // CMP Y,dp
-		data += dp;
-		goto cmp_y_addr;
-	case 0x5E: // CMP Y,abs
-		data = READ_PROG16( pc );
-		pc++;
-	cmp_y_addr:
-		data = READ( data );
-	case 0xAD: // CMP Y,imm
-		nz = y - data;
-		c = ~nz;
-		nz &= 0xFF;
-		goto inc_pc_loop;
-	
-	{
-		int addr;
-	case 0xB9: // SBC (x),(y)
-	case 0x99: // ADC (x),(y)
-		pc--; // compensate for inc later
-		data = READ_DP( x );
-		addr = y + dp;
-		goto adc_addr;
-	case 0xA9: // SBC dp,dp
-	case 0x89: // ADC dp,dp
-		data = READ_DP( data );
-	case 0xB8: // SBC dp,imm
-	case 0x98: // ADC dp,imm
-		pc++;
-		addr = READ_PROG( pc ) + dp;
-	adc_addr:
-		nz = READ( addr );
-		goto adc_data;
-		
-// catch ADC and SBC together, then decode later based on operand
-#undef CASE
-#define CASE( n ) case n: case (n) + 0x20:
-	ADDR_MODES( 0x88 ) // ADC/SBC addr
-		data = READ( data );
-	case 0xA8: // SBC imm
-	case 0x88: // ADC imm
-		addr = -1; // A
-		nz = a;
-	adc_data: {
-		if ( opcode & 0x20 )
-			data ^= 0xFF; // SBC
-		int carry = (c >> 8) & 1;
-		int ov = (nz ^ 0x80) + carry + (BOOST::int8_t) data; // sign-extend
-		int hc = (nz & 15) + carry;
-		c = nz += data + carry;
-		hc = (nz & 15) - hc;
-		status = (status & ~(st_v | st_h)) | ((ov >> 2) & st_v) | ((hc >> 1) & st_h);
-		if ( addr < 0 ) {
-			a = (uint8_t) nz;
-			goto inc_pc_loop;
-		}
-		WRITE( addr, (uint8_t) nz );
-		goto inc_pc_loop;
-	}
-	
-	}
-	
-// 6. ADDITION & SUBTRACTION COMMANDS
-
-#define INC_DEC_REG( reg, n )\
-		nz = reg + n;\
-		reg = (uint8_t) nz;\
-		goto loop;
-
-	case 0xBC: INC_DEC_REG( a, 1 ) // INC A
-	case 0x3D: INC_DEC_REG( x, 1 ) // INC X
-	case 0xFC: INC_DEC_REG( y, 1 ) // INC Y
-	
-	case 0x9C: INC_DEC_REG( a, -1 ) // DEC A
-	case 0x1D: INC_DEC_REG( x, -1 ) // DEC X
-	case 0xDC: INC_DEC_REG( y, -1 ) // DEC Y
-
-	case 0x9B: // DEC dp+X
-	case 0xBB: // INC dp+X
-		data = uint8_t (data + x);
-	case 0x8B: // DEC dp
-	case 0xAB: // INC dp
-		data += dp;
-		goto inc_abs;
-	case 0x8C: // DEC abs
-	case 0xAC: // INC abs
-		data = READ_PROG16( pc );
-		pc++;
-	inc_abs:
-		nz = ((opcode >> 4) & 2) - 1;
-		nz += READ( data );
-		WRITE( data, (uint8_t) nz );
-		goto inc_pc_loop;
-	
-// 7. SHIFT, ROTATION COMMANDS
-
-	case 0x5C: // LSR A
-		c = 0;
-	case 0x7C:{// ROR A
-		nz = ((c >> 1) & 0x80) | (a >> 1);
-		c = a << 8;
-		a = nz;
-		goto loop;
-	}
-	
-	case 0x1C: // ASL A
-		c = 0;
-	case 0x3C:{// ROL A
-		int temp = (c >> 8) & 1;
-		c = a << 1;
-		nz = c | temp;
-		a = (uint8_t) nz;
-		goto loop;
-	}
-	
-	case 0x0B: // ASL dp
-		c = 0;
-		data += dp;
-		goto rol_mem;
-	case 0x1B: // ASL dp+X
-		c = 0;
-	case 0x3B: // ROL dp+X
-		data = uint8_t (data + x);
-	case 0x2B: // ROL dp
-		data += dp;
-		goto rol_mem;
-	case 0x0C: // ASL abs
-		c = 0;
-	case 0x2C: // ROL abs
-		data = READ_PROG16( pc );
-		pc++;
-	rol_mem:
-		nz = (c >> 8) & 1;
-		nz |= (c = READ( data ) << 1);
-		WRITE( data, (uint8_t) nz );
-		goto inc_pc_loop;
-	
-	case 0x4B: // LSR dp
-		c = 0;
-		data += dp;
-		goto ror_mem;
-	case 0x5B: // LSR dp+X
-		c = 0;
-	case 0x7B: // ROR dp+X
-		data = uint8_t (data + x);
-	case 0x6B: // ROR dp
-		data += dp;
-		goto ror_mem;
-	case 0x4C: // LSR abs
-		c = 0;
-	case 0x6C: // ROR abs
-		data = READ_PROG16( pc );
-		pc++;
-	ror_mem: {
-		int temp = READ( data );
-		nz = ((c >> 1) & 0x80) | (temp >> 1);
-		c = temp << 8;
-		WRITE( data, nz );
-		goto inc_pc_loop;
-	}
-
-	case 0x9F: // XCN
-		nz = a = (a >> 4) | uint8_t (a << 4);
-		goto loop;
-
-// 8. 16-BIT TRANSMISION COMMANDS
-
-	case 0xBA: // MOVW YA,dp
-		a = READ_DP( data );
-		nz = (a & 0x7F) | (a >> 1);
-		y = READ_DP( uint8_t (data + 1) );
-		nz |= y;
-		goto inc_pc_loop;
-	
-	case 0xDA: // MOVW dp,YA
-		WRITE_DP( data, a );
-		WRITE_DP( uint8_t (data + 1), y );
-		goto inc_pc_loop;
-	
-// 9. 16-BIT OPERATION COMMANDS
-
-	case 0x3A: // INCW dp
-	case 0x1A:{// DECW dp
-		data += dp;
-		
-		// low byte
-		int temp = READ( data );
-		temp += ((opcode >> 4) & 2) - 1; // +1 for INCW, -1 for DECW
-		nz = ((temp >> 1) | temp) & 0x7F;
-		WRITE( data, (uint8_t) temp );
-		
-		// high byte
-		data = uint8_t (data + 1) + dp;
-		temp >>= 8;
-		temp = uint8_t (temp + READ( data ));
-		nz |= temp;
-		WRITE( data, temp );
-		
-		goto inc_pc_loop;
-	}
-		
-	case 0x9A: // SUBW YA,dp
-	case 0x7A: // ADDW YA,dp
-	{
-		// read 16-bit addend
-		int temp = READ_DP( data );
-		int sign = READ_DP( uint8_t (data + 1) );
-		temp += 0x100 * sign;
-		status &= ~(st_v | st_h);
-		
-		// to do: fix half-carry for SUBW (it's probably wrong)
-		
-		// for SUBW, negate and truncate to 16 bits
-		if ( opcode & 0x80 ) {
-			temp = (temp ^ 0xFFFF) + 1;
-			sign = temp >> 8;
-		}
-		
-		// add low byte (A)
-		temp += a;
-		a = (uint8_t) temp;
-		nz = (temp | (temp >> 1)) & 0x7F;
-		
-		// add high byte (Y)
-		temp >>= 8;
-		c = y + temp;
-		nz = (nz | c) & 0xFF;
-		
-		// half-carry (temporary avoids CodeWarrior optimizer bug)
-		unsigned hc = (c & 15) - (y & 15);
-		status |= (hc >> 4) & st_h;
-		
-		// overflow if sign of YA changed when previous sign and addend sign were same
-		status |= (((c ^ y) & ~(y ^ sign)) >> 1) & st_v;
-		
-		y = (uint8_t) c;
-		
-		goto inc_pc_loop;
-	}
-	
-	case 0x5A: { // CMPW YA,dp
-		int temp = a - READ_DP( data );
-		nz = ((temp >> 1) | temp) & 0x7F;
-		temp = y + (temp >> 8);
-		temp -= READ_DP( uint8_t (data + 1) );
-		nz |= temp;
-		c = ~temp;
-		nz &= 0xFF;
-		goto inc_pc_loop;
-	}
-	
-// 10. MULTIPLICATION & DIVISON COMMANDS
-
-	case 0xCF: { // MUL YA
-		unsigned temp = y * a;
-		a = (uint8_t) temp;
-		nz = ((temp >> 1) | temp) & 0x7F;
-		y = temp >> 8;
-		nz |= y;
-		goto loop;
-	}
-	
-	case 0x9E: // DIV YA,X
-	{
-		// behavior based on SPC CPU tests
-		
-		status &= ~(st_h | st_v);
-		
-		if ( (y & 15) >= (x & 15) )
-			status |= st_h;
-		
-		if ( y >= x )
-			status |= st_v;
-		
-		unsigned ya = y * 0x100 + a;
-		if ( y < x * 2 )
-		{
-			a = ya / x;
-			y = ya - a * x;
-		}
-		else
-		{
-			a = 255 - (ya - x * 0x200) / (256 - x);
-			y = x + (ya - x * 0x200) % (256 - x);
-		}
-		
-		nz = (uint8_t) a;
-		a = (uint8_t) a;
-		
-		goto loop;
-	}
-	
-// 11. DECIMAL COMPENSATION COMMANDS
-	
-	// seem unused
-	// case 0xDF: // DAA
-	// case 0xBE: // DAS
-	
-// 12. BRANCHING COMMANDS
-
-	case 0x2F: // BRA rel
-		pc += (BOOST::int8_t) data;
-		goto inc_pc_loop;
-	
-	case 0x30: // BMI
-		BRANCH( IS_NEG )
-	
-	case 0x10: // BPL
-		BRANCH( !IS_NEG )
-	
-	case 0xB0: // BCS
-		BRANCH( c & 0x100 )
-	
-	case 0x90: // BCC
-		BRANCH( !(c & 0x100) )
-	
-	case 0x70: // BVS
-		BRANCH( status & st_v )
-	
-	case 0x50: // BVC
-		BRANCH( !(status & st_v) )
-	
-	case 0x03: // BBS dp.bit,rel
-	case 0x23:
-	case 0x43:
-	case 0x63:
-	case 0x83:
-	case 0xA3:
-	case 0xC3:
-	case 0xE3:
-		pc++;
-		if ( (READ_DP( data ) >> (opcode >> 5)) & 1 )
-			goto cbranch_taken_loop;
-		goto inc_pc_loop;
-	
-	case 0x13: // BBC dp.bit,rel
-	case 0x33:
-	case 0x53:
-	case 0x73:
-	case 0x93:
-	case 0xB3:
-	case 0xD3:
-	case 0xF3:
-		pc++;
-		if ( !((READ_DP( data ) >> (opcode >> 5)) & 1) )
-			goto cbranch_taken_loop;
-		goto inc_pc_loop;
-	
-	case 0xDE: // CBNE dp+X,rel
-		data = uint8_t (data + x);
-		// fall through
-	case 0x2E: // CBNE dp,rel
-		pc++;
-		if ( READ_DP( data ) != a )
-			goto cbranch_taken_loop;
-		goto inc_pc_loop;
-	
-	case 0xFE: // DBNZ Y,rel
-		y = uint8_t (y - 1);
-		BRANCH( y )
-	
-	case 0x6E: { // DBNZ dp,rel
-		pc++;
-		unsigned temp = READ_DP( data ) - 1;
-		WRITE_DP( (uint8_t) data, (uint8_t) temp );
-		if ( temp )
-			goto cbranch_taken_loop;
-		goto inc_pc_loop;
-	}
-	
-	case 0x1F: // JMP (abs+X)
-		pc = READ_PROG16( pc ) + x;
-		// fall through
-	case 0x5F: // JMP abs
-		pc = READ_PROG16( pc );
-		goto loop;
-	
-// 13. SUB-ROUTINE CALL RETURN COMMANDS
-	
-	case 0x0F:{// BRK
-		check( false ); // untested
-		PUSH16( pc + 1 );
-		pc = READ_PROG16( 0xFFDE ); // vector address verified
-		int temp;
-		CALC_STATUS( temp );
-		PUSH( temp );
-		status = (status | st_b) & ~st_i;
-		goto loop;
-	}
-	
-	case 0x4F: // PCALL offset
-		pc++;
-		PUSH16( pc );
-		pc = 0xFF00 + data;
-		goto loop;
-	
-	case 0x01: // TCALL n
-	case 0x11:
-	case 0x21:
-	case 0x31:
-	case 0x41:
-	case 0x51:
-	case 0x61:
-	case 0x71:
-	case 0x81:
-	case 0x91:
-	case 0xA1:
-	case 0xB1:
-	case 0xC1:
-	case 0xD1:
-	case 0xE1:
-	case 0xF1:
-		PUSH16( pc );
-		pc = READ_PROG16( 0xFFDE - (opcode >> 3) );
-		goto loop;
-	
-// 14. STACK OPERATION COMMANDS
-
-	{
-		int temp;
-	case 0x7F: // RET1
-		temp = POP();
-		pc = POP();
-		pc |= POP() << 8;
-		goto set_status;
-	case 0x8E: // POP PSW
-		temp = POP();
-	set_status:
-		SET_STATUS( temp );
-		goto loop;
-	}
-	
-	case 0x0D: { // PUSH PSW
-		int temp;
-		CALC_STATUS( temp );
-		PUSH( temp );
-		goto loop;
-	}
-
-	case 0x2D: // PUSH A
-		PUSH( a );
-		goto loop;
-	
-	case 0x4D: // PUSH X
-		PUSH( x );
-		goto loop;
-	
-	case 0x6D: // PUSH Y
-		PUSH( y );
-		goto loop;
-	
-	case 0xAE: // POP A
-		a = POP();
-		goto loop;
-	
-	case 0xCE: // POP X
-		x = POP();
-		goto loop;
-	
-	case 0xEE: // POP Y
-		y = POP();
-		goto loop;
-	
-// 15. BIT OPERATION COMMANDS
-
-	case 0x02: // SET1
-	case 0x22:
-	case 0x42:
-	case 0x62:
-	case 0x82:
-	case 0xA2:
-	case 0xC2:
-	case 0xE2:
-	case 0x12: // CLR1
-	case 0x32:
-	case 0x52:
-	case 0x72:
-	case 0x92:
-	case 0xB2:
-	case 0xD2:
-	case 0xF2: {
-		data += dp;
-		int bit = 1 << (opcode >> 5);
-		int mask = ~bit;
-		if ( opcode & 0x10 )
-			bit = 0;
-		WRITE( data, (READ( data ) & mask) | bit );
-		goto inc_pc_loop;
-	}
-		
-	case 0x0E: // TSET1 abs
-	case 0x4E:{// TCLR1 abs
-		data = READ_PROG16( pc );
-		pc += 2;
-		unsigned temp = READ( data );
-		nz = temp & a;
-		temp &= ~a;
-		if ( !(opcode & 0x40) )
-			temp |= a;
-		WRITE( data, temp );
-		goto loop;
-	}
-	
-	case 0x4A: // AND1 C,mem.bit
-		c &= mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-	case 0x6A: // AND1 C,/mem.bit
-		check( false ); // untested
-		c &= ~mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-	case 0x0A: // OR1 C,mem.bit
-		check( false ); // untested
-		c |= mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-	case 0x2A: // OR1 C,/mem.bit
-		check( false ); // untested
-		c |= ~mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-	case 0x8A: // EOR1 C,mem.bit
-		c ^= mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-	case 0xEA: { // NOT1 mem.bit
-		data = READ_PROG16( pc );
-		pc += 2;
-		unsigned temp = READ( data & 0x1FFF );
-		temp ^= 1 << (data >> 13);
-		WRITE( data & 0x1FFF, temp );
-		goto loop;
-	}
-	
-	case 0xCA: { // MOV1 mem.bit,C
-		data = READ_PROG16( pc );
-		pc += 2;
-		unsigned temp = READ( data & 0x1FFF );
-		unsigned bit = data >> 13;
-		temp = (temp & ~(1 << bit)) | (((c >> 8) & 1) << bit);
-		WRITE( data & 0x1FFF, temp );
-		goto loop;
-	}
-	
-	case 0xAA: // MOV1 C,mem.bit
-		c = mem_bit( pc );
-		pc += 2;
-		goto loop;
-	
-// 16. PROGRAM STATUS FLAG OPERATION COMMANDS
-
-	case 0x60: // CLRC
-		c = 0;
-		goto loop;
-		
-	case 0x80: // SETC
-		c = ~0;
-		goto loop;
-	
-	case 0xED: // NOTC
-		c ^= 0x100;
-		goto loop;
-		
-	case 0xE0: // CLRV
-		status &= ~(st_v | st_h);
-		goto loop;
-	
-	case 0x20: // CLRP
-		dp = 0;
-		goto loop;
-	
-	case 0x40: // SETP
-		dp = 0x100;
-		goto loop;
-	
-	case 0xA0: // EI
-		check( false ); // untested
-		status |= st_i;
-		goto loop;
-	
-	case 0xC0: // DI
-		check( false ); // untested
-		status &= ~st_i;
-		goto loop;
-	
-// 17. OTHER COMMANDS
-
-	case 0x00: // NOP
-		goto loop;
-	
-	//case 0xEF: // SLEEP
-	//case 0xFF: // STOP
-	
-	} // switch
-	
-	// unhandled instructions fall out of switch so emulator can catch them
-	
-stop:
-	pc--;
-	
-	{
-		int temp;
-		CALC_STATUS( temp );
-		r.status = (uint8_t) temp;
-	}
-	
-	r.pc = pc;
-	r.sp = (uint8_t) GET_SP();
-	r.a = (uint8_t) a;
-	r.x = (uint8_t) x;
-	r.y = (uint8_t) y;
-	
-	return remain_;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Cpu.h Deleted

@@ -1,57 +0,0 @@
-// Super Nintendo (SNES) SPC-700 CPU emulator
-
-// Game_Music_Emu 0.5.5
-#ifndef SPC_CPU_H
-#define SPC_CPU_H
-
-#include "blargg_common.h"
-
-typedef unsigned spc_addr_t;
-typedef blargg_long spc_time_t;
-
-class Snes_Spc;
-
-class Spc_Cpu {
-	typedef BOOST::uint8_t uint8_t;
-	uint8_t* const ram;
-public:
-	// Keeps pointer to 64K RAM
-	Spc_Cpu( Snes_Spc* spc, uint8_t* ram );
-	
-	// SPC-700 registers. *Not* kept updated during a call to run().
-	struct registers_t {
-		long pc; // more than 16 bits to allow overflow detection
-		uint8_t a;
-		uint8_t x;
-		uint8_t y;
-		uint8_t status;
-		uint8_t sp;
-	} r;
-	
-	// Run CPU for at least 'count' cycles. Return the number of cycles remaining
-	// when emulation stopped (negative if extra cycles were emulated). Emulation
-	// stops when there are no more remaining cycles or an unhandled instruction
-	// is encountered (STOP, SLEEP, and any others not yet implemented). In the
-	// latter case, the return value is greater than zero.
-	spc_time_t run( spc_time_t count );
-	
-	// Number of clock cycles remaining for current run() call
-	spc_time_t remain() const;
-	
-	// Access memory as the emulated CPU does
-	int  read ( spc_addr_t );
-	void write( spc_addr_t, int );
-	
-private:
-	// noncopyable
-	Spc_Cpu( const Spc_Cpu& );
-	Spc_Cpu& operator = ( const Spc_Cpu& );
-	unsigned mem_bit( spc_addr_t );
-	
-	spc_time_t remain_;
-	Snes_Spc& emu;
-};
-
-inline spc_time_t Spc_Cpu::remain() const { return remain_; }
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Dsp.cpp Deleted

@@ -1,666 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-// Based on Brad Martin's OpenSPC DSP emulator
-
-#include "Spc_Dsp.h"
-
-#include "blargg_endian.h"
-#include <string.h>
-
-/* Copyright (C) 2002 Brad Martin */
-/* Copyright (C) 2004-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-#ifdef BLARGG_ENABLE_OPTIMIZER
-	#include BLARGG_ENABLE_OPTIMIZER
-#endif
-
-Spc_Dsp::Spc_Dsp( uint8_t* ram_ ) : ram( ram_ )
-{
-	set_gain( 1.0 );
-	mute_voices( 0 );
-	disable_surround( false );
-	
-	assert( offsetof (globals_t,unused9 [2]) == register_count );
-	assert( sizeof (voice) == register_count );
-	blargg_verify_byte_order();
-}
-
-void Spc_Dsp::mute_voices( int mask )
-{
-	for ( int i = 0; i < voice_count; i++ )
-		voice_state [i].enabled = (mask >> i & 1) ? 31 : 7;
-}
-
-void Spc_Dsp::reset()
-{
-	keys = 0;
-	echo_ptr = 0;
-	noise_count = 0;
-	noise = 1;
-	fir_offset = 0;
-	
-	g.flags = 0xE0; // reset, mute, echo off
-	g.key_ons = 0;
-	
-	for ( int i = 0; i < voice_count; i++ )
-	{
-		voice_t& v = voice_state [i];
-		v.on_cnt = 0;
-		v.volume [0] = 0;
-		v.volume [1] = 0;
-		v.envstate = state_release;
-	}
-	
-	memset( fir_buf, 0, sizeof fir_buf );
-}
-
-void Spc_Dsp::write( int i, int data )
-{
-	require( (unsigned) i < register_count );
-	
-	reg [i] = data;
-	int high = i >> 4;
-	switch ( i & 0x0F )
-	{
-		// voice volume
-		case 0:
-		case 1: {
-			short* volume = voice_state [high].volume;
-			int left = (int8_t) reg [i & ~1];
-			int right = (int8_t) reg [i | 1];
-			volume [0] = left;
-			volume [1] = right;
-			// kill surround only if enabled and signs of volumes differ
-			if ( left * right < surround_threshold )
-			{
-				if ( left < 0 )
-					volume [0] = -left;
-				else
-					volume [1] = -right;
-			}
-			break;
-		}
-		
-		// fir coefficients
-		case 0x0F:
-			fir_coeff [high] = (int8_t) data; // sign-extend
-			break;
-	}
-}
-
-// This table is for envelope timing. It represents the number of counts
-// that should be subtracted from the counter each sample period (32kHz).
-// The counter starts at 30720 (0x7800). Each count divides exactly into
-// 0x7800 without remainder.
-const int env_rate_init = 0x7800;
-static short const env_rates [0x20] =
-{
-	0x0000, 0x000F, 0x0014, 0x0018, 0x001E, 0x0028, 0x0030, 0x003C,
-	0x0050, 0x0060, 0x0078, 0x00A0, 0x00C0, 0x00F0, 0x0140, 0x0180,
-	0x01E0, 0x0280, 0x0300, 0x03C0, 0x0500, 0x0600, 0x0780, 0x0A00,
-	0x0C00, 0x0F00, 0x1400, 0x1800, 0x1E00, 0x2800, 0x3C00, 0x7800
-};
-
-const int env_range = 0x800;
-
-inline int Spc_Dsp::clock_envelope( int v )
-{ /* Return value is current 
-								 * ENVX */
-	raw_voice_t& raw_voice = this->voice [v];
-	voice_t& voice = voice_state [v];
-	
-	int envx = voice.envx;
-	if ( voice.envstate == state_release )
-	{
-		/*
-		 * Docs: "When in the state of "key off". the "click" sound is 
-		 * prevented by the addition of the fixed value 1/256" WTF???
-		 * Alright, I'm going to choose to interpret that this way:
-		 * When a note is keyed off, start the RELEASE state, which
-		 * subtracts 1/256th each sample period (32kHz). Note there's 
-		 * no need for a count because it always happens every update. 
-		 */
-		envx -= env_range / 256;
-		if ( envx <= 0 )
-		{
-			envx = 0;
-			keys &= ~(1 << v);
-			return -1;
-		}
-		voice.envx = envx;
-		raw_voice.envx = envx >> 8;
-		return envx;
-	}
-	
-	int cnt = voice.envcnt;
-	int adsr1 = raw_voice.adsr [0];
-	if ( adsr1 & 0x80 )
-	{
-		switch ( voice.envstate )
-		{
-			case state_attack: {
-				// increase envelope by 1/64 each step
-				int t = adsr1 & 15;
-				if ( t == 15 )
-				{
-					envx += env_range / 2;
-				}
-				else
-				{
-					cnt -= env_rates [t * 2 + 1];
-					if ( cnt > 0 )
-						break;
-					envx += env_range / 64;
-					cnt = env_rate_init;
-				}
-				if ( envx >= env_range )
-				{
-					envx = env_range - 1;
-					voice.envstate = state_decay;
-				}
-				voice.envx = envx;
-				break;
-			}
-			
-			case state_decay: {
-				// Docs: "DR... [is multiplied] by the fixed value
-				// 1-1/256." Well, at least that makes some sense.
-				// Multiplying ENVX by 255/256 every time DECAY is
-				// updated. 
-				cnt -= env_rates [((adsr1 >> 3) & 0xE) + 0x10];
-				if ( cnt <= 0 )
-				{
-					cnt = env_rate_init;
-					envx -= ((envx - 1) >> 8) + 1;
-					voice.envx = envx;
-				}
-				int sustain_level = raw_voice.adsr [1] >> 5;
-				
-				if ( envx <= (sustain_level + 1) * 0x100 )
-					voice.envstate = state_sustain;
-				break;
-			}
-			
-			case state_sustain:
-				// Docs: "SR [is multiplied] by the fixed value 1-1/256."
-				// Multiplying ENVX by 255/256 every time SUSTAIN is
-				// updated. 
-				cnt -= env_rates [raw_voice.adsr [1] & 0x1F];
-				if ( cnt <= 0 )
-				{
-					cnt = env_rate_init;
-					envx -= ((envx - 1) >> 8) + 1;
-					voice.envx = envx;
-				}
-				break;
-			
-			case state_release:
-				// handled above
-				break;
-		}
-	}
-	else
-	{ /* GAIN mode is set */
-		/*
-		 * Note: if the game switches between ADSR and GAIN modes
-		 * partway through, should the count be reset, or should it
-		 * continue from where it was? Does the DSP actually watch for 
-		 * that bit to change, or does it just go along with whatever
-		 * it sees when it performs the update? I'm going to assume
-		 * the latter and not update the count, unless I see a game
-		 * that obviously wants the other behavior. The effect would
-		 * be pretty subtle, in any case. 
-		 */
-		int t = raw_voice.gain;
-		if (t < 0x80)
-		{
-			envx = voice.envx = t << 4;
-		}
-		else switch (t >> 5)
-		{
-		case 4: /* Docs: "Decrease (linear): Subtraction
-							 * of the fixed value 1/64." */
-			cnt -= env_rates [t & 0x1F];
-			if (cnt > 0)
-				break;
-			cnt = env_rate_init;
-			envx -= env_range / 64;
-			if ( envx < 0 )
-			{
-				envx = 0;
-				if ( voice.envstate == state_attack )
-					voice.envstate = state_decay;
-			}
-			voice.envx = envx;
-			break;
-		case 5: /* Docs: "Drecrease <sic> (exponential):
-							 * Multiplication by the fixed value
-							 * 1-1/256." */
-			cnt -= env_rates [t & 0x1F];
-			if (cnt > 0)
-				break;
-			cnt = env_rate_init;
-			envx -= ((envx - 1) >> 8) + 1;
-			if ( envx < 0 )
-			{
-				envx = 0;
-				if ( voice.envstate == state_attack )
-					voice.envstate = state_decay;
-			}
-			voice.envx = envx;
-			break;
-		case 6: /* Docs: "Increase (linear): Addition of
-							 * the fixed value 1/64." */
-			cnt -= env_rates [t & 0x1F];
-			if (cnt > 0)
-				break;
-			cnt = env_rate_init;
-			envx += env_range / 64;
-			if ( envx >= env_range )
-				envx = env_range - 1;
-			voice.envx = envx;
-			break;
-		case 7: /* Docs: "Increase (bent line): Addition
-							 * of the constant 1/64 up to .75 of the
-							 * constaint <sic> 1/256 from .75 to 1." */
-			cnt -= env_rates [t & 0x1F];
-			if (cnt > 0)
-				break;
-			cnt = env_rate_init;
-			if ( envx < env_range * 3 / 4 )
-				envx += env_range / 64;
-			else
-				envx += env_range / 256;
-			if ( envx >= env_range )
-				envx = env_range - 1;
-			voice.envx = envx;
-			break;
-		}
-	}
-	voice.envcnt = cnt;
-	raw_voice.envx = envx >> 4;
-	return envx;
-}
-
-// Clamp n into range -32768 <= n <= 32767
-inline int clamp_16( int n )
-{
-	if ( (BOOST::int16_t) n != n )
-		n = BOOST::int16_t (0x7FFF - (n >> 31));
-	return n;
-}
-
-void Spc_Dsp::run( long count, short* out_buf )
-{
-	// to do: make clock_envelope() inline so that this becomes a leaf function?
-	
-	// Should we just fill the buffer with silence? Flags won't be cleared
-	// during this run so it seems it should keep resetting every sample.
-	if ( g.flags & 0x80 )
-		reset();
-	
-	struct src_dir {
-		char start [2];
-		char loop [2];
-	};
-	
-	const src_dir* const sd = (src_dir*) &ram [g.wave_page * 0x100];
-	
-	int left_volume = g.left_volume;
-	int right_volume = g.right_volume;
-	if ( left_volume * right_volume < surround_threshold )
-		right_volume = -right_volume; // kill global surround
-	left_volume *= emu_gain;
-	right_volume *= emu_gain;
-	
-	while ( --count >= 0 )
-	{
-		// Here we check for keys on/off. Docs say that successive writes
-		// to KON/KOF must be separated by at least 2 Ts periods or risk
-		// being neglected. Therefore DSP only looks at these during an
-		// update, and not at the time of the write. Only need to do this
-		// once however, since the regs haven't changed over the whole
-		// period we need to catch up with. 
-		
-		g.wave_ended &= ~g.key_ons; // Keying on a voice resets that bit in ENDX.
-		
-		if ( g.noise_enables )
-		{
-			noise_count -= env_rates [g.flags & 0x1F];
-			if ( noise_count <= 0 )
-			{
-				noise_count = env_rate_init;
-				
-				noise_amp = BOOST::int16_t (noise * 2);
-				
-				// TODO: switch to Galios style
-				int feedback = (noise << 13) ^ (noise << 14);
-				noise = (feedback & 0x4000) | (noise >> 1);
-			}
-		}
-		
-		// What is the expected behavior when pitch modulation is enabled on
-		// voice 0? Jurassic Park 2 does this. Assume 0 for now.
-		blargg_long prev_outx = 0;
-		
-		int echol = 0;
-		int echor = 0;
-		int left = 0;
-		int right = 0;
-		for ( int vidx = 0; vidx < voice_count; vidx++ )
-		{
-			const int vbit = 1 << vidx;
-			raw_voice_t& raw_voice = voice [vidx];
-			voice_t& voice = voice_state [vidx];
-			
-			if ( voice.on_cnt && !--voice.on_cnt )
-			{
-				// key on
-				keys |= vbit;
-				voice.addr = GET_LE16( sd [raw_voice.waveform].start );
-				voice.block_remain = 1;
-				voice.envx = 0;
-				voice.block_header = 0;
-				voice.fraction = 0x3FFF; // decode three samples immediately
-				voice.interp0 = 0; // BRR decoder filter uses previous two samples
-				voice.interp1 = 0;
-				
-				// NOTE: Real SNES does *not* appear to initialize the
-				// envelope counter to anything in particular. The first
-				// cycle always seems to come at a random time sooner than 
-				// expected; as yet, I have been unable to find any
-				// pattern. I doubt it will matter though, so we'll go
-				// ahead and do the full time for now. 
-				voice.envcnt = env_rate_init;
-				voice.envstate = state_attack;
-			}
-			
-			if ( g.key_ons & vbit & ~g.key_offs )
-			{
-				// voice doesn't come on if key off is set
-				g.key_ons &= ~vbit;
-				voice.on_cnt = 8;
-			}
-			
-			if ( keys & g.key_offs & vbit )
-			{
-				// key off
-				voice.envstate = state_release;
-				voice.on_cnt = 0;
-			}
-			
-			int envx;
-			if ( !(keys & vbit) || (envx = clock_envelope( vidx )) < 0 )
-			{
-				raw_voice.envx = 0;
-				raw_voice.outx = 0;
-				prev_outx = 0;
-				continue;
-			}
-			
-			// Decode samples when fraction >= 1.0 (0x1000)
-			for ( int n = voice.fraction >> 12; --n >= 0; )
-			{
-				if ( !--voice.block_remain )
-				{
-					if ( voice.block_header & 1 )
-					{
-						g.wave_ended |= vbit;
-					
-						if ( voice.block_header & 2 )
-						{
-							// verified (played endless looping sample and ENDX was set)
-							voice.addr = GET_LE16( sd [raw_voice.waveform].loop );
-						}
-						else
-						{
-							// first block was end block; don't play anything (verified)
-							goto sample_ended; // to do: find alternative to goto
-						}
-					}
-					
-					voice.block_header = ram [voice.addr++];
-					voice.block_remain = 16; // nybbles
-				}
-				
-				// if next block has end flag set, *this* block ends *early* (verified)
-				if ( voice.block_remain == 9 && (ram [voice.addr + 5] & 3) == 1 &&
-						(voice.block_header & 3) != 3 )
-				{
-			sample_ended:
-					g.wave_ended |= vbit;
-					keys &= ~vbit;
-					raw_voice.envx = 0;
-					voice.envx = 0;
-					// add silence samples to interpolation buffer
-					do
-					{
-						voice.interp3 = voice.interp2;
-						voice.interp2 = voice.interp1;
-						voice.interp1 = voice.interp0;
-						voice.interp0 = 0;
-					}
-					while ( --n >= 0 );
-					break;
-				}
-				
-				int delta = ram [voice.addr];
-				if ( voice.block_remain & 1 )
-				{
-					delta <<= 4; // use lower nybble
-					voice.addr++;
-				}
-				
-				// Use sign-extended upper nybble
-				delta = int8_t (delta) >> 4;
-				
-				// For invalid ranges (D,E,F): if the nybble is negative,
-				// the result is F000. If positive, 0000. Nothing else
-				// like previous range, etc seems to have any effect. If
-				// range is valid, do the shift normally. Note these are
-				// both shifted right once to do the filters properly, but 
-				// the output will be shifted back again at the end.
-				int shift = voice.block_header >> 4;
-				delta = (delta << shift) >> 1;
-				if ( shift > 0x0C )
-					delta = (delta >> 14) & ~0x7FF;
-				
-				// One, two and three point IIR filters
-				int smp1 = voice.interp0;
-				int smp2 = voice.interp1;
-				if ( voice.block_header & 8 )
-				{
-					delta += smp1;
-					delta -= smp2 >> 1;
-					if ( !(voice.block_header & 4) )
-					{
-						delta += (-smp1 - (smp1 >> 1)) >> 5;
-						delta += smp2 >> 5;
-					}
-					else
-					{
-						delta += (-smp1 * 13) >> 7;
-						delta += (smp2 + (smp2 >> 1)) >> 4;
-					}
-				}
-				else if ( voice.block_header & 4 )
-				{
-					delta += smp1 >> 1;
-					delta += (-smp1) >> 5;
-				}
-				
-				voice.interp3 = voice.interp2;
-				voice.interp2 = smp2;
-				voice.interp1 = smp1;
-				voice.interp0 = BOOST::int16_t (clamp_16( delta ) * 2); // sign-extend
-			}
-			
-			// rate (with possible modulation)
-			int rate = GET_LE16( raw_voice.rate ) & 0x3FFF;
-			if ( g.pitch_mods & vbit )
-				rate = (rate * (prev_outx + 32768)) >> 15;
-			
-			// Gaussian interpolation using most recent 4 samples
-			int index = voice.fraction >> 2 & 0x3FC;
-			voice.fraction = (voice.fraction & 0x0FFF) + rate;
-			const BOOST::int16_t* table = (BOOST::int16_t const*) ((char const*) gauss + index);
-			const BOOST::int16_t* table2 = (BOOST::int16_t const*) ((char const*) gauss + (255*4 - index));
-			int s = ((table [0] * voice.interp3) >> 12) +
-					((table [1] * voice.interp2) >> 12) +
-					((table2 [1] * voice.interp1) >> 12);
-			s = (BOOST::int16_t) (s * 2);
-			s += (table2 [0] * voice.interp0) >> 11 & ~1;
-			int output = clamp_16( s );
-			if ( g.noise_enables & vbit )
-				output = noise_amp;
-			
-			// scale output and set outx values
-			output = (output * envx) >> 11 & ~1;
-			
-			// output and apply muting (by setting voice.enabled to 31)
-			// if voice is externally disabled (not a SNES feature)
-			int l = (voice.volume [0] * output) >> voice.enabled;
-			int r = (voice.volume [1] * output) >> voice.enabled;
-			prev_outx = output;
-			raw_voice.outx = int8_t (output >> 8);
-			if ( g.echo_ons & vbit )
-			{
-				echol += l;
-				echor += r;
-			}
-			left += l;
-			right += r;
-		}
-		// end of channel loop
-		
-		// main volume control
-		left = (left * left_volume ) >> (7 + emu_gain_bits);
-		right = (right * right_volume) >> (7 + emu_gain_bits);
-		
-		// Echo FIR filter
-		
-		// read feedback from echo buffer
-		int echo_ptr = this->echo_ptr;
-		uint8_t* echo_buf = &ram [(g.echo_page * 0x100 + echo_ptr) & 0xFFFF];
-		echo_ptr += 4;
-		if ( echo_ptr >= (g.echo_delay & 15) * 0x800 )
-			echo_ptr = 0;
-		int fb_left = (BOOST::int16_t) GET_LE16( echo_buf ); // sign-extend
-		int fb_right = (BOOST::int16_t) GET_LE16( echo_buf + 2 ); // sign-extend
-		this->echo_ptr = echo_ptr;
-		
-		// put samples in history ring buffer
-		const int fir_offset = this->fir_offset;
-		short (*fir_pos) [2] = &fir_buf [fir_offset];
-		this->fir_offset = (fir_offset + 7) & 7; // move backwards one step
-		fir_pos [0] [0] = (short) fb_left;
-		fir_pos [0] [1] = (short) fb_right;
-		fir_pos [8] [0] = (short) fb_left; // duplicate at +8 eliminates wrap checking below
-		fir_pos [8] [1] = (short) fb_right;
-		
-		// FIR
-		fb_left = fb_left * fir_coeff [7] +
-				fir_pos [1] [0] * fir_coeff [6] +
-				fir_pos [2] [0] * fir_coeff [5] +
-				fir_pos [3] [0] * fir_coeff [4] +
-				fir_pos [4] [0] * fir_coeff [3] +
-				fir_pos [5] [0] * fir_coeff [2] +
-				fir_pos [6] [0] * fir_coeff [1] +
-				fir_pos [7] [0] * fir_coeff [0];
-		
-		fb_right = fb_right * fir_coeff [7] +
-				fir_pos [1] [1] * fir_coeff [6] +
-				fir_pos [2] [1] * fir_coeff [5] +
-				fir_pos [3] [1] * fir_coeff [4] +
-				fir_pos [4] [1] * fir_coeff [3] +
-				fir_pos [5] [1] * fir_coeff [2] +
-				fir_pos [6] [1] * fir_coeff [1] +
-				fir_pos [7] [1] * fir_coeff [0];
-		
-		left += (fb_left * g.left_echo_volume ) >> 14;
-		right += (fb_right * g.right_echo_volume) >> 14;
-		
-		// echo buffer feedback
-		if ( !(g.flags & 0x20) )
-		{
-			echol += (fb_left * g.echo_feedback) >> 14;
-			echor += (fb_right * g.echo_feedback) >> 14;
-			SET_LE16( echo_buf , clamp_16( echol ) );
-			SET_LE16( echo_buf + 2, clamp_16( echor ) );
-		}
-		
-		if ( out_buf )
-		{
-			// write final samples
-			
-			left = clamp_16( left );
-			right = clamp_16( right );
-			
-			int mute = g.flags & 0x40;
-			
-			out_buf [0] = (short) left;
-			out_buf [1] = (short) right;
-			out_buf += 2;
-			
-			// muting
-			if ( mute )
-			{
-				out_buf [-2] = 0;
-				out_buf [-1] = 0;
-			}
-		}
-	}
-}
-
-// Base normal_gauss table is almost exactly (with an error of 0 or -1 for each entry):
-// int normal_gauss [512];
-// normal_gauss [i] = exp((i-511)*(i-511)*-9.975e-6)*pow(sin(0.00307096*i),1.7358)*1304.45
-
-// Interleved gauss table (to improve cache coherency).
-// gauss [i * 2 + j] = normal_gauss [(1 - j) * 256 + i]
-const BOOST::int16_t Spc_Dsp::gauss [512] =
-{
- 370,1305, 366,1305, 362,1304, 358,1304, 354,1304, 351,1304, 347,1304, 343,1303,
- 339,1303, 336,1303, 332,1302, 328,1302, 325,1301, 321,1300, 318,1300, 314,1299,
- 311,1298, 307,1297, 304,1297, 300,1296, 297,1295, 293,1294, 290,1293, 286,1292,
- 283,1291, 280,1290, 276,1288, 273,1287, 270,1286, 267,1284, 263,1283, 260,1282,
- 257,1280, 254,1279, 251,1277, 248,1275, 245,1274, 242,1272, 239,1270, 236,1269,
- 233,1267, 230,1265, 227,1263, 224,1261, 221,1259, 218,1257, 215,1255, 212,1253,
- 210,1251, 207,1248, 204,1246, 201,1244, 199,1241, 196,1239, 193,1237, 191,1234,
- 188,1232, 186,1229, 183,1227, 180,1224, 178,1221, 175,1219, 173,1216, 171,1213,
- 168,1210, 166,1207, 163,1205, 161,1202, 159,1199, 156,1196, 154,1193, 152,1190,
- 150,1186, 147,1183, 145,1180, 143,1177, 141,1174, 139,1170, 137,1167, 134,1164,
- 132,1160, 130,1157, 128,1153, 126,1150, 124,1146, 122,1143, 120,1139, 118,1136,
- 117,1132, 115,1128, 113,1125, 111,1121, 109,1117, 107,1113, 106,1109, 104,1106,
- 102,1102, 100,1098, 99,1094, 97,1090, 95,1086, 94,1082, 92,1078, 90,1074,
- 89,1070, 87,1066, 86,1061, 84,1057, 83,1053, 81,1049, 80,1045, 78,1040,
- 77,1036, 76,1032, 74,1027, 73,1023, 71,1019, 70,1014, 69,1010, 67,1005,
- 66,1001, 65, 997, 64, 992, 62, 988, 61, 983, 60, 978, 59, 974, 58, 969,
- 56, 965, 55, 960, 54, 955, 53, 951, 52, 946, 51, 941, 50, 937, 49, 932,
- 48, 927, 47, 923, 46, 918, 45, 913, 44, 908, 43, 904, 42, 899, 41, 894,
- 40, 889, 39, 884, 38, 880, 37, 875, 36, 870, 36, 865, 35, 860, 34, 855,
- 33, 851, 32, 846, 32, 841, 31, 836, 30, 831, 29, 826, 29, 821, 28, 816,
- 27, 811, 27, 806, 26, 802, 25, 797, 24, 792, 24, 787, 23, 782, 23, 777,
- 22, 772, 21, 767, 21, 762, 20, 757, 20, 752, 19, 747, 19, 742, 18, 737,
- 17, 732, 17, 728, 16, 723, 16, 718, 15, 713, 15, 708, 15, 703, 14, 698,
- 14, 693, 13, 688, 13, 683, 12, 678, 12, 674, 11, 669, 11, 664, 11, 659,
- 10, 654, 10, 649, 10, 644, 9, 640, 9, 635, 9, 630, 8, 625, 8, 620,
- 8, 615, 7, 611, 7, 606, 7, 601, 6, 596, 6, 592, 6, 587, 6, 582,
- 5, 577, 5, 573, 5, 568, 5, 563, 4, 559, 4, 554, 4, 550, 4, 545,
- 4, 540, 3, 536, 3, 531, 3, 527, 3, 522, 3, 517, 2, 513, 2, 508,
- 2, 504, 2, 499, 2, 495, 2, 491, 2, 486, 1, 482, 1, 477, 1, 473,
- 1, 469, 1, 464, 1, 460, 1, 456, 1, 451, 1, 447, 1, 443, 1, 439,
- 0, 434, 0, 430, 0, 426, 0, 422, 0, 418, 0, 414, 0, 410, 0, 405,
- 0, 401, 0, 397, 0, 393, 0, 389, 0, 385, 0, 381, 0, 378, 0, 374,
-};

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Dsp.h Deleted

@@ -1,152 +0,0 @@
-// Super Nintendo (SNES) SPC DSP emulator
-
-// Game_Music_Emu 0.5.5
-#ifndef SPC_DSP_H
-#define SPC_DSP_H
-
-#include "blargg_common.h"
-
-class Spc_Dsp {
-	typedef BOOST::int8_t int8_t;
-	typedef BOOST::uint8_t uint8_t;
-public:
-	
-	// Keeps pointer to 64K ram
-	Spc_Dsp( uint8_t* ram );
-	
-	// Mute voice n if bit n (1 << n) of mask is clear.
-	enum { voice_count = 8 };
-	void mute_voices( int mask );
-	
-	// Clear state and silence everything.
-	void reset();
-	
-	// Set gain, where 1.0 is normal. When greater than 1.0, output is clamped to
-	// the 16-bit sample range.
-	void set_gain( double );
-	
-	// If true, prevent channels and global volumes from being phase-negated
-	void disable_surround( bool disable );
-	
-	// Read/write register 'n', where n ranges from 0 to register_count - 1.
-	enum { register_count = 128 };
-	int read ( int n );
-	void write( int n, int );
-	
-	// Run DSP for 'count' samples. Write resulting samples to 'buf' if not NULL.
-	void run( long count, short* buf = NULL );
-	
-	
-// End of public interface
-private:
-	
-	struct raw_voice_t {
-		int8_t left_vol;
-		int8_t right_vol;
-		uint8_t rate [2];
-		uint8_t waveform;
-		uint8_t adsr [2]; // envelope rates for attack, decay, and sustain
-		uint8_t gain; // envelope gain (if not using ADSR)
-		int8_t envx; // current envelope level
-		int8_t outx; // current sample
-		int8_t unused [6];
-	};
-	
-	struct globals_t {
-		int8_t unused1 [12];
-		int8_t left_volume; // 0C Main Volume Left (-.7)
-		int8_t echo_feedback; // 0D Echo Feedback (-.7)
-		int8_t unused2 [14];
-		int8_t right_volume; // 1C Main Volume Right (-.7)
-		int8_t unused3 [15];
-		int8_t left_echo_volume; // 2C Echo Volume Left (-.7)
-		uint8_t pitch_mods; // 2D Pitch Modulation on/off for each voice
-		int8_t unused4 [14];
-		int8_t right_echo_volume; // 3C Echo Volume Right (-.7)
-		uint8_t noise_enables; // 3D Noise output on/off for each voice
-		int8_t unused5 [14];
-		uint8_t key_ons; // 4C Key On for each voice
-		uint8_t echo_ons; // 4D Echo on/off for each voice
-		int8_t unused6 [14];
-		uint8_t key_offs; // 5C key off for each voice (instantiates release mode)
-		uint8_t wave_page; // 5D source directory (wave table offsets)
-		int8_t unused7 [14];
-		uint8_t flags; // 6C flags and noise freq
-		uint8_t echo_page; // 6D
-		int8_t unused8 [14];
-		uint8_t wave_ended; // 7C
-		uint8_t echo_delay; // 7D ms >> 4
-		char unused9 [2];
-	};
-	
-	union {
-		raw_voice_t voice [voice_count];
-		uint8_t reg [register_count];
-		globals_t g;
-	};
-	
-	uint8_t* const ram;
-	
-	// Cache of echo FIR values for faster access
-	short fir_coeff [voice_count];
-	
-	// fir_buf [i + 8] == fir_buf [i], to avoid wrap checking in FIR code
-	short fir_buf [16] [2];
-	int fir_offset; // (0 to 7)
-	
-	enum { emu_gain_bits = 8 };
-	int emu_gain;
-	
-	int keyed_on; // 8-bits for 8 voices
-	int keys;
-	
-	int echo_ptr;
-	int noise_amp;
-	int noise;
-	int noise_count;
-	
-	int surround_threshold;
-	
-	static BOOST::int16_t const gauss [];
-	
-	enum state_t {
-		state_attack,
-		state_decay,
-		state_sustain,
-		state_release
-	};
-	
-	struct voice_t {
-		short volume [2];
-		short fraction;// 12-bit fractional position
-		short interp3; // most recent four decoded samples
-		short interp2;
-		short interp1;
-		short interp0;
-		short block_remain; // number of nybbles remaining in current block
-		unsigned short addr;
-		short block_header; // header byte from current block
-		short envcnt;
-		short envx;
-		short on_cnt;
-		short enabled; // 7 if enabled, 31 if disabled
-		short envstate;
-		short unused; // pad to power of 2
-	};
-	
-	voice_t voice_state [voice_count];
-	
-	int clock_envelope( int );
-};
-
-inline void Spc_Dsp::disable_surround( bool disable ) { surround_threshold = disable ? 0 : -0x7FFF; }
-
-inline void Spc_Dsp::set_gain( double v ) { emu_gain = (int) (v * (1 << emu_gain_bits)); }
-
-inline int Spc_Dsp::read( int i )
-{
-	assert( (unsigned) i < register_count );
-	return reg [i];
-}
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Emu.cpp Deleted

@@ -1,328 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Spc_Emu.h"
-
-#include "blargg_endian.h"
-#include <stdlib.h>
-#include <string.h>
-
-/* Copyright (C) 2004-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-Spc_Emu::Spc_Emu()
-{
-	set_type( gme_spc_type );
-	
-	static const char* const names [Snes_Spc::voice_count] = {
-		"DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
-	};
-	set_voice_names( names );
-	
-	set_gain( 1.4 );
-}
-
-Spc_Emu::~Spc_Emu() { }
-
-// Track info
-
-long const trailer_offset = 0x10200;
-
-byte const* Spc_Emu::trailer() const { return &file_data [min( file_size, trailer_offset )]; }
-
-long Spc_Emu::trailer_size() const { return max( 0L, file_size - trailer_offset ); }
-
-static void get_spc_xid6( byte const* begin, long size, track_info_t* out )
-{
-	// header
-	byte const* end = begin + size;
-	if ( size < 8 || memcmp( begin, "xid6", 4 ) )
-	{
-		check( false );
-		return;
-	}
-	long info_size = get_le32( begin + 4 );
-	byte const* in = begin + 8; 
-	if ( end - in > info_size )
-	{
-		debug_printf( "Extra data after SPC xid6 info\n" );
-		end = in + info_size;
-	}
-	
-	int year = 0;
-	char copyright [256 + 5];
-	int copyright_len = 0;
-	int const year_len = 5;
-	
-	while ( end - in >= 4 )
-	{
-		// header
-		int id = in [0];
-		int data = in [3] * 0x100 + in [2];
-		int type = in [1];
-		int len = type ? data : 0;
-		in += 4;
-		if ( len > end - in )
-		{
-			check( false );
-			break; // block goes past end of data
-		}
-		
-		// handle specific block types
-		char* field = 0;
-		switch ( id )
-		{
-			case 0x01: field = out->song; break;
-			case 0x02: field = out->game; break;
-			case 0x03: field = out->author; break;
-			case 0x04: field = out->dumper; break;
-			case 0x07: field = out->comment; break;
-			case 0x14: year = data; break;
-			
-			//case 0x30: // intro length
-			// Many SPCs have intro length set wrong for looped tracks, making it useless
-			/*
-			case 0x30:
-				check( len == 4 );
-				if ( len >= 4 )
-				{
-					out->intro_length = get_le32( in ) / 64;
-					if ( out->length > 0 )
-					{
-						long loop = out->length - out->intro_length;
-						if ( loop >= 2000 )
-							out->loop_length = loop;
-					}
-				}
-				break;
-			*/
-			
-			case 0x13:
-				copyright_len = min( len, (int) sizeof copyright - year_len );
-				memcpy( &copyright [year_len], in, copyright_len );
-				break;
-			
-			default:
-				if ( id < 0x01 || (id > 0x07 && id < 0x10) ||
-						(id > 0x14 && id < 0x30) || id > 0x36 )
-					debug_printf( "Unknown SPC xid6 block: %X\n", (int) id );
-				break;
-		}
-		if ( field )
-		{
-			check( type == 1 );
-			Gme_File::copy_field_( field, (char const*) in, len );
-		}
-		
-		// skip to next block
-		in += len;
-		
-		// blocks are supposed to be 4-byte aligned with zero-padding...
-		byte const* unaligned = in;
-		while ( (in - begin) & 3 && in < end )
-		{
-			if ( *in++ != 0 )
-			{
-				// ...but some files have no padding
-				in = unaligned;
-				debug_printf( "SPC info tag wasn't properly padded to align\n" );
-				break;
-			}
-		}
-	}
-	
-	char* p = &copyright [year_len];
-	if ( year )
-	{
-		*--p = ' ';
-		for ( int n = 4; n--; )
-		{
-			*--p = char (year % 10 + '0');
-			year /= 10;
-		}
-		copyright_len += year_len;
-	}
-	if ( copyright_len )
-		Gme_File::copy_field_( out->copyright, p, copyright_len );
-	
-	check( in == end );
-}
-
-static void get_spc_info( Spc_Emu::header_t const& h, byte const* xid6, long xid6_size,
-		track_info_t* out )
-{
-	// decode length (can be in text or binary format, sometimes ambiguous ugh)
-	long len_secs = 0;
-	for ( int i = 0; i < 3; i++ )
-	{
-		unsigned n = h.len_secs [i] - '0';
-		if ( n > 9 )
-		{
-			// ignore single-digit text lengths
-			// (except if author field is present and begins at offset 1, ugh)
-			if ( i == 1 && (h.author [0] || !h.author [1]) )
-				len_secs = 0;
-			break;
-		}
-		len_secs *= 10;
-		len_secs += n;
-	}
-	if ( !len_secs || len_secs > 0x1FFF )
-		len_secs = get_le16( h.len_secs );
-	if ( len_secs < 0x1FFF )
-		out->length = len_secs * 1000;
-	
-	int offset = (h.author [0] < ' ' || unsigned (h.author [0] - '0') <= 9);
-	Gme_File::copy_field_( out->author, &h.author [offset], sizeof h.author - offset );
-	
-	GME_COPY_FIELD( h, out, song );
-	GME_COPY_FIELD( h, out, game );
-	GME_COPY_FIELD( h, out, dumper );
-	GME_COPY_FIELD( h, out, comment );
-	
-	if ( xid6_size )
-		get_spc_xid6( xid6, xid6_size, out );
-}
-
-blargg_err_t Spc_Emu::track_info_( track_info_t* out, int ) const
-{
-	get_spc_info( header(), trailer(), trailer_size(), out );
-	return 0;
-}
-
-static blargg_err_t check_spc_header( void const* header )
-{
-	if ( memcmp( header, "SNES-SPC700 Sound File Data", 27 ) )
-		return gme_wrong_file_type;
-	return 0;
-}
-
-struct Spc_File : Gme_Info_
-{
-	Spc_Emu::header_t header;
-	blargg_vector<byte> xid6;
-	
-	Spc_File() { set_type( gme_spc_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		long file_size = in.remain();
-		if ( file_size < Snes_Spc::spc_file_size )
-			return gme_wrong_file_type;
-		RETURN_ERR( in.read( &header, Spc_Emu::header_size ) );
-		RETURN_ERR( check_spc_header( header.tag ) );
-		long const xid6_offset = 0x10200;
-		long xid6_size = file_size - xid6_offset;
-		if ( xid6_size > 0 )
-		{
-			RETURN_ERR( xid6.resize( xid6_size ) );
-			RETURN_ERR( in.skip( xid6_offset - Spc_Emu::header_size ) );
-			RETURN_ERR( in.read( xid6.begin(), xid6.size() ) );
-		}
-		return 0;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		get_spc_info( header, xid6.begin(), xid6.size(), out );
-		return 0;
-	}
-};
-
-static Music_Emu* new_spc_emu () { return BLARGG_NEW Spc_Emu ; }
-static Music_Emu* new_spc_file() { return BLARGG_NEW Spc_File; }
-
-static gme_type_t_ const gme_spc_type_ = { "Super Nintendo", 1, &new_spc_emu, &new_spc_file, "SPC", 0 };
-gme_type_t const gme_spc_type = &gme_spc_type_;
-
-
-// Setup
-
-blargg_err_t Spc_Emu::set_sample_rate_( long sample_rate )
-{
-	apu.set_gain( gain() );
-	if ( sample_rate != native_sample_rate )
-	{
-		RETURN_ERR( resampler.buffer_size( native_sample_rate / 20 * 2 ) );
-		resampler.time_ratio( (double) native_sample_rate / sample_rate, 0.9965 );
-	}
-	return 0;
-}
-
-void Spc_Emu::mute_voices_( int m )
-{
-	Music_Emu::mute_voices_( m );
-	apu.mute_voices( m );
-}
-
-blargg_err_t Spc_Emu::load_mem_( byte const* in, long size )
-{
-	assert( offsetof (header_t,unused2 [46]) == header_size );
-	file_data = in;
-	file_size = size;
-	set_voice_count( Snes_Spc::voice_count );
-	if ( size < Snes_Spc::spc_file_size )
-		return gme_wrong_file_type;
-	return check_spc_header( in );
-}
-
-// Emulation
-
-void Spc_Emu::set_tempo_( double t ) { apu.set_tempo( t ); }
-
-blargg_err_t Spc_Emu::start_track_( int track )
-{
-	RETURN_ERR( Music_Emu::start_track_( track ) );
-	resampler.clear();
-	RETURN_ERR( apu.load_spc( file_data, file_size ) );
-	apu.clear_echo();
-	return 0;
-}
-
-blargg_err_t Spc_Emu::skip_( long count )
-{
-	if ( sample_rate() != native_sample_rate )
-	{
-		count = long (count * resampler.ratio()) & ~1;
-		count -= resampler.skip_input( count );
-	}
-	
-	// TODO: shouldn't skip be adjusted for the 64 samples read afterwards?
-	
-	if ( count > 0 )
-		RETURN_ERR( apu.skip( count ) );
-	
-	// eliminate pop due to resampler
-	const int resampler_latency = 64;
-	sample_t buf [resampler_latency];
-	return play_( resampler_latency, buf );
-}
-
-blargg_err_t Spc_Emu::play_( long count, sample_t* out )
-{
-	if ( sample_rate() == native_sample_rate )
-		return apu.play( count, out );
-	
-	long remain = count;
-	while ( remain > 0 )
-	{
-		remain -= resampler.read( &out [count - remain], remain );
-		if ( remain > 0 )
-		{
-			long n = resampler.max_write();
-			RETURN_ERR( apu.play( n, resampler.buffer() ) );
-			resampler.write( n );
-		}
-	}
-	check( remain == 0 );
-	return 0;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/Spc_Emu.h Deleted

@@ -1,77 +0,0 @@
-// Super Nintendo SPC music file emulator
-
-// Game_Music_Emu 0.5.5
-#ifndef SPC_EMU_H
-#define SPC_EMU_H
-
-#include "Fir_Resampler.h"
-#include "Music_Emu.h"
-#include "Snes_Spc.h"
-
-class Spc_Emu : public Music_Emu {
-public:
-	// 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
-	{
-		char tag [35];
-		byte format;
-		byte version;
-		byte pc [2];
-		byte a, x, y, psw, sp;
-		byte unused [2];
-		char song [32];
-		char game [32];
-		char dumper [16];
-		char comment [32];
-		byte date [11];
-		byte len_secs [3];
-		byte fade_msec [4];
-		char author [32]; // sometimes first char should be skipped (see official SPC spec)
-		byte mute_mask;
-		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;
-	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()
-	long trailer_size() const;
-
-public:
-	Spc_Emu();
-	~Spc_Emu();
-protected:
-	blargg_err_t load_mem_( byte const*, long );
-	blargg_err_t track_info_( track_info_t*, int track ) const;
-	blargg_err_t set_sample_rate_( long );
-	blargg_err_t start_track_( int );
-	blargg_err_t play_( long, sample_t* );
-	blargg_err_t skip_( long );
-	void mute_voices_( int );
-	void set_tempo_( double );
-private:
-	byte const* file_data;
-	long file_size;
-	Fir_Resampler<24> resampler;
-	Snes_Spc apu;
-};
-
-inline void Spc_Emu::disable_surround( bool b ) { apu.disable_surround( b ); }
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/blargg_common.h Deleted

@@ -1,175 +0,0 @@
-// Sets up common environment for Shay Green's libraries.
-// To change configuration options, modify blargg_config.h, not this file.
-
-#ifndef BLARGG_COMMON_H
-#define BLARGG_COMMON_H
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-
-#undef BLARGG_COMMON_H
-// allow blargg_config.h to #include blargg_common.h
-#include "blargg_config.h"
-#ifndef BLARGG_COMMON_H
-#define BLARGG_COMMON_H
-
-// STATIC_CAST(T,expr): Used in place of static_cast<T> (expr)
-#ifndef STATIC_CAST
-	#define STATIC_CAST(T,expr) ((T) (expr))
-#endif
-
-// blargg_err_t (0 on success, otherwise error string)
-#ifndef blargg_err_t
-	typedef const char* blargg_err_t;
-#endif
-
-// blargg_vector - very lightweight vector of POD types (no constructor/destructor)
-template<class T>
-class blargg_vector {
-	T* begin_;
-	size_t size_;
-public:
-	blargg_vector() : begin_( 0 ), size_( 0 ) { }
-	~blargg_vector() { free( begin_ ); }
-	size_t size() const { return size_; }
-	T* begin() const { return begin_; }
-	T* end() const { return begin_ + size_; }
-	blargg_err_t resize( size_t n )
-	{
-		void* p = realloc( begin_, n * sizeof (T) );
-		if ( !p && n )
-			return "Out of memory";
-		begin_ = (T*) p;
-		size_ = n;
-		return 0;
-	}
-	void clear() { void* p = begin_; begin_ = 0; size_ = 0; free( p ); }
-	T& operator [] ( size_t n ) const
-	{
-		assert( n <= size_ ); // <= to allow past-the-end value
-		return begin_ [n];
-	}
-};
-
-#ifndef BLARGG_DISABLE_NOTHROW
-	#if __cplusplus < 199711
-		#define BLARGG_THROWS( spec )
-	#else
-		#define BLARGG_THROWS( spec ) throw spec
-	#endif
-	#define BLARGG_DISABLE_NOTHROW \
-		void* operator new ( size_t s ) BLARGG_THROWS(()) { return malloc( s ); }\
-		void operator delete ( void* p ) { free( p ); }
-	#define BLARGG_NEW new
-#else
-	#include <new>
-	#define BLARGG_NEW new (std::nothrow)
-#endif
-
-#define BLARGG_4CHAR( a, b, c, d ) \
-	((a&0xFF)*0x1000000L + (b&0xFF)*0x10000L + (c&0xFF)*0x100L + (d&0xFF))
-
-// BOOST_STATIC_ASSERT( expr ): Generates compile error if expr is 0.
-#ifndef BOOST_STATIC_ASSERT
-	#ifdef _MSC_VER
-		// MSVC6 (_MSC_VER < 1300) fails for use of __LINE__ when /Zl is specified
-		#define BOOST_STATIC_ASSERT( expr ) \
-			void blargg_failed_( int (*arg) [2 / (int) !!(expr) - 1] )
-	#else
-		// Some other compilers fail when declaring same function multiple times in class,
-		// so differentiate them by line
-		#define BOOST_STATIC_ASSERT( expr ) \
-			void blargg_failed_( int (*arg) [2 / !!(expr) - 1] [__LINE__] )
-	#endif
-#endif
-
-// BLARGG_COMPILER_HAS_BOOL: If 0, provides bool support for old compiler. If 1,
-// compiler is assumed to support bool. If undefined, availability is determined.
-#ifndef BLARGG_COMPILER_HAS_BOOL
-	#if defined (__MWERKS__)
-		#if !__option(bool)
-			#define BLARGG_COMPILER_HAS_BOOL 0
-		#endif
-	#elif defined (_MSC_VER)
-		#if _MSC_VER < 1100
-			#define BLARGG_COMPILER_HAS_BOOL 0
-		#endif
-	#elif defined (__GNUC__)
-		// supports bool
-	#elif __cplusplus < 199711
-		#define BLARGG_COMPILER_HAS_BOOL 0
-	#endif
-#endif
-#if defined (BLARGG_COMPILER_HAS_BOOL) && !BLARGG_COMPILER_HAS_BOOL
-	// If you get errors here, modify your blargg_config.h file
-	typedef int bool;
-	const bool true = 1;
-	const bool false = 0;
-#endif
-
-// blargg_long/blargg_ulong = at least 32 bits, int if it's big enough
-#include <limits.h>
-
-#if INT_MAX >= 0x7FFFFFFF
-	typedef int blargg_long;
-#else
-	typedef long blargg_long;
-#endif
-
-#if UINT_MAX >= 0xFFFFFFFF
-	typedef unsigned blargg_ulong;
-#else
-	typedef unsigned long blargg_ulong;
-#endif
-
-// BOOST::int8_t etc.
-
-// HAVE_STDINT_H: If defined, use <stdint.h> for int8_t etc.
-#if defined (HAVE_STDINT_H)
-	#include <stdint.h>
-	#define BOOST
-
-// HAVE_INTTYPES_H: If defined, use <stdint.h> for int8_t etc.
-#elif defined (HAVE_INTTYPES_H)
-	#include <inttypes.h>
-	#define BOOST
-
-#else
-	struct BOOST
-	{
-		#if UCHAR_MAX == 0xFF && SCHAR_MAX == 0x7F
-			typedef signed char int8_t;
-			typedef unsigned char uint8_t;
-		#else
-			// No suitable 8-bit type available
-			typedef struct see_blargg_common_h int8_t;
-			typedef struct see_blargg_common_h uint8_t;
-		#endif
-		
-		#if USHRT_MAX == 0xFFFF
-			typedef short int16_t;
-			typedef unsigned short uint16_t;
-		#else
-			// No suitable 16-bit type available
-			typedef struct see_blargg_common_h int16_t;
-			typedef struct see_blargg_common_h uint16_t;
-		#endif
-		
-		#if ULONG_MAX == 0xFFFFFFFF
-			typedef long int32_t;
-			typedef unsigned long uint32_t;
-		#elif UINT_MAX == 0xFFFFFFFF
-			typedef int int32_t;
-			typedef unsigned int uint32_t;
-		#else
-			// No suitable 32-bit type available
-			typedef struct see_blargg_common_h int32_t;
-			typedef struct see_blargg_common_h uint32_t;
-		#endif
-	};
-#endif
-
-#endif
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/blargg_config.h Deleted

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/blargg_endian.h Deleted

@@ -1,158 +0,0 @@
-// CPU Byte Order Utilities
-
-// Game_Music_Emu 0.5.5
-#ifndef BLARGG_ENDIAN
-#define BLARGG_ENDIAN
-
-#include "blargg_common.h"
-
-// BLARGG_CPU_CISC: Defined if CPU has very few general-purpose registers (< 16)
-#if defined (_M_IX86) || defined (_M_IA64) || defined (__i486__) || \
-		defined (__x86_64__) || defined (__ia64__) || defined (__i386__)
-	#define BLARGG_CPU_X86 1
-	#define BLARGG_CPU_CISC 1
-#endif
-
-#if defined (__powerpc__) || defined (__ppc__) || defined (__POWERPC__) || defined (__powerc)
-	#define BLARGG_CPU_POWERPC 1
-#endif
-
-// BLARGG_BIG_ENDIAN, BLARGG_LITTLE_ENDIAN: Determined automatically, otherwise only
-// one may be #defined to 1. Only needed if something actually depends on byte order.
-#if !defined (BLARGG_BIG_ENDIAN) && !defined (BLARGG_LITTLE_ENDIAN)
-#ifdef __GLIBC__
-	// GCC handles this for us
-	#include <endian.h>
-	#if __BYTE_ORDER == __LITTLE_ENDIAN
-		#define BLARGG_LITTLE_ENDIAN 1
-	#elif __BYTE_ORDER == __BIG_ENDIAN
-		#define BLARGG_BIG_ENDIAN 1
-	#endif
-#else
-
-#if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \
-		(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
-	#define BLARGG_LITTLE_ENDIAN 1
-#endif
-
-#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-	defined (__mips__) || defined (__sparc__) || BLARGG_CPU_POWERPC || \
-	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
-	#define BLARGG_BIG_ENDIAN 1
-#else
-	// No endian specified; assume little-endian, since it's most common
-	#define BLARGG_LITTLE_ENDIAN 1
-#endif
-#endif
-#endif
-
-#if BLARGG_LITTLE_ENDIAN && BLARGG_BIG_ENDIAN
-	#undef BLARGG_LITTLE_ENDIAN
-	#undef BLARGG_BIG_ENDIAN
-#endif
-
-inline void blargg_verify_byte_order()
-{
-	#ifndef NDEBUG
-		#if BLARGG_BIG_ENDIAN
-			volatile int i = 1;
-			assert( *(volatile char*) &i == 0 );
-		#elif BLARGG_LITTLE_ENDIAN
-			volatile int i = 1;
-			assert( *(volatile char*) &i != 0 );
-		#endif
-	#endif
-}
-
-inline unsigned get_le16( void const* p ) {
-	return ((unsigned char const*) p) [1] * 0x100u +
-			((unsigned char const*) p) [0];
-}
-inline unsigned get_be16( void const* p ) {
-	return ((unsigned char const*) p) [0] * 0x100u +
-			((unsigned char const*) p) [1];
-}
-inline blargg_ulong get_le32( void const* p ) {
-	return ((unsigned char const*) p) [3] * 0x01000000u +
-			((unsigned char const*) p) [2] * 0x00010000u +
-			((unsigned char const*) p) [1] * 0x00000100u +
-			((unsigned char const*) p) [0];
-}
-inline blargg_ulong get_be32( void const* p ) {
-	return ((unsigned char const*) p) [0] * 0x01000000u +
-			((unsigned char const*) p) [1] * 0x00010000u +
-			((unsigned char const*) p) [2] * 0x00000100u +
-			((unsigned char const*) p) [3];
-}
-inline void set_le16( void* p, unsigned n ) {
-	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [0] = (unsigned char) n;
-}
-inline void set_be16( void* p, unsigned n ) {
-	((unsigned char*) p) [0] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [1] = (unsigned char) n;
-}
-inline void set_le32( void* p, blargg_ulong n ) {
-	((unsigned char*) p) [3] = (unsigned char) (n >> 24);
-	((unsigned char*) p) [2] = (unsigned char) (n >> 16);
-	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [0] = (unsigned char) n;
-}
-inline void set_be32( void* p, blargg_ulong n ) {
-	((unsigned char*) p) [0] = (unsigned char) (n >> 24);
-	((unsigned char*) p) [1] = (unsigned char) (n >> 16);
-	((unsigned char*) p) [2] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [3] = (unsigned char) n;
-}
-
-#if BLARGG_NONPORTABLE
-	// Optimized implementation if byte order is known
-	#if BLARGG_LITTLE_ENDIAN
-		#define GET_LE16( addr ) (*(BOOST::uint16_t*) (addr))
-		#define GET_LE32( addr ) (*(BOOST::uint32_t*) (addr))
-		#define SET_LE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
-		#define SET_LE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
-	#elif BLARGG_BIG_ENDIAN
-		#define GET_BE16( addr ) (*(BOOST::uint16_t*) (addr))
-		#define GET_BE32( addr ) (*(BOOST::uint32_t*) (addr))
-		#define SET_BE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
-		#define SET_BE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
-	#endif
-	
-	#if BLARGG_CPU_POWERPC && defined (__MWERKS__)
-		// PowerPC has special byte-reversed instructions
-		// to do: assumes that PowerPC is running in big-endian mode
-		// to do: implement for other compilers which don't support these macros
-		#define GET_LE16( addr ) (__lhbrx( (addr), 0 ))
-		#define GET_LE32( addr ) (__lwbrx( (addr), 0 ))
-		#define SET_LE16( addr, data ) (__sthbrx( (data), (addr), 0 ))
-		#define SET_LE32( addr, data ) (__stwbrx( (data), (addr), 0 ))
-	#endif
-#endif
-
-#ifndef GET_LE16
-	#define GET_LE16( addr ) get_le16( addr )
-	#define GET_LE32( addr ) get_le32( addr )
-	#define SET_LE16( addr, data ) set_le16( addr, data )
-	#define SET_LE32( addr, data ) set_le32( addr, data )
-#endif
-
-#ifndef GET_BE16
-	#define GET_BE16( addr ) get_be16( addr )
-	#define GET_BE32( addr ) get_be32( addr )
-	#define SET_BE16( addr, data ) set_be16( addr, data )
-	#define SET_BE32( addr, data ) set_be32( addr, data )
-#endif
-
-// auto-selecting versions
-
-inline void set_le( BOOST::uint16_t* p, unsigned n ) { SET_LE16( p, n ); }
-inline void set_le( BOOST::uint32_t* p, blargg_ulong n ) { SET_LE32( p, n ); }
-inline void set_be( BOOST::uint16_t* p, unsigned n ) { SET_BE16( p, n ); }
-inline void set_be( BOOST::uint32_t* p, blargg_ulong n ) { SET_BE32( p, n ); }
-inline unsigned get_le( BOOST::uint16_t* p ) { return GET_LE16( p ); }
-inline blargg_ulong get_le( BOOST::uint32_t* p ) { return GET_LE32( p ); }
-inline unsigned get_be( BOOST::uint16_t* p ) { return GET_BE16( p ); }
-inline blargg_ulong get_be( BOOST::uint32_t* p ) { return GET_BE32( p ); }
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/blargg_source.h Deleted

@@ -1,78 +0,0 @@
-// Included at the beginning of library source files, after all other #include lines
-#ifndef BLARGG_SOURCE_H
-#define BLARGG_SOURCE_H
-
-// If debugging is enabled, abort program if expr is false. Meant for checking
-// internal state and consistency. A failed assertion indicates a bug in the module.
-// void assert( bool expr );
-#include <assert.h>
-
-// If debugging is enabled and expr is false, abort program. Meant for checking
-// caller-supplied parameters and operations that are outside the control of the
-// module. A failed requirement indicates a bug outside the module.
-// void require( bool expr );
-#undef require
-#define require( expr ) assert( expr )
-
-// Like printf() except output goes to debug log file. Might be defined to do
-// nothing (not even evaluate its arguments).
-// void debug_printf( const char* format, ... );
-inline void blargg_dprintf_( const char*, ... ) { }
-#undef debug_printf
-#define debug_printf (1) ? (void) 0 : blargg_dprintf_
-
-// If enabled, evaluate expr and if false, make debug log entry with source file
-// and line. Meant for finding situations that should be examined further, but that
-// don't indicate a problem. In all cases, execution continues normally.
-#undef check
-#define check( expr ) ((void) 0)
-
-// If expr yields error string, return it from current function, otherwise continue.
-#undef RETURN_ERR
-#define RETURN_ERR( expr ) do { \
-		blargg_err_t blargg_return_err_ = (expr); \
-		if ( blargg_return_err_ ) return blargg_return_err_; \
-	} while ( 0 )
-
-// If ptr is 0, return out of memory error string.
-#undef CHECK_ALLOC
-#define CHECK_ALLOC( ptr ) do { if ( (ptr) == 0 ) return "Out of memory"; } while ( 0 )
-
-// Avoid any macros which evaluate their arguments multiple times
-#undef min
-#undef max
-
-// using const references generates crappy code, and I am currenly only using these
-// for built-in types, so they take arguments by value
-
-template<class T>
-inline T min( T x, T y )
-{
-	if ( x < y )
-		return x;
-	return y;
-}
-
-template<class T>
-inline T max( T x, T y )
-{
-	if ( x < y )
-		return y;
-	return x;
-}
-
-// TODO: good idea? bad idea?
-#undef byte
-#define byte byte_
-typedef unsigned char byte;
-
-// deprecated
-#define BLARGG_CHECK_ALLOC CHECK_ALLOC
-#define BLARGG_RETURN_ERR RETURN_ERR
-
-// BLARGG_SOURCE_BEGIN: If defined, #included, allowing redefition of debug_printf and check
-#ifdef BLARGG_SOURCE_BEGIN
-	#include BLARGG_SOURCE_BEGIN
-#endif
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/gb_cpu_io.h Deleted

@@ -1,72 +0,0 @@
-
-#include "Gbs_Emu.h"
-
-#include "blargg_source.h"
-
-int Gbs_Emu::cpu_read( gb_addr_t addr )
-{
-	int result = *cpu::get_code( addr );
-	if ( unsigned (addr - Gb_Apu::start_addr) < Gb_Apu::register_count )
-		result = apu.read_register( clock(), addr );
-#ifndef NDEBUG
-	else if ( unsigned (addr - 0x8000) < 0x2000 || unsigned (addr - 0xE000) < 0x1F00 )
-		debug_printf( "Read from unmapped memory $%.4x\n", (unsigned) addr );
-	else if ( unsigned (addr - 0xFF01) < 0xFF80 - 0xFF01 )
-		debug_printf( "Unhandled I/O read 0x%4X\n", (unsigned) addr );
-#endif
-	return result;
-}
-
-void Gbs_Emu::cpu_write( gb_addr_t addr, int data )
-{
-	unsigned offset = addr - ram_addr;
-	if ( offset <= 0xFFFF - ram_addr )
-	{
-		ram [offset] = data;
-		if ( (addr ^ 0xE000) <= 0x1F80 - 1 )
-		{
-			if ( unsigned (addr - Gb_Apu::start_addr) < Gb_Apu::register_count )
-			{
-				GME_APU_HOOK( this, addr - Gb_Apu::start_addr, data );
-				apu.write_register( clock(), addr, data );
-			}
-			else if ( (addr ^ 0xFF06) < 2 )
-				update_timer();
-			else if ( addr == joypad_addr )
-				ram [offset] = 0; // keep joypad return value 0
-			else
-				ram [offset] = 0xFF;
-
-			//if ( addr == 0xFFFF )
-			// debug_printf( "Wrote interrupt mask\n" );
-		}
-	}
-	else if ( (addr ^ 0x2000) <= 0x2000 - 1 )
-	{
-		set_bank( data );
-	}
-#ifndef NDEBUG
-	else if ( unsigned (addr - 0x8000) < 0x2000 || unsigned (addr - 0xE000) < 0x1F00 )
-	{
-		debug_printf( "Wrote to unmapped memory $%.4x\n", (unsigned) addr );
-	}
-#endif
-}
-
-#define CPU_READ_FAST( cpu, addr, time, out ) \
-	CPU_READ_FAST_( STATIC_CAST(Gbs_Emu*,cpu), addr, time, out )
-
-#define CPU_READ_FAST_( emu, addr, time, out ) \
-{\
-	out = READ_PROG( addr );\
-	if ( unsigned (addr - Gb_Apu::start_addr) <= Gb_Apu::register_count )\
-		out = emu->apu.read_register( emu->cpu_time - time * clocks_per_instr, addr );\
-	else\
-		check( out == emu->cpu_read( addr ) );\
-}
-
-#define CPU_READ( cpu, addr, time ) \
-	STATIC_CAST(Gbs_Emu*,cpu)->cpu_read( addr )
-
-#define CPU_WRITE( cpu, addr, data, time ) \
-	STATIC_CAST(Gbs_Emu*,cpu)->cpu_write( addr, data )

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/gme.cpp Deleted

@@ -1,367 +0,0 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Music_Emu.h"
-
-#if !GME_DISABLE_STEREO_DEPTH
-#include "Effects_Buffer.h"
-#endif
-#include "blargg_endian.h"
-#include <string.h>
-#include <ctype.h>
-
-/* Copyright (C) 2003-2006 Shay Green. This module 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
-module 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 module; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "blargg_source.h"
-
-gme_type_t const* gme_type_list()
-{
-	static gme_type_t const gme_type_list_ [] = {
-#ifdef USE_GME_AY
- gme_ay_type,
-#endif
-#ifdef USE_GME_GBS
- gme_gbs_type,
-#endif
-#ifdef USE_GME_GYM
- gme_gym_type,
-#endif
-#ifdef USE_GME_HES
- gme_hes_type,
-#endif
-#ifdef USE_GME_KSS
- gme_kss_type,
-#endif
-#if defined(USE_GME_NSF) || defined(USE_GME_NSFE)
- gme_nsf_type,
-#endif
-#ifdef USE_GME_NSFE
- gme_nsfe_type,
-#endif
-#ifdef USE_GME_SAP
- gme_sap_type,
-#endif
-#ifdef USE_GME_SPC
- gme_spc_type,
-#endif
-#ifdef USE_GME_VGM
- gme_vgm_type,
- gme_vgz_type,
-#endif
- 0 };
-
-	return gme_type_list_;
-}
-
-const char* gme_identify_header( void const* header )
-{
-	switch ( get_be32( header ) )
-	{
-		case BLARGG_4CHAR('Z','X','A','Y'): return "AY";
-		case BLARGG_4CHAR('G','B','S',0x01): return "GBS";
-		case BLARGG_4CHAR('G','Y','M','X'): return "GYM";
-		case BLARGG_4CHAR('H','E','S','M'): return "HES";
-		case BLARGG_4CHAR('K','S','C','C'):
-		case BLARGG_4CHAR('K','S','S','X'): return "KSS";
-		case BLARGG_4CHAR('N','E','S','M'): return "NSF";
-		case BLARGG_4CHAR('N','S','F','E'): return "NSFE";
-		case BLARGG_4CHAR('S','A','P',0x0D): return "SAP";
-		case BLARGG_4CHAR('S','N','E','S'): return "SPC";
-		case BLARGG_4CHAR('V','g','m',' '): return "VGM";
-	}
-	return "";
-}
-
-static void to_uppercase( const char* in, int len, char* out )
-{
-	for ( int i = 0; i < len; i++ )
-	{
-		if ( !(out [i] = toupper( in [i] )) )
-			return;
-	}
-	*out = 0; // extension too long
-}
-
-gme_type_t gme_identify_extension( const char* extension_ )
-{
-	char const* end = strrchr( extension_, '.' );
-	if ( end )
-		extension_ = end + 1;
-	
-	char extension [6];
-	to_uppercase( extension_, sizeof extension, extension );
-	
-	for ( gme_type_t const* types = gme_type_list(); *types; types++ )
-		if ( !strcmp( extension, (*types)->extension_ ) )
-			return *types;
-	return 0;
-}
-
-gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
-{
-	*type_out = gme_identify_extension( path );
-	// TODO: don't examine header if file has extension?
-	if ( !*type_out )
-	{
-		char header [4];
-		GME_FILE_READER in;
-		RETURN_ERR( in.open( path ) );
-		RETURN_ERR( in.read( header, sizeof header ) );
-		*type_out = gme_identify_extension( gme_identify_header( header ) );
-	}
-	return 0; 
-}
-
-gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
-{
-	require( (data || !size) && out );
-	*out = 0;
-	
-	gme_type_t file_type = 0;
-	if ( size >= 4 )
-		file_type = gme_identify_extension( gme_identify_header( data ) );
-	if ( !file_type )
-		return gme_wrong_file_type;
-	
-	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
-	CHECK_ALLOC( emu );
-	
-	gme_err_t err = gme_load_data( emu, data, size );
-	
-	if ( err )
-		delete emu;
-	else
-		*out = emu;
-	
-	return err;
-}
-
-gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
-{
-	require( path && out );
-	*out = 0;
-	
-	GME_FILE_READER in;
-	RETURN_ERR( in.open( path ) );
-	
-	char header [4];
-	int header_size = 0;
-	
-	gme_type_t file_type = gme_identify_extension( path );
-	if ( !file_type )
-	{
-		header_size = sizeof header;
-		RETURN_ERR( in.read( header, sizeof header ) );
-		file_type = gme_identify_extension( gme_identify_header( header ) );
-	}
-	if ( !file_type )
-		return gme_wrong_file_type;
-	
-	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
-	CHECK_ALLOC( emu );
-	
-	// optimization: avoids seeking/re-reading header
-	Remaining_Reader rem( header, header_size, &in );
-	gme_err_t err = emu->load( rem );
-	in.close();
-	
-	if ( err )
-		delete emu;
-	else
-		*out = emu;
-	
-	return err;
-}
-
-Music_Emu* gme_new_emu( gme_type_t type, int rate )
-{
-	if ( type )
-	{
-		if ( rate == gme_info_only )
-			return type->new_info();
-		
-		Music_Emu* me = type->new_emu();
-		if ( me )
-		{
-		#if !GME_DISABLE_STEREO_DEPTH
-			if ( type->flags_ & 1 )
-			{
-				me->effects_buffer = BLARGG_NEW Effects_Buffer;
-				if ( me->effects_buffer )
-					me->set_buffer( me->effects_buffer );
-			}
-			
-			if ( !(type->flags_ & 1) || me->effects_buffer )
-		#endif
-			{
-				if ( !me->set_sample_rate( rate ) )
-				{
-					check( me->type() == type );
-					return me;
-				}
-			}
-			delete me;
-		}
-	}
-	return 0;
-}
-
-gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
-
-gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
-{
-	Mem_File_Reader in( data, size );
-	return me->load( in );
-}
-
-gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
-{
-	Callback_Reader in( func, size, data );
-	return me->load( in );
-}
-
-void gme_delete( Music_Emu* me ) { delete me; }
-
-gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
-
-const char* gme_warning( Music_Emu* me ) { return me->warning(); }
-
-int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
-
-struct gme_info_t_ : gme_info_t
-{
-	track_info_t info;
-	
-	BLARGG_DISABLE_NOTHROW
-};
-
-gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
-{
-	*out = NULL;
-	
-	gme_info_t_* info = BLARGG_NEW gme_info_t_;
-	CHECK_ALLOC( info );
-	
-	gme_err_t err = me->track_info( &info->info, track );
-	if ( err )
-	{
-		gme_free_info( info );
-		return err;
-	}
-	
-	#define COPY(name) info->name = info->info.name;
-	
-	COPY( length );
-	COPY( intro_length );
-	COPY( loop_length );
-	
-	info->i4 = -1;
-	info->i5 = -1;
-	info->i6 = -1;
-	info->i7 = -1;
-	info->i8 = -1;
-	info->i9 = -1;
-	info->i10 = -1;
-	info->i11 = -1;
-	info->i12 = -1;
-	info->i13 = -1;
-	info->i14 = -1;
-	info->i15 = -1;
-	
-	info->s7 = "";
-	info->s8 = "";
-	info->s9 = "";
-	info->s10 = "";
-	info->s11 = "";
-	info->s12 = "";
-	info->s13 = "";
-	info->s14 = "";
-	info->s15 = "";
-	
-	COPY( system );
-	COPY( game );
-	COPY( song );
-	COPY( author );
-	COPY( copyright );
-	COPY( comment );
-	COPY( dumper );
-	
-	#undef COPY
-	
-	info->play_length = info->length;
-	if ( info->play_length <= 0 )
-	{
-		info->play_length = info->intro_length + 2 * info->loop_length; // intro + 2 loops
-		if ( info->play_length <= 0 )
-			info->play_length = 150 * 1000; // 2.5 minutes
-	}
-	
-	*out = info;
-	
-	return 0;
-}
-
-void gme_free_info( gme_info_t* info )
-{
-	delete STATIC_CAST(gme_info_t_*,info);
-}
-
-void gme_set_stereo_depth( Music_Emu* me, double depth )
-{
-#if !GME_DISABLE_STEREO_DEPTH
-	if ( me->effects_buffer )
-		STATIC_CAST(Effects_Buffer*,me->effects_buffer)->set_depth( depth );
-#endif
-}
-
-void* gme_user_data ( Music_Emu const* me ) { return me->user_data(); }
-void gme_set_user_data ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
-void gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
-
-gme_err_t gme_start_track ( Music_Emu* me, int index ) { return me->start_track( index ); }
-gme_err_t gme_play ( Music_Emu* me, int n, short* p ) { return me->play( n, p ); }
-void gme_set_fade ( Music_Emu* me, int start_msec ) { me->set_fade( start_msec ); }
-int gme_track_ended ( Music_Emu const* me ) { return me->track_ended(); }
-int gme_tell ( Music_Emu const* me ) { return me->tell(); }
-gme_err_t gme_seek ( Music_Emu* me, int msec ) { return me->seek( msec ); }
-int gme_voice_count ( Music_Emu const* me ) { return me->voice_count(); }
-void gme_ignore_silence ( Music_Emu* me, int disable ) { me->ignore_silence( disable != 0 ); }
-void gme_set_tempo ( Music_Emu* me, double t ) { me->set_tempo( t ); }
-void gme_mute_voice ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
-void gme_mute_voices ( Music_Emu* me, int mask ) { me->mute_voices( mask ); }
-
-void gme_set_equalizer ( Music_Emu* me, gme_equalizer_t const* eq )
-{
-	Music_Emu::equalizer_t e = me->equalizer();
-	e.treble = eq->treble;
-	e.bass = eq->bass;
-	me->set_equalizer( e );
-}
-
-void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
-{
-	gme_equalizer_t e = { };
-	e.treble = me->equalizer().treble;
-	e.bass = me->equalizer().bass;
-	*out = e;
-}
-
-const char* gme_voice_name( Music_Emu const* me, int i )
-{
-	assert( (unsigned) i < (unsigned) me->voice_count() );
-	return me->voice_names() [i];
-}
-
-const char* gme_type_system( gme_type_t type )
-{
-	assert( type );
-	return type->system;
-}

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/gme.h Deleted

@@ -1,254 +0,0 @@
-/* Game music emulator library C interface (also usable from C++) */
-
-/* Game_Music_Emu 0.5.5 */
-#ifndef GME_H
-#define GME_H
-
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
-/* Error string returned by library functions, or NULL if no error (success) */
-typedef const char* gme_err_t;
-
-/* First parameter of most gme_ functions is a pointer to the Music_Emu */
-typedef struct Music_Emu Music_Emu;
-
-
-/******** Basic operations ********/
-
-/* Create emulator and load game music file/data into it. Sets *out to new emulator. */
-gme_err_t gme_open_file( const char path [], Music_Emu** out, int sample_rate );
-
-/* Number of tracks available */
-int gme_track_count( Music_Emu const* );
-
-/* Start a track, where 0 is the first track */
-gme_err_t gme_start_track( Music_Emu*, int index );
-
-/* Generate 'count' 16-bit signed samples info 'out'. Output is in stereo. */
-gme_err_t gme_play( Music_Emu*, int count, short out [] );
-
-/* Finish using emulator and free memory */
-void gme_delete( Music_Emu* );
-
-
-/******** Track position/length ********/
-
-/* Set time to start fading track out. Once fade ends track_ended() returns true.
-Fade time can be changed while track is playing. */
-void gme_set_fade( Music_Emu*, int start_msec );
-
-/* True if a track has reached its end */
-int gme_track_ended( Music_Emu const* );
-
-/* Number of milliseconds (1000 = one second) played since beginning of track */
-int gme_tell( Music_Emu const* );
-
-/* Seek to new time in track. Seeking backwards or far forward can take a while. */
-gme_err_t gme_seek( Music_Emu*, int msec );
-
-
-/******** Informational ********/
-
-/* If you only need track information from a music file, pass gme_info_only for
-sample_rate to open/load. */
-enum { gme_info_only = -1 };
-
-/* Most recent warning string, or NULL if none. Clears current warning after returning.
-Warning is also cleared when loading a file and starting a track. */
-const char* gme_warning( Music_Emu* );
-
-/* Load m3u playlist file (must be done after loading music) */
-gme_err_t gme_load_m3u( Music_Emu*, const char path [] );
-
-/* Clear any loaded m3u playlist and any internal playlist that the music format
-supports (NSFE for example). */
-void gme_clear_playlist( Music_Emu* );
-
-/* Gets information for a particular track (length, name, author, etc.).
-Must be freed after use. */
-typedef struct gme_info_t gme_info_t;
-gme_err_t gme_track_info( Music_Emu const*, gme_info_t** out, int track );
-
-/* Frees track information */
-void gme_free_info( gme_info_t* );
-
-struct gme_info_t
-{
-	/* times in milliseconds; -1 if unknown */
-	int length;			/* total length, if file specifies it */
-	int intro_length;	/* length of song up to looping section */
-	int loop_length;	/* length of looping section */
-	
-	/* Length if available, otherwise intro_length+loop_length*2 if available,
-	otherwise a default of 150000 (2.5 minutes). */
-	int play_length;
-	
-	int i4,i5,i6,i7,i8,i9,i10,i11,i12,i13,i14,i15; /* reserved */
-	
-	/* empty string ("") if not available */
-	const char* system;
-	const char* game;
-	const char* song;
-	const char* author;
-	const char* copyright;
-	const char* comment;
-	const char* dumper;
-	
-	const char *s7,*s8,*s9,*s10,*s11,*s12,*s13,*s14,*s15; /* reserved */
-};
-
-
-/******** Advanced playback ********/
-
-/* Adjust stereo echo depth, where 0.0 = off and 1.0 = maximum. Has no effect for
-GYM, SPC, and Sega Genesis VGM music */
-void gme_set_stereo_depth( Music_Emu*, double depth );
-
-/* Disable automatic end-of-track detection and skipping of silence at beginning
-if ignore is true */
-void gme_ignore_silence( Music_Emu*, int ignore );
-
-/* 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 gme_set_tempo( Music_Emu*, double tempo );
-
-/* Number of voices used by currently loaded file */
-int gme_voice_count( Music_Emu const* );
-
-/* Name of voice i, from 0 to gme_voice_count() - 1 */
-const char* gme_voice_name( Music_Emu const*, int i );
-
-/* Mute/unmute voice i, where voice 0 is first voice */
-void gme_mute_voice( Music_Emu*, int index, int mute );
-
-/* Set muting state of all voices at once using a bit mask, where -1 mutes all
-voices, 0 unmutes them all, 0x01 mutes just the first voice, etc. */
-void gme_mute_voices( Music_Emu*, int muting_mask );
-
-/* Frequency equalizer parameters (see gme.txt) */
-typedef struct gme_equalizer_t
-{
-	double treble; /* -50.0 = muffled, 0 = flat, +5.0 = extra-crisp */
-	double bass;   /* 1 = full bass, 90 = average, 16000 = almost no bass */
-	
-	double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */
-} gme_equalizer_t;
-
-/* Get current frequency equalizater parameters */
-void gme_equalizer( Music_Emu const*, gme_equalizer_t* out );
-
-/* Change frequency equalizer parameters */
-void gme_set_equalizer( Music_Emu*, gme_equalizer_t const* eq );
-
-
-
-/******** Game music types ********/
-
-/* Music file type identifier. Can also hold NULL. */
-typedef const struct gme_type_t_* gme_type_t;
-
-/* Emulator type constants for each supported file type */
-extern const gme_type_t
-	gme_ay_type,
-	gme_gbs_type,
-	gme_gym_type,
-	gme_hes_type,
-	gme_kss_type,
-	gme_nsf_type,
-	gme_nsfe_type,
-	gme_sap_type,
-	gme_spc_type,
-	gme_vgm_type,
-	gme_vgz_type;
-
-/* Type of this emulator */
-gme_type_t gme_type( Music_Emu const* );
-
-/* Pointer to array of all music types, with NULL entry at end. Allows a player linked
-to this library to support new music types without having to be updated. */
-gme_type_t const* gme_type_list();
-
-/* Name of game system for this music file type */
-const char* gme_type_system( gme_type_t );
-
-/* True if this music file type supports multiple tracks */
-int gme_type_multitrack( gme_type_t );
-
-
-/******** Advanced file loading ********/
-
-/* Error returned if file type is not supported */
-extern const char* const gme_wrong_file_type;
-
-/* Same as gme_open_file(), but uses file data already in memory. Makes copy of data. */
-gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate );
-
-/* Determine likely game music type based on first four bytes of file. Returns
-string containing proper file suffix (i.e. "NSF", "SPC", etc.) or "" if
-file header is not recognized. */
-const char* gme_identify_header( void const* header );
-
-/* Get corresponding music type for file path or extension passed in. */
-gme_type_t gme_identify_extension( const char path_or_extension [] );
-
-/* Determine file type based on file's extension or header (if extension isn't recognized).
-Sets *type_out to type, or 0 if unrecognized or error. */
-gme_err_t gme_identify_file( const char path [], gme_type_t* type_out );
-
-/* Create new emulator and set sample rate. Returns NULL if out of memory. If you only need
-track information, pass gme_info_only for sample_rate. */
-Music_Emu* gme_new_emu( gme_type_t, int sample_rate );
-
-/* Load music file into emulator */
-gme_err_t gme_load_file( Music_Emu*, const char path [] );
-
-/* Load music file from memory into emulator. Makes a copy of data passed. */
-gme_err_t gme_load_data( Music_Emu*, void const* data, long size );
-
-/* Load music file using custom data reader function that will be called to
-read file data. Most emulators load the entire file in one read call. */
-typedef gme_err_t (*gme_reader_t)( void* your_data, void* out, int count );
-gme_err_t gme_load_custom( Music_Emu*, gme_reader_t, long file_size, void* your_data );
-
-/* Load m3u playlist file from memory (must be done after loading music) */
-gme_err_t gme_load_m3u_data( Music_Emu*, void const* data, long size );
-
-
-/******** User data ********/
-
-/* Set/get pointer to data you want to associate with this emulator.
-You can use this for whatever you want. */
-void  gme_set_user_data( Music_Emu*, void* new_user_data );
-void* gme_user_data( Music_Emu const* );
-
-/* Register cleanup function to be called when deleting emulator, or NULL to
-clear it. Passes user_data to cleanup function. */
-typedef void (*gme_user_cleanup_t)( void* user_data );
-void gme_set_user_cleanup( Music_Emu*, gme_user_cleanup_t func );
-
-typedef struct
-{
-	long track_count;
-	
-	/* times in milliseconds; -1 if unknown */
-	long length;
-	long intro_length;
-	long loop_length;
-	
-	/* empty string if not available */
-	char system    [256];
-	char game      [256];
-	char song      [256];
-	char author    [256];
-	char copyright [256];
-	char comment   [256];
-	char dumper    [256];
-} track_info_t;
-
-#ifdef __cplusplus
-	}
-#endif
-
-#endif

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/gme/gme_types.h Deleted

deadbeef-0.5.1.tar.bz2/plugins/gme/game-music-emu-0.5.5/readme.txt Deleted

@@ -1,218 +0,0 @@
-Game_Music_Emu 0.5.5: Game Music Emulators
-------------------------------------------
-Game_Music_Emu is a collection of video game music file emulators that
-support the following formats and systems:
-
-AY ZX Spectrum/Amstrad CPC
-GBS Nintendo Game Boy
-GYM Sega Genesis/Mega Drive
-HES NEC TurboGrafx-16/PC Engine
-KSS MSX Home Computer/other Z80 systems (doesn't support FM sound)
-NSF/NSFE Nintendo NES/Famicom (with VRC 6, Namco 106, and FME-7 sound)
-SAP Atari systems using POKEY sound chip
-SPC Super Nintendo/Super Famicom
-VGM/VGZ Sega Master System/Mark III, Sega Genesis/Mega Drive,BBC Micro
-
-Features:
-* Can be used in C and C++ code
-* High emphasis has been placed on making the library very easy to use
-* One set of common functions work with all emulators the same way
-* Several code examples, including music player using SDL
-* Portable code for use on any system with modern or older C++ compilers
-* Adjustable output sample rate using quality band-limited resampling
-* Uniform access to text information fields and track timing information
-* End-of-track fading and automatic look ahead silence detection
-* Treble/bass and stereo echo for AY/GBS/HES/KSS/NSF/NSFE/SAP/VGM
-* Tempo can be adjusted and individual voices can be muted while playing
-* Can read music data from file, memory, or custom reader function/class
-* Can access track information without having to load into full emulator
-* M3U track listing support for multi-track formats
-* Modular design allows elimination of unneeded emulators/features
-
-This library has been used in game music players for Windows, Linux on
-several architectures, Mac OS, MorphOS, Xbox, PlayStation Portable,
-GP2X, and Nintendo DS.
-
-Author : Shay Green <gblargg@gmail.com>
-Website: http://www.slack.net/~ant/
-Forum : http://groups.google.com/group/blargg-sound-libs
-License: GNU Lesser General Public License (LGPL)
-
-
-Getting Started
----------------
-Build a program consisting of demo/basics.c, demo/Wave_Writer.cpp, and
-all source files in gme/.
-
-If you have CMake 2.6 or higher you can use CMake to perform the build for
-you using standard CMake technique (i.e. cd to the source directory, run
-cmake, cd demo, run make)
-
-Be sure "test.nsf" is in the same directory.
-Running the program should generate the recording "out.wav".
-
-A slightly more extensive demo application is available in the player/
-directory. It requires SDL to build.
-
-Read gme.txt for more information. Post to the discussion forum for
-assistance.
-
-
-Files
------
-gme.txt General notes about the library
-changes.txt Changes made since previous releases
-design.txt Library design notes
-license.txt GNU Lesser General Public License
-CMakeLists.txt CMake build rules
-
-test.nsf Test file for NSF emulator
-test.m3u Test m3u playlist for features.c demo
-
-demo/
- basics.c Records NSF file to wave sound file
- cpp_basics.cpp C++ version of basics.c
- features.c Demonstrates many additional features
- Wave_Writer.h WAVE sound file writer used for demo output
- Wave_Writer.cpp
- CMakeLists.txt CMake build rules
-
-player/ Player using the SDL multimedia library
- player.cpp Simple music player with waveform display
- Music_Player.cpp Stand alone player for background music
- Music_Player.h
- Audio_Scope.cpp Audio waveform scope
- Audio_Scope.h
- CMakeLists.txt CMake build rules
-
-gme/
- blargg_config.h Library configuration (modify this file as needed)
-
- gme.h C interface (also usable in C++, and simpler too)
- gme.cpp
-
- Gme_File.h File loading and track information
- Music_Emu.h Track playback and adjustments
- Data_Reader.h Custom data readers
-
- Effects_Buffer.h Sound buffer with stereo echo and panning
- Effects_Buffer.cpp
-
- M3u_Playlist.h M3U playlist support
- M3u_Playlist.cpp
-
- Ay_Emu.h ZX Spectrum AY emulator
- Ay_Emu.cpp
- Ay_Apu.cpp
- Ay_Apu.h
- Ay_Cpu.cpp
- Ay_Cpu.h
-
- Gbs_Emu.h Nintendo Game Boy GBS emulator
- Gbs_Emu.cpp
- Gb_Apu.cpp
- Gb_Apu.h
- Gb_Cpu.cpp
- Gb_Cpu.h
- gb_cpu_io.h
- Gb_Oscs.cpp
- Gb_Oscs.h
-
- Hes_Emu.h TurboGrafx-16/PC Engine HES emulator
- Hes_Apu.cpp
- Hes_Apu.h
- Hes_Cpu.cpp
- Hes_Cpu.h
- hes_cpu_io.h
- Hes_Emu.cpp
-
- Kss_Emu.h MSX Home Computer/other Z80 systems KSS emulator
- Kss_Emu.cpp
- Kss_Cpu.cpp
- Kss_Cpu.h
- Kss_Scc_Apu.cpp
- Kss_Scc_Apu.h
- Ay_Apu.h
- Ay_Apu.cpp
- Sms_Apu.h
- Sms_Apu.cpp
- Sms_Oscs.h
-
- Nsf_Emu.h Nintendo NES NSF/NSFE emulator
- Nsf_Emu.cpp
- Nes_Apu.cpp
- Nes_Apu.h
- Nes_Cpu.cpp
- Nes_Cpu.h
- nes_cpu_io.h
- Nes_Oscs.cpp
- Nes_Oscs.h
- Nes_Fme7_Apu.cpp
- Nes_Fme7_Apu.h
- Nes_Namco_Apu.cpp
- Nes_Namco_Apu.h
- Nes_Vrc6_Apu.cpp
- Nes_Vrc6_Apu.h
- Nsfe_Emu.h NSFE support
- Nsfe_Emu.cpp
-
- Spc_Emu.h Super Nintendo SPC emulator
- Spc_Emu.cpp
- Snes_Spc.cpp
- Snes_Spc.h
- Spc_Cpu.cpp
- Spc_Cpu.h
- Spc_Dsp.cpp
- Spc_Dsp.h
- Fir_Resampler.cpp
- Fir_Resampler.h
-
- Sap_Emu.h Atari SAP emulator
- Sap_Emu.cpp
- Sap_Apu.cpp
- Sap_Apu.h
- Sap_Cpu.cpp
- Sap_Cpu.h
- sap_cpu_io.h
-
- Vgm_Emu.h Sega VGM emulator
- Vgm_Emu_Impl.cpp
- Vgm_Emu_Impl.h
- Vgm_Emu.cpp
- Ym2413_Emu.cpp
- Ym2413_Emu.h
- Gym_Emu.h Sega Genesis GYM emulator
- Gym_Emu.cpp
- Sms_Apu.cpp Common Sega emulator files
- Sms_Apu.h
- Sms_Oscs.h
- Ym2612_Emu.cpp
- Ym2612_Emu.h
- Dual_Resampler.cpp
- Dual_Resampler.h
- Fir_Resampler.cpp
- Fir_Resampler.h
-
- blargg_common.h Common files needed by all emulators
- blargg_endian.h
- blargg_source.h
- Blip_Buffer.cpp
- Blip_Buffer.h
- Gme_File.cpp
- Music_Emu.cpp
- Classic_Emu.h
- Classic_Emu.cpp
- Multi_Buffer.h
- Multi_Buffer.cpp
- Data_Reader.cpp
- CMakeLists.txt CMake build rules
-
-
-Legal
------
-Game_Music_Emu library copyright (C) 2003-2006 Shay Green.
-SNES SPC DSP emulator based on OpenSPC, copyright (C) 2002 Brad Martin.
-Sega Genesis YM2612 emulator copyright (C) 2002 Stephane Dallongeville.
-
---
-Shay Green <gblargg@gmail.com>

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.vala Deleted

@@ -1,111 +0,0 @@
-/*
- DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-namespace Ddb {
-
- public class CellEditableTextView : Gtk.CellEditable, Gtk.TextView {
- public bool editing_canceled = false;
- public string tree_path;
-
- private override bool key_press_event (Gdk.EventKey event) {
- bool res = true;
- if (event.keyval == Gdk.KeySyms.Return) {
- if ((event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) != 0) {
- res = base.key_press_event (event);
- }
- else {
- editing_done ();
- remove_widget ();
- return true;
- }
- }
- else if (event.keyval == Gdk.KeySyms.Escape) {
- editing_canceled = true;
- editing_done ();
- remove_widget ();
- return true;
- }
- else {
- res = base.key_press_event (event);
- }
-
- return res;
- }
-
- public void start_editing (Gdk.Event event) {
- }
- }
-
- public class CellRendererTextMultiline : Gtk.CellRendererText
- {
- private CellEditableTextView entry;
- private ulong focus_out_id;
-
- private static void gtk_cell_renderer_text_editing_done (CellEditableTextView entry, CellRendererTextMultiline self) {
- entry.disconnect (self.focus_out_id);
- self.stop_editing (entry.editing_canceled);
- Gtk.TextBuffer buf = entry.get_buffer ();
- Gtk.TextIter begin, end;
- buf.get_iter_at_offset (out begin, 0);
- buf.get_iter_at_offset (out end, -1);
- string new_text = buf.get_text (begin, end, true);
- self.edited (entry.tree_path, new_text);
- }
-
- private static bool gtk_cell_renderer_focus_out_event (CellEditableTextView entry, Gdk.Event event, CellRendererTextMultiline self) {
- entry.editing_canceled = true;
- entry.remove_widget ();
- return false;
- }
-
-
- public override unowned Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags) {
- if (!editable) {
- return (Gtk.CellEditable)null;
- }
-
- Gtk.TreePath p = new Gtk.TreePath.from_string (path);
- Gtk.TreeView tv = (Gtk.TreeView)widget;
- Gtk.ListStore store = (Gtk.ListStore)tv.get_model();
- Gtk.TreeIter iter;
- store.get_iter (out iter, p);
- GLib.Value v;
- store.get_value (iter, 3, out v);
- int mult = v.get_int ();
-
- entry = new CellEditableTextView ();
- if (mult != 0) {
- text = "";
- }
-
- entry.tree_path = path;
- Gtk.TextBuffer buf = new Gtk.TextBuffer (null);
- if (text != null) {
- buf.set_text (text, -1);
- }
- entry.set_buffer (buf);
- Signal.connect (entry, "editing-done", (GLib.Callback)gtk_cell_renderer_text_editing_done, this);
- focus_out_id = Signal.connect_after (entry, "focus-out-event", (GLib.Callback)gtk_cell_renderer_focus_out_event, this);
- entry.set_size_request (cell_area.width, cell_area.height);
- entry.show ();
-
- return (Gtk.CellEditable)entry;
- }
- }
-}

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbequalizer.vala Deleted

@@ -1,361 +0,0 @@
-/*
- SuperEQ GTK Widget for for DeaDBeeF
- Copyright (C) 2010 Viktor Semykin <thesame.ml@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, 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, see <http://www.gnu.org/licenses/>.
-*/
-
-// sripped down and polished by Alexey Yakovenko <waker@users.sourceforge.net>
-
-const string[] freqs = {
- "55 Hz","77 Hz","110 Hz","156 Hz","220 Hz","311 Hz","440 Hz","622 Hz","880 Hz",
- "1.2 kHz","1.8 kHz","2.5 kHz","3.5 kHz","5 kHz","7 kHz","10 kHz","14 kHz","20 kHz"
-};
-
-namespace Ddb {
- public class Equalizer : Gtk.DrawingArea
- {
- public signal void on_changed ();
-
- private double[] values = new double [bands];
- private double preamp = 0.5;
-
- private int mouse_y = -1;
- 
- private bool curve_hook = false;
- private bool preamp_hook = false;
-
- private int margin_bottom = -1;
- private int margin_left = -1;
- static const int spot_size = 3;
- static const int bands = 18;
-
-// Gdk.Cursor moving_cursor = new Gdk.Cursor (Gdk.CursorType.FLEUR);
-// Gdk.Cursor updown_cursor = new Gdk.Cursor (Gdk.CursorType.double_ARROW);
- Gdk.Cursor pointer_cursor = new Gdk.Cursor (Gdk.CursorType.LEFT_PTR);
-
- construct
- {
- margin_bottom = (int)(Pango.units_to_double (get_style ().font_desc.get_size ()) * Gdk.Screen.get_default ().get_resolution () / 72 + 4);
- margin_left = margin_bottom * 4;
-
- //color_changed ();
- }
-
- public override bool configure_event (Gdk.EventConfigure event) {
- Gtkui.init_theme_colors ();
- return false;
- }
-
- public override void realize () {
- base.realize ();
- add_events (Gdk.EventMask.EXPOSURE_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK | Gdk.EventMask.POINTER_MOTION_MASK);
- }
-
- public override bool
- expose_event (Gdk.EventExpose event)
- {
- Gdk.Color fore_bright_color = Gtkui.get_bar_foreground_color ();
-
- Gdk.Color c1 = fore_bright_color;
- Gdk.Color c2 = Gtkui.get_bar_background_color ();
- Gdk.Color fore_dark_color = c2;
- fore_dark_color.red += (int16)((c1.red - c2.red) * 0.5);
- fore_dark_color.green += (int16)((c1.green - c2.green) * 0.5);
- fore_dark_color.blue += (int16)((c1.blue - c2.blue) * 0.5);
-
- int width = allocation.width;
- int height = allocation.height;
-
- Gdk.Drawable d = get_window();
- var gc = d.create_gc (Gdk.GCValues(), 0);
- //Gdk.Rectangle rc = {0, 0, allocation.width, allocation.height};
- //gc.set_clip_rectangle (rc);
-
- gc.set_rgb_fg_color (c2);
-
- d.draw_rectangle (gc, true, 0, 0, width, height);
-
- gc.set_rgb_fg_color (fore_dark_color);
- //drawing grid:
- double step = (double)(width - margin_left) / (double)(bands+1);
- int i;
- for (i = 0; i < bands; i++)
- {
- //does anyone know why this method is static?
- Gdk.draw_line (d, gc,
- (int)((i+1)*step)+margin_left,
- 0,
- (int)((i+1)*step)+margin_left,
- height - margin_bottom);
- }
-
- double vstep = (double)(height-margin_bottom);
- for (double di=0; di < 2; di += 0.25)
- {
- Gdk.draw_line (d, gc,
- margin_left,
- (int)((di-preamp)*vstep),
- width,
- (int)((di-preamp)*vstep));
- }
-
- gc.set_rgb_fg_color (fore_bright_color);
-
- //drawing freqs:
- Pango.Layout l = create_pango_layout (null);
- var ctx = l.get_context ();
-
- var fd = get_style ().font_desc.copy ();
-
-// var fd = ctx.get_font_description ();
- fd.set_size ((int)(get_style ().font_desc.get_size () * 0.7));
- ctx.set_font_description (fd);
- for (i = 0; i < bands; i++)
- {
- l.set_text (freqs[i], (int)freqs[i].len());
- Pango.Rectangle ink, log;
- l.get_pixel_extents (out ink, out log);
- int offs = 2;
- if ((i % 2) != 0) {
- offs += 2;
- }
- Gdk.draw_layout (d, gc, (int)((i+1)*step)+margin_left - ink.width/2, height-margin_bottom + offs, l);
- }
- fd.set_size ((int)(get_style ().font_desc.get_size ()));
- ctx.set_font_description (fd);
- 
- //drawing db's:
- l.set_width (margin_left-1);
- l.set_alignment (Pango.Alignment.RIGHT);
-
- int fontsize = (int)(Pango.units_to_double (fd.get_size ()) * Gdk.Screen.get_default ().get_resolution () / 72);
-
- if ((mouse_y >= 0) && (mouse_y < height - margin_bottom))
- {
- double db = scale((double)(mouse_y-1) / (double)(height - margin_bottom - 2));
- string tmp = "%s%.1fdB".printf (db > 0 ? "+" : "", db);
- l.set_text (tmp, (int)tmp.len());
- Gdk.draw_layout (d, gc, margin_left-1, mouse_y-3, l);
- }
- 
- string tmp;
- double val = scale(1);
- tmp = "%s%.1fdB".printf (val > 0 ? "+" : "", val);
- l.set_text (tmp, (int)tmp.len());
- Gdk.draw_layout (d, gc, margin_left-1, height-margin_bottom-fontsize, l);
-
- val = scale(0);
- tmp = "%s%.1fdB".printf (val > 0 ? "+" : "", val);
- l.set_text (tmp, (int)tmp.len());
- Gdk.draw_layout (d, gc, margin_left-1, 1, l);
-
- l.set_text ("+0dB", 4);
- Gdk.draw_layout (d, gc, margin_left-1, (int)((1-preamp)*(height-margin_bottom))-fontsize/2, l);
-
- l.set_text ("preamp", 6);
- l.set_alignment (Pango.Alignment.LEFT);
- Gdk.draw_layout (d, gc, 1, height-margin_bottom+2, l);
-
- d.draw_rectangle (gc, false, margin_left, 0, width-margin_left-1, height-margin_bottom-1);
- gc.set_line_attributes (2, Gdk.LineStyle.SOLID, Gdk.CapStyle.NOT_LAST, Gdk.JoinStyle.MITER);
- 
- //draw preamp
- gc.set_clip_rectangle ({0, (int)(preamp * (height-margin_bottom)), 11, height});
-
- gc.set_rgb_fg_color (fore_bright_color);
- int count = (int)((height-margin_bottom) / 6)+1;
- for (int j = 0; j < count; j++)
- d.draw_rectangle (
- gc,
- true,
- 1,
- height-margin_bottom-j*6 - 6,
- 11,
- 4);
-
- gc.set_clip_rectangle ({margin_left+1, 1, width-margin_left-2, height-margin_bottom-2});
-
- //drawing bars:
- gc.set_rgb_fg_color (fore_bright_color);
-
- int bar_w = 11;
- if (step < bar_w)
- bar_w = (int)step-1;
-
-
- for (i = 0; i < bands; i++)
- {
- gc.set_clip_rectangle ({
- (int)((i+1)*step)+margin_left - bar_w/2,
- (int)(values[i] * (height-margin_bottom)),
- 11,
- height});
- count = (int)((height-margin_bottom) * (1-values[i]) / 6)+1;
- for (int j = 0; j < count; j++)
- d.draw_rectangle (
- gc,
- true,
- (int)((i+1)*step)+margin_left - bar_w/2,
- height-margin_bottom-j*6 - 6,
- bar_w,
- 4);
- }
- gc.set_clip_rectangle ({0, 0, width, height});
-
- //drawing mouse coordinates:
- gc.set_line_attributes (1, Gdk.LineStyle.ON_OFF_DASH, Gdk.CapStyle.NOT_LAST, Gdk.JoinStyle.MITER);
- Gdk.draw_line (d, gc, margin_left+1, mouse_y, width, mouse_y);
- 
- return false;
- }
- 
- private inline double
- scale (double val)
- {
- double k = -40;
- double d = 20;
- return (val + preamp - 0.5) * k + d;
- }
-
- private bool
- in_curve_area (double x, double y)
- {
- return
- x > margin_left &&
- x < allocation.width-1 &&
- y > 1 &&
- y < allocation.height-margin_bottom;
- }
-
- private void
- update_eq_drag (double x, double y) {
- double band_width = (double)(allocation.width - margin_left) / (double)(bands+1);
- int band = (int)GLib.Math.floor ((x - margin_left) / band_width - 0.5);
- if (band < 0) {
- band = 0;
- }
- if (band >= bands) {
- band = band-1;
- }
- if (band >= 0 && band < bands) {
- values[band] = y / (double)(allocation.height - margin_bottom);
- if (values[band] > 1) {
- values[band] = 1;
- }
- else if (values[band] < 0) {
- values[band] = 0;
- }
- on_changed ();
- }
- }
-
- /* Mouse button got pressed over widget */
- public override bool
- button_press_event (Gdk.EventButton event)
- {
- if (in_curve_area ((int)event.x, (int)event.y))
- {
- curve_hook = true;
- update_eq_drag ((int)event.x, (int)event.y);
- mouse_y = (int)event.y;
- queue_draw ();
- return false;
- }
-
- if (event.x <= 11 &&
- event.y > 1 &&
- event.y <= allocation.height-margin_bottom &&
- event.button == 1
- )
- {
- preamp = event.y / (double)(allocation.height - margin_bottom);
- on_changed ();
- preamp_hook = true;
- mouse_y = (int)event.y;
- queue_draw ();
- }
-
- return false;
- }
-
- /* Mouse button got released */
- public override bool
- button_release_event (Gdk.EventButton event)
- {
- curve_hook = false;
- preamp_hook = false;
- get_window().set_cursor (pointer_cursor);
- return false;
- }
-
- public override bool
- leave_notify_event (Gdk.EventCrossing event)
- {
- mouse_y = -1;
- queue_draw();
- return false;
- }
-
- /* Mouse pointer moved over widget */
- public override bool
- motion_notify_event (Gdk.EventMotion event) {
- double y = event.y / (double)(allocation.height - margin_bottom);
- if (y < 0) y = 0;
- if (y > 1) y = 1;
-
- if (preamp_hook)
- {
- preamp = y;
- on_changed ();
- queue_draw();
- return false;
- }
- 
- if (!in_curve_area ((int)event.x, (int)event.y))
- mouse_y = -1;
- else
- mouse_y = (int)event.y;
-
- if (curve_hook)
- {
- update_eq_drag ((int)event.x, (int)event.y);
- mouse_y = (int)event.y;
- }
- queue_draw ();
- return false;
- }
-
- public void
- set_band (int band, double v) {
- values[band] = 1 - (v + 20.0) / 40.0;
- }
-
- public double
- get_band (int band) {
- return ((1 - values[band]) * 40.0) - 20.0;
- }
-
- public void
- set_preamp (double v) {
- preamp = 1 - (v + 20.0) / 40.0;
- }
-
- public double
- get_preamp () {
- return ((1 - preamp) * 40.0) - 20.0;
- }
-
- }
-}

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbseekbar.vala Deleted

@@ -1,64 +0,0 @@
-/*
- DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net>
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-namespace Ddb {
- public class Seekbar : Gtk.Widget
- {
- construct
- {
- }
-
- public override void realize () {
- set_has_window (false);
- base.realize ();
- }
-
- public override void unrealize () {
- base.unrealize ();
- }
-
- public override void size_request (out Gtk.Requisition requisition) {
- // leave at default for now
- }
-
- public override bool expose_event (Gdk.EventExpose event) {
- seekbar_draw (base);
- return true;
- }
-
- public override bool button_press_event (Gdk.EventButton event) {
- return on_seekbar_button_press_event (this, event);
- }
-
- public override bool button_release_event (Gdk.EventButton event) {
- return on_seekbar_button_release_event (this, event);
- }
-
- public override bool motion_notify_event (Gdk.EventMotion event) {
- return on_seekbar_motion_notify_event (this, event);
- }
-
- public override bool configure_event (Gdk.EventConfigure event) {
- Gtkui.init_theme_colors ();
- return false;
- }
- }
-
-}
-

deadbeef-0.5.1.tar.bz2/ChangeLog -> deadbeef-0.5.2.tar.bz2/ChangeLog Changed

@@ -1,3 +1,54 @@
+version 0.5.2
+	fixed reading id3v2 and apev2 tags from raw AAC files
+	fixed proxy authentication bug in vfs_curl plugin
+	added OpenIndian b148 support (Kevin van der Vlist)
+	improved APE performance
+	fixed freeze bug in alsa plugin on x86_64
+	added automatic creation of directory structure to the converter plugin
+	few fixes in random and shuffle modes
+	improved automatic config saving
+	added support for ffmpeg-0.8 (Igor Murzov)
+	fixed rename/remove playlist crash when no playlist was selected
+	last.fm plugin will now split multiline fields when scrobbling
+	few bug fixes / improvements in cuesheet support
+	fixed writing non-ascii id3v1 tags
+	pressing enter/play in paused state will now play selected track (bugfix)
+	fixed content-length handling after redirects in vfs_curl plugin
+	artwork plugin now supports png by default
+	fixed rdb check in aac adts parser, this means improved aac support (by 少昊)
+	fixed rare aac crash
+	added EXTM3U support
+	m3u and pls files are now supported only via Load Playlist menu
+	fix off-by-one error in convstr_id3v2 (gohai)
+	improved support for the case when an M3U file contains URIs of other M3Us
+	improved volumebar tooltip (xent)
+	replaygain preamp improvements (Jan D. Behrens)
+	ignore embedded album cuesheets in single-track files
+	experimental GTK3 support, can be enabled with ./configure --enable-gtk3
+	Vala is not used in this project anymore
+	vorbis plugin will now try to open .OGA files
+	GME plugin: added fadeout support, fixed intro/looping, fixed headerless files support (e.g. some GYM), improved gzipped files detection
+	added auto-resizing support to playlist columns
+	DUMB, AudioOverload, SHN, Mono2Stereo plugins are now back in the main tarball
+	default PulseAudio buffer is set to 8K
+	added FLAC embedded album covers (Tydus)
+	added "Album Artist" support to shuffle albums mode
+	fixed several memory leaks
+	config file parser now supports blank values
+	added %L %X %Z to title formatting for "selected playback length", "selected track count", "current channel configuration" respectively
+	added new commandline switch --gui to select GUI plugin
+	added WM/Year field support to ffmpeg plugin
+	fixed reading embedded covers from id3v2.4
+	added optional "Album Artist" support to last.fm
+	aac: improved duration scanner, fixed infinite loop in mp4ff ATOM_UNKNOWN handler
+	avoid scanning/loading plugins twice when XDG_LOCAL_HOME is the same as install directory (Thynson)
+	improvements in the command line handling code (Eugene Debrev)
+	shellexec now supports quoting strings for more flexibility
+	fixed resampler dsp plugin auto-configuration when the player is started for the 1st time
+	plugin API now allows to extend playlist context menu
+	added "audio/ogg" mime-type support
+	fixed playing mp4/aac files with id3v2 tags
+
 version 0.5.1
 	fixed crash bug after deleting playlists
 	fixed importing fb2k EQ presets

deadbeef-0.5.1.tar.bz2/Makefile.am -> deadbeef-0.5.2.tar.bz2/Makefile.am Changed

deadbeef-0.5.1.tar.bz2/Makefile.in -> deadbeef-0.5.2.tar.bz2/Makefile.in Changed

@@ -68,19 +68,35 @@
 deadbeef_OBJECTS = $(am_deadbeef_OBJECTS)
 am__DEPENDENCIES_1 =
 deadbeef_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(deadbeef_SOURCES)
 DIST_SOURCES = $(deadbeef_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -163,6 +179,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -210,14 +227,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -307,7 +327,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -318,6 +337,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -426,7 +446,7 @@
 
 desktopdir = $(datadir)/applications
 desktop_DATA = deadbeef.desktop
-EXTRA_DIST = $(docs_DATA) $(desktop_DATA) $(INTLTOOL_FILES) translation/extra.c sj_to_unicode.h examples/decoder_template.c examples/dsp_template.c
+EXTRA_DIST = $(docs_DATA) $(desktop_DATA) $(INTLTOOL_FILES) translation/extra.c sj_to_unicode.h examples/decoder_template.c examples/dsp_template.c yasmwrapper.sh
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -533,7 +553,7 @@
 	rm -f $$list
 deadbeef$(EXEEXT): $(deadbeef_OBJECTS) $(deadbeef_DEPENDENCIES) 
 	@rm -f deadbeef$(EXEEXT)
-	$(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -563,36 +583,41 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volume.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 md5.o: md5/md5.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
 
 md5.obj: md5/md5.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`

deadbeef-0.5.1.tar.bz2/README -> deadbeef-0.5.2.tar.bz2/README Changed

deadbeef-0.5.1.tar.bz2/about.txt -> deadbeef-0.5.2.tar.bz2/about.txt Changed

deadbeef-0.5.1.tar.bz2/aclocal.m4 -> deadbeef-0.5.2.tar.bz2/aclocal.m4 Changed

@@ -2654,8 +2654,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -2664,8 +2664,8 @@
 
 m4_define([_LT_COPYING], [dnl
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # Written by Gordon Matzigkeit, 1996
 #
 # This file is part of GNU Libtool.
@@ -2799,6 +2799,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -3284,7 +3286,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -3448,6 +3450,7 @@
 m4_case([$1],
 [C],			[_LT_LANG(C)],
 [C++],		[_LT_LANG(CXX)],
+ [Go],			[_LT_LANG(GO)],
 [Java],		[_LT_LANG(GCJ)],
 [Fortran 77],		[_LT_LANG(F77)],
 [Fortran],		[_LT_LANG(FC)],
@@ -3469,6 +3472,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_GO. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC], [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+ if test -n "$ac_tool_prefix"; then
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+ fi
+fi
+if test -z "$GOC"; then
+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -3499,6 +3525,10 @@
 m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+ [LT_LANG(GO)],
+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
 [LT_LANG(RC)],
 [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -3601,7 +3631,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
 _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+	 cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	 lt_cv_apple_cc_single_mod=yes
 	else
 	 cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -3609,6 +3645,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
 fi])
+
 AC_CACHE_CHECK([for -exported_symbols_list linker flag],
 [lt_cv_ld_exported_symbols_list],
 [lt_cv_ld_exported_symbols_list=no
@@ -3620,6 +3657,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
 ])
+
 AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
 [lt_cv_ld_force_load=no
 cat > conftest.c << _LT_EOF
@@ -3637,7 +3675,9 @@
 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
 _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
 else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -3682,8 +3722,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -3694,6 +3734,8 @@
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 if test "$lt_cv_ld_force_load" = "yes"; then
 _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
 else
 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
 fi
@@ -3977,14 +4019,27 @@
 CFLAGS="$SAVE_CFLAGS"
 fi
 ;;
-sparc*-*solaris*)
+*-*solaris*)
 # Find out which ABI we are using.
 echo 'int i;' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
 case `/usr/bin/file conftest.o` in
 *64-bit*)
 case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
 *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	 LD="${LD-ld} -64"
@@ -4061,13 +4116,13 @@
 if test -n "$RANLIB"; then
 case $host_os in
 openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 ;;
 *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
 ;;
 esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -4247,6 +4302,11 @@
 lt_cv_sys_max_cmd_len=196608
 ;;
 
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
 osf*)
 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4286,7 +4346,7 @@
 # If test is not a shell built-in, we'll probably end up computing a
 # maximum length that is only half of the actual maximum length, but
 # we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	 test $i != 17 # 1/2 MB should be enough
 do
@@ -4832,7 +4892,7 @@
 
 case $host_os in
 aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 shlibpath_var=LIBPATH
 
@@ -4841,7 +4901,7 @@
 ;;
 
 aix[[4-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 hardcode_into_libs=yes
@@ -4906,7 +4966,7 @@
 ;;
 
 bsdi[[45]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
@@ -5045,7 +5105,7 @@
 ;;
 
 dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -5053,10 +5113,6 @@
 shlibpath_var=LD_LIBRARY_PATH
 ;;
 
-freebsd1*)
- dynamic_linker=no
- ;;
-
 freebsd* | dragonfly*)
 # DragonFly does not have aout. When/if they implement a new
 # versioning mechanism, adjust this.
@@ -5064,7 +5120,7 @@
 objformat=`/usr/bin/objformat`
 else
 case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[23]].*) objformat=aout ;;
 *) objformat=elf ;;
 esac
 fi
@@ -5082,7 +5138,7 @@
 esac
 shlibpath_var=LD_LIBRARY_PATH
 case $host_os in
- freebsd2*)
+ freebsd2.*)
 shlibpath_overrides_runpath=yes
 ;;
 freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -5102,17 +5158,18 @@
 ;;
 
 gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
 hardcode_into_libs=yes
 ;;
 
 haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 dynamic_linker="$host_os runtime_loader"
@@ -5173,7 +5230,7 @@
 ;;
 
 interix[[3-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -5189,7 +5246,7 @@
 nonstopux*) version_type=nonstopux ;;
 *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -5226,9 +5283,9 @@
 dynamic_linker=no
 ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -5291,7 +5348,7 @@
 ;;
 
 newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
@@ -5360,7 +5417,7 @@
 ;;
 
 solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -5385,7 +5442,7 @@
 ;;
 
 sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -5409,7 +5466,7 @@
 
 sysv4*MP*)
 if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
 soname_spec='$libname${shared_ext}.$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -5440,7 +5497,7 @@
 
 tpf*)
 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -5450,7 +5507,7 @@
 ;;
 
 uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -5872,7 +5929,7 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
 lt_cv_deplibs_check_method=pass_all
 ;;
@@ -6292,6 +6349,7 @@
 # which start with @ or ?.
 lt_cv_sys_global_symbol_pipe="$AWK ['"\
 " {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 " \$ 0!~/External *\|/{next};"\
 " / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
@@ -6876,7 +6934,9 @@
 case $cc_basename in
 nvcc*) # Cuda Compiler Driver 2.2
 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+ fi
 ;;
 esac
 else
@@ -6968,18 +7028,33 @@
 	;;
 *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	 _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	 ;;
+	*Sun\ F* | *Sun*Fortran*)
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	 ;;
 	*Sun\ C*)
 	 # Sun C 5.9
 	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	 ;;
+ *Intel*\ [[CF]]*Compiler*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	 ;;
+	*Portland\ Group*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	 ;;
 	esac
 	;;
 esac
@@ -7139,7 +7214,9 @@
 ;;
 cygwin* | mingw* | cegcc*)
 case $cc_basename in
- cl*) ;;
+ cl*)
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
 *)
 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -7164,7 +7241,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -7415,8 +7491,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	 _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	 _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	 if test "x$supports_anon_versioning" = xyes; then
 	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -7711,6 +7786,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -7757,10 +7833,6 @@
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 ;;
 
- freebsd1*)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 # support. Future versions do this automatically, but an explicit c++rt0.o
 # does not break anything, and helps significantly (at the cost of a little
@@ -7773,7 +7845,7 @@
 ;;
 
 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 _LT_TAGVAR(hardcode_direct, $1)=yes
 _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -7812,7 +7884,6 @@
 fi
 if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -8254,9 +8325,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
 [Flag to hardcode $libdir into a binary during linking.
 This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
- [[If ld is used when linking, flag to hardcode $libdir into a binary
- during linking. This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
 [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -8410,7 +8478,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -8780,7 +8847,7 @@
 esac
 ;;
 
- freebsd[[12]]*)
+ freebsd2.*)
 # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
 _LT_TAGVAR(ld_shlibs, $1)=no
@@ -9541,12 +9608,18 @@
 }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -9743,7 +9816,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -9876,7 +9948,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -10059,6 +10130,73 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+ _LT_COMPILER_NO_RTTI($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -10128,6 +10266,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -10937,9 +11082,24 @@
 # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
- [AS_HELP_STRING([--with-pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
+ [lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	 pic_mode=yes
+	fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
 [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -11111,15 +11271,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
@@ -11284,7 +11444,8 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -11330,7 +11491,8 @@
 pkg_cv_[]$1="$$1"
 elif test -n "$PKG_CONFIG"; then
 PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes ],
 		 [pkg_failed=yes])
 else
 pkg_failed=untried
@@ -11378,9 +11540,9 @@
 	AC_MSG_RESULT([no])
 _PKG_SHORT_ERRORS_SUPPORTED
 if test $_pkg_short_errors_supported = yes; then
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 else 
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -11404,7 +11566,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
 ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -13451,6 +13613,33 @@
 fi
 AC_MSG_RESULT(yes)])
 
+# Copyright (C) 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.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -13594,34 +13783,4 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-# Autoconf support for the Vala compiler
-
-# Copyright (C) 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.
-
-# serial 4
-
-# Check whether the Vala compiler exists in `PATH'. If it is found, the
-# variable VALAC is set. Optionally a minimum release number of the
-# compiler can be requested.
-#
-# AM_PROG_VALAC([MINIMUM-VERSION])
-# --------------------------------
-AC_DEFUN([AM_PROG_VALAC],
-[AC_PATH_PROG([VALAC], [valac], [])
- AS_IF([test -z "$VALAC"],
- [AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])],
- [AS_IF([test -n "$1"],
- [AC_MSG_CHECKING([$VALAC is at least version $1])
- am__vala_version=`$VALAC --version | sed 's/Vala *//'`
- AS_VERSION_COMPARE([$1], ["$am__vala_version"],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Vala $1 not found.])])])])
-])
-
 m4_include([acinclude.m4])

deadbeef-0.5.1.tar.bz2/common.h -> deadbeef-0.5.2.tar.bz2/common.h Changed

deadbeef-0.5.1.tar.bz2/conf.c -> deadbeef-0.5.2.tar.bz2/conf.c Changed

deadbeef-0.5.1.tar.bz2/conf.h -> deadbeef-0.5.2.tar.bz2/conf.h Changed

deadbeef-0.5.1.tar.bz2/configure -> deadbeef-0.5.2.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for deadbeef 0.5.1.
+# Generated by GNU Autoconf 2.68 for deadbeef 0.5.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -543,66 +543,6 @@
 
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-as_awk_strverscmp='
- # Use only awk features that work with 7th edition Unix awk (1978).
- # My, what an old awk you have, Mr. Solaris!
- END {
- while (length(v1) && length(v2)) {
- # Set d1 to be the next thing to compare from v1, and likewise for d2.
- # Normally this is a single character, but if v1 and v2 contain digits,
- # compare them as integers and fractions as strverscmp does.
- if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
-	# Split v1 and v2 into their leading digit string components d1 and d2,
-	# and advance v1 and v2 past the leading digit strings.
-	for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
-	for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
-	d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
-	d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
-	if (d1 ~ /^0/) {
-	 if (d2 ~ /^0/) {
-	 # Compare two fractions.
-	 while (d1 ~ /^0/ && d2 ~ /^0/) {
-	 d1 = substr(d1, 2); len1--
-	 d2 = substr(d2, 2); len2--
-	 }
-	 if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
-	 # The two components differ in length, and the common prefix
-	 # contains only leading zeros. Consider the longer to be less.
-	 d1 = -len1
-	 d2 = -len2
-	 } else {
-	 # Otherwise, compare as strings.
-	 d1 = "x" d1
-	 d2 = "x" d2
-	 }
-	 } else {
-	 # A fraction is less than an integer.
-	 exit 1
-	 }
-	} else {
-	 if (d2 ~ /^0/) {
-	 # An integer is greater than a fraction.
-	 exit 2
-	 } else {
-	 # Compare two integers.
-	 d1 += 0
-	 d2 += 0
-	 }
-	}
- } else {
-	# The normal case, without worrying about digits.
-	d1 = substr(v1, 1, 1); v1 = substr(v1, 2)
-	d2 = substr(v2, 1, 1); v2 = substr(v2, 2)
- }
- if (d1 < d2) exit 1
- if (d1 > d2) exit 2
- }
- # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10),
- # which mishandles some comparisons of empty strings to integers.
- if (length(v2)) exit 1
- if (length(v1)) exit 2
- }
-'
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -627,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='deadbeef'
 PACKAGE_TARNAME='deadbeef'
-PACKAGE_VERSION='0.5.1'
-PACKAGE_STRING='deadbeef 0.5.1'
+PACKAGE_VERSION='0.5.2'
+PACKAGE_STRING='deadbeef 0.5.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -676,6 +616,16 @@
 LTLIBOBJS
 LIBOBJS
 PLUGINS_DIRS
+HAVE_MONO2STEREO_FALSE
+HAVE_MONO2STEREO_TRUE
+HAVE_SHN_FALSE
+HAVE_SHN_TRUE
+HAVE_PSF_FALSE
+HAVE_PSF_TRUE
+HAVE_DUMB_FALSE
+HAVE_DUMB_TRUE
+HAVE_YASM_FALSE
+HAVE_YASM_TRUE
 HAVE_PNG_FALSE
 HAVE_PNG_TRUE
 HAVE_JPEG_FALSE
@@ -744,6 +694,10 @@
 HAVE_FFMPEG_TRUE
 HAVE_ALSA_FALSE
 HAVE_ALSA_TRUE
+HAVE_GTK3_FALSE
+HAVE_GTK3_TRUE
+HAVE_GTK2_FALSE
+HAVE_GTK2_TRUE
 HAVE_GTKUI_FALSE
 HAVE_GTKUI_TRUE
 HAVE_CDDA_FALSE
@@ -785,15 +739,18 @@
 FFMPEG_DEPS_LIBS
 ALSA_DEPS_LIBS
 ALSA_DEPS_CFLAGS
-GTKUI_DEPS_LIBS
-GTKUI_DEPS_CFLAGS
+GTK2_DEPS_LIBS
+GTK2_DEPS_CFLAGS
+GTK3_DEPS_LIBS
+GTK3_DEPS_CFLAGS
 ZIP_LIBS
 ZLIB_LIBS
 DL_LIBS
+HAVE_YASM
 INSANE_CXXFLAGS
 INSANE_CFLAGS
+YASM_FLAGS
 LIB
-VALAC
 GETTEXT_PACKAGE
 ALL_LINGUAS
 INTLTOOL_PERL
@@ -872,6 +829,12 @@
 GETTEXT_MACRO_VERSION
 USE_NLS
 CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
 OTOOL64
 OTOOL
 LIPO
@@ -899,12 +862,6 @@
 build_cpu
 build
 LIBTOOL
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
 EGREP
 GREP
 CPP
@@ -927,6 +884,8 @@
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
 am__untar
 am__tar
 AMTAR
@@ -991,6 +950,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_shared
@@ -1012,6 +972,8 @@
 enable_oss
 enable_pulse
 enable_gtkui
+enable_gtk3
+enable_gtk2
 enable_vfs_curl
 enable_lfm
 enable_artwork
@@ -1044,6 +1006,10 @@
 enable_vfs_zip
 enable_converter
 enable_artwork_imlib2
+enable_dumb
+enable_shn
+enable_psf
+enable_mono2stereo
 '
 ac_precious_vars='build_alias
 host_alias
@@ -1061,8 +1027,10 @@
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-GTKUI_DEPS_CFLAGS
-GTKUI_DEPS_LIBS
+GTK3_DEPS_CFLAGS
+GTK3_DEPS_LIBS
+GTK2_DEPS_CFLAGS
+GTK2_DEPS_LIBS
 ALSA_DEPS_CFLAGS
 ALSA_DEPS_LIBS
 FFMPEG_DEPS_CFLAGS
@@ -1617,7 +1585,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 deadbeef 0.5.1 to adapt to many kinds of systems.
+\`configure' configures deadbeef 0.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1687,7 +1655,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of deadbeef 0.5.1:";;
+ short | recursive ) echo "Configuration of deadbeef 0.5.2:";;
 esac
 cat <<\_ACEOF
 
@@ -1695,6 +1663,8 @@
 --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]
+ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')
 --enable-maintainer-mode enable make rules and dependencies not useful
 			 (and sometimes confusing) to the casual installer
 --disable-dependency-tracking speeds up one-time build
@@ -1714,8 +1684,12 @@
 --disable-oss disable Open Sound System output plugin (default:
 enabled)
 --disable-pulse disable PulseAudio output plugin (default: enabled)
- --disable-gtkui disable standard GTK2 user interface plugin
+ --disable-gtkui disable standard GTK+ user interface plugin
 (default: enabled)
+ --enable-gtk3 build GTK3 version of gtkui plugin (default:
+ disabled)
+ --disable-gtk2 build GTK2 version of gtkui plugin (default:
+ enabled)
 --disable-vfs-curl disable HTTP streaming vfs plugin (default: enabled)
 --disable-lfm disable last.fm/libre.fm scrobbler plugin (default:
 enabled)
@@ -1759,11 +1733,17 @@
 build converter plugin (default: auto)
 --enable-artwork-imlib2
 use imlib2 in artwork plugin (default: auto)
+ --enable-dumb build DUMB plugin (default: auto)
+ --enable-shn build SHN plugin (default: auto)
+ --enable-psf build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default:
+ auto)
+ --enable-mono2stereo
+ build mono2stereo DSP plugin (default: auto)
 
 Optional Packages:
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pic try to use only PIC/non-PIC objects [default=use
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
 both]
 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
 --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1794,10 +1774,14 @@
 directories to add to pkg-config's search path
 PKG_CONFIG_LIBDIR
 path overriding pkg-config's built-in search path
- GTKUI_DEPS_CFLAGS
- C compiler flags for GTKUI_DEPS, overriding pkg-config
- GTKUI_DEPS_LIBS
- linker flags for GTKUI_DEPS, overriding pkg-config
+ GTK3_DEPS_CFLAGS
+ C compiler flags for GTK3_DEPS, overriding pkg-config
+ GTK3_DEPS_LIBS
+ linker flags for GTK3_DEPS, overriding pkg-config
+ GTK2_DEPS_CFLAGS
+ C compiler flags for GTK2_DEPS, overriding pkg-config
+ GTK2_DEPS_LIBS
+ linker flags for GTK2_DEPS, overriding pkg-config
 ALSA_DEPS_CFLAGS
 C compiler flags for ALSA_DEPS, overriding pkg-config
 ALSA_DEPS_LIBS
@@ -1889,7 +1873,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-deadbeef configure 0.5.1
+deadbeef configure 0.5.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2138,44 +2122,6 @@
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2289,6 +2235,44 @@
 
 } # ac_fn_c_check_func
 
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
 # ac_fn_cxx_try_cpp LINENO
 # ------------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -2607,7 +2591,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by deadbeef $as_me 0.5.1, which was
+It was created by deadbeef $as_me 0.5.2, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 $ $0 $@
@@ -3430,7 +3414,7 @@
 
 # Define the identity of the package.
 PACKAGE='deadbeef'
- VERSION='0.5.1'
+ VERSION='0.5.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3470,6 +3454,18 @@
 
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=0;;
+esac
+AM_BACKSLASH='\'
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -4932,1170 +4928,6 @@
 $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GCC=yes
-else
- GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
- CFLAGS="-g"
- fi
-else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CXX" && break
-done
-
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
-
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- fi
- rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-else
- CXXFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
 case `pwd` in
 *\ * | *\	*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -6104,8 +4936,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6820,6 +5652,11 @@
 lt_cv_sys_max_cmd_len=196608
 ;;
 
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
 osf*)
 # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6859,7 +5696,7 @@
 # If test is not a shell built-in, we'll probably end up computing a
 # maximum length that is only half of the actual maximum length, but
 # we can't tell.
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	 test $i != 17 # 1/2 MB should be enough
 do
@@ -7288,7 +6125,7 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
 lt_cv_deplibs_check_method=pass_all
 ;;
@@ -7928,13 +6765,13 @@
 if test -n "$RANLIB"; then
 case $host_os in
 openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 ;;
 *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
 ;;
 esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -8081,6 +6918,7 @@
 # which start with @ or ?.
 lt_cv_sys_global_symbol_pipe="$AWK '"\
 " {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 " \$ 0!~/External *\|/{next};"\
 " / 0+ UNDEF /{next}; / UNDEF $[^|]$*()/{next};"\
@@ -8469,7 +7307,7 @@
 CFLAGS="$SAVE_CFLAGS"
 fi
 ;;
-sparc*-*solaris*)
+*-*solaris*)
 # Find out which ABI we are using.
 echo 'int i;' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -8480,7 +7318,20 @@
 case `/usr/bin/file conftest.o` in
 *64-bit*)
 case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD="${LD-ld}_sol2"
+ fi
+ ;;
 *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	 LD="${LD-ld} -64"
@@ -9120,7 +7971,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
 _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+	 cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	 lt_cv_apple_cc_single_mod=yes
 	else
 	 cat conftest.err >&5
@@ -9131,6 +7988,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -9163,6 +8021,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -9184,7 +8043,9 @@
 echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
 _lt_result=$?
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
 else
 	cat conftest.err >&5
@@ -9246,17 +8107,6 @@
 
 
 
-func_stripname_cnf ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname_cnf
-
-
-
-
 
 # Set options
 
@@ -9333,7 +8183,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
+ withval=$with_pic; lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	 pic_mode=yes
+	fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
 else
 pic_mode=default
 fi
@@ -9411,6 +8276,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9866,7 +8735,9 @@
 case $cc_basename in
 nvcc*) # Cuda Compiler Driver 2.2
 lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
 ;;
 esac
 else
@@ -9957,18 +8828,33 @@
 	;;
 *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	 lt_prog_compiler_pic='-KPIC'
 	 lt_prog_compiler_static='-Bstatic'
 	 lt_prog_compiler_wl=''
 	 ;;
+	*Sun\ F* | *Sun*Fortran*)
+	 lt_prog_compiler_pic='-KPIC'
+	 lt_prog_compiler_static='-Bstatic'
+	 lt_prog_compiler_wl='-Qoption ld '
+	 ;;
 	*Sun\ C*)
 	 # Sun C 5.9
 	 lt_prog_compiler_pic='-KPIC'
 	 lt_prog_compiler_static='-Bstatic'
 	 lt_prog_compiler_wl='-Wl,'
 	 ;;
+ *Intel*\ [CF]*Compiler*)
+	 lt_prog_compiler_wl='-Wl,'
+	 lt_prog_compiler_pic='-fPIC'
+	 lt_prog_compiler_static='-static'
+	 ;;
+	*Portland\ Group*)
+	 lt_prog_compiler_wl='-Wl,'
+	 lt_prog_compiler_pic='-fpic'
+	 lt_prog_compiler_static='-Bstatic'
+	 ;;
 	esac
 	;;
 esac
@@ -10330,7 +9216,6 @@
 hardcode_direct=no
 hardcode_direct_absolute=no
 hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld=
 hardcode_libdir_separator=
 hardcode_minus_L=no
 hardcode_shlibpath_var=unsupported
@@ -10580,8 +9465,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	 # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	 whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	 hardcode_libdir_flag_spec=
-	 hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	 if test "x$supports_anon_versioning" = xyes; then
 	 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10960,6 +9844,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -11005,6 +9890,7 @@
 hardcode_shlibpath_var=unsupported
 if test "$lt_cv_ld_force_load" = "yes"; then
 whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
 else
 whole_archive_flag_spec=''
 fi
@@ -11033,10 +9919,6 @@
 hardcode_shlibpath_var=no
 ;;
 
- freebsd1*)
- ld_shlibs=no
- ;;
-
 # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 # support. Future versions do this automatically, but an explicit c++rt0.o
 # does not break anything, and helps significantly (at the cost of a little
@@ -11049,7 +9931,7 @@
 ;;
 
 # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 hardcode_direct=yes
 hardcode_minus_L=yes
@@ -11088,7 +9970,6 @@
 fi
 if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11712,11 +10593,6 @@
 
 
 
-
-
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11806,7 +10682,7 @@
 
 case $host_os in
 aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 shlibpath_var=LIBPATH
 
@@ -11815,7 +10691,7 @@
 ;;
 
 aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 hardcode_into_libs=yes
@@ -11880,7 +10756,7 @@
 ;;
 
 bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
@@ -12019,7 +10895,7 @@
 ;;
 
 dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -12027,10 +10903,6 @@
 shlibpath_var=LD_LIBRARY_PATH
 ;;
 
-freebsd1*)
- dynamic_linker=no
- ;;
-
 freebsd* | dragonfly*)
 # DragonFly does not have aout. When/if they implement a new
 # versioning mechanism, adjust this.
@@ -12038,7 +10910,7 @@
 objformat=`/usr/bin/objformat`
 else
 case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
 *) objformat=elf ;;
 esac
 fi
@@ -12056,7 +10928,7 @@
 esac
 shlibpath_var=LD_LIBRARY_PATH
 case $host_os in
- freebsd2*)
+ freebsd2.*)
 shlibpath_overrides_runpath=yes
 ;;
 freebsd3.[01]* | freebsdelf3.[01]*)
@@ -12076,17 +10948,18 @@
 ;;
 
 gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
 hardcode_into_libs=yes
 ;;
 
 haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 dynamic_linker="$host_os runtime_loader"
@@ -12147,7 +11020,7 @@
 ;;
 
 interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -12163,7 +11036,7 @@
 nonstopux*) version_type=nonstopux ;;
 *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -12200,9 +11073,9 @@
 dynamic_linker=no
 ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12284,7 +11157,7 @@
 ;;
 
 newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
@@ -12353,7 +11226,7 @@
 ;;
 
 solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12378,7 +11251,7 @@
 ;;
 
 sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -12402,7 +11275,7 @@
 
 sysv4*MP*)
 if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
 soname_spec='$libname${shared_ext}.$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -12433,7 +11306,7 @@
 
 tpf*)
 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12443,7 +11316,7 @@
 ;;
 
 uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -13213,6 +12086,1089 @@
 
 CC="$lt_save_CC"
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+else
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+	continue
+ else
+	break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CXX" && break
+done
+
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
+
+ fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+else
+ ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+else
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CXX" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+	continue
+ else
+	break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
+
+
+
+
+func_stripname_cnf ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname_cnf
+
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 (test "X$CXX" != "Xg++"))) ; then
@@ -13368,7 +13324,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -13952,6 +13907,7 @@
 hardcode_shlibpath_var_CXX=unsupported
 if test "$lt_cv_ld_force_load" = "yes"; then
 whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
 else
 whole_archive_flag_spec_CXX=''
 fi
@@ -13996,7 +13952,7 @@
 esac
 ;;
 
- freebsd[12]*)
+ freebsd2.*)
 # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
 ld_shlibs_CXX=no
@@ -14672,6 +14628,7 @@
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15461,7 +15418,9 @@
 ;;
 cygwin* | mingw* | cegcc*)
 case $cc_basename in
- cl*) ;;
+ cl*)
+ exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ ;;
 *)
 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
 exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -15614,8 +15573,6 @@
 
 
 
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15641,7 +15598,7 @@
 
 case $host_os in
 aix3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 shlibpath_var=LIBPATH
 
@@ -15650,7 +15607,7 @@
 ;;
 
 aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 hardcode_into_libs=yes
@@ -15715,7 +15672,7 @@
 ;;
 
 bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
@@ -15852,7 +15809,7 @@
 ;;
 
 dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15860,10 +15817,6 @@
 shlibpath_var=LD_LIBRARY_PATH
 ;;
 
-freebsd1*)
- dynamic_linker=no
- ;;
-
 freebsd* | dragonfly*)
 # DragonFly does not have aout. When/if they implement a new
 # versioning mechanism, adjust this.
@@ -15871,7 +15824,7 @@
 objformat=`/usr/bin/objformat`
 else
 case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
 *) objformat=elf ;;
 esac
 fi
@@ -15889,7 +15842,7 @@
 esac
 shlibpath_var=LD_LIBRARY_PATH
 case $host_os in
- freebsd2*)
+ freebsd2.*)
 shlibpath_overrides_runpath=yes
 ;;
 freebsd3.[01]* | freebsdelf3.[01]*)
@@ -15909,17 +15862,18 @@
 ;;
 
 gnu*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
 hardcode_into_libs=yes
 ;;
 
 haiku*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 dynamic_linker="$host_os runtime_loader"
@@ -15980,7 +15934,7 @@
 ;;
 
 interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -15996,7 +15950,7 @@
 nonstopux*) version_type=nonstopux ;;
 *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -16033,9 +15987,9 @@
 dynamic_linker=no
 ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16117,7 +16071,7 @@
 ;;
 
 newsos6)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
@@ -16186,7 +16140,7 @@
 ;;
 
 solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16211,7 +16165,7 @@
 ;;
 
 sysv4 | sysv4.3*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -16235,7 +16189,7 @@
 
 sysv4*MP*)
 if test -d /usr/nec ;then
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
 soname_spec='$libname${shared_ext}.$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -16266,7 +16220,7 @@
 
 tpf*)
 # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16276,7 +16230,7 @@
 ;;
 
 uts4*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 soname_spec='${libname}${release}${shared_ext}$major'
 shlibpath_var=LD_LIBRARY_PATH
@@ -16404,25 +16358,120 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
+int
+main ()
+{
 
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
 
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
+fi
 
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
 
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
+fi
 
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		 (('a' <= (c) && (c) <= 'i') \
+		 || ('j' <= (c) && (c) <= 'r') \
+		 || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
- ac_config_commands="$ac_config_commands libtool"
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
 
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-# Only expand once:
+fi
 
 
+#AC_PROG_LIBTOOL
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -21908,6 +21957,7 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -22576,86 +22626,14 @@
 _ACEOF
 
 
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
- # Extract the first word of "valac", so it can be a program name with args.
-set dummy valac; 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_VALAC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $VALAC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_VALAC="$VALAC" # 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_VALAC="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-VALAC=$ac_cv_path_VALAC
-if test -n "$VALAC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALAC" >&5
-$as_echo "$VALAC" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test -z "$VALAC"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5
-$as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;}
-else
- if test -n "0.7.0"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.7.0" >&5
-$as_echo_n "checking $VALAC is at least version 0.7.0... " >&6; }
- am__vala_version=`$VALAC --version | sed 's/Vala *//'`
- as_arg_v1=0.7.0
-as_arg_v2="$am__vala_version"
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
- 1) :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
- 0) :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
- 2) :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "Vala 0.7.0 not found." "$LINENO" 5 ;; #(
- *) :
- ;;
-esac
-fi
-fi
-
- if test "x$VALAC" = "x" ; then
- as_fn_error $? "Cannot find the \"valac\" compiler in your PATH" "$LINENO" 5
- fi
-fi
-
 case "$host" in
 i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
 
 $as_echo "#define ARCH_X86_32 1" >>confdefs.h
 
 LIB="../deadbeef-deps/lib-x86-32"
+ YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
+ APE_USE_YASM=yes
 ;;
 x86_64-apple-*)
 
@@ -22668,6 +22646,8 @@
 $as_echo "#define ARCH_X86_64 1" >>confdefs.h
 
 LIB="../deadbeef-deps/lib-x86-64"
+ YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
+ APE_USE_YASM=yes
 ;;
 powerpc-*-* )
 
@@ -22689,8 +22669,8 @@
 esac
 
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
 
 
@@ -22731,6 +22711,20 @@
 enable_gtkui=yes
 fi
 
+# Check whether --enable-gtk3 was given.
+if test "${enable_gtk3+set}" = set; then :
+ enableval=$enable_gtk3; enable_gtk3=$enableval
+else
+ enable_gtk3=no
+fi
+
+# Check whether --enable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then :
+ enableval=$enable_gtk2; enable_gtk2=$enableval
+else
+ enable_gtk2=yes
+fi
+
 # Check whether --enable-vfs_curl was given.
 if test "${enable_vfs_curl+set}" = set; then :
 enableval=$enable_vfs_curl; enable_vfs_curl=$enableval
@@ -22955,6 +22949,34 @@
 enable_artwork_imlib2=yes
 fi
 
+# Check whether --enable-dumb was given.
+if test "${enable_dumb+set}" = set; then :
+ enableval=$enable_dumb; enable_dumb=$enableval
+else
+ enable_dumb=yes
+fi
+
+# Check whether --enable-shn was given.
+if test "${enable_shn+set}" = set; then :
+ enableval=$enable_shn; enable_shn=$enableval
+else
+ enable_shn=yes
+fi
+
+# Check whether --enable-psf was given.
+if test "${enable_psf+set}" = set; then :
+ enableval=$enable_psf; enable_psf=$enableval
+else
+ enable_psf=yes
+fi
+
+# Check whether --enable-mono2stereo was given.
+if test "${enable_mono2stereo+set}" = set; then :
+ enableval=$enable_mono2stereo; enable_mono2stereo=$enableval
+else
+ enable_mono2stereo=yes
+fi
+
 
 if test "x$enable_staticlink" != "xno" ; then
 
@@ -22965,6 +22987,45 @@
 STATICLINK=yes
 fi
 
+# Extract the first word of "yasm", so it can be a program name with args.
+set dummy yasm; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_YASM+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$HAVE_YASM"; then
+ ac_cv_prog_HAVE_YASM="$HAVE_YASM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_HAVE_YASM="yes"
+ $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_prog_HAVE_YASM" && ac_cv_prog_HAVE_YASM="no"
+fi
+fi
+HAVE_YASM=$ac_cv_prog_HAVE_YASM
+if test -n "$HAVE_YASM"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_YASM" >&5
+$as_echo "$HAVE_YASM" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
 $as_echo_n "checking for main in -ldl... " >&6; }
 if ${ac_cv_lib_dl_main+:} false; then :
@@ -23000,6 +23061,49 @@
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5
+$as_echo_n "checking for main in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_main=yes
+else
+ ac_cv_lib_socket_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
+$as_echo "$ac_cv_lib_socket_main" >&6; }
+if test "x$ac_cv_lib_socket_main" = xyes; then :
+ HAVE_SOCKET=yes;DL_LIBS="-lsocket";
+fi
+
+ac_fn_c_check_header_mongrel "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "$ac_includes_default"
+if test "x$ac_cv_header_alloca_h" = xyes; then :
+
+else
+ alloca.h not found.
+fi
+
+
+
 if test "x$enable_portable" != "xno" && test "x$enable_staticlink" != "xno" ; then
 
 cat >>confdefs.h <<_ACEOF
@@ -23110,14 +23214,90 @@
 fi
 
 
-if test "x$enable_gtkui" != "xno" ; then
+if test "x$enable_gtk3" == "xyes" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK3_DEPS" >&5
+$as_echo_n "checking for GTK3_DEPS... " >&6; }
+
+if test -n "$GTK3_DEPS_CFLAGS"; then
+ pkg_cv_GTK3_DEPS_CFLAGS="$GTK3_DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK3_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTK3_DEPS_LIBS"; then
+ pkg_cv_GTK3_DEPS_LIBS="$GTK3_DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK3_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.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
+	 GTK3_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0" 2>&1`
+ else
+	 GTK3_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK3_DEPS_PKG_ERRORS" >&5
+
+	HAVE_GTK3=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_GTK3=no
+else
+	GTK3_DEPS_CFLAGS=$pkg_cv_GTK3_DEPS_CFLAGS
+	GTK3_DEPS_LIBS=$pkg_cv_GTK3_DEPS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_GTK3=yes
+fi
+else
+ HAVE_GTK3=no
+fi
+
+if test "x$enable_gtk2" == "xyes" ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKUI_DEPS" >&5
-$as_echo_n "checking for GTKUI_DEPS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2_DEPS" >&5
+$as_echo_n "checking for GTK2_DEPS... " >&6; }
 
-if test -n "$GTKUI_DEPS_CFLAGS"; then
- pkg_cv_GTKUI_DEPS_CFLAGS="$GTKUI_DEPS_CFLAGS"
+if test -n "$GTK2_DEPS_CFLAGS"; then
+ pkg_cv_GTK2_DEPS_CFLAGS="$GTK2_DEPS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0\""; } >&5
@@ -23125,15 +23305,16 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTKUI_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>/dev/null`
+ pkg_cv_GTK2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$GTKUI_DEPS_LIBS"; then
- pkg_cv_GTKUI_DEPS_LIBS="$GTKUI_DEPS_LIBS"
+if test -n "$GTK2_DEPS_LIBS"; then
+ pkg_cv_GTK2_DEPS_LIBS="$GTK2_DEPS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0\""; } >&5
@@ -23141,7 +23322,8 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTKUI_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>/dev/null`
+ pkg_cv_GTK2_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23161,27 +23343,27 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GTKUI_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>&1`
+	 GTK2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>&1`
 else
-	 GTKUI_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>&1`
+	 GTK2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GTKUI_DEPS_PKG_ERRORS" >&5
+	echo "$GTK2_DEPS_PKG_ERRORS" >&5
 
-	HAVE_GTK=no
+	HAVE_GTK2=no
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	HAVE_GTK=no
+	HAVE_GTK2=no
 else
-	GTKUI_DEPS_CFLAGS=$pkg_cv_GTKUI_DEPS_CFLAGS
-	GTKUI_DEPS_LIBS=$pkg_cv_GTKUI_DEPS_LIBS
+	GTK2_DEPS_CFLAGS=$pkg_cv_GTK2_DEPS_CFLAGS
+	GTK2_DEPS_LIBS=$pkg_cv_GTK2_DEPS_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVE_GTK=yes
+	HAVE_GTK2=yes
 fi
 else
- HAVE_GTK=no
+ HAVE_GTK2=no
 fi
 
 if test "x$enable_alsa" != "xno" ; then
@@ -23200,6 +23382,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_ALSA_DEPS_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23216,6 +23399,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_ALSA_DEPS_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23235,9 +23419,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 ALSA_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
+	 ALSA_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa" 2>&1`
 else
-	 ALSA_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
+	 ALSA_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ALSA_DEPS_PKG_ERRORS" >&5
@@ -23277,6 +23461,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_FFMPEG_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23293,6 +23478,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_FFMPEG_DEPS_LIBS=`$PKG_CONFIG --libs "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23312,9 +23498,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FFMPEG_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>&1`
+	 FFMPEG_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>&1`
 else
-	 FFMPEG_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>&1`
+	 FFMPEG_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FFMPEG_DEPS_PKG_ERRORS" >&5
@@ -23355,6 +23541,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_DBUS_DEPS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23371,6 +23558,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_DBUS_DEPS_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23390,9 +23578,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 DBUS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
+	 DBUS_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1" 2>&1`
 else
-	 DBUS_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
+	 DBUS_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_DEPS_PKG_ERRORS" >&5
@@ -23427,6 +23615,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_PULSE_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpulse-simple" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23443,6 +23632,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_PULSE_DEPS_LIBS=`$PKG_CONFIG --libs "libpulse-simple" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -23462,9 +23652,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 PULSE_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse-simple" 2>&1`
+	 PULSE_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse-simple" 2>&1`
 else
-	 PULSE_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse-simple" 2>&1`
+	 PULSE_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse-simple" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PULSE_DEPS_PKG_ERRORS" >&5
@@ -23988,7 +24178,7 @@
 fi
 
 if test "x$enable_gtkui" != "xno" ; then
- if test "x$HAVE_GTK" = "xyes" ; then
+ if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then
 HAVE_GTKUI=yes
 fi
 fi
@@ -24127,6 +24317,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_IMLIB2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "imlib2" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -24143,6 +24334,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_IMLIB2_DEPS_LIBS=`$PKG_CONFIG --libs "imlib2" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -24162,9 +24354,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 IMLIB2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "imlib2" 2>&1`
+	 IMLIB2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "imlib2" 2>&1`
 else
-	 IMLIB2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "imlib2" 2>&1`
+	 IMLIB2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "imlib2" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$IMLIB2_DEPS_PKG_ERRORS" >&5
@@ -24264,7 +24456,7 @@
 HAVE_ADPLUG=yes
 fi
 
-if test "x$enable_ffap" != "xno" ; then
+if test "x$enable_ffap" != "xno" && ( test "x$HAVE_YASM" == "xyes" || test "x$APE_USE_YASM" != "xyes" ) ; then
 HAVE_FFAP=yes
 fi
 
@@ -24297,6 +24489,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_LIBSAMPLERATE_DEPS_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -24313,6 +24506,7 @@
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_LIBSAMPLERATE_DEPS_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
@@ -24332,9 +24526,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBSAMPLERATE_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "samplerate" 2>&1`
+	 LIBSAMPLERATE_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
 else
-	 LIBSAMPLERATE_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "samplerate" 2>&1`
+	 LIBSAMPLERATE_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBSAMPLERATE_DEPS_PKG_ERRORS" >&5
@@ -24458,12 +24652,28 @@
 fi
 
 if test "x$enable_converter" != "xno" ; then
- if test "x$HAVE_GTK" = "xyes" ; then
+ if test "x$HAVE_GTK2" = "xyes" || test "x$HAVE_GTK3" = "xyes" ; then
 HAVE_CONVERTER=yes
 fi
 fi
 
-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter"
+if test "x$enable_dumb" != "xno" ; then
+ HAVE_DUMB=yes
+fi
+
+if test "x$enable_shn" != "xno" ; then
+ HAVE_SHN=yes
+fi
+
+if test "x$enable_psf" != "xno" ; then
+ HAVE_PSF=yes
+fi
+
+if test "x$enable_mono2stereo" != "xno" ; then
+ HAVE_MONO2STEREO=yes
+fi
+
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo"
 
 if test "x$HAVE_VORBISPLUGIN" = "xyes"; then
 HAVE_VORBIS_TRUE=
@@ -24513,6 +24723,22 @@
 HAVE_GTKUI_FALSE=
 fi
 
+ if test "x$HAVE_GTK2" = "xyes"; then
+ HAVE_GTK2_TRUE=
+ HAVE_GTK2_FALSE='#'
+else
+ HAVE_GTK2_TRUE='#'
+ HAVE_GTK2_FALSE=
+fi
+
+ if test "x$HAVE_GTK3" = "xyes"; then
+ HAVE_GTK3_TRUE=
+ HAVE_GTK3_FALSE='#'
+else
+ HAVE_GTK3_TRUE='#'
+ HAVE_GTK3_FALSE=
+fi
+
 if test "x$HAVE_ALSAPLUGIN" = "xyes"; then
 HAVE_ALSA_TRUE=
 HAVE_ALSA_FALSE='#'
@@ -24785,6 +25011,46 @@
 HAVE_PNG_FALSE=
 fi
 
+ if test "x$HAVE_YASM" = "xyes"; then
+ HAVE_YASM_TRUE=
+ HAVE_YASM_FALSE='#'
+else
+ HAVE_YASM_TRUE='#'
+ HAVE_YASM_FALSE=
+fi
+
+ if test "x$HAVE_DUMB" = "xyes"; then
+ HAVE_DUMB_TRUE=
+ HAVE_DUMB_FALSE='#'
+else
+ HAVE_DUMB_TRUE='#'
+ HAVE_DUMB_FALSE=
+fi
+
+ if test "x$HAVE_PSF" = "xyes"; then
+ HAVE_PSF_TRUE=
+ HAVE_PSF_FALSE='#'
+else
+ HAVE_PSF_TRUE='#'
+ HAVE_PSF_FALSE=
+fi
+
+ if test "x$HAVE_SHN" = "xyes"; then
+ HAVE_SHN_TRUE=
+ HAVE_SHN_FALSE='#'
+else
+ HAVE_SHN_TRUE='#'
+ HAVE_SHN_FALSE=
+fi
+
+ if test "x$HAVE_MONO2STEREO" = "xyes"; then
+ HAVE_MONO2STEREO_TRUE=
+ HAVE_MONO2STEREO_FALSE='#'
+else
+ HAVE_MONO2STEREO_TRUE='#'
+ HAVE_MONO2STEREO_FALSE=
+fi
+
 
 
 
@@ -24793,7 +25059,6 @@
 echo "Build Configuration:"
 echo
 echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
-echo " * Vala: $VALAC"
 fi
 
 echo
@@ -24931,7 +25196,7 @@
 
 
 
- if test "x$HAVE_GTK" = "xyes" ; then
+ if test "x$HAVE_GTKUI" = "xyes" ; then
 echo " gtkui: yes - GTK user interface"
 else
 echo " gtkui: no - GTK user interface"
@@ -25083,9 +25348,41 @@
 
 
 
+ if test "x$HAVE_PSF" = "xyes" ; then
+ echo " psf: yes - PSF format plugin, using AOSDK"
+ else
+ echo " psf: no - PSF format plugin, using AOSDK"
+ fi
+
+
+
+ if test "x$HAVE_DUMB" = "xyes" ; then
+ echo " dumb: yes - DUMB module plugin, for MOD, S3M, etc"
+ else
+ echo " dumb: no - DUMB module plugin, for MOD, S3M, etc"
+ fi
+
+
+
+ if test "x$HAVE_SHN" = "xyes" ; then
+ echo " shn: yes - SHN plugin based on xmms-shn"
+ else
+ echo " shn: no - SHN plugin based on xmms-shn"
+ fi
+
+
+
+ if test "x$HAVE_MONO2STEREO" = "xyes" ; then
+ echo " mono2stereo: yes - mono2stereo DSP plugin"
+ else
+ echo " mono2stereo: no - mono2stereo DSP plugin"
+ fi
+
+
+
 echo
 
-ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
+ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mpgmad/Makefile plugins/vorbis/Makefile plugins/flac/Makefile plugins/wavpack/Makefile plugins/sndfile/Makefile plugins/vfs_curl/Makefile plugins/cdda/Makefile plugins/gtkui/Makefile plugins/nullout/Makefile plugins/vtx/Makefile plugins/adplug/Makefile plugins/ffmpeg/Makefile plugins/sid/Makefile plugins/oss/Makefile plugins/pulse/Makefile plugins/artwork/Makefile plugins/supereq/Makefile plugins/notify/Makefile plugins/shellexec/Makefile plugins/musepack/Makefile plugins/wildmidi/Makefile plugins/tta/Makefile plugins/dca/Makefile plugins/aac/Makefile plugins/mms/Makefile plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile plugins/ao/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
 
 
 cat >confcache <<\_ACEOF
@@ -25254,6 +25551,14 @@
 as_fn_error $? "conditional \"HAVE_GTKUI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_GTK2_TRUE}" && test -z "${HAVE_GTK2_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GTK2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GTK3_TRUE}" && test -z "${HAVE_GTK3_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GTK3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25390,6 +25695,26 @@
 as_fn_error $? "conditional \"HAVE_PNG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_YASM_TRUE}" && test -z "${HAVE_YASM_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_YASM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_DUMB_TRUE}" && test -z "${HAVE_DUMB_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_DUMB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_PSF_TRUE}" && test -z "${HAVE_PSF_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_PSF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_SHN_TRUE}" && test -z "${HAVE_SHN_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SHN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_MONO2STEREO_TRUE}" && test -z "${HAVE_MONO2STEREO_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_MONO2STEREO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -25799,7 +26124,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by deadbeef $as_me 0.5.1, which was
+This file was extended by deadbeef $as_me 0.5.2, which was
 generated by GNU Autoconf 2.68. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -25865,7 +26190,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-deadbeef config.status 0.5.1
+deadbeef config.status 0.5.2
 configured by $0, generated by GNU Autoconf 2.68,
 with options \\"\$ac_cs_config\\"
 
@@ -26002,6 +26327,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -26084,7 +26410,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -26156,7 +26481,6 @@
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -26195,6 +26519,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -26245,7 +26570,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -26279,7 +26603,6 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -26419,6 +26742,10 @@
 "plugins/m3u/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/m3u/Makefile" ;;
 "plugins/vfs_zip/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/vfs_zip/Makefile" ;;
 "plugins/converter/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/converter/Makefile" ;;
+ "plugins/dumb/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dumb/Makefile" ;;
+ "plugins/ao/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/ao/Makefile" ;;
+ "plugins/shn/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/shn/Makefile" ;;
+ "plugins/mono2stereo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mono2stereo/Makefile" ;;
 "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 "deadbeef.desktop") CONFIG_FILES="$CONFIG_FILES deadbeef.desktop" ;;
@@ -27134,8 +27461,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # Written by Gordon Matzigkeit, 1996
 #
 # This file is part of GNU Libtool.
@@ -27189,6 +27516,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -27490,10 +27820,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -27836,10 +28162,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking. This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX

deadbeef-0.5.1.tar.bz2/configure.ac -> deadbeef-0.5.2.tar.bz2/configure.ac Changed

@@ -1,17 +1,19 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([deadbeef], [0.5.1])
+AC_INIT([deadbeef], [0.5.2])
 
 AC_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE([1.11 dist-bzip2])
+AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE()
 
 AC_USE_SYSTEM_EXTENSIONS
+LT_INIT
 AC_PROG_CC
 AC_PROG_CXX
 AC_STDC_HEADERS
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+#AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_C_BIGENDIAN
 AM_GNU_GETTEXT
@@ -24,17 +26,12 @@
 test "$prefix" = NONE && prefix=/usr/local
 AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", [Name of gettext locale directory])
 
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-    AM_PROG_VALAC([0.7.0])
-    if test "x$VALAC" = "x" ; then
-        AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
-    fi
-fi
-
 case "$host" in
   i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
     LIB="../deadbeef-deps/lib-x86-32"
+    YASM_FLAGS="-f elf -D ARCH_X86_32 -m x86"
+    APE_USE_YASM=yes
     ;;
   x86_64-apple-*)
     AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX])
@@ -43,6 +40,8 @@
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
     LIB="../deadbeef-deps/lib-x86-64"
+    YASM_FLAGS="-f elf -D ARCH_X86_64 -m amd64"
+    APE_USE_YASM=yes
     ;;
   powerpc-*-* )
     AC_DEFINE(ARCH_PPC_32, 1, [architecture is ppc32])
@@ -57,10 +56,10 @@
     ;;
 esac
 AC_SUBST(LIB)
+AC_SUBST(YASM_FLAGS)
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
-
 dnl INSANE_CFLAGS="-Wformat -Wdisabled-optimization -Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast"
 dnl INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits"
 
@@ -71,8 +70,9 @@
 AC_ARG_ENABLE(alsa,     [AS_HELP_STRING([--disable-alsa    ], [disable ALSA output plugin (default: enabled)])], [enable_alsa=$enableval], [enable_alsa=yes])
 AC_ARG_ENABLE(oss,      [AS_HELP_STRING([--disable-oss     ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
 AC_ARG_ENABLE(pulse,    [AS_HELP_STRING([--disable-pulse   ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
-AC_ARG_ENABLE(gtkui,    [AS_HELP_STRING([--disable-gtkui   ], [disable standard GTK2 user interface plugin (default: enabled)])], [enable_gtkui=$enableval], [enable_gtkui=yes])
-dnl AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--enable-gtk3     ], [use GTK3 library (default: disabled)])], [enable_gtk3=$enableval], [enable_gtk3=no])
+AC_ARG_ENABLE(gtkui,    [AS_HELP_STRING([--disable-gtkui   ], [disable standard GTK+ user interface plugin (default: enabled)])], [enable_gtkui=$enableval], [enable_gtkui=yes])
+AC_ARG_ENABLE(gtk3,     [AS_HELP_STRING([--enable-gtk3     ], [build GTK3 version of gtkui plugin (default: disabled)])], [enable_gtk3=$enableval], [enable_gtk3=no])
+AC_ARG_ENABLE(gtk2,     [AS_HELP_STRING([--disable-gtk2     ], [build GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
 AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
 AC_ARG_ENABLE(lfm,      [AS_HELP_STRING([--disable-lfm     ], [disable last.fm/libre.fm scrobbler plugin (default: enabled)])], [enable_lfm=$enableval], [enable_lfm=yes])
 AC_ARG_ENABLE(artwork,  [AS_HELP_STRING([--disable-artwork ], [disable album art loader plugin (default: enabled)])], [enable_artwork=$enableval], [enable_artwork=yes])
@@ -105,15 +105,27 @@
 AC_ARG_ENABLE(vfs-zip,      [AS_HELP_STRING([--enable-vfs-zip      ], [build vfs_zip plugin (default: auto)])], [enable_vfs_zip=$enableval], [enable_vfs_zip=yes])
 AC_ARG_ENABLE(converter,      [AS_HELP_STRING([--enable-converter      ], [build converter plugin (default: auto)])], [enable_converter=$enableval], [enable_converter=yes])
 AC_ARG_ENABLE(artwork-imlib2, [AS_HELP_STRING([--enable-artwork-imlib2      ], [use imlib2 in artwork plugin (default: auto)])], [enable_artwork_imlib2=$enableval], [enable_artwork_imlib2=yes])
+AC_ARG_ENABLE(dumb,      [AS_HELP_STRING([--enable-dumb      ], [build DUMB plugin (default: auto)])], [enable_dumb=$enableval], [enable_dumb=yes])
+AC_ARG_ENABLE(shn,      [AS_HELP_STRING([--enable-shn      ], [build SHN plugin (default: auto)])], [enable_shn=$enableval], [enable_shn=yes])
+AC_ARG_ENABLE(psf,      [AS_HELP_STRING([--enable-psf      ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes])
+AC_ARG_ENABLE(mono2stereo,      [AS_HELP_STRING([--enable-mono2stereo      ], [build mono2stereo DSP plugin (default: auto)])], [enable_mono2stereo=$enableval], [enable_mono2stereo=yes])
 
 if test "x$enable_staticlink" != "xno" ; then
     AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version])
     STATICLINK=yes
 fi
 
+dnl check for yasm
+AC_CHECK_PROG(HAVE_YASM, yasm, yes, no)
+
 dnl check for libdl
 AC_CHECK_LIB([dl], [main], [HAVE_DL=yes;DL_LIBS="-ldl";AC_SUBST(DL_LIBS)])
 
+dnl check libsocket (OpenIndiana)
+AC_CHECK_LIB([socket], [main], [HAVE_SOCKET=yes;DL_LIBS="-lsocket";AC_SUBST(DL_LIBS)])
+dnl check for seperate alloca.h (OpenIndiana)
+AC_CHECK_HEADER([alloca.h],[],[alloca.h not found.])
+
 if test "x$enable_portable" != "xno" && test "x$enable_staticlink" != "xno" ; then
     AC_DEFINE_UNQUOTED([PORTABLE], [1], [Define if building portable version])
     PORTABLE=yes
@@ -150,14 +162,16 @@
 fi
 AC_SUBST(ZIP_LIBS)
 
-if test "x$enable_gtkui" != "xno" ; then
-dnl    if test "x$enable_gtk3" == "xyes" ; then
-dnl        PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-3.0 >= 2.90 gthread-2.0 glib-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-dnl    else
-        PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-dnl    fi
+if test "x$enable_gtk3" == "xyes" ; then
+    PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
 else
-    HAVE_GTK=no
+    HAVE_GTK3=no
+fi
+
+if test "x$enable_gtk2" == "xyes" ; then
+    PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
+else
+    HAVE_GTK2=no
 fi
 
 if test "x$enable_alsa" != "xno" ; then
@@ -322,7 +336,7 @@
 
 dnl gtkui plugin
 if test "x$enable_gtkui" != "xno" ; then
-    if test "x$HAVE_GTK" = "xyes" ; then
+    if test "x$HAVE_GTK2" == "xyes" || test "x$HAVE_GTK3" == "xyes" ; then
         HAVE_GTKUI=yes
     fi
 fi
@@ -440,7 +454,7 @@
     HAVE_ADPLUG=yes
 fi
 
-if test "x$enable_ffap" != "xno" ; then
+if test "x$enable_ffap" != "xno" && ( test "x$HAVE_YASM" == "xyes" || test "x$APE_USE_YASM" != "xyes" ) ; then
     HAVE_FFAP=yes
 fi
 
@@ -533,12 +547,28 @@
 fi
 
 if test "x$enable_converter" != "xno" ; then
-    if test "x$HAVE_GTK" = "xyes" ; then
+    if test "x$HAVE_GTK2" = "xyes" || test "x$HAVE_GTK3" = "xyes" ; then
         HAVE_CONVERTER=yes
     fi
 fi
 
-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter"
+if test "x$enable_dumb" != "xno" ; then
+    HAVE_DUMB=yes
+fi
+
+if test "x$enable_shn" != "xno" ; then
+    HAVE_SHN=yes
+fi
+
+if test "x$enable_psf" != "xno" ; then
+    HAVE_PSF=yes
+fi
+
+if test "x$enable_mono2stereo" != "xno" ; then
+    HAVE_MONO2STEREO=yes
+fi
+
+PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo"
 
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
@@ -546,6 +576,8 @@
 AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_CDDA, test "x$HAVE_CDDAPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_GTKUI, test "x$HAVE_GTKUI" = "xyes")
+AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes")
+AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
 AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
@@ -580,6 +612,11 @@
 AM_CONDITIONAL(HAVE_IMLIB2, test "x$HAVE_IMLIB2" = "xyes")
 AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
 AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
+AM_CONDITIONAL(HAVE_YASM, test "x$HAVE_YASM" = "xyes")
+AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes")
+AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes")
+AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
+AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes")
 
 AC_SUBST(PLUGINS_DIRS)
 
@@ -588,7 +625,6 @@
 echo "Build Configuration:"
 echo
 echo "* Maintainer Mode:        $USE_MAINTAINER_MODE"
-echo "    * Vala:               $VALAC"
 fi
 
 dnl print summary
@@ -622,7 +658,7 @@
 PRINT_PLUGIN_INFO([adplug],[adplug player (OPL2/OPL3 emulation)],[test "x$HAVE_ADPLUG" = "xyes"])
 PRINT_PLUGIN_INFO([vfs_curl],[http/ftp streaming support],[test "x$HAVE_VFS_CURL" = "xyes"])
 PRINT_PLUGIN_INFO([cdda],[cd audio player],[test "x$HAVE_CDDAPLUGIN" = "xyes"])
-PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTK" = "xyes"])
+PRINT_PLUGIN_INFO([gtkui],[GTK user interface],[test "x$HAVE_GTKUI" = "xyes"])
 PRINT_PLUGIN_INFO([hotkeys],[Global hotkeys support],[test "x$HAVE_HOTKEYS" = "xyes"])
 PRINT_PLUGIN_INFO([ffmpeg],[ffmpeg codecs],[test "x$HAVE_FFMPEGPLUGIN" = "xyes"])
 PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"])
@@ -641,6 +677,10 @@
 PRINT_PLUGIN_INFO([m3u],[M3U and PLS playlist support],[test "x$HAVE_M3U" = "xyes"])
 PRINT_PLUGIN_INFO([vfs_zip],[zip archive support],[test "x$HAVE_VFS_ZIP" = "xyes"])
 PRINT_PLUGIN_INFO([converter],[plugin for converting files to any formats],[test "x$HAVE_CONVERTER" = "xyes"])
+PRINT_PLUGIN_INFO([psf],[PSF format plugin, using AOSDK],[test "x$HAVE_PSF" = "xyes"])
+PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"])
+PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
+PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
 
 echo
 
@@ -682,6 +722,10 @@
 plugins/m3u/Makefile
 plugins/vfs_zip/Makefile
 plugins/converter/Makefile
+plugins/dumb/Makefile
+plugins/ao/Makefile
+plugins/shn/Makefile
+plugins/mono2stereo/Makefile
 intl/Makefile
 po/Makefile.in
 deadbeef.desktop

deadbeef-0.5.1.tar.bz2/deadbeef.h -> deadbeef-0.5.2.tar.bz2/deadbeef.h Changed

@@ -2,7 +2,7 @@
 deadbeef.h -- plugin API of the DeaDBeeF audio player
 http://deadbeef.sourceforge.net
 
- Copyright (C) 2009-2011 Alexey Yakovenko
+ Copyright (C) 2009-2012 Alexey Yakovenko
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -61,6 +61,7 @@
 
 // api version history:
 // 9.9 -- devel
+// 1.2 -- deadbeef-0.5.2
 // 1.1 -- deadbeef-0.5.1
 // adds pass_through method to dsp plugins for optimization purposes
 // 1.0 -- deadbeef-0.5.0
@@ -76,7 +77,7 @@
 // 0.1 -- deadbeef-0.2.0
 
 #define DB_API_VERSION_MAJOR 1
-#define DB_API_VERSION_MINOR 1
+#define DB_API_VERSION_MINOR 2
 
 #define DDB_PLUGIN_SET_API_VERSION\
 .plugin.api_vmajor = DB_API_VERSION_MAJOR,\
@@ -633,7 +634,7 @@
 // junk reading/writing
 int (*junk_id3v1_read) (DB_playItem_t *it, DB_FILE *fp);
 int (*junk_id3v1_find) (DB_FILE *fp);
- int (*junk_id3v1_write) (FILE *fp, DB_playItem_t *it);
+ int (*junk_id3v1_write) (FILE *fp, DB_playItem_t *it, const char *enc);
 int (*junk_id3v2_find) (DB_FILE *fp, int *psize);
 int (*junk_id3v2_read) (DB_playItem_t *it, DB_FILE *fp);
 int (*junk_id3v2_read_full) (DB_playItem_t *it, DB_id3v2_tag_t *tag, DB_FILE *fp);
@@ -725,8 +726,32 @@
 int (*dsp_preset_load) (const char *fname, struct ddb_dsp_context_s **head);
 int (*dsp_preset_save) (const char *fname, struct ddb_dsp_context_s *head);
 void (*dsp_preset_free) (struct ddb_dsp_context_s *head);
+
+ // ******* new 1.2 APIs ********
+ ddb_playlist_t *(*plt_alloc) (const char *title);
+ void (*plt_free) (ddb_playlist_t *plt);
+
+ void (*plt_set_fast_mode) (ddb_playlist_t *plt, int fast);
+ int (*plt_is_fast_mode) (ddb_playlist_t *plt);
+
+ const char * (*metacache_add_string) (const char *str);
+ void (*metacache_remove_string) (const char *str);
+ void (*metacache_ref) (const char *str);
+ void (*metacache_unref) (const char *str);
+
+ // this function must return original un-overriden value (ignoring the keys prefixed with '!')
+ const char *(*pl_find_meta_raw) (DB_playItem_t *it, const char *key);
 } DB_functions_t;
 
+// NOTE: an item placement must be selected like this
+// if (flags & DB_ACTION_COMMON) -> main menu, or nowhere, or where GUI plugin wants
+// basically, to put it into main menu, prefix the item title with the menu name
+// e.g. title = "File/MyItem" --> this will add the item under File menu
+// 
+// if (flags & PLAYLIST) -> playlist (tab) context menu
+//
+// if (none of the above) -> track context menu
+
 enum {
 /* Action in main menu (or whereever ui prefers) */
 DB_ACTION_COMMON = 1 << 0,
@@ -741,12 +766,21 @@
 DB_ACTION_CAN_MULTIPLE_TRACKS = 1 << 3,
 
 /* Action is inactive */
- DB_ACTION_DISABLED = 1 << 4
+ DB_ACTION_DISABLED = 1 << 4,
+
+ /* Action for the playlist (tab) */
+ /* this is new in 0.5.2 (API v1.2) */
+ DB_ACTION_PLAYLIST = 1 << 5,
 };
 
 struct DB_plugin_action_s;
 
-typedef int (*DB_plugin_action_callback_t) (struct DB_plugin_action_s *action, DB_playItem_t *it);
+// userdata type depends on type of action
+// it must be NULL for DB_ACTION_COMMON
+// or ddb_playlist_t * for DB_ACTION_PLAYLIST
+// or ddb_playItem_t * for none of the above (track context menu)
+typedef int (*DB_plugin_action_callback_t) (struct DB_plugin_action_s *action, void *userdata);
+#define DDB_ACTION_CALLBACK(x)((int (*)(struct DB_plugin_action_s *action, void *userdata))x)
 
 typedef struct DB_plugin_action_s {
 const char *title;

deadbeef-0.5.1.tar.bz2/dsppreset.c -> deadbeef-0.5.2.tar.bz2/dsppreset.c Changed

deadbeef-0.5.1.tar.bz2/dsppreset.h -> deadbeef-0.5.2.tar.bz2/dsppreset.h Changed

deadbeef-0.5.1.tar.bz2/examples/dsp_template.c -> deadbeef-0.5.2.tar.bz2/examples/dsp_template.c Changed

deadbeef-0.5.1.tar.bz2/icons/Makefile.in -> deadbeef-0.5.2.tar.bz2/icons/Makefile.in Changed

@@ -45,6 +45,12 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -86,6 +92,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -133,14 +140,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -230,7 +240,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -241,6 +250,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@

deadbeef-0.5.1.tar.bz2/junklib.c -> deadbeef-0.5.2.tar.bz2/junklib.c Changed

deadbeef-0.5.1.tar.bz2/junklib.h -> deadbeef-0.5.2.tar.bz2/junklib.h Changed

deadbeef-0.5.1.tar.bz2/ltmain.sh -> deadbeef-0.5.2.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 # --quiet, --silent don't print informational messages
 # --no-quiet, --no-silent
 # print informational messages (default)
+# --no-warn don't display warning messages
 # --tag=TAG use configuration variables from tag TAG
 # -v, --verbose print more informational messages than default
 # --no-verbose don't print the extra informational messages
@@ -69,7 +70,7 @@
 # compiler:		$LTCC
 # compiler flags:		$LTCFLAGS
 # linker:		$LD (gnu? $with_gnu_ld)
-# $progname:	(GNU libtool) 2.4
+# $progname:	(GNU libtool) 2.4.2
 # automake:	$automake_version
 # autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
 ;;
 *)
 save_IFS="$IFS"
- IFS=:
+ IFS=${PATH_SEPARATOR-:}
 for progdir in $PATH; do
 IFS="$save_IFS"
 test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
 }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+ --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
 --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
 *.[cCFSifmso] | \
 *.ada | *.adb | *.ads | *.asm | \
 *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
 func_xform "$libobj"
 libobj=$func_xform_result
 ;;
@@ -3201,11 +3202,13 @@
 
 # Set up the ranlib parameters.
 oldlib="$destdir/$name"
+ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+ tool_oldlib=$func_to_tool_file_result
 
 func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
 if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
 fi
 
 # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	 # linked before any other PIC object. But we must not use
 	 # pic_flag when linking with -static. The problem exists in
 	 # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	 *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	 *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	 pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	 *-*-hpux*)
 	 pic_flag_for_symtable=" $pic_flag" ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
- for lt_wr_arg
- do
- case \$lt_wr_arg in
- --lt-*) ;;
- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- esac
- shift
- done
+ case \" \$* \" in
+ *\\ --lt-*)
+ for lt_wr_arg
+ do
+ case \$lt_wr_arg in
+ --lt-*) ;;
+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+ esac
+ shift
+ done ;;
+ esac
 func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	 func_emit_wrapper yes |
- $SED -e 's/$[\\"]$/\\\1/g' \
-	 -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
+	 $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$[\\"]$/\\\1/g
+s/$/\\n/
+s/$[^\n]*$.*/ fputs ("\1", f);/p
+g
+D'
 cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	 if test "$linkmode,$pass" = "prog,link"; then
 	 compile_deplibs="$deplib $compile_deplibs"
 	 finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	 test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	 elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		 case $libdir in
@@ -7316,6 +7330,7 @@
 	 # which has an extra 1 added just for fun
 	 #
 	 case $version_type in
+	 # correct linux to gnu/linux during the next big refactor
 	 darwin|linux|osf|windows|none)
 	 func_arith $number_major + $number_minor
 	 current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	 versuffix="$major.$revision"
 	 ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	 func_arith $current - $age
 	 major=.$func_arith_result
 	 versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
 # Test again, we may have decided not to build it any more
 if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	 *\$LD\ *) wl= ;;
+ esac
 	if test "$hardcode_into_libs" = yes; then
 	 # Hardcode the library paths
 	 hardcode_libdirs=
@@ -8050,7 +8070,7 @@
 	 elif test -n "$runpath_var"; then
 	 case "$perm_rpath " in
 	 *" $libdir "*) ;;
-	 *) func_apped perm_rpath " $libdir" ;;
+	 *) func_append perm_rpath " $libdir" ;;
 	 esac
 	 fi
 	 done
@@ -8058,11 +8078,7 @@
 	 if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
 	 libdir="$hardcode_libdirs"
-	 if test -n "$hardcode_libdir_flag_spec_ld"; then
-	 eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	 else
-	 eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	 fi
+	 eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	 fi
 	 if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	 # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	 esac
 	 done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	 *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		 func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

deadbeef-0.5.1.tar.bz2/main.c -> deadbeef-0.5.2.tar.bz2/main.c Changed

deadbeef-0.5.1.tar.bz2/messagepump.c -> deadbeef-0.5.2.tar.bz2/messagepump.c Changed

deadbeef-0.5.1.tar.bz2/messagepump.h -> deadbeef-0.5.2.tar.bz2/messagepump.h Changed

deadbeef-0.5.1.tar.bz2/metacache.c -> deadbeef-0.5.2.tar.bz2/metacache.c Changed

deadbeef-0.5.1.tar.bz2/metacache.h -> deadbeef-0.5.2.tar.bz2/metacache.h Changed

deadbeef-0.5.1.tar.bz2/optmath.h -> deadbeef-0.5.2.tar.bz2/optmath.h Changed

deadbeef-0.5.1.tar.bz2/pixmaps/Makefile.in -> deadbeef-0.5.2.tar.bz2/pixmaps/Makefile.in Changed

@@ -45,6 +45,12 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -77,6 +83,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -124,14 +131,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -221,7 +231,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -232,6 +241,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@

deadbeef-0.5.1.tar.bz2/playlist.c -> deadbeef-0.5.2.tar.bz2/playlist.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
@@ -31,7 +34,7 @@
 #include <time.h>
 #include <sys/time.h>
 #ifndef __linux__
-#define _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 1
 #endif
 #include <limits.h>
 #include <errno.h>
@@ -76,6 +79,7 @@
 #define trace(fmt,...)
 
 #define SKIP_BLANK_CUE_TRACKS 0
+#define MAX_CUE_TRACKS 99
 
 #define min(x,y) ((x)<(y)?(x):(y))
 
@@ -101,7 +105,7 @@
 .refc = 1
 }; 
 
-static int pl_order; // mirrors "playback.order" config variable
+static int pl_order = -1; // mirrors "playback.order" config variable
 
 static int no_remove_notify;
 
@@ -109,12 +113,16 @@
 
 void
 pl_set_order (int order) {
- if (pl_order != order || pl_order == PLAYBACK_ORDER_SHUFFLE_TRACKS || pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
+ int prev_order = pl_order;
+
+ if (pl_order != order) {
 pl_order = order;
 for (playlist_t *plt = playlists_head; plt; plt = plt->next) {
 plt_reshuffle (plt, NULL, NULL);
 }
 }
+
+ streamer_notify_order_changed (prev_order, pl_order);
 }
 
 int
@@ -142,7 +150,7 @@
 
 for (playItem_t *it = playlists_head->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
 if (it->_refc > 1) {
- fprintf (stderr, "\033[0;31mWARNING: playitem %p %s has refc=%d at delete time\033[37;0m\n", it, pl_find_meta (it, ":URI"), it->_refc);
+ fprintf (stderr, "\033[0;31mWARNING: playitem %p %s(%s) has refc=%d at delete time\033[37;0m\n", it, pl_find_meta_raw (it, ":URI"), pl_find_meta_raw (it, "track"), it->_refc);
 }
 }
 
@@ -162,6 +170,7 @@
 mutex_plt = 0;
 }
 #endif
+ playlist = NULL;
 }
 
 #if DEBUG_LOCKING
@@ -323,6 +332,15 @@
 return 0;
 }
 
+playlist_t *
+plt_alloc (const char *title) {
+ playlist_t *plt = malloc (sizeof (playlist_t));
+ memset (plt, 0, sizeof (playlist_t));
+ plt->refc = 1;
+ plt->title = strdup (title);
+ return plt;
+}
+
 int
 plt_add (int before, const char *title) {
 assert (before >= 0);
@@ -331,10 +349,7 @@
 fprintf (stderr, "can't create more than 100 playlists. sorry.\n");
 return -1;
 }
- playlist_t *plt = malloc (sizeof (playlist_t));
- memset (plt, 0, sizeof (playlist_t));
- plt->refc = 1;
- plt->title = strdup (title);
+ playlist_t *plt = plt_alloc (title);
 plt_modified (plt);
 
 LOCK;
@@ -394,7 +409,7 @@
 conf_save ();
 messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
 }
- return playlists_count-1;
+ return before;
 }
 
 // NOTE: caller must ensure that configuration is saved after that call
@@ -866,19 +881,19 @@
 }
 
 static playItem_t *
-plt_process_cue_track (playlist_t *playlist, playItem_t *after, const char *fname, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
+plt_process_cue_track (playlist_t *playlist, const char *fname, playItem_t **prev, char *track, char *index00, char *index01, char *pregap, char *title, char *albumperformer, char *performer, char *albumtitle, char *genre, char *date, char *replaygain_album_gain, char *replaygain_album_peak, char *replaygain_track_gain, char *replaygain_track_peak, const char *decoder_id, const char *ftype, int samplerate) {
 if (!track[0]) {
 trace ("pl_process_cue_track: invalid track (file=%s, title=%s)\n", fname, title);
- return after;
+ return NULL;
 }
 if (!index00[0] && !index01[0]) {
 trace ("pl_process_cue_track: invalid index (file=%s, title=%s, track=%s)\n", fname, title, track);
- return after;
+ return NULL;
 }
 #if SKIP_BLANK_CUE_TRACKS
 if (!title[0]) {
 trace ("pl_process_cue_track: invalid title (file=%s, title=%s, track=%s)\n", fname, title, track);
- return after;
+ return NULL;
 }
 #endif
 // fix track number
@@ -907,7 +922,7 @@
 }
 else {
 trace ("pl_process_cue_track: invalid pregap or index01 (pregap=%s, index01=%s)\n", pregap, index01);
- return after;
+ return NULL;
 }
 (*prev)->endsample = (prevtime * samplerate) - 1;
 plt_set_item_duration (playlist, *prev, (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate);
@@ -932,7 +947,7 @@
 if (!index01[0]) {
 *prev = NULL;
 trace ("pl_process_cue_track: invalid index01 (pregap=%s, index01=%s)\n", pregap, index01);
- return after;
+ return NULL;
 }
 playItem_t *it = pl_item_alloc_init (fname, decoder_id);
 pl_set_meta_int (it, ":TRACKNUM", atoi (track));
@@ -976,8 +991,6 @@
 pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (replaygain_track_peak));
 }
 it->_flags |= DDB_IS_SUBTRACK | DDB_TAG_CUESHEET;
- after = pl_insert_item (after, it);
- pl_item_unref (it);
 *prev = it;
 return it;
 }
@@ -1001,6 +1014,11 @@
 char replaygain_album_peak[256] = "";
 char replaygain_track_gain[256] = "";
 char replaygain_track_peak[256] = "";
+ const char *filetype = pl_find_meta_raw (origin, ":FILETYPE");
+
+ playItem_t *cuetracks[MAX_CUE_TRACKS];
+ int ncuetracks = 0;
+
 playItem_t *prev = NULL;
 while (buffersize > 0) {
 const uint8_t *p = buffer;
@@ -1050,12 +1068,17 @@
 pl_get_value_from_cue (p + 9, sizeof (date), date);
 }
 else if (!strncmp (p, "TRACK ", 6)) {
- trace ("cue: adding track: %s %s %s\n", pl_find_meta (origin, ":URI"), title, track);
+ trace ("cue: adding track: %s %s %s\n", pl_find_meta_raw (origin, ":URI"), title, track);
 if (title[0]) {
 // add previous track
- const char *filetype = pl_find_meta (origin, ":FILETYPE");
- after = plt_process_cue_track (playlist, after, pl_find_meta (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta (origin, ":DECODER"), filetype, samplerate);
- trace ("cue: added %p (%p)\n", after);
+ playItem_t *it = plt_process_cue_track (playlist, pl_find_meta_raw (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta_raw (origin, ":DECODER"), filetype, samplerate);
+ trace ("cue: added %p\n", it);
+ if (it) {
+ if (it->startsample >= numsamples || it->endsample >= numsamples) {
+ goto error;
+ }
+ cuetracks[ncuetracks++] = it;
+ }
 }
 
 track[0] = 0;
@@ -1094,38 +1117,60 @@
 // fprintf (stderr, "got unknown line:\n%s\n", p);
 }
 }
- if (!title[0]) {
+ if (title[0]) {
+ // handle last track
+ playItem_t *it = plt_process_cue_track (playlist, pl_find_meta_raw (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta_raw (origin, ":DECODER"), filetype, samplerate);
+ if (it) {
+ trace ("last track endsample: %d\n", numsamples-1);
+ it->endsample = numsamples-1;
+ if (it->endsample >= numsamples || it->startsample >= numsamples) {
+ goto error;
+ }
+ plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate);
+ cuetracks[ncuetracks++] = it;
+ }
+ }
+
+ if (!ncuetracks) {
 UNLOCK;
 return NULL;
 }
- const char *filetype = pl_find_meta (origin, ":FILETYPE");
- after = plt_process_cue_track (playlist, after, pl_find_meta (origin, ":URI"), &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, pl_find_meta (origin, ":DECODER"), filetype, samplerate);
- if (after) {
- trace ("last track endsample: %d\n", numsamples-1);
- after->endsample = numsamples-1;
- plt_set_item_duration (playlist, after, (float)(after->endsample - after->startsample + 1) / samplerate);
- }
- // add caller ref
- if (after && after != ins) {
- pl_item_ref (after);
+
+ playItem_t *last = cuetracks[ncuetracks-1];
+ pl_item_ref (last);
+
+ for (int i = 0; i < ncuetracks; i++) {
+ after = plt_insert_item (playlist, after, cuetracks[i]);
+ pl_item_unref (cuetracks[i]);
 }
- // copy metadata from embedded tags
 playItem_t *first = ins ? ins->next[PL_MAIN] : playlist->head[PL_MAIN];
+ if (!first) {
+ UNLOCK;
+ return NULL;
+ }
+ // copy metadata from embedded tags
 uint32_t f = pl_get_item_flags (origin);
 f |= DDB_TAG_CUESHEET | DDB_IS_SUBTRACK;
- if (pl_find_meta (origin, "cuesheet")) {
+ if (pl_find_meta_raw (origin, "cuesheet")) {
 f |= DDB_HAS_EMBEDDED_CUESHEET;
 }
 pl_set_item_flags (origin, f);
 pl_items_copy_junk (origin, first, after);
 UNLOCK;
 return after;
+error:
+ trace ("cue parsing error occured\n");
+ for (int i = 0; i < ncuetracks; i++) {
+ pl_item_unref (cuetracks[i]);
+ }
+ UNLOCK;
+ return NULL;
 }
 
 playItem_t *
 plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int numsamples, int samplerate) {
 trace ("pl_insert_cue numsamples=%d, samplerate=%d\n", numsamples, samplerate);
- const char *fname = pl_find_meta (origin, ":URI");
+ const char *fname = pl_find_meta_raw (origin, ":URI");
 int len = strlen (fname);
 char cuename[len+5];
 strcpy (cuename, fname);
@@ -1160,263 +1205,6 @@
 return plt_insert_cue_from_buffer (plt, after, origin, buf, sz, numsamples, samplerate);
 }
 
-playItem_t *
-plt_insert_m3u (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- trace ("enter pl_insert_m3u\n");
- // skip all empty lines and comments
- DB_FILE *fp = vfs_fopen (fname);
- if (!fp) {
- trace ("failed to open file %s\n", fname);
- return NULL;
- }
- int sz = vfs_fgetlength (fp);
- if (sz > 1024*1024) {
- vfs_fclose (fp);
- trace ("file %s is too large to be a playlist\n", fname);
- return NULL;
- }
- trace ("loading m3u...\n");
- uint8_t buffer[sz];
- vfs_fread (buffer, 1, sz, fp);
- vfs_fclose (fp);
- const uint8_t *p = buffer;
- const uint8_t *end = buffer+sz;
- while (p < end) {
- p = pl_str_skipspaces (p, end);
- if (p >= end) {
- break;
- }
- if (*p == '#') {
- while (p < end && *p >= 0x20) {
- p++;
- }
- if (p >= end) {
- break;
- }
- continue;
- }
- const uint8_t *e = p;
- while (e < end && *e >= 0x20) {
- e++;
- }
- int n = e-p;
- uint8_t nm[n+1];
- memcpy (nm, p, n);
- nm[n] = 0;
- trace ("pl_insert_m3u: adding file %s\n", nm);
- playItem_t *it = plt_insert_file (plt, after, nm, pabort, cb, user_data);
- if (it) {
- after = it;
- }
- if (pabort && *pabort) {
- return after;
- }
- p = e;
- if (p >= end) {
- break;
- }
- }
- trace ("leave pl_insert_m3u\n");
- return after;
-}
-
-// that has to be opened with vfs functions to allow loading from http, as
-// referenced from M3U.
-static playItem_t *
-plt_insert_pls (playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- DB_FILE *fp = vfs_fopen (fname);
- if (!fp) {
- trace ("failed to open file %s\n", fname);
- return NULL;
- }
- int sz = vfs_fgetlength (fp);
- if (sz > 1024*1024) {
- vfs_fclose (fp);
- trace ("file %s is too large to be a playlist\n", fname);
- return NULL;
- }
- if (sz < 10) {
- vfs_fclose (fp);
- trace ("file %s is too small to be a playlist (%d)\n", fname, sz);
- return NULL;
- }
- vfs_rewind (fp);
- uint8_t buffer[sz];
- vfs_fread (buffer, 1, sz, fp);
- vfs_fclose (fp);
- // 1st line must be "[playlist]"
- const uint8_t *p = buffer;
- const uint8_t *end = buffer+sz;
- if (strncasecmp (p, "[playlist]", 10)) {
- trace ("file %s doesn't begin with [playlist]\n", fname);
- return NULL;
- }
- p += 10;
- p = pl_str_skipspaces (p, end);
- if (p >= end) {
- trace ("file %s finished before numberofentries had been read\n", fname);
- return NULL;
- }
- // fetch all tracks
- char url[1024] = "";
- char title[1024] = "";
- char length[20] = "";
- int lastidx = -1;
- while (p < end) {
- p = pl_str_skipspaces (p, end);
- if (p >= end) {
- break;
- }
- if (end-p < 6) {
- break;
- }
- const uint8_t *e;
- int n;
- if (!strncasecmp (p, "numberofentries=", 16) || !strncasecmp (p, "version=", 8)) {
- while (p < end && *p >= 0x20) {
- p++;
- }
- continue;
- }
- else if (!strncasecmp (p, "file", 4)) {
- int idx = atoi (p + 4);
- if (url[0] && idx != lastidx && lastidx != -1) {
- // add track
- playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data);
- if (it) {
- after = it;
- plt_set_item_duration (playlist, it, atoi (length));
- if (title[0]) {
- pl_delete_all_meta (it);
- pl_add_meta (it, "title", title);
- }
- }
- if (pabort && *pabort) {
- return after;
- }
- url[0] = 0;
- title[0] = 0;
- length[0] = 0;
- }
- lastidx = idx;
- p += 4;
- while (p < end && *p != '=') {
- p++;
- }
- p++;
- if (p >= end) {
- break;
- }
- e = p;
- while (e < end && *e >= 0x20) {
- e++;
- }
- n = e-p;
- n = min (n, sizeof (url)-1);
- memcpy (url, p, n);
- url[n] = 0;
- trace ("url: %s\n", url);
- p = ++e;
- }
- else if (!strncasecmp (p, "title", 5)) {
- int idx = atoi (p + 5);
- if (url[0] && idx != lastidx && lastidx != -1) {
- // add track
- playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data);
- if (it) {
- after = it;
- plt_set_item_duration (playlist, it, atoi (length));
- if (title[0]) {
- pl_delete_all_meta (it);
- pl_add_meta (it, "title", title);
- }
- }
- if (pabort && *pabort) {
- return after;
- }
- url[0] = 0;
- title[0] = 0;
- length[0] = 0;
- }
- lastidx = idx;
- p += 5;
- while (p < end && *p != '=') {
- p++;
- }
- p++;
- if (p >= end) {
- break;
- }
- e = p;
- while (e < end && *e >= 0x20) {
- e++;
- }
- n = e-p;
- n = min (n, sizeof (title)-1);
- memcpy (title, p, n);
- title[n] = 0;
- trace ("title: %s\n", title);
- p = ++e;
- }
- else if (!strncasecmp (p, "length", 6)) {
- int idx = atoi (p + 6);
- if (url[0] && idx != lastidx && lastidx != -1) {
- // add track
- playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data);
- if (it) {
- after = it;
- if (title[0]) {
- pl_delete_all_meta (it);
- pl_add_meta (it, "title", title);
- }
- }
- if (pabort && *pabort) {
- return after;
- }
- url[0] = 0;
- title[0] = 0;
- length[0] = 0;
- }
- lastidx = idx;
- p += 6;
- // skip =
- while (p < end && *p != '=') {
- p++;
- }
- p++;
- if (p >= end) {
- break;
- }
- e = p;
- while (e < end && *e >= 0x20) {
- e++;
- }
- n = e-p;
- n = min (n, sizeof (length)-1);
- memcpy (length, p, n);
- }
- else {
- trace ("invalid entry in pls file: %s\n", p);
- break;
- }
- while (e < end && *e < 0x20) {
- e++;
- }
- p = e;
- }
- if (url[0]) {
- playItem_t *it = plt_insert_file (playlist, after, url, pabort, cb, user_data);
- if (it) {
- after = it;
- if (title[0]) {
- pl_delete_all_meta (it);
- pl_add_meta (it, "title", title);
- }
- }
- }
- return after;
-}
-
 static int follow_symlinks = 0;
 static int ignore_archives = 0;
 
@@ -1448,13 +1236,6 @@
 }
 }
 
- // detect decoder
- const char *eol = strrchr (fname, '.');
- if (!eol) {
- return NULL;
- }
- eol++;
-
 const char *fn = strrchr (fname, '/');
 if (!fn) {
 fn = fname;
@@ -1463,18 +1244,6 @@
 fn++;
 }
 
- // detect pls/m3u files
- // they must be handled before checking for http://,
- // so that remote playlist files referenced from other playlist files could
- // be loaded correctly
- if (!strncmp (eol, "m3u", 3) || !strncmp (eol, "m3u8", 4)) {
- return plt_insert_m3u (playlist, after, fname, pabort, cb, user_data);
- }
- else if (!strncmp (eol, "pls", 3)) {
-
- return plt_insert_pls (playlist, after, fname, pabort, cb, user_data);
- }
-
 // add all posible streams as special-case:
 // set decoder to NULL, and filetype to "content"
 // streamer is responsible to determine content type on 1st access and
@@ -1538,6 +1307,13 @@
 fname += 7;
 }
 
+ // detect decoder
+ const char *eol = strrchr (fname, '.');
+ if (!eol) {
+ return NULL;
+ }
+ eol++;
+
 DB_decoder_t **decoders = plug_get_decoder_list ();
 // match by decoder
 for (int i = 0; decoders[i]; i++) {
@@ -1625,6 +1401,10 @@
 }
 else {
 inserted = plt_insert_file (playlist, after, namelist[i]->d_name, pabort, cb, user_data);
+ if (!inserted) {
+ // special case for loading playlists in zip files
+ inserted = plt_load (playlist, after, namelist[i]->d_name, pabort, cb, user_data);
+ }
 }
 if (inserted) {
 after = inserted;
@@ -1708,10 +1488,9 @@
 
 if (!no_remove_notify) {
 streamer_song_removed_notify (it);
+ pl_playqueue_remove (it);
 }
 
- pl_playqueue_remove (it);
-
 // remove from both lists
 LOCK;
 for (int iter = PL_MAIN; iter <= PL_SEARCH; iter++) {
@@ -1877,7 +1656,24 @@
 
 // shuffle
 playItem_t *prev = it->prev[PL_MAIN];
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album") && pl_find_meta (prev, "artist") == pl_find_meta (it, "artist")) {
+ const char *aa = NULL, *prev_aa = NULL;
+ if (prev) {
+ aa = pl_find_meta_raw (it, "band");
+ if (!aa) {
+ aa = pl_find_meta_raw (it, "album artist");
+ }
+ if (!aa) {
+ aa = pl_find_meta_raw (it, "albumartist");
+ }
+ prev_aa = pl_find_meta_raw (prev, "band");
+ if (!prev_aa) {
+ prev_aa = pl_find_meta_raw (prev, "album artist");
+ }
+ if (!prev_aa) {
+ prev_aa = pl_find_meta_raw (prev, "albumartist");
+ }
+ }
+ if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta_raw (prev, "album") == pl_find_meta_raw (it, "album") && ((aa && prev_aa && aa == prev_aa) || pl_find_meta_raw (prev, "artist") == pl_find_meta_raw (it, "artist"))) {
 it->shufflerating = prev->shufflerating;
 }
 else {
@@ -1956,7 +1752,7 @@
 pl_item_ref (playItem_t *it) {
 LOCK;
 it->_refc++;
- //trace ("\033[0;34m+it %p: refc=%d: %s\033[37;0m\n", it, it->_refc, pl_find_meta (it, ":URI"));
+ //fprintf (stderr, "\033[0;34m+it %p: refc=%d: %s\033[37;0m\n", it, it->_refc, pl_find_meta_raw (it, ":URI"));
 UNLOCK;
 }
 
@@ -1980,12 +1776,12 @@
 pl_item_unref (playItem_t *it) {
 LOCK;
 it->_refc--;
- //trace ("\033[0;31m-it %p: refc=%d: %s\033[37;0m\n", it, it->_refc, pl_find_meta (it, ":URI"));
+ //trace ("\033[0;31m-it %p: refc=%d: %s\033[37;0m\n", it, it->_refc, pl_find_meta_raw (it, ":URI"));
 if (it->_refc < 0) {
 trace ("\033[0;31mplaylist: bad refcount on item %p\033[37;0m\n", it);
 }
 if (it->_refc <= 0) {
- //printf ("\033[0;31mdeleted %s\033[37;0m\n", pl_find_meta (it, ":URI"));
+ //printf ("\033[0;31mdeleted %s\033[37;0m\n", pl_find_meta_raw (it, ":URI"));
 pl_item_free (it);
 }
 UNLOCK;
@@ -2019,8 +1815,9 @@
 int
 pl_delete_selected (void) {
 LOCK;
- plt_delete_selected (playlist);
+ int ret = plt_delete_selected (playlist);
 UNLOCK;
+ return ret;
 }
 
 void
@@ -2090,7 +1887,7 @@
 uint16_t l;
 uint8_t ll;
 #if (PLAYLIST_MINOR_VER==2)
- const char *fname = pl_find_meta (it, ":URI");
+ const char *fname = pl_find_meta_raw (it, ":URI");
 l = strlen (fname);
 if (fwrite (&l, 1, 2, fp) != 2) {
 goto save_fail;
@@ -2098,7 +1895,7 @@
 if (fwrite (fname, 1, l, fp) != l) {
 goto save_fail;
 }
- const char *decoder_id = pl_find_meta (it, ":DECODER");
+ const char *decoder_id = pl_find_meta_raw (it, ":DECODER");
 if (decoder_id) {
 ll = strlen (decoder_id);
 if (fwrite (&ll, 1, 1, fp) != 1) {
@@ -2130,7 +1927,7 @@
 goto save_fail;
 }
 #if (PLAYLIST_MINOR_VER==2)
- const char *filetype = pl_find_meta (it, ":FILETYPE");
+ const char *filetype = pl_find_meta_raw (it, ":FILETYPE");
 if (!filetype) {
 filetype = "";
 }
@@ -2167,7 +1964,7 @@
 int16_t nm = 0;
 DB_metaInfo_t *m;
 for (m = it->meta; m; m = m->next) {
- if (m->key[0] == '_') {
+ if (m->key[0] == '_' || m->key[0] == '!') {
 continue; // skip reserved names
 }
 nm++;
@@ -2176,7 +1973,7 @@
 goto save_fail;
 }
 for (m = it->meta; m; m = m->next) {
- if (m->key[0] == '_') {
+ if (m->key[0] == '_' || m->key[0] == '!') {
 continue; // skip reserved names
 }
 
@@ -2314,15 +2111,10 @@
 
 playItem_t *
 plt_load (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- FILE *fp = fopen (fname, "rb");
- if (!fp) {
- trace ("plt_load: failed to open %s\n", fname);
- return NULL;
- }
-
 // try plugins 1st
 const char *ext = strrchr (fname, '.');
 if (ext) {
+ trace ("finding playlist plugin for %s\n", ext);
 ext++;
 DB_playlist_t **plug = plug_get_playlist_list ();
 int p, e;
@@ -2336,6 +2128,12 @@
 }
 }
 trace ("plt_load: loading dbpl\n");
+ FILE *fp = fopen (fname, "rb");
+ if (!fp) {
+ trace ("plt_load: failed to open %s\n", fname);
+ return NULL;
+ }
+
 
 uint8_t majorver;
 uint8_t minorver;
@@ -2595,7 +2393,6 @@
 char path[1024];
 DB_conf_item_t *it = conf_find ("playlist.tab.", NULL);
 if (!it) {
-// fprintf (stderr, "INFO: loading legacy default playlist\n");
 // legacy (0.3.3 and earlier)
 char defpl[1024]; // $HOME/.config/deadbeef/default.dbpl
 if (snprintf (defpl, sizeof (defpl), "%s/default.dbpl", dbconfdir) > sizeof (defpl)) {
@@ -2680,12 +2477,27 @@
 playItem_t *pmin = NULL;
 playItem_t *pmax = NULL;
 playItem_t *prev = NULL;
+ const char *alb = NULL;
+ const char *art = NULL;
+ const char *aa = NULL;
 for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album") && pl_find_meta (prev, "artist") == pl_find_meta (it, "artist")) {
+ const char *new_aa = NULL;
+ new_aa = pl_find_meta_raw (it, "band");
+ if (!new_aa) {
+ new_aa = pl_find_meta_raw (it, "album artist");
+ }
+ if (!new_aa) {
+ new_aa = pl_find_meta_raw (it, "albumartist");
+ }
+ if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && alb == pl_find_meta_raw (it, "album") && ((aa && new_aa && aa == new_aa) || art == pl_find_meta_raw (it, "artist"))) {
 it->shufflerating = prev->shufflerating;
 }
 else {
+ prev = it;
 it->shufflerating = rand ();
+ alb = pl_find_meta_raw (it, "album");
+ art = pl_find_meta_raw (it, "artist");
+ aa = new_aa;
 }
 if (!pmin || it->shufflerating < pmin->shufflerating) {
 pmin = it;
@@ -2694,7 +2506,6 @@
 pmax = it;
 }
 it->played = 0;
- prev = it;
 }
 if (ppmin) {
 *ppmin = pmin;
@@ -2708,7 +2519,7 @@
 void
 plt_set_item_duration (playlist_t *playlist, playItem_t *it, float duration) {
 LOCK;
- if (it->in_playlist) {
+ if (it->in_playlist && playlist) {
 if (it->_duration > 0) {
 playlist->totaltime -= it->_duration;
 }
@@ -2770,6 +2581,7 @@
 case DDB_REPLAYGAIN_TRACKPEAK:
 return pl_find_meta_float (it, rg_keys[idx], 1);
 }
+ return 0;
 }
 
 int
@@ -2777,7 +2589,7 @@
 LOCK;
 *s = 0;
 int initsize = size;
- const char *val = pl_find_meta (it, "_playing");
+ const char *val = pl_find_meta_raw (it, "_playing");
 while (val && *val) {
 while (*val && *val != '=') {
 val++;
@@ -2899,9 +2711,7 @@
 // @escape_chars: list of escapable characters terminated with 0, or NULL if none
 static int
 pl_format_title_int (const char *escape_chars, playItem_t *it, int idx, char *s, int size, int id, const char *fmt) {
- char dur[50];
- char elp[50];
- char fno[50];
+ char tmp[50];
 char tags[200];
 char dirname[PATH_MAX];
 const char *duration = NULL;
@@ -2917,8 +2727,8 @@
 if (idx == -1) {
 idx = pl_get_idx_of (it);
 }
- snprintf (fno, sizeof (fno), "%d", idx+1);
- text = fno;
+ snprintf (tmp, sizeof (tmp), "%d", idx+1);
+ text = tmp;
 break;
 case DB_COLUMN_PLAYING:
 UNLOCK;
@@ -2967,7 +2777,7 @@
 l = min (l, sizeof (nm)-1);
 strncpy (nm, fmt+1, l);
 nm[l] = 0;
- meta = pl_find_meta (it, nm);
+ meta = pl_find_meta_raw (it, nm);
 if (!meta) {
 meta = "?";
 }
@@ -2975,15 +2785,15 @@
 }
 }
 else if (*fmt == 'a') {
- meta = pl_find_meta (it, "artist");
+ meta = pl_find_meta_raw (it, "artist");
 if (!meta) {
 meta = "Unknown artist";
 }
 }
 else if (*fmt == 't') {
- meta = pl_find_meta (it, "title");
+ meta = pl_find_meta_raw (it, "title");
 if (!meta) {
- const char *f = pl_find_meta (it, ":URI");
+ const char *f = pl_find_meta_raw (it, ":URI");
 if (f) {
 const char *start = strrchr (f, '/');
 if (start) {
@@ -3010,28 +2820,28 @@
 }
 }
 else if (*fmt == 'b') {
- meta = pl_find_meta (it, "album");
+ meta = pl_find_meta_raw (it, "album");
 if (!meta) {
 meta = "Unknown album";
 }
 }
 else if (*fmt == 'B') {
- meta = pl_find_meta (it, "band");
+ meta = pl_find_meta_raw (it, "band");
 if (!meta) {
- meta = pl_find_meta (it, "album artist");
+ meta = pl_find_meta_raw (it, "album artist");
 if (!meta) {
- meta = pl_find_meta (it, "albumartist");
+ meta = pl_find_meta_raw (it, "albumartist");
 if (!meta) {
- meta = pl_find_meta (it, "artist");
+ meta = pl_find_meta_raw (it, "artist");
 }
 }
 }
 }
 else if (*fmt == 'C') {
- meta = pl_find_meta (it, "composer");
+ meta = pl_find_meta_raw (it, "composer");
 }
 else if (*fmt == 'n') {
- meta = pl_find_meta (it, "track");
+ meta = pl_find_meta_raw (it, "track");
 if (meta) {
 // check if it's numbers only
 const char *p = meta;
@@ -3042,28 +2852,28 @@
 p++;
 }
 if (!(*p)) {
- snprintf (fno, sizeof (fno), "%02d", atoi (meta));
- meta = fno;
+ snprintf (tmp, sizeof (tmp), "%02d", atoi (meta));
+ meta = tmp;
 }
 }
 }
 else if (*fmt == 'N') {
- meta = pl_find_meta (it, "numtracks");
+ meta = pl_find_meta_raw (it, "numtracks");
 }
 else if (*fmt == 'y') {
- meta = pl_find_meta (it, "year");
+ meta = pl_find_meta_raw (it, "year");
 }
 else if (*fmt == 'g') {
- meta = pl_find_meta (it, "genre");
+ meta = pl_find_meta_raw (it, "genre");
 }
 else if (*fmt == 'c') {
- meta = pl_find_meta (it, "comment");
+ meta = pl_find_meta_raw (it, "comment");
 }
 else if (*fmt == 'r') {
- meta = pl_find_meta (it, "copyright");
+ meta = pl_find_meta_raw (it, "copyright");
 }
 else if (*fmt == 'l') {
- const char *value = (duration = pl_format_duration (it, duration, dur, sizeof (dur)));
+ const char *value = (duration = pl_format_duration (it, duration, tmp, sizeof (tmp)));
 while (n > 0 && *value) {
 *s++ = *value++;
 n--;
@@ -3071,14 +2881,14 @@
 }
 else if (*fmt == 'e') {
 // what a hack..
- const char *value = (elapsed = pl_format_elapsed (elapsed, elp, sizeof (elp)));
+ const char *value = (elapsed = pl_format_elapsed (elapsed, tmp, sizeof (tmp)));
 while (n > 0 && *value) {
 *s++ = *value++;
 n--;
 }
 }
 else if (*fmt == 'f') {
- const char *f = pl_find_meta (it, ":URI");
+ const char *f = pl_find_meta_raw (it, ":URI");
 meta = strrchr (f, '/');
 if (meta) {
 meta++;
@@ -3088,7 +2898,7 @@
 }
 }
 else if (*fmt == 'F') {
- meta = pl_find_meta (it, ":URI");
+ meta = pl_find_meta_raw (it, ":URI");
 }
 else if (*fmt == 'T') {
 char *t = tags;
@@ -3135,7 +2945,7 @@
 }
 else if (*fmt == 'd') {
 // directory
- const char *f = pl_find_meta (it, ":URI");
+ const char *f = pl_find_meta_raw (it, ":URI");
 const char *end = strrchr (f, '/');
 if (!end) {
 meta = ""; // got relative path without folder (should not happen)
@@ -3160,7 +2970,7 @@
 }
 }
 else if (*fmt == 'D') {
- const char *f = pl_find_meta (it, ":URI");
+ const char *f = pl_find_meta_raw (it, ":URI");
 // directory with path
 const char *end = strrchr (f, '/');
 if (!end) {
@@ -3175,6 +2985,36 @@
 meta = dirname;
 }
 }
+ else if (*fmt == 'L') {
+ float l = 0;
+ for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
+ if (it->selected) {
+ l += it->_duration;
+ }
+ }
+ pl_format_time (l, tmp, sizeof(tmp));
+ meta = tmp;
+ }
+ else if (*fmt == 'X') {
+ int n = 0;
+ for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
+ if (it->selected) {
+ n++;
+ }
+ }
+ snprintf (tmp, sizeof (tmp), "%d", n);
+ meta = tmp;
+ }
+ else if (*fmt == 'Z') {
+ DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+ if (c->fmt.channels <= 2) {
+ meta = c->fmt.channels == 1 ? _("Mono") : _("Stereo");
+ }
+ else {
+ snprintf (tmp, sizeof (tmp), "%dch Multichannel", c->fmt.channels);
+ meta = tmp;
+ }
+ }
 else if (*fmt == 'V') {
 meta = VERSION;
 }
@@ -3297,14 +3137,14 @@
 int t1;
 int t2;
 const char *t;
- t = pl_find_meta (a, "track");
+ t = pl_find_meta_raw (a, "track");
 if (t && !isdigit (*t)) {
 t1 = 999999;
 }
 else {
 t1 = t ? atoi (t) : -1;
 }
- t = pl_find_meta (b, "track");
+ t = pl_find_meta_raw (b, "track");
 if (t && !isdigit (*t)) {
 t2 = 999999;
 }
@@ -3405,6 +3245,9 @@
 
 float
 plt_get_totaltime (playlist_t *playlist) {
+ if (!playlist) {
+ return 0;
+ }
 return playlist->totaltime;
 }
 
@@ -3646,7 +3489,7 @@
 if (*text) {
 DB_metaInfo_t *m = NULL;
 for (m = it->meta; m; m = m->next) {
- if (m->key[0] == ':' || m->key[0] == '_') {
+ if (m->key[0] == ':' || m->key[0] == '_' || m->key[0] == '!') {
 break;
 }
 if (m->key!=cuesheet && m->key!=log) {
@@ -3668,7 +3511,7 @@
 }
 }
 else if (utfcasestr_fast (m->value, lc)) {
- //fprintf (stderr, "%s -> %s match (%s.%s)\n", text, m->value, pl_find_meta (it, ":URI"), m->key);
+ //fprintf (stderr, "%s -> %s match (%s.%s)\n", text, m->value, pl_find_meta_raw (it, ":URI"), m->key);
 // add to list
 it->next[PL_SEARCH] = NULL;
 if (playlist->tail[PL_SEARCH]) {
@@ -3732,6 +3575,7 @@
 }
 for (i = 0; i < cnt; i++) {
 pl_item_unref (playqueue[i]);
+ playqueue[i] = NULL;
 }
 UNLOCK;
 }
@@ -3893,3 +3737,13 @@
 }
 pl_unlock ();
 }
+
+void
+plt_set_fast_mode (playlist_t *plt, int fast) {
+ plt->fast_mode = (unsigned)fast;
+}
+
+int
+plt_is_fast_mode (playlist_t *plt) {
+ return plt->fast_mode;
+}

deadbeef-0.5.1.tar.bz2/playlist.h -> deadbeef-0.5.2.tar.bz2/playlist.h Changed

deadbeef-0.5.1.tar.bz2/plmeta.c -> deadbeef-0.5.2.tar.bz2/plmeta.c Changed

deadbeef-0.5.1.tar.bz2/pltmeta.c -> deadbeef-0.5.2.tar.bz2/pltmeta.c Changed

deadbeef-0.5.1.tar.bz2/pltmeta.h -> deadbeef-0.5.2.tar.bz2/pltmeta.h Changed

deadbeef-0.5.1.tar.bz2/plugins.c -> deadbeef-0.5.2.tar.bz2/plugins.c Changed

deadbeef-0.5.1.tar.bz2/plugins.h -> deadbeef-0.5.2.tar.bz2/plugins.h Changed

deadbeef-0.5.1.tar.bz2/plugins/aac/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/aac/Makefile.in Changed

@@ -78,9 +78,12 @@
 @HAVE_AAC_TRUE@	mp4ff.lo mp4meta.lo mp4sample.lo \
 @HAVE_AAC_TRUE@	mp4tagupdate.lo mp4util.lo
 aac_la_OBJECTS = $(am_aac_la_OBJECTS)
-aac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(aac_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+aac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(aac_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_AAC_TRUE@am_aac_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -88,13 +91,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(aac_la_SOURCES)
 DIST_SOURCES = $(am__aac_la_SOURCES_DIST)
 ETAGS = etags
@@ -106,6 +122,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -153,14 +170,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -250,7 +270,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -261,6 +280,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -398,7 +418,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 aac.la: $(aac_la_OBJECTS) $(aac_la_DEPENDENCIES) 
-	$(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(aac_la_LINK) $(am_aac_la_rpath) $(aac_la_OBJECTS) $(aac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -416,67 +436,76 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4util.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mp4atom.lo: mp4ff/mp4atom.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4atom.lo -MD -MP -MF $(DEPDIR)/mp4atom.Tpo -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4atom.Tpo $(DEPDIR)/mp4atom.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4atom.lo -MD -MP -MF $(DEPDIR)/mp4atom.Tpo -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4atom.Tpo $(DEPDIR)/mp4atom.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4atom.c' object='mp4atom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
 
 mp4ff.lo: mp4ff/mp4ff.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4ff.lo -MD -MP -MF $(DEPDIR)/mp4ff.Tpo -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4ff.Tpo $(DEPDIR)/mp4ff.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4ff.lo -MD -MP -MF $(DEPDIR)/mp4ff.Tpo -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4ff.Tpo $(DEPDIR)/mp4ff.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4ff.c' object='mp4ff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
 
 mp4meta.lo: mp4ff/mp4meta.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4meta.lo -MD -MP -MF $(DEPDIR)/mp4meta.Tpo -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4meta.Tpo $(DEPDIR)/mp4meta.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4meta.lo -MD -MP -MF $(DEPDIR)/mp4meta.Tpo -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4meta.Tpo $(DEPDIR)/mp4meta.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4meta.c' object='mp4meta.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
 
 mp4sample.lo: mp4ff/mp4sample.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4sample.lo -MD -MP -MF $(DEPDIR)/mp4sample.Tpo -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4sample.Tpo $(DEPDIR)/mp4sample.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4sample.lo -MD -MP -MF $(DEPDIR)/mp4sample.Tpo -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4sample.Tpo $(DEPDIR)/mp4sample.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4sample.c' object='mp4sample.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
 
 mp4tagupdate.lo: mp4ff/mp4tagupdate.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4tagupdate.lo -MD -MP -MF $(DEPDIR)/mp4tagupdate.Tpo -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4tagupdate.Tpo $(DEPDIR)/mp4tagupdate.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4tagupdate.lo -MD -MP -MF $(DEPDIR)/mp4tagupdate.Tpo -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4tagupdate.Tpo $(DEPDIR)/mp4tagupdate.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4tagupdate.c' object='mp4tagupdate.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
 
 mp4util.lo: mp4ff/mp4util.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4util.lo -MD -MP -MF $(DEPDIR)/mp4util.Tpo -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mp4util.Tpo $(DEPDIR)/mp4util.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4util.lo -MD -MP -MF $(DEPDIR)/mp4util.Tpo -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mp4util.Tpo $(DEPDIR)/mp4util.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp4ff/mp4util.c' object='mp4util.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/aac/aac.c -> deadbeef-0.5.2.tar.bz2/plugins/aac/aac.c Changed

deadbeef-0.5.1.tar.bz2/plugins/aac/aac_parser.c -> deadbeef-0.5.2.tar.bz2/plugins/aac/aac_parser.c Changed

deadbeef-0.5.1.tar.bz2/plugins/aac/aac_parser.h -> deadbeef-0.5.2.tar.bz2/plugins/aac/aac_parser.h Changed

deadbeef-0.5.1.tar.bz2/plugins/aac/mp4ff/mp4meta.c -> deadbeef-0.5.2.tar.bz2/plugins/aac/mp4ff/mp4meta.c Changed

deadbeef-0.5.1.tar.bz2/plugins/adplug/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/adplug/Makefile.am Changed

deadbeef-0.5.1.tar.bz2/plugins/adplug/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/adplug/Makefile.in Changed

@@ -117,7 +117,10 @@
 @HAVE_ADPLUG_TRUE@	rol.lo s3m.lo sa2.lo sng.lo surroundopl.lo \
 @HAVE_ADPLUG_TRUE@	temuopl.lo u6m.lo xad.lo xsm.lo
 adplug_la_OBJECTS = $(am_adplug_la_OBJECTS)
-adplug_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+adplug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(adplug_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ADPLUG_TRUE@am_adplug_la_rpath = -rpath $(pkglibdir)
@@ -127,22 +130,42 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo " CXX " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(adplug_la_SOURCES)
 DIST_SOURCES = $(am__adplug_la_SOURCES_DIST)
 ETAGS = etags
@@ -154,6 +177,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -201,14 +225,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -298,7 +325,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -309,6 +335,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -368,8 +395,8 @@
 @HAVE_ADPLUG_TRUE@adlibdir = $(libdir)/$(PACKAGE)
 @HAVE_ADPLUG_TRUE@pkglib_LTLIBRARIES = adplug.la
 @HAVE_ADPLUG_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
-@HAVE_ADPLUG_TRUE@adplug_la_LDFLAGS = -module -nostdlib -lsupc++
-@HAVE_ADPLUG_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -fPIC
+@HAVE_ADPLUG_TRUE@adplug_la_LDFLAGS = -module -nostdlib -lm -lsupc++
+@HAVE_ADPLUG_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
 @HAVE_ADPLUG_TRUE@adplug_la_SOURCES = plugin.c\
 @HAVE_ADPLUG_TRUE@ adplug-db.cpp\
 @HAVE_ADPLUG_TRUE@				 libbinio/binfile.h\
@@ -559,7 +586,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 adplug.la: $(adplug_la_OBJECTS) $(adplug_la_DEPENDENCIES) 
-	$(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(adplug_la_LINK) $(am_adplug_la_rpath) $(adplug_la_OBJECTS) $(adplug_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -629,452 +656,516 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 adlibemu.lo: adplug/adlibemu.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT adlibemu.lo -MD -MP -MF $(DEPDIR)/adlibemu.Tpo -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adlibemu.Tpo $(DEPDIR)/adlibemu.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/adlibemu.c' object='adlibemu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adlibemu.lo `test -f 'adplug/adlibemu.c' || echo '$(srcdir)/'`adplug/adlibemu.c
 
 debug.lo: adplug/debug.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT debug.lo -MD -MP -MF $(DEPDIR)/debug.Tpo -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/debug.Tpo $(DEPDIR)/debug.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/debug.c' object='debug.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o debug.lo `test -f 'adplug/debug.c' || echo '$(srcdir)/'`adplug/debug.c
 
 fmopl.lo: adplug/fmopl.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adplug/fmopl.c' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fmopl.lo `test -f 'adplug/fmopl.c' || echo '$(srcdir)/'`adplug/fmopl.c
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 binfile.lo: libbinio/binfile.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binfile.lo -MD -MP -MF $(DEPDIR)/binfile.Tpo -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binfile.Tpo $(DEPDIR)/binfile.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binfile.cpp' object='binfile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binfile.lo `test -f 'libbinio/binfile.cpp' || echo '$(srcdir)/'`libbinio/binfile.cpp
 
 binio.lo: libbinio/binio.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binio.lo -MD -MP -MF $(DEPDIR)/binio.Tpo -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binio.Tpo $(DEPDIR)/binio.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binio.cpp' object='binio.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binio.lo `test -f 'libbinio/binio.cpp' || echo '$(srcdir)/'`libbinio/binio.cpp
 
 binstr.lo: libbinio/binstr.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binstr.lo -MD -MP -MF $(DEPDIR)/binstr.Tpo -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binstr.Tpo $(DEPDIR)/binstr.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binstr.cpp' object='binstr.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binstr.lo `test -f 'libbinio/binstr.cpp' || echo '$(srcdir)/'`libbinio/binstr.cpp
 
 binwrap.lo: libbinio/binwrap.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT binwrap.lo -MD -MP -MF $(DEPDIR)/binwrap.Tpo -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/binwrap.Tpo $(DEPDIR)/binwrap.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='libbinio/binwrap.cpp' object='binwrap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o binwrap.lo `test -f 'libbinio/binwrap.cpp' || echo '$(srcdir)/'`libbinio/binwrap.cpp
 
 a2m.lo: adplug/a2m.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT a2m.lo -MD -MP -MF $(DEPDIR)/a2m.Tpo -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/a2m.Tpo $(DEPDIR)/a2m.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/a2m.cpp' object='a2m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o a2m.lo `test -f 'adplug/a2m.cpp' || echo '$(srcdir)/'`adplug/a2m.cpp
 
 adl.lo: adplug/adl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adl.lo -MD -MP -MF $(DEPDIR)/adl.Tpo -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adl.Tpo $(DEPDIR)/adl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adl.cpp' object='adl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adl.lo `test -f 'adplug/adl.cpp' || echo '$(srcdir)/'`adplug/adl.cpp
 
 adplug.lo: adplug/adplug.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adplug.lo -MD -MP -MF $(DEPDIR)/adplug.Tpo -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adplug.Tpo $(DEPDIR)/adplug.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adplug.cpp' object='adplug.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adplug.lo `test -f 'adplug/adplug.cpp' || echo '$(srcdir)/'`adplug/adplug.cpp
 
 adtrack.lo: adplug/adtrack.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT adtrack.lo -MD -MP -MF $(DEPDIR)/adtrack.Tpo -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/adtrack.Tpo $(DEPDIR)/adtrack.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/adtrack.cpp' object='adtrack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o adtrack.lo `test -f 'adplug/adtrack.cpp' || echo '$(srcdir)/'`adplug/adtrack.cpp
 
 amd.lo: adplug/amd.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT amd.lo -MD -MP -MF $(DEPDIR)/amd.Tpo -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amd.Tpo $(DEPDIR)/amd.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/amd.cpp' object='amd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o amd.lo `test -f 'adplug/amd.cpp' || echo '$(srcdir)/'`adplug/amd.cpp
 
 analopl.lo: adplug/analopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT analopl.lo -MD -MP -MF $(DEPDIR)/analopl.Tpo -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/analopl.Tpo $(DEPDIR)/analopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/analopl.cpp' object='analopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o analopl.lo `test -f 'adplug/analopl.cpp' || echo '$(srcdir)/'`adplug/analopl.cpp
 
 bam.lo: adplug/bam.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bam.lo -MD -MP -MF $(DEPDIR)/bam.Tpo -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bam.Tpo $(DEPDIR)/bam.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/bam.cpp' object='bam.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bam.lo `test -f 'adplug/bam.cpp' || echo '$(srcdir)/'`adplug/bam.cpp
 
 bmf.lo: adplug/bmf.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bmf.lo -MD -MP -MF $(DEPDIR)/bmf.Tpo -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bmf.Tpo $(DEPDIR)/bmf.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/bmf.cpp' object='bmf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bmf.lo `test -f 'adplug/bmf.cpp' || echo '$(srcdir)/'`adplug/bmf.cpp
 
 cff.lo: adplug/cff.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cff.lo -MD -MP -MF $(DEPDIR)/cff.Tpo -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cff.Tpo $(DEPDIR)/cff.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/cff.cpp' object='cff.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cff.lo `test -f 'adplug/cff.cpp' || echo '$(srcdir)/'`adplug/cff.cpp
 
 d00.lo: adplug/d00.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT d00.lo -MD -MP -MF $(DEPDIR)/d00.Tpo -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/d00.Tpo $(DEPDIR)/d00.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/d00.cpp' object='d00.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o d00.lo `test -f 'adplug/d00.cpp' || echo '$(srcdir)/'`adplug/d00.cpp
 
 dfm.lo: adplug/dfm.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dfm.lo -MD -MP -MF $(DEPDIR)/dfm.Tpo -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dfm.Tpo $(DEPDIR)/dfm.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dfm.cpp' object='dfm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfm.lo `test -f 'adplug/dfm.cpp' || echo '$(srcdir)/'`adplug/dfm.cpp
 
 diskopl.lo: adplug/diskopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskopl.lo -MD -MP -MF $(DEPDIR)/diskopl.Tpo -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/diskopl.Tpo $(DEPDIR)/diskopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/diskopl.cpp' object='diskopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskopl.lo `test -f 'adplug/diskopl.cpp' || echo '$(srcdir)/'`adplug/diskopl.cpp
 
 dmo.lo: adplug/dmo.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dmo.lo -MD -MP -MF $(DEPDIR)/dmo.Tpo -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dmo.Tpo $(DEPDIR)/dmo.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dmo.cpp' object='dmo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dmo.lo `test -f 'adplug/dmo.cpp' || echo '$(srcdir)/'`adplug/dmo.cpp
 
 dro2.lo: adplug/dro2.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro2.lo -MD -MP -MF $(DEPDIR)/dro2.Tpo -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dro2.Tpo $(DEPDIR)/dro2.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dro2.cpp' object='dro2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro2.lo `test -f 'adplug/dro2.cpp' || echo '$(srcdir)/'`adplug/dro2.cpp
 
 dro.lo: adplug/dro.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dro.lo -MD -MP -MF $(DEPDIR)/dro.Tpo -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dro.Tpo $(DEPDIR)/dro.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dro.cpp' object='dro.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dro.lo `test -f 'adplug/dro.cpp' || echo '$(srcdir)/'`adplug/dro.cpp
 
 dtm.lo: adplug/dtm.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dtm.lo -MD -MP -MF $(DEPDIR)/dtm.Tpo -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dtm.Tpo $(DEPDIR)/dtm.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/dtm.cpp' object='dtm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dtm.lo `test -f 'adplug/dtm.cpp' || echo '$(srcdir)/'`adplug/dtm.cpp
 
 emuopl.lo: adplug/emuopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT emuopl.lo -MD -MP -MF $(DEPDIR)/emuopl.Tpo -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/emuopl.Tpo $(DEPDIR)/emuopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/emuopl.cpp' object='emuopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emuopl.lo `test -f 'adplug/emuopl.cpp' || echo '$(srcdir)/'`adplug/emuopl.cpp
 
 flash.lo: adplug/flash.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flash.lo -MD -MP -MF $(DEPDIR)/flash.Tpo -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/flash.Tpo $(DEPDIR)/flash.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/flash.cpp' object='flash.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flash.lo `test -f 'adplug/flash.cpp' || echo '$(srcdir)/'`adplug/flash.cpp
 
 fmc.lo: adplug/fmc.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fmc.lo -MD -MP -MF $(DEPDIR)/fmc.Tpo -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmc.Tpo $(DEPDIR)/fmc.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/fmc.cpp' object='fmc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmc.lo `test -f 'adplug/fmc.cpp' || echo '$(srcdir)/'`adplug/fmc.cpp
 
 fprovide.lo: adplug/fprovide.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fprovide.lo -MD -MP -MF $(DEPDIR)/fprovide.Tpo -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fprovide.Tpo $(DEPDIR)/fprovide.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/fprovide.cpp' object='fprovide.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fprovide.lo `test -f 'adplug/fprovide.cpp' || echo '$(srcdir)/'`adplug/fprovide.cpp
 
 hsc.lo: adplug/hsc.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsc.lo -MD -MP -MF $(DEPDIR)/hsc.Tpo -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hsc.Tpo $(DEPDIR)/hsc.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hsc.cpp' object='hsc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsc.lo `test -f 'adplug/hsc.cpp' || echo '$(srcdir)/'`adplug/hsc.cpp
 
 hsp.lo: adplug/hsp.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hsp.lo -MD -MP -MF $(DEPDIR)/hsp.Tpo -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hsp.Tpo $(DEPDIR)/hsp.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hsp.cpp' object='hsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hsp.lo `test -f 'adplug/hsp.cpp' || echo '$(srcdir)/'`adplug/hsp.cpp
 
 hybrid.lo: adplug/hybrid.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hybrid.lo -MD -MP -MF $(DEPDIR)/hybrid.Tpo -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hybrid.Tpo $(DEPDIR)/hybrid.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hybrid.cpp' object='hybrid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hybrid.lo `test -f 'adplug/hybrid.cpp' || echo '$(srcdir)/'`adplug/hybrid.cpp
 
 hyp.lo: adplug/hyp.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hyp.lo -MD -MP -MF $(DEPDIR)/hyp.Tpo -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hyp.Tpo $(DEPDIR)/hyp.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/hyp.cpp' object='hyp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hyp.lo `test -f 'adplug/hyp.cpp' || echo '$(srcdir)/'`adplug/hyp.cpp
 
 imf.lo: adplug/imf.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT imf.lo -MD -MP -MF $(DEPDIR)/imf.Tpo -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/imf.Tpo $(DEPDIR)/imf.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/imf.cpp' object='imf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o imf.lo `test -f 'adplug/imf.cpp' || echo '$(srcdir)/'`adplug/imf.cpp
 
 jbm.lo: adplug/jbm.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT jbm.lo -MD -MP -MF $(DEPDIR)/jbm.Tpo -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/jbm.Tpo $(DEPDIR)/jbm.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/jbm.cpp' object='jbm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o jbm.lo `test -f 'adplug/jbm.cpp' || echo '$(srcdir)/'`adplug/jbm.cpp
 
 ksm.lo: adplug/ksm.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ksm.lo -MD -MP -MF $(DEPDIR)/ksm.Tpo -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ksm.Tpo $(DEPDIR)/ksm.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/ksm.cpp' object='ksm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ksm.lo `test -f 'adplug/ksm.cpp' || echo '$(srcdir)/'`adplug/ksm.cpp
 
 lds.lo: adplug/lds.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lds.lo -MD -MP -MF $(DEPDIR)/lds.Tpo -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lds.Tpo $(DEPDIR)/lds.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/lds.cpp' object='lds.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lds.lo `test -f 'adplug/lds.cpp' || echo '$(srcdir)/'`adplug/lds.cpp
 
 mad.lo: adplug/mad.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mad.lo -MD -MP -MF $(DEPDIR)/mad.Tpo -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mad.Tpo $(DEPDIR)/mad.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mad.cpp' object='mad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mad.lo `test -f 'adplug/mad.cpp' || echo '$(srcdir)/'`adplug/mad.cpp
 
 mid.lo: adplug/mid.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mid.lo -MD -MP -MF $(DEPDIR)/mid.Tpo -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mid.Tpo $(DEPDIR)/mid.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mid.cpp' object='mid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mid.lo `test -f 'adplug/mid.cpp' || echo '$(srcdir)/'`adplug/mid.cpp
 
 mkj.lo: adplug/mkj.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mkj.lo -MD -MP -MF $(DEPDIR)/mkj.Tpo -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mkj.Tpo $(DEPDIR)/mkj.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mkj.cpp' object='mkj.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mkj.lo `test -f 'adplug/mkj.cpp' || echo '$(srcdir)/'`adplug/mkj.cpp
 
 msc.lo: adplug/msc.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT msc.lo -MD -MP -MF $(DEPDIR)/msc.Tpo -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/msc.Tpo $(DEPDIR)/msc.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/msc.cpp' object='msc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o msc.lo `test -f 'adplug/msc.cpp' || echo '$(srcdir)/'`adplug/msc.cpp
 
 mtk.lo: adplug/mtk.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mtk.lo -MD -MP -MF $(DEPDIR)/mtk.Tpo -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mtk.Tpo $(DEPDIR)/mtk.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/mtk.cpp' object='mtk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mtk.lo `test -f 'adplug/mtk.cpp' || echo '$(srcdir)/'`adplug/mtk.cpp
 
 player.lo: adplug/player.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'adplug/player.cpp' || echo '$(srcdir)/'`adplug/player.cpp
 
 players.lo: adplug/players.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT players.lo -MD -MP -MF $(DEPDIR)/players.Tpo -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/players.Tpo $(DEPDIR)/players.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/players.cpp' object='players.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o players.lo `test -f 'adplug/players.cpp' || echo '$(srcdir)/'`adplug/players.cpp
 
 protrack.lo: adplug/protrack.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT protrack.lo -MD -MP -MF $(DEPDIR)/protrack.Tpo -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/protrack.Tpo $(DEPDIR)/protrack.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/protrack.cpp' object='protrack.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o protrack.lo `test -f 'adplug/protrack.cpp' || echo '$(srcdir)/'`adplug/protrack.cpp
 
 psi.lo: adplug/psi.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psi.lo -MD -MP -MF $(DEPDIR)/psi.Tpo -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psi.Tpo $(DEPDIR)/psi.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/psi.cpp' object='psi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psi.lo `test -f 'adplug/psi.cpp' || echo '$(srcdir)/'`adplug/psi.cpp
 
 rad.lo: adplug/rad.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rad.lo -MD -MP -MF $(DEPDIR)/rad.Tpo -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rad.Tpo $(DEPDIR)/rad.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rad.cpp' object='rad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rad.lo `test -f 'adplug/rad.cpp' || echo '$(srcdir)/'`adplug/rad.cpp
 
 rat.lo: adplug/rat.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rat.lo -MD -MP -MF $(DEPDIR)/rat.Tpo -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rat.Tpo $(DEPDIR)/rat.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rat.cpp' object='rat.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rat.lo `test -f 'adplug/rat.cpp' || echo '$(srcdir)/'`adplug/rat.cpp
 
 raw.lo: adplug/raw.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT raw.lo -MD -MP -MF $(DEPDIR)/raw.Tpo -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/raw.Tpo $(DEPDIR)/raw.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/raw.cpp' object='raw.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o raw.lo `test -f 'adplug/raw.cpp' || echo '$(srcdir)/'`adplug/raw.cpp
 
 realopl.lo: adplug/realopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT realopl.lo -MD -MP -MF $(DEPDIR)/realopl.Tpo -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/realopl.Tpo $(DEPDIR)/realopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/realopl.cpp' object='realopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o realopl.lo `test -f 'adplug/realopl.cpp' || echo '$(srcdir)/'`adplug/realopl.cpp
 
 rix.lo: adplug/rix.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rix.lo -MD -MP -MF $(DEPDIR)/rix.Tpo -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rix.Tpo $(DEPDIR)/rix.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rix.cpp' object='rix.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rix.lo `test -f 'adplug/rix.cpp' || echo '$(srcdir)/'`adplug/rix.cpp
 
 rol.lo: adplug/rol.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rol.lo -MD -MP -MF $(DEPDIR)/rol.Tpo -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rol.Tpo $(DEPDIR)/rol.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/rol.cpp' object='rol.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rol.lo `test -f 'adplug/rol.cpp' || echo '$(srcdir)/'`adplug/rol.cpp
 
 s3m.lo: adplug/s3m.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT s3m.lo -MD -MP -MF $(DEPDIR)/s3m.Tpo -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s3m.Tpo $(DEPDIR)/s3m.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/s3m.cpp' object='s3m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o s3m.lo `test -f 'adplug/s3m.cpp' || echo '$(srcdir)/'`adplug/s3m.cpp
 
 sa2.lo: adplug/sa2.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sa2.lo -MD -MP -MF $(DEPDIR)/sa2.Tpo -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sa2.Tpo $(DEPDIR)/sa2.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/sa2.cpp' object='sa2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sa2.lo `test -f 'adplug/sa2.cpp' || echo '$(srcdir)/'`adplug/sa2.cpp
 
 sng.lo: adplug/sng.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sng.lo -MD -MP -MF $(DEPDIR)/sng.Tpo -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sng.Tpo $(DEPDIR)/sng.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/sng.cpp' object='sng.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sng.lo `test -f 'adplug/sng.cpp' || echo '$(srcdir)/'`adplug/sng.cpp
 
 surroundopl.lo: adplug/surroundopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT surroundopl.lo -MD -MP -MF $(DEPDIR)/surroundopl.Tpo -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/surroundopl.Tpo $(DEPDIR)/surroundopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/surroundopl.cpp' object='surroundopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o surroundopl.lo `test -f 'adplug/surroundopl.cpp' || echo '$(srcdir)/'`adplug/surroundopl.cpp
 
 temuopl.lo: adplug/temuopl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT temuopl.lo -MD -MP -MF $(DEPDIR)/temuopl.Tpo -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/temuopl.Tpo $(DEPDIR)/temuopl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/temuopl.cpp' object='temuopl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o temuopl.lo `test -f 'adplug/temuopl.cpp' || echo '$(srcdir)/'`adplug/temuopl.cpp
 
 u6m.lo: adplug/u6m.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT u6m.lo -MD -MP -MF $(DEPDIR)/u6m.Tpo -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/u6m.Tpo $(DEPDIR)/u6m.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/u6m.cpp' object='u6m.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o u6m.lo `test -f 'adplug/u6m.cpp' || echo '$(srcdir)/'`adplug/u6m.cpp
 
 xad.lo: adplug/xad.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xad.lo -MD -MP -MF $(DEPDIR)/xad.Tpo -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xad.Tpo $(DEPDIR)/xad.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/xad.cpp' object='xad.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xad.lo `test -f 'adplug/xad.cpp' || echo '$(srcdir)/'`adplug/xad.cpp
 
 xsm.lo: adplug/xsm.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsm.lo -MD -MP -MF $(DEPDIR)/xsm.Tpo -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xsm.Tpo $(DEPDIR)/xsm.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='adplug/xsm.cpp' object='xsm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsm.lo `test -f 'adplug/xsm.cpp' || echo '$(srcdir)/'`adplug/xsm.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/adplug/adplug-db.cpp -> deadbeef-0.5.2.tar.bz2/plugins/adplug/adplug-db.cpp Changed

deadbeef-0.5.1.tar.bz2/plugins/adplug/plugin.c -> deadbeef-0.5.2.tar.bz2/plugins/adplug/plugin.c Changed

deadbeef-0.5.1.tar.bz2/plugins/alsa/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/alsa/Makefile.in Changed

@@ -73,9 +73,12 @@
 am__alsa_la_SOURCES_DIST = alsa.c
 @HAVE_ALSA_TRUE@am_alsa_la_OBJECTS = alsa.lo
 alsa_la_OBJECTS = $(am_alsa_la_OBJECTS)
-alsa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(alsa_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+alsa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(alsa_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ALSA_TRUE@am_alsa_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(alsa_la_SOURCES)
 DIST_SOURCES = $(am__alsa_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 alsa.la: $(alsa_la_OBJECTS) $(alsa_la_DEPENDENCIES) 
-	$(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(alsa_la_LINK) $(am_alsa_la_rpath) $(alsa_la_OBJECTS) $(alsa_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alsa.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/alsa/alsa.c -> deadbeef-0.5.2.tar.bz2/plugins/alsa/alsa.c Changed

deadbeef-0.5.2.tar.bz2/plugins/ao Added

deadbeef-0.5.2.tar.bz2/plugins/ao/Makefile.am Added

@@ -0,0 +1,27 @@
+if HAVE_PSF
+aodir = $(libdir)/$(PACKAGE)
+pkglib_LTLIBRARIES = ddb_ao.la
+ddb_ao_la_SOURCES = plugin.c main.c corlett.c\
+eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\
+eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \
+eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\
+eng_qsf/eng_qsf.c eng_qsf/kabuki.c eng_qsf/qsound.c eng_qsf/z80.c eng_qsf/z80dasm.c\
+eng_psf/eng_psf.c eng_psf/psx.c eng_psf/psx_hw.c eng_psf/peops/spu.c \
+eng_psf/eng_psf2.c eng_psf/peops2/spu2.c eng_psf/peops2/dma2.c eng_psf/peops2/registers2.c\
+eng_psf/eng_spu.c\
+ao.h corlett.h cpuintrf.h eng_protos.h mem.h osd_cpu.h\
+eng_dsf/aicadsp.h eng_dsf/aica.h eng_dsf/arm7.h eng_dsf/arm7i.h eng_dsf/arm7thumb.h eng_dsf/dc_hw.h\
+eng_ssf/m68kconf.h eng_ssf/m68kcpu.h eng_ssf/m68k.h eng_ssf/m68kmame.h eng_ssf/m68kops.h eng_ssf/sat_hw.h eng_ssf/scspdsp.h eng_ssf/scsp.h \
+eng_qsf/qsound.h eng_qsf/z80dasm.h eng_qsf/z80.h\
+eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\
+eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
+eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h 
+
+ddb_ao_la_LDFLAGS = -module -fPIC
+
+EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
+
+ddb_ao_la_LIBADD = $(LDADD)
+AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm $(ZLIB_LIBS)
+endif
+

deadbeef-0.5.2.tar.bz2/plugins/ao/Makefile.in Added

@@ -0,0 +1,961 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/ao
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_ao_la_DEPENDENCIES =
+am__ddb_ao_la_SOURCES_DIST = plugin.c main.c corlett.c \
+	eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c \
+	eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c \
+	eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c \
+	eng_ssf/m68kopnz.c eng_ssf/m68kops.c eng_ssf/scsp.c \
+	eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c \
+	eng_qsf/eng_qsf.c eng_qsf/kabuki.c eng_qsf/qsound.c \
+	eng_qsf/z80.c eng_qsf/z80dasm.c eng_psf/eng_psf.c \
+	eng_psf/psx.c eng_psf/psx_hw.c eng_psf/peops/spu.c \
+	eng_psf/eng_psf2.c eng_psf/peops2/spu2.c eng_psf/peops2/dma2.c \
+	eng_psf/peops2/registers2.c eng_psf/eng_spu.c ao.h corlett.h \
+	cpuintrf.h eng_protos.h mem.h osd_cpu.h eng_dsf/aicadsp.h \
+	eng_dsf/aica.h eng_dsf/arm7.h eng_dsf/arm7i.h \
+	eng_dsf/arm7thumb.h eng_dsf/dc_hw.h eng_ssf/m68kconf.h \
+	eng_ssf/m68kcpu.h eng_ssf/m68k.h eng_ssf/m68kmame.h \
+	eng_ssf/m68kops.h eng_ssf/sat_hw.h eng_ssf/scspdsp.h \
+	eng_ssf/scsp.h eng_qsf/qsound.h eng_qsf/z80dasm.h \
+	eng_qsf/z80.h eng_psf/cpuintrf.h eng_psf/mamemem.h \
+	eng_psf/psx.h eng_psf/peops/adsr.h eng_psf/peops/dma.h \
+	eng_psf/peops/externals.h eng_psf/peops/gauss_i.h \
+	eng_psf/peops/registers.h eng_psf/peops/regs.h \
+	eng_psf/peops/spu.h eng_psf/peops/stdafx.h \
+	eng_psf/peops2/adsr.h eng_psf/peops2/dma.h \
+	eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h \
+	eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h \
+	eng_psf/peops2/regs.h eng_psf/peops2/reverb.h \
+	eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h
+@HAVE_PSF_TRUE@am_ddb_ao_la_OBJECTS = plugin.lo main.lo corlett.lo \
+@HAVE_PSF_TRUE@	eng_dsf.lo dc_hw.lo aica.lo aicadsp.lo arm7.lo \
+@HAVE_PSF_TRUE@	arm7i.lo m68kcpu.lo m68kopac.lo m68kopdm.lo \
+@HAVE_PSF_TRUE@	m68kopnz.lo m68kops.lo scsp.lo scspdsp.lo \
+@HAVE_PSF_TRUE@	sat_hw.lo eng_ssf.lo eng_qsf.lo kabuki.lo \
+@HAVE_PSF_TRUE@	qsound.lo z80.lo z80dasm.lo eng_psf.lo psx.lo \
+@HAVE_PSF_TRUE@	psx_hw.lo spu.lo eng_psf2.lo spu2.lo dma2.lo \
+@HAVE_PSF_TRUE@	registers2.lo eng_spu.lo
+ddb_ao_la_OBJECTS = $(am_ddb_ao_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ddb_ao_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ddb_ao_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_PSF_TRUE@am_ddb_ao_la_rpath = -rpath $(pkglibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(ddb_ao_la_SOURCES)
+DIST_SOURCES = $(am__ddb_ao_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
+ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
+IMLIB2_DEPS_LIBS = @IMLIB2_DEPS_LIBS@
+INSANE_CFLAGS = @INSANE_CFLAGS@
+INSANE_CXXFLAGS = @INSANE_CXXFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIB = @LIB@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMMS_LIBS = @LIBMMS_LIBS@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBSAMPLERATE_DEPS_CFLAGS = @LIBSAMPLERATE_DEPS_CFLAGS@
+LIBSAMPLERATE_DEPS_LIBS = @LIBSAMPLERATE_DEPS_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OSS_CFLAGS = @OSS_CFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
+PULSE_DEPS_LIBS = @PULSE_DEPS_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@HAVE_PSF_TRUE@aodir = $(libdir)/$(PACKAGE)
+@HAVE_PSF_TRUE@pkglib_LTLIBRARIES = ddb_ao.la
+@HAVE_PSF_TRUE@ddb_ao_la_SOURCES = plugin.c main.c corlett.c\
+@HAVE_PSF_TRUE@eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\
+@HAVE_PSF_TRUE@eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \
+@HAVE_PSF_TRUE@eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\
+@HAVE_PSF_TRUE@eng_qsf/eng_qsf.c eng_qsf/kabuki.c eng_qsf/qsound.c eng_qsf/z80.c eng_qsf/z80dasm.c\
+@HAVE_PSF_TRUE@eng_psf/eng_psf.c eng_psf/psx.c eng_psf/psx_hw.c eng_psf/peops/spu.c \
+@HAVE_PSF_TRUE@eng_psf/eng_psf2.c eng_psf/peops2/spu2.c eng_psf/peops2/dma2.c eng_psf/peops2/registers2.c\
+@HAVE_PSF_TRUE@eng_psf/eng_spu.c\
+@HAVE_PSF_TRUE@ao.h corlett.h cpuintrf.h eng_protos.h mem.h osd_cpu.h\
+@HAVE_PSF_TRUE@eng_dsf/aicadsp.h eng_dsf/aica.h eng_dsf/arm7.h eng_dsf/arm7i.h eng_dsf/arm7thumb.h eng_dsf/dc_hw.h\
+@HAVE_PSF_TRUE@eng_ssf/m68kconf.h eng_ssf/m68kcpu.h eng_ssf/m68k.h eng_ssf/m68kmame.h eng_ssf/m68kops.h eng_ssf/sat_hw.h eng_ssf/scspdsp.h eng_ssf/scsp.h \
+@HAVE_PSF_TRUE@eng_qsf/qsound.h eng_qsf/z80dasm.h eng_qsf/z80.h\
+@HAVE_PSF_TRUE@eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\
+@HAVE_PSF_TRUE@eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\
+@HAVE_PSF_TRUE@eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h 
+
+@HAVE_PSF_TRUE@ddb_ao_la_LDFLAGS = -module -fPIC
+@HAVE_PSF_TRUE@EXTRA_DIST = eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
+@HAVE_PSF_TRUE@ddb_ao_la_LIBADD = $(LDADD)
+@HAVE_PSF_TRUE@AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm $(ZLIB_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	 case '$(am__configure_deps)' in \
+	 *$$dep*) \
+	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	 && { if test -f $@; then exit 0; else break; fi; }; \
+	 exit 1;; \
+	 esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ao/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu plugins/ao/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	 *config.status*) \
+	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	 *) \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	 if test -f $$p; then \
+	 list2="$$list2 $$p"; \
+	 else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	 $(am__strip_dir) \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	 test "$$dir" != "$$p" || dir=.; \
+	 echo "rm -f \"$${dir}/so_locations\""; \
+	 rm -f "$${dir}/so_locations"; \
+	done
+ddb_ao.la: $(ddb_ao_la_OBJECTS) $(ddb_ao_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_ao_la_LINK) $(am_ddb_ao_la_rpath) $(ddb_ao_la_OBJECTS) $(ddb_ao_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aica.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aicadsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arm7.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arm7i.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/corlett.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dc_hw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dma2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_dsf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_psf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_psf2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_qsf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_spu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eng_ssf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kabuki.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68kcpu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68kopac.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68kopdm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68kopnz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68kops.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psx_hw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsound.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registers2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sat_hw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scspdsp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spu2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/z80.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/z80dasm.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+eng_dsf.lo: eng_dsf/eng_dsf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_dsf.lo -MD -MP -MF $(DEPDIR)/eng_dsf.Tpo -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_dsf.Tpo $(DEPDIR)/eng_dsf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/eng_dsf.c' object='eng_dsf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+
+dc_hw.lo: eng_dsf/dc_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dc_hw.lo -MD -MP -MF $(DEPDIR)/dc_hw.Tpo -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dc_hw.Tpo $(DEPDIR)/dc_hw.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/dc_hw.c' object='dc_hw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+
+aica.lo: eng_dsf/aica.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aica.lo -MD -MP -MF $(DEPDIR)/aica.Tpo -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/aica.Tpo $(DEPDIR)/aica.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+
+aicadsp.lo: eng_dsf/aicadsp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aicadsp.lo -MD -MP -MF $(DEPDIR)/aicadsp.Tpo -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/aicadsp.Tpo $(DEPDIR)/aicadsp.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+
+arm7.lo: eng_dsf/arm7.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7.lo -MD -MP -MF $(DEPDIR)/arm7.Tpo -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/arm7.Tpo $(DEPDIR)/arm7.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+
+arm7i.lo: eng_dsf/arm7i.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm7i.lo -MD -MP -MF $(DEPDIR)/arm7i.Tpo -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/arm7i.Tpo $(DEPDIR)/arm7i.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+
+m68kcpu.lo: eng_ssf/m68kcpu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kcpu.lo -MD -MP -MF $(DEPDIR)/m68kcpu.Tpo -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kcpu.Tpo $(DEPDIR)/m68kcpu.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+
+m68kopac.lo: eng_ssf/m68kopac.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopac.lo -MD -MP -MF $(DEPDIR)/m68kopac.Tpo -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopac.Tpo $(DEPDIR)/m68kopac.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+
+m68kopdm.lo: eng_ssf/m68kopdm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopdm.lo -MD -MP -MF $(DEPDIR)/m68kopdm.Tpo -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopdm.Tpo $(DEPDIR)/m68kopdm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+
+m68kopnz.lo: eng_ssf/m68kopnz.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kopnz.lo -MD -MP -MF $(DEPDIR)/m68kopnz.Tpo -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kopnz.Tpo $(DEPDIR)/m68kopnz.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+
+m68kops.lo: eng_ssf/m68kops.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT m68kops.lo -MD -MP -MF $(DEPDIR)/m68kops.Tpo -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m68kops.Tpo $(DEPDIR)/m68kops.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+
+scsp.lo: eng_ssf/scsp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scsp.lo -MD -MP -MF $(DEPDIR)/scsp.Tpo -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/scsp.Tpo $(DEPDIR)/scsp.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+
+scspdsp.lo: eng_ssf/scspdsp.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT scspdsp.lo -MD -MP -MF $(DEPDIR)/scspdsp.Tpo -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/scspdsp.Tpo $(DEPDIR)/scspdsp.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+
+sat_hw.lo: eng_ssf/sat_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sat_hw.lo -MD -MP -MF $(DEPDIR)/sat_hw.Tpo -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sat_hw.Tpo $(DEPDIR)/sat_hw.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/sat_hw.c' object='sat_hw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+
+eng_ssf.lo: eng_ssf/eng_ssf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_ssf.lo -MD -MP -MF $(DEPDIR)/eng_ssf.Tpo -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_ssf.Tpo $(DEPDIR)/eng_ssf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_ssf/eng_ssf.c' object='eng_ssf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+
+eng_qsf.lo: eng_qsf/eng_qsf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_qsf.lo -MD -MP -MF $(DEPDIR)/eng_qsf.Tpo -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_qsf.Tpo $(DEPDIR)/eng_qsf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/eng_qsf.c' object='eng_qsf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+
+kabuki.lo: eng_qsf/kabuki.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kabuki.lo -MD -MP -MF $(DEPDIR)/kabuki.Tpo -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/kabuki.Tpo $(DEPDIR)/kabuki.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+
+qsound.lo: eng_qsf/qsound.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT qsound.lo -MD -MP -MF $(DEPDIR)/qsound.Tpo -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/qsound.Tpo $(DEPDIR)/qsound.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+
+z80.lo: eng_qsf/z80.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80.lo -MD -MP -MF $(DEPDIR)/z80.Tpo -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/z80.Tpo $(DEPDIR)/z80.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+
+z80dasm.lo: eng_qsf/z80dasm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT z80dasm.lo -MD -MP -MF $(DEPDIR)/z80dasm.Tpo -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/z80dasm.Tpo $(DEPDIR)/z80dasm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+
+eng_psf.lo: eng_psf/eng_psf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf.lo -MD -MP -MF $(DEPDIR)/eng_psf.Tpo -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf.Tpo $(DEPDIR)/eng_psf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_psf.c' object='eng_psf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+
+psx.lo: eng_psf/psx.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx.lo -MD -MP -MF $(DEPDIR)/psx.Tpo -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psx.Tpo $(DEPDIR)/psx.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+
+psx_hw.lo: eng_psf/psx_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT psx_hw.lo -MD -MP -MF $(DEPDIR)/psx_hw.Tpo -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psx_hw.Tpo $(DEPDIR)/psx_hw.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/psx_hw.c' object='psx_hw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+
+spu.lo: eng_psf/peops/spu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu.lo -MD -MP -MF $(DEPDIR)/spu.Tpo -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spu.Tpo $(DEPDIR)/spu.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops/spu.c' object='spu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+
+eng_psf2.lo: eng_psf/eng_psf2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_psf2.lo -MD -MP -MF $(DEPDIR)/eng_psf2.Tpo -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_psf2.Tpo $(DEPDIR)/eng_psf2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_psf2.c' object='eng_psf2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+
+spu2.lo: eng_psf/peops2/spu2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spu2.lo -MD -MP -MF $(DEPDIR)/spu2.Tpo -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spu2.Tpo $(DEPDIR)/spu2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/spu2.c' object='spu2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+
+dma2.lo: eng_psf/peops2/dma2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dma2.lo -MD -MP -MF $(DEPDIR)/dma2.Tpo -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dma2.Tpo $(DEPDIR)/dma2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/dma2.c' object='dma2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+
+registers2.lo: eng_psf/peops2/registers2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT registers2.lo -MD -MP -MF $(DEPDIR)/registers2.Tpo -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/registers2.Tpo $(DEPDIR)/registers2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/peops2/registers2.c' object='registers2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+
+eng_spu.lo: eng_psf/eng_spu.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eng_spu.lo -MD -MP -MF $(DEPDIR)/eng_spu.Tpo -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/eng_spu.Tpo $(DEPDIR)/eng_spu.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eng_psf/eng_spu.c' object='eng_spu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eng_spu.lo `test -f 'eng_psf/eng_spu.c' || echo '$(srcdir)/'`eng_psf/eng_spu.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	 test -n "$$unique" || unique=$$empty_fix; \
+	 if test $$# -gt 0; then \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 "$$@" $$unique; \
+	 else \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 $$unique; \
+	 fi; \
+	fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	 $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	 && $(am__cd) $(top_srcdir) \
+	 && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	 dist_files=`for file in $$list; do echo $$file; done | \
+	 sed -e "s|^$$srcdirstrip/||;t" \
+	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	 */*) $(MKDIR_P) `echo "$$dist_files" | \
+			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			 sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	 if test -d $$d/$$file; then \
+	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	 if test -d "$(distdir)/$$file"; then \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	 else \
+	 test -f "$(distdir)/$$file" \
+	 || cp -p $$d/$$file "$(distdir)/$$file" \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 `test -z '$(STRIP)' || \
+	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

deadbeef-0.5.2.tar.bz2/plugins/ao/ao.h Added

@@ -0,0 +1,231 @@
+//
+// Audio Overload SDK
+//
+// Fake ao.h to set up the general Audio Overload style environment
+//
+
+#ifndef __AO_H
+#define __AO_H
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#define AO_SUCCESS					1
+#define AO_FAIL						0
+#define AO_FAIL_DECOMPRESSION		-1
+
+#define MAX_DISP_INFO_LENGTH		256
+#define AUDIO_RATE					(44100)
+
+enum
+{
+	COMMAND_NONE = 0,
+	COMMAND_PREV,
+	COMMAND_NEXT,
+	COMMAND_RESTART,
+	COMMAND_HAS_PREV,
+	COMMAND_HAS_NEXT,
+	COMMAND_GET_MIN,
+	COMMAND_GET_MAX,
+	COMMAND_JUMP
+};
+
+#if 0
+/* Compiler defines for Xcode */
+#ifdef __BIG_ENDIAN__
+	#undef LSB_FIRST
+#endif
+
+#ifdef __LITTLE_ENDIAN__
+	#define LSB_FIRST	1
+#endif
+#endif
+
+#ifdef WORDS_BIGENDIAN
+	#undef LSB_FIRST
+#else
+	#define LSB_FIRST	1
+#endif
+
+typedef unsigned char ao_bool;
+
+#ifdef __GNUC__
+#include <stddef.h>	// get NULL
+#include <stdbool.h>
+
+#ifndef nil
+#define nil NULL
+#endif
+
+#ifndef TRUE
+#define TRUE (1)
+#endif
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#define xmalloc(a) malloc(a)
+
+#endif
+
+#ifdef _MSC_VER
+#include <stddef.h>	// get NULL
+#include <wchar.h> // for off_t
+
+#ifndef nil
+#define nil NULL
+#endif
+
+#ifndef TRUE
+#define TRUE (1)
+#endif
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#define true (1)
+#define false (0)
+
+#define xmalloc(a) malloc(a)
+
+#define strcasecmp _strcmpi
+
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX	2048
+#endif
+
+typedef struct
+{
+	char title[9][MAX_DISP_INFO_LENGTH];
+	char info[9][MAX_DISP_INFO_LENGTH];
+} ao_display_info;
+
+typedef unsigned char		uint8;
+typedef unsigned char		UINT8;
+typedef signed char			int8;
+typedef signed char			INT8;
+typedef unsigned short		uint16;
+typedef unsigned short		UINT16;
+typedef signed short		int16;
+typedef signed short		INT16;
+typedef signed int			int32;
+typedef unsigned int		uint32;
+#ifdef LONG_IS_64BIT
+typedef signed long int64;
+typedef unsigned long uint64;
+#else
+typedef signed long long	int64;
+typedef unsigned long long	uint64;
+#endif
+
+typedef int8 s8;
+typedef int16 s16;
+typedef int32 s32;
+typedef int64 s64;
+
+typedef uint8 u8;
+typedef uint16 u16;
+typedef uint32 u32;
+typedef uint64 u64;
+
+#ifndef INLINE
+#if defined(_MSC_VER)
+#define INLINE __forceinline
+#elif defined(__GNUC__)
+#define INLINE __inline__
+#elif defined(_MWERKS_)
+#define INLINE inline
+#elif defined(__powerc)
+#define INLINE inline
+#else
+#define INLINE
+#endif
+#endif
+
+#if LSB_FIRST
+static INLINE u16 BFLIP16(u16 x)
+{
+ return x;
+}
+#else
+static INLINE u16 BFLIP16(u16 x)
+{
+ return( ((x>>8)&0xFF)| ((x&0xFF)<<8) );
+}
+#endif
+
+#ifdef WIN32
+#ifndef _BASETSD_H
+typedef signed int			INT32;
+typedef unsigned int		UINT32;
+typedef signed long long	INT64;
+typedef unsigned long long	UINT64;
+#endif
+#else
+typedef signed int			INT32;
+typedef unsigned int		UINT32;
+#ifdef LONG_IS_64BIT
+typedef signed long INT64;
+typedef unsigned long UINT64;
+#else
+typedef signed long long	INT64;
+typedef unsigned long long	UINT64;
+#endif
+#endif
+
+#if LSB_FIRST
+#define LE16(x) (x)
+#define LE32(x) (x)
+
+#ifndef __ENDIAN__ /* Mac OS X Endian header has this function in it */
+static unsigned long INLINE Endian32_Swap(unsigned long addr)
+{
+	unsigned long res = (((addr&0xff000000)>>24) |
+		 ((addr&0x00ff0000)>>8) |
+		 ((addr&0x0000ff00)<<8) |
+		 ((addr&0x000000ff)<<24));
+
+	return res;
+}
+#endif
+
+#else
+
+static unsigned short INLINE LE16(unsigned short x)
+{
+	unsigned short res = (((x & 0xFF00) >> 8) | ((x & 0xFF) << 8));
+	return res;
+}
+
+static unsigned long INLINE LE32(unsigned long addr)
+{
+	unsigned long res = (((addr&0xff000000)>>24) |
+		 ((addr&0x00ff0000)>>8) |
+		 ((addr&0x0000ff00)<<8) |
+		 ((addr&0x000000ff)<<24));
+
+	return res;
+}
+
+#endif
+
+int ao_get_lib(char *filename, uint8 **buffer, uint64 *length);
+
+int ao_identify (char *buffer);
+
+void *ao_start (uint32 type, const char *name, uint8 *buffer, uint32 size);
+
+int ao_stop (uint32 type, void *handle);
+
+int ao_get_info (uint32 type, void *handle, ao_display_info *info);
+
+int ao_decode (uint32 type, void *handle, int16 *buffer, uint32 size);
+
+int ao_command (uint32 type, void *handle, int32 command, int32 param);
+
+void ao_getlibpath (const char *path, const char *libname, char *libpath, int size);
+
+#endif // AO_H

deadbeef-0.5.2.tar.bz2/plugins/ao/corlett.c Added

@@ -0,0 +1,376 @@
+/*
+
+	Audio Overload SDK
+
+	Copyright (c) 2007-2008, R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+// corlett.c
+
+// Decodes file format designed by Neill Corlett (PSF, QSF, ...)
+
+/*
+ - First 3 bytes: ASCII signature: "PSF" (case sensitive)
+
+- Next 1 byte: Version byte
+ The version byte is used to determine the type of PSF file. It does NOT
+ affect the basic structure of the file in any way.
+
+ Currently accepted version bytes are:
+ 0x01: Playstation (PSF1)
+ 0x02: Playstation 2 (PSF2)
+ 0x11: Saturn (SSF) [TENTATIVE]
+ 0x12: Dreamcast (DSF) [TENTATIVE]
+ 0x21: Nintendo 64 (USF) [RESERVED]
+ 0x41: Capcom QSound (QSF)
+
+- Next 4 bytes: Size of reserved area (R), little-endian unsigned long
+
+- Next 4 bytes: Compressed program length (N), little-endian unsigned long
+ This is the length of the program data _after_ compression.
+
+- Next 4 bytes: Compressed program CRC-32, little-endian unsigned long
+ This is the CRC-32 of the program data _after_ compression. Filling in
+ this value is mandatory, as a PSF file may be regarded as corrupt if it
+ does not match.
+
+- Next R bytes: Reserved area.
+ May be empty if R is 0 bytes.
+
+- Next N bytes: Compressed program, in zlib compress() format.
+ May be empty if N is 0 bytes.
+
+The following data is optional and may be omitted:
+
+- Next 5 bytes: ASCII signature: "[TAG]" (case sensitive)
+ If these 5 bytes do not match, then the remainder of the file may be
+ regarded as invalid and discarded.
+
+- Remainder of file: Uncompressed ASCII tag data.
+*/
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "corlett.h"
+
+#include <zlib.h>
+#include <stdlib.h>
+
+#define DECOMP_MAX_SIZE		((32 * 1024 * 1024) + 12)
+
+int corlett_decode(uint8 *input, uint32 input_len, uint8 **output, uint64 *size, corlett_t **c)
+{
+	uint32 *buf;
+	uint32 res_area, comp_crc, actual_crc;
+	uint8 *decomp_dat, *tag_dec;
+	uLongf decomp_length, comp_length;
+	
+	// 32-bit pointer to data
+	buf = (uint32 *)input;
+	
+	// Check we have a PSF format file.
+	if ((input[0] != 'P') || (input[1] != 'S') || (input[2] != 'F'))
+	{
+		return AO_FAIL;
+	}
+	
+	// Get our values
+	res_area = LE32(buf[1]);
+	comp_length = LE32(buf[2]);
+	comp_crc = LE32(buf[3]);
+		
+	if (comp_length > 0)
+	{
+		// Check length
+		if (input_len < comp_length + 16)
+			return AO_FAIL;
+	
+		// Check CRC is correct
+		actual_crc = crc32(0, (unsigned char *)&buf[4+(res_area/4)], comp_length);
+		if (actual_crc != comp_crc)
+			return AO_FAIL;
+	
+		// Decompress data if any
+		decomp_dat = malloc(DECOMP_MAX_SIZE);
+		decomp_length = DECOMP_MAX_SIZE;
+		if (uncompress(decomp_dat, &decomp_length, (unsigned char *)&buf[4+(res_area/4)], comp_length) != Z_OK)
+		{
+			free(decomp_dat);
+			return AO_FAIL;
+		}
+
+		// Resize memory buffer to what we actually need
+		decomp_dat = realloc(decomp_dat, (size_t)decomp_length + 1);
+	}
+	else
+	{
+		decomp_dat = NULL;
+		decomp_length = 0;
+	}
+
+	// Make structure
+	*c = malloc(sizeof(corlett_t));
+	if (!(*c))
+	{
+		free(decomp_dat);
+		return AO_FAIL;
+	}
+	memset(*c, 0, sizeof(corlett_t));
+	strcpy((*c)->inf_title, "n/a");
+	strcpy((*c)->inf_copy, "n/a");
+	strcpy((*c)->inf_artist, "n/a");
+	strcpy((*c)->inf_game, "n/a");
+	strcpy((*c)->inf_year, "n/a");
+	strcpy((*c)->inf_length, "n/a");
+	strcpy((*c)->inf_fade, "n/a");
+
+	// set reserved section pointer
+	(*c)->res_section = &buf[4];
+	(*c)->res_size = res_area;
+	
+	// Return it
+	*output = decomp_dat;
+	*size = decomp_length;
+		
+	// Next check for tags
+	input_len -= (comp_length + 16 + res_area);
+	if (input_len < 5)
+		return AO_SUCCESS;
+		
+//	printf("\n\nNew corlett: input len %d\n", input_len);
+	
+	tag_dec = input + (comp_length + res_area + 16);
+	if ((tag_dec[0] == '[') && (tag_dec[1] == 'T') && (tag_dec[2] == 'A') && (tag_dec[3] == 'G') && (tag_dec[4] == ']'))
+	{
+		int tag, l, num_tags, data;
+		
+		// Tags found!
+		tag_dec += 5;
+		input_len -= 5;
+
+		tag = 0;
+		data = false;
+		num_tags = 0;
+		l = 0;
+		while (input_len && (num_tags < MAX_UNKNOWN_TAGS))
+		{
+			if (data)
+			{
+				if ((*tag_dec == 0xA) || (*tag_dec == 0x00))
+				{
+					(*c)->tag_data[num_tags][l] = 0;
+					data = false;
+					num_tags++;
+					l = 0;
+				}
+				else
+				{
+					(*c)->tag_data[num_tags][l++] = *tag_dec;
+				}
+			}
+			else
+			{
+				if (*tag_dec == '=')
+				{
+					(*c)->tag_name[num_tags][l] = 0;
+					l = 0;
+					data = true;
+				}
+				else
+				{
+					(*c)->tag_name[num_tags][l++] = *tag_dec;
+				}
+			}
+			
+			tag_dec++;
+			input_len--;
+		}
+		
+		
+		// Now, process that tag array into what we expect
+		for (num_tags = 0; num_tags < MAX_UNKNOWN_TAGS; num_tags++)
+		{			
+			// See if tag belongs in one of the special fields we have
+			if (!strcasecmp((*c)->tag_name[num_tags], "_lib"))
+			{
+				strcpy((*c)->lib, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib2", 5))
+			{
+				strcpy((*c)->libaux[0], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib3", 5))
+			{
+				strcpy((*c)->libaux[1], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib4", 5))
+			{
+				strcpy((*c)->libaux[2], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib5", 5))
+			{
+				strcpy((*c)->libaux[3], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib6", 5))
+			{
+				strcpy((*c)->libaux[4], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib7", 5))
+			{
+				strcpy((*c)->libaux[5], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib8", 5))
+			{
+				strcpy((*c)->libaux[6], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_lib9", 5))
+			{
+				strcpy((*c)->libaux[7], (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "_refresh", 8))
+			{
+				strcpy((*c)->inf_refresh, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "title", 5))
+			{
+				strcpy((*c)->inf_title, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "copyright", 9))
+			{
+				strcpy((*c)->inf_copy, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "artist", 6))
+			{
+				strcpy((*c)->inf_artist, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "game", 4))
+			{
+				strcpy((*c)->inf_game, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "year", 4))
+			{
+				strcpy((*c)->inf_year, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "length", 6))
+			{
+				strcpy((*c)->inf_length, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+			else if (!strncmp((*c)->tag_name[num_tags], "fade", 4))
+			{
+				strcpy((*c)->inf_fade, (*c)->tag_data[num_tags]);
+				(*c)->tag_data[num_tags][0] = 0;
+				(*c)->tag_name[num_tags][0] = 0;
+			}
+		}
+	}
+	
+	// Bingo
+	return AO_SUCCESS;
+}
+
+uint32 psfTimeToMS(char *str)
+{
+	int x, c=0;
+	uint32 acc=0;
+	char s[100];
+
+	strncpy(s,str,100);
+	s[99]=0;
+
+	for (x=strlen(s); x>=0; x--)
+	{
+		if (s[x]=='.' || s[x]==',')
+		{
+			acc=atoi(s+x+1);
+			s[x]=0;
+		}
+		else if (s[x]==':')
+		{
+			if(c==0) 
+			{
+				acc+=atoi(s+x+1)*10;
+			}
+			else if(c==1) 
+			{
+				acc+=atoi(s+x+(x?1:0))*10*60;
+			}
+
+			c++;
+			s[x]=0;
+		}
+		else if (x==0)
+		{
+			if(c==0)
+			{ 
+				acc+=atoi(s+x)*10;
+			}
+			else if(c==1) 
+			{
+				acc+=atoi(s+x)*10*60;
+			}
+			else if(c==2) 
+			{
+				acc+=atoi(s+x)*10*60*60;
+			}
+		}
+	}
+
+	acc*=100;
+	return(acc);
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/corlett.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/cpuintrf.h Added

@@ -0,0 +1,668 @@
+#ifndef CPUINTRF_H
+#define CPUINTRF_H
+
+#include "osd_cpu.h"
+
+/* The old system is obsolete and no longer supported by the core */
+#define NEW_INTERRUPT_SYSTEM 1
+
+#define MAX_IRQ_LINES 8 /* maximum number of IRQ lines per CPU */
+
+#define CLEAR_LINE		0		/* clear (a fired, held or pulsed) line */
+#define ASSERT_LINE 1 /* assert an interrupt immediately */
+#define HOLD_LINE 2 /* hold interrupt line until enable is true */
+#define PULSE_LINE		3		/* pulse interrupt line for one instruction */
+
+#define MAX_REGS		64		/* maximum number of register of any CPU */
+
+#define	IRQ_LINE_NMI	10
+/* Values passed to the cpu_info function of a core to retrieve information */
+enum {
+	CPU_INFO_REG,
+	CPU_INFO_FLAGS=MAX_REGS,
+	CPU_INFO_NAME,
+ CPU_INFO_FAMILY,
+ CPU_INFO_VERSION,
+ CPU_INFO_FILE,
+ CPU_INFO_CREDITS,
+ CPU_INFO_REG_LAYOUT,
+	CPU_INFO_WIN_LAYOUT
+};
+
+#define CPU_IS_LE		0	/* emulated CPU is little endian */
+#define CPU_IS_BE		1	/* emulated CPU is big endian */
+
+/*
+ * This value is passed to cpu_get_reg to retrieve the previous
+ * program counter value, ie. before a CPU emulation started
+ * to fetch opcodes and arguments for the current instrution.
+ */
+#define REG_PREVIOUSPC	-1
+
+/*
+ * This value is passed to cpu_get_reg/cpu_set_reg, instead of one of
+ * the names from the enum a CPU core defines for it's registers,
+ * to get or set the contents of the memory pointed to by a stack pointer.
+ * You can specify the n'th element on the stack by (REG_SP_CONTENTS-n),
+ * ie. lower negative values. The actual element size (UINT16 or UINT32)
+ * depends on the CPU core.
+ * This is also used to replace the cpu_geturnpc() function.
+ */
+#define REG_SP_CONTENTS -2
+
+/*
+ * These flags can be defined in the makefile (or project) to
+ * exclude (zero) or include (non zero) specific CPU cores
+ */
+#ifndef HAS_GENSYNC
+#define HAS_GENSYNC		0
+#endif
+#ifndef HAS_Z80
+#define HAS_Z80 		0
+#endif
+#ifndef HAS_Z80_VM
+#define HAS_Z80_VM		0
+#endif
+#ifndef HAS_8080
+#define HAS_8080		0
+#endif
+#ifndef HAS_8085A
+#define HAS_8085A		0
+#endif
+#ifndef HAS_M6502
+#define HAS_M6502		0
+#endif
+#ifndef HAS_M65C02
+#define HAS_M65C02		0
+#endif
+#ifndef HAS_M65SC02
+#define HAS_M65SC02		0
+#endif
+#ifndef HAS_M65CE02
+#define HAS_M65CE02		0
+#endif
+#ifndef HAS_M6509
+#define HAS_M6509		0
+#endif
+#ifndef HAS_M6510
+#define HAS_M6510		0
+#endif
+#ifndef HAS_N2A03
+#define HAS_N2A03		0
+#endif
+#ifndef HAS_H6280
+#define HAS_H6280		0
+#endif
+#ifndef HAS_I86
+#define HAS_I86 		0
+#endif
+#ifndef HAS_V20
+#define HAS_V20 		0
+#endif
+#ifndef HAS_V30
+#define HAS_V30 		0
+#endif
+#ifndef HAS_V33
+#define HAS_V33 		0
+#endif
+#ifndef HAS_I8035
+#define HAS_I8035		0
+#endif
+#ifndef HAS_I8039
+#define HAS_I8039		0
+#endif
+#ifndef HAS_I8048
+#define HAS_I8048		0
+#endif
+#ifndef HAS_N7751
+#define HAS_N7751		0
+#endif
+#ifndef HAS_M6800
+#define HAS_M6800		0
+#endif
+#ifndef HAS_M6801
+#define HAS_M6801		0
+#endif
+#ifndef HAS_M6802
+#define HAS_M6802		0
+#endif
+#ifndef HAS_M6803
+#define HAS_M6803		0
+#endif
+#ifndef HAS_M6808
+#define HAS_M6808		0
+#endif
+#ifndef HAS_HD63701
+#define HAS_HD63701 	0
+#endif
+#ifndef HAS_M6805
+#define HAS_M6805		0
+#endif
+#ifndef HAS_M68705
+#define HAS_M68705		0
+#endif
+#ifndef HAS_HD63705
+#define HAS_HD63705 	0
+#endif
+#ifndef HAS_HD6309
+#define HAS_HD6309		0
+#endif
+#ifndef HAS_M6809
+#define HAS_M6809		0
+#endif
+#ifndef HAS_KONAMI
+#define HAS_KONAMI		0
+#endif
+#ifndef HAS_M68000
+#define HAS_M68000		0
+#endif
+#ifndef HAS_M68010
+#define HAS_M68010		0
+#endif
+#ifndef HAS_M68020
+#define HAS_M68020		0
+#endif
+#ifndef HAS_T11
+#define HAS_T11 		0
+#endif
+#ifndef HAS_S2650
+#define HAS_S2650		0
+#endif
+#ifndef HAS_TMS34010
+#define HAS_TMS34010	0
+#endif
+#ifndef HAS_TMS9900
+#define HAS_TMS9900 	0
+#endif
+#ifndef HAS_TMS9940
+#define HAS_TMS9940 	0
+#endif
+#ifndef HAS_TMS9980
+#define HAS_TMS9980 	0
+#endif
+#ifndef HAS_TMS9985
+#define HAS_TMS9985 	0
+#endif
+#ifndef HAS_TMS9989
+#define HAS_TMS9989 	0
+#endif
+#ifndef HAS_TMS9995
+#define HAS_TMS9995 	0
+#endif
+#ifndef HAS_TMS99105A
+#define HAS_TMS99105A 	0
+#endif
+#ifndef HAS_TMS99110A
+#define HAS_TMS99110A 	0
+#endif
+#ifndef HAS_Z8000
+#define HAS_Z8000		0
+#endif
+#ifndef HAS_TMS320C10
+#define HAS_TMS320C10	0
+#endif
+#ifndef HAS_CCPU
+#define HAS_CCPU		0
+#endif
+#ifndef HAS_PDP1
+#define HAS_PDP1		0
+#endif
+#ifndef HAS_ADSP2100
+#define HAS_ADSP2100	0
+#endif
+
+/* ASG 971222 -- added this generic structure */
+struct cpu_interface
+{
+ unsigned cpu_num;
+ void (*reset)(void *param);
+ void (*exit)(void);
+ int (*execute)(int cycles);
+ void (*burn)(int cycles);
+ unsigned (*get_context)(void *reg);
+ void (*set_context)(void *reg);
+ unsigned (*get_pc)(void);
+ void (*set_pc)(unsigned val);
+ unsigned (*get_sp)(void);
+ void (*set_sp)(unsigned val);
+ unsigned (*get_reg)(int regnum);
+ void (*set_reg)(int regnum, unsigned val);
+ void (*set_nmi_line)(int linestate);
+ void (*set_irq_line)(int irqline, int linestate);
+ void (*set_irq_callback)(int(*callback)(int irqline));
+ void (*internal_interrupt)(int type);
+ void (*cpu_state_save)(void *file);
+ void (*cpu_state_load)(void *file);
+ const char* (*cpu_info)(void *context,int regnum);
+ unsigned (*cpu_dasm)(char *buffer,unsigned pc);
+	unsigned num_irqs;
+	int default_vector;
+ int *icount;
+ double overclock;
+ int no_int, irq_int, nmi_int;
+ int (*memory_read)(int offset);
+ void (*memory_write)(int offset, int data);
+ void (*set_op_base)(int pc);
+	int address_shift;
+	unsigned address_bits, endianess, align_unit, max_inst_len;
+ unsigned abits1, abits2, abitsmin;
+};
+
+extern struct cpu_interface cpuintf[];
+
+void cpu_init(void);
+void cpu_run(void);
+
+/* optional watchdog */
+void watchdog_reset_w(int offset,int data);
+int watchdog_reset_r(int offset);
+/* Use this function to reset the machine */
+void machine_reset(void);
+/* Use this function to reset a single CPU */
+void cpu_set_reset_line(int cpu,int state);
+/* Use this function to halt a single CPU */
+void cpu_set_halt_line(int cpu,int state);
+
+/* This function returns CPUNUM current status (running or halted) */
+int cpu_getstatus(int cpunum);
+int cpu_gettotalcpu(void);
+int cpu_getactivecpu(void);
+void cpu_setactivecpu(int cpunum);
+
+/* Returns the current program counter */
+unsigned cpu_get_pc(void);
+/* Set the current program counter */
+void cpu_set_pc(unsigned val);
+
+/* Returns the current stack pointer */
+unsigned cpu_get_sp(void);
+/* Set the current stack pointer */
+void cpu_set_sp(unsigned val);
+
+/* Get the active CPUs context and return it's size */
+unsigned cpu_get_context(void *context);
+/* Set the active CPUs context */
+void cpu_set_context(void *context);
+
+/* Returns a specific register value (mamedbg) */
+unsigned cpu_get_reg(int regnum);
+/* Sets a specific register value (mamedbg) */
+void cpu_set_reg(int regnum, unsigned val);
+
+/* Returns previous pc (start of opcode causing read/write) */
+/* int cpu_getpreviouspc(void); */
+#define cpu_getpreviouspc() cpu_get_reg(REG_PREVIOUSPC)
+
+/* Returns the return address from the top of the stack (Z80 only) */
+/* int cpu_getreturnpc(void); */
+/* This can now be handled with a generic function */
+#define cpu_geturnpc() cpu_get_reg(REG_SP_CONTENTS)
+
+int cycles_currently_ran(void);
+int cycles_left_to_run(void);
+
+/* Returns the number of CPU cycles which take place in one video frame */
+int cpu_gettotalcycles(void);
+/* Returns the number of CPU cycles before the next interrupt handler call */
+int cpu_geticount(void);
+/* Returns the number of CPU cycles before the end of the current video frame */
+int cpu_getfcount(void);
+/* Returns the number of CPU cycles in one video frame */
+int cpu_getfperiod(void);
+/* Scales a given value by the ratio of fcount / fperiod */
+int cpu_scalebyfcount(int value);
+/* Returns the current scanline number */
+int cpu_getscanline(void);
+/* Returns the amount of time until a given scanline */
+double cpu_getscanlinetime(int scanline);
+/* Returns the duration of a single scanline */
+double cpu_getscanlineperiod(void);
+/* Returns the duration of a single scanline in cycles */
+int cpu_getscanlinecycles(void);
+/* Returns the number of cycles since the beginning of this frame */
+int cpu_getcurrentcycles(void);
+/* Returns the current horizontal beam position in pixels */
+int cpu_gethorzbeampos(void);
+/*
+ Returns the number of times the interrupt handler will be called before
+ the end of the current video frame. This is can be useful to interrupt
+ handlers to synchronize their operation. If you call this from outside
+ an interrupt handler, add 1 to the result, i.e. if it returns 0, it means
+ that the interrupt handler will be called once.
+*/
+int cpu_getiloops(void);
+
+/* Returns the current VBLANK state */
+int cpu_getvblank(void);
+
+/* Returns the number of the video frame we are currently playing */
+int cpu_getcurrentframe(void);
+
+
+/* generate a trigger after a specific period of time */
+void cpu_triggertime (double duration, int trigger);
+/* generate a trigger now */
+void cpu_trigger (int trigger);
+
+/* burn CPU cycles until a timer trigger */
+void cpu_spinuntil_trigger (int trigger);
+/* burn CPU cycles until the next interrupt */
+void cpu_spinuntil_int (void);
+/* burn CPU cycles until our timeslice is up */
+void cpu_spin (void);
+/* burn CPU cycles for a specific period of time */
+void cpu_spinuntil_time (double duration);
+
+/* yield our timeslice for a specific period of time */
+void cpu_yielduntil_trigger (int trigger);
+/* yield our timeslice until the next interrupt */
+void cpu_yielduntil_int (void);
+/* yield our current timeslice */
+void cpu_yield (void);
+/* yield our timeslice for a specific period of time */
+void cpu_yielduntil_time (double duration);
+
+/* set the NMI line state for a CPU, normally use PULSE_LINE */
+void cpu_set_nmi_line(int cpunum, int state);
+/* set the IRQ line state for a specific irq line of a CPU */
+/* normally use state HOLD_LINE, irqline 0 for first IRQ type of a cpu */
+void cpu_set_irq_line(int cpunum, int irqline, int state);
+/* this is to be called by CPU cores only! */
+void cpu_generate_internal_interrupt(int cpunum, int type);
+/* set the vector to be returned during a CPU's interrupt acknowledge cycle */
+void cpu_irq_line_vector_w(int cpunum, int irqline, int vector);
+
+/* use these in your write memory/port handles to set an IRQ vector */
+/* offset corresponds to the irq line number here */
+void cpu_0_irq_line_vector_w(int offset, int data);
+void cpu_1_irq_line_vector_w(int offset, int data);
+void cpu_2_irq_line_vector_w(int offset, int data);
+void cpu_3_irq_line_vector_w(int offset, int data);
+void cpu_4_irq_line_vector_w(int offset, int data);
+void cpu_5_irq_line_vector_w(int offset, int data);
+void cpu_6_irq_line_vector_w(int offset, int data);
+void cpu_7_irq_line_vector_w(int offset, int data);
+
+/* Obsolete functions: avoid to use them in new drivers if possible. */
+
+/* cause an interrupt on a CPU */
+void cpu_cause_interrupt(int cpu,int type);
+void cpu_clear_pending_interrupts(int cpu);
+void interrupt_enable_w(int offset,int data);
+void interrupt_vector_w(int offset,int data);
+int interrupt(void);
+int nmi_interrupt(void);
+int m68_level1_irq(void);
+int m68_level2_irq(void);
+int m68_level3_irq(void);
+int m68_level4_irq(void);
+int m68_level5_irq(void);
+int m68_level6_irq(void);
+int m68_level7_irq(void);
+int ignore_interrupt(void);
+
+/* CPU context access */
+void* cpu_getcontext (int _activecpu);
+int cpu_is_saving_context(int _activecpu);
+
+/***************************************************************************
+ * Get information for the currently active CPU
+ * cputype is a value from the CPU enum in driver.h
+ ***************************************************************************/
+/* Return number of address bits */
+unsigned cpu_address_bits(void);
+/* Return address mask */
+unsigned cpu_address_mask(void);
+/* Return address shift factor (TMS34010 bit addressing mode) */
+int cpu_address_shift(void);
+/* Return endianess of the emulated CPU (CPU_IS_LE or CPU_IS_BE) */
+unsigned cpu_endianess(void);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cpu_align_unit(void);
+/* Return maximum instruction length */
+unsigned cpu_max_inst_len(void);
+
+/* Return name of the active CPU */
+const char *cpu_name(void);
+/* Return family name of the active CPU */
+const char *cpu_core_family(void);
+/* Return core version of the active CPU */
+const char *cpu_core_version(void);
+/* Return core filename of the active CPU */
+const char *cpu_core_file(void);
+/* Return credits info for of the active CPU */
+const char *cpu_core_credits(void);
+/* Return register layout definition for the active CPU */
+const char *cpu_reg_layout(void);
+/* Return (debugger) window layout definition for the active CPU */
+const char *cpu_win_layout(void);
+
+/* Disassemble an instruction at PC into the given buffer */
+unsigned cpu_dasm(char *buffer, unsigned pc);
+/* Return a string describing the currently set flag (status) bits of the active CPU */
+const char *cpu_flags(void);
+/* Return a string with a register name and hex value for the active CPU */
+/* regnum is a value defined in the CPU cores header files */
+const char *cpu_dump_reg(int regnum);
+/* Return a string describing the active CPUs current state */
+const char *cpu_dump_state(void);
+
+/***************************************************************************
+ * Get information for a specific CPU type
+ * cputype is a value from the CPU enum in driver.h
+ ***************************************************************************/
+/* Return address shift factor */
+/* TMS320C10 -1: word addressing mode, TMS34010 3: bit addressing mode */
+int cputype_address_shift(int cputype);
+/* Return number of address bits */
+unsigned cputype_address_bits(int cputype);
+/* Return address mask */
+unsigned cputype_address_mask(int cputype);
+/* Return endianess of the emulated CPU (CPU_IS_LE or CPU_IS_BE) */
+unsigned cputype_endianess(int cputype);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cputype_align_unit(int cputype);
+/* Return maximum instruction length */
+unsigned cputype_max_inst_len(int cputype);
+
+/* Return name of the CPU */
+const char *cputype_name(int cputype);
+/* Return family name of the CPU */
+const char *cputype_core_family(int cputype);
+/* Return core version number of the CPU */
+const char *cputype_core_version(int cputype);
+/* Return core filename of the CPU */
+const char *cputype_core_file(int cputype);
+/* Return credits for the CPU core */
+const char *cputype_core_credits(int cputype);
+/* Return register layout definition for the CPU core */
+const char *cputype_reg_layout(int cputype);
+/* Return (debugger) window layout definition for the CPU core */
+const char *cputype_win_layout(int cputype);
+
+/***************************************************************************
+ * Get (or set) information for a numbered CPU of the running machine
+ * cpunum is a value between 0 and cpu_gettotalcpu() - 1
+ ***************************************************************************/
+/* Return number of address bits */
+unsigned cpunum_address_bits(int cputype);
+/* Return address mask */
+unsigned cpunum_address_mask(int cputype);
+/* Return endianess of the emulated CPU (CPU_LSB_FIRST or CPU_MSB_FIRST) */
+unsigned cpunum_endianess(int cputype);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cpunum_align_unit(int cputype);
+/* Return maximum instruction length */
+unsigned cpunum_max_inst_len(int cputype);
+
+/* Get a register value for the specified CPU number of the running machine */
+unsigned cpunum_get_reg(int cpunum, int regnum);
+/* Set a register value for the specified CPU number of the running machine */
+void cpunum_set_reg(int cpunum, int regnum, unsigned val);
+
+/* Return (debugger) register layout definition for the CPU core */
+const char *cpunum_reg_layout(int cpunum);
+/* Return (debugger) window layout definition for the CPU core */
+const char *cpunum_win_layout(int cpunum);
+
+unsigned cpunum_dasm(int cpunum,char *buffer,unsigned pc);
+/* Return a string describing the currently set flag (status) bits of the CPU */
+const char *cpunum_flags(int cpunum);
+/* Return a string with a register name and value */
+/* regnum is a value defined in the CPU cores header files */
+const char *cpunum_dump_reg(int cpunum, int regnum);
+/* Return a string describing the CPUs current state */
+const char *cpunum_dump_state(int cpunum);
+/* Return a name for the specified cpu number */
+const char *cpunum_name(int cpunum);
+/* Return a family name for the specified cpu number */
+const char *cpunum_core_family(int cpunum);
+/* Return a version for the specified cpu number */
+const char *cpunum_core_version(int cpunum);
+/* Return a the source filename for the specified cpu number */
+const char *cpunum_core_file(int cpunum);
+/* Return a the credits for the specified cpu number */
+const char *cpunum_core_credits(int cpunum);
+
+/* Dump all of the running machines CPUs state to stderr */
+void cpu_dump_states(void);
+
+/* daisy-chain link */
+typedef struct {
+ void (*reset)(int); /* reset callback */
+ int (*interrupt_entry)(int); /* entry callback */
+ void (*interrupt_reti)(int); /* reti callback */
+ int irq_param; /* callback paramater */
+}	Z80_DaisyChain;
+
+#define Z80_MAXDAISY	4		/* maximum of daisy chan device */
+
+#define Z80_INT_REQ 0x01 /* interrupt request mask */
+#define Z80_INT_IEO 0x02 /* interrupt disable mask(IEO) */
+
+#define Z80_VECTOR(device,state) (((device)<<8)|(state))
+
+#ifndef INLINE
+#define INLINE 		inline
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define cpu_readmem16		memory_read
+#define cpu_readport16		memory_readport
+#define cpu_writeport16		memory_writeport
+#define cpu_writemem16		memory_write
+#define cpu_readop			memory_readop
+#define cpu_readop_arg		memory_read
+#define logerror(x, ...)
+#define change_pc16(x)
+#define CALL_MAME_DEBUG
+
+#define ADDRESS_SPACES			3						/* maximum number of address spaces */
+#define ADDRESS_SPACE_PROGRAM	0						/* program address space */
+#define ADDRESS_SPACE_DATA		1						/* data address space */
+#define ADDRESS_SPACE_IO		2						/* I/O address space */
+
+enum
+{
+	/* internal flags (not for use by drivers!) */
+	INTERNAL_CLEAR_LINE = 100 + CLEAR_LINE,
+	INTERNAL_ASSERT_LINE = 100 + ASSERT_LINE,
+
+	/* input lines */
+	MAX_INPUT_LINES = 32+3,
+	INPUT_LINE_IRQ0 = 0,
+	INPUT_LINE_IRQ1 = 1,
+	INPUT_LINE_IRQ2 = 2,
+	INPUT_LINE_IRQ3 = 3,
+	INPUT_LINE_IRQ4 = 4,
+	INPUT_LINE_IRQ5 = 5,
+	INPUT_LINE_IRQ6 = 6,
+	INPUT_LINE_IRQ7 = 7,
+	INPUT_LINE_IRQ8 = 8,
+	INPUT_LINE_IRQ9 = 9,
+	INPUT_LINE_NMI = MAX_INPUT_LINES - 3,
+
+	/* special input lines that are implemented in the core */
+	INPUT_LINE_RESET = MAX_INPUT_LINES - 2,
+	INPUT_LINE_HALT = MAX_INPUT_LINES - 1,
+
+	/* output lines */
+	MAX_OUTPUT_LINES = 32
+};
+
+enum
+{
+	/* --- the following bits of info are returned as 64-bit signed integers --- */
+	CPUINFO_INT_FIRST = 0x00000,
+
+	CPUINFO_INT_CONTEXT_SIZE = CPUINFO_INT_FIRST,		/* R/O: size of CPU context in bytes */
+	CPUINFO_INT_INPUT_LINES,							/* R/O: number of input lines */
+	CPUINFO_INT_OUTPUT_LINES,							/* R/O: number of output lines */
+	CPUINFO_INT_DEFAULT_IRQ_VECTOR,						/* R/O: default IRQ vector */
+	CPUINFO_INT_ENDIANNESS,								/* R/O: either CPU_IS_BE or CPU_IS_LE */
+	CPUINFO_INT_CLOCK_DIVIDER,							/* R/O: internal clock divider */
+	CPUINFO_INT_MIN_INSTRUCTION_BYTES,					/* R/O: minimum bytes per instruction */
+	CPUINFO_INT_MAX_INSTRUCTION_BYTES,					/* R/O: maximum bytes per instruction */
+	CPUINFO_INT_MIN_CYCLES,								/* R/O: minimum cycles for a single instruction */
+	CPUINFO_INT_MAX_CYCLES,								/* R/O: maximum cycles for a single instruction */
+
+	CPUINFO_INT_DATABUS_WIDTH,							/* R/O: data bus size for each address space (8,16,32,64) */
+	CPUINFO_INT_DATABUS_WIDTH_LAST = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACES - 1,
+	CPUINFO_INT_ADDRBUS_WIDTH,							/* R/O: address bus size for each address space (12-32) */
+	CPUINFO_INT_ADDRBUS_WIDTH_LAST = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACES - 1,
+	CPUINFO_INT_ADDRBUS_SHIFT,							/* R/O: shift applied to addresses each address space (+3 means >>3, -1 means <<1) */
+	CPUINFO_INT_ADDRBUS_SHIFT_LAST = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACES - 1,
+
+	CPUINFO_INT_SP,										/* R/W: the current stack pointer value */
+	CPUINFO_INT_PC,										/* R/W: the current PC value */
+	CPUINFO_INT_PREVIOUSPC,								/* R/W: the previous PC value */
+	CPUINFO_INT_INPUT_STATE,							/* R/W: states for each input line */
+	CPUINFO_INT_INPUT_STATE_LAST = CPUINFO_INT_INPUT_STATE + MAX_INPUT_LINES - 1,
+	CPUINFO_INT_OUTPUT_STATE,							/* R/W: states for each output line */
+	CPUINFO_INT_OUTPUT_STATE_LAST = CPUINFO_INT_OUTPUT_STATE + MAX_OUTPUT_LINES - 1,
+	CPUINFO_INT_REGISTER,								/* R/W: values of up to MAX_REGs registers */
+	CPUINFO_INT_REGISTER_LAST = CPUINFO_INT_REGISTER + MAX_REGS - 1,
+
+	CPUINFO_INT_CPU_SPECIFIC = 0x08000,					/* R/W: CPU-specific values start here */
+
+	/* --- the following bits of info are returned as pointers to data or functions --- */
+	CPUINFO_PTR_FIRST = 0x10000,
+
+	CPUINFO_PTR_SET_INFO = CPUINFO_PTR_FIRST,			/* R/O: void (*set_info)(UINT32 state, INT64 data, void *ptr) */
+	CPUINFO_PTR_GET_CONTEXT_,							/* R/O: void (*get_context)(void *buffer) */
+	CPUINFO_PTR_SET_CONTEXT_,							/* R/O: void (*set_context)(void *buffer) */
+	CPUINFO_PTR_INIT,									/* R/O: void (*init)(void) */
+	CPUINFO_PTR_RESET,									/* R/O: void (*reset)(void *param) */
+	CPUINFO_PTR_EXIT,									/* R/O: void (*exit)(void) */
+	CPUINFO_PTR_EXECUTE,								/* R/O: int (*execute)(int cycles) */
+	CPUINFO_PTR_BURN,									/* R/O: void (*burn)(int cycles) */
+	CPUINFO_PTR_DISASSEMBLE,							/* R/O: void (*disassemble)(char *buffer, offs_t pc) */
+	CPUINFO_PTR_IRQ_CALLBACK,							/* R/W: int (*irqcallback)(int state) */
+	CPUINFO_PTR_INSTRUCTION_COUNTER,					/* R/O: int *icount */
+	CPUINFO_PTR_REGISTER_LAYOUT,						/* R/O: struct debug_register_layout *layout */
+	CPUINFO_PTR_WINDOW_LAYOUT,							/* R/O: struct debug_window_layout *layout */
+	CPUINFO_PTR_INTERNAL_MEMORY_MAP,					/* R/O: construct_map_t map */
+	CPUINFO_PTR_INTERNAL_MEMORY_MAP_LAST = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1,
+	CPUINFO_PTR_DEBUG_REGISTER_LIST,					/* R/O: int *list: list of registers for NEW_DEBUGGER */
+
+	CPUINFO_PTR_CPU_SPECIFIC = 0x18000,					/* R/W: CPU-specific values start here */
+
+	/* --- the following bits of info are returned as NULL-terminated strings --- */
+	CPUINFO_STR_FIRST = 0x20000,
+
+	CPUINFO_STR_NAME = CPUINFO_STR_FIRST,				/* R/O: name of the CPU */
+	CPUINFO_STR_CORE_FAMILY,							/* R/O: family of the CPU */
+	CPUINFO_STR_CORE_VERSION,							/* R/O: version of the CPU core */
+	CPUINFO_STR_CORE_FILE,								/* R/O: file containing the CPU core */
+	CPUINFO_STR_CORE_CREDITS,							/* R/O: credits for the CPU core */
+	CPUINFO_STR_FLAGS,									/* R/O: string representation of the main flags value */
+	CPUINFO_STR_REGISTER,								/* R/O: string representation of up to MAX_REGs registers */
+	CPUINFO_STR_REGISTER_LAST = CPUINFO_STR_REGISTER + MAX_REGS - 1,
+
+	CPUINFO_STR_CPU_SPECIFIC = 0x28000					/* R/W: CPU-specific values start here */
+};
+
+#endif	/* CPUINTRF_H */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/aica.c Added

@@ -0,0 +1,1281 @@
+/*
+ Sega/Yamaha AICA emulation
+ By ElSemi, kingshriek, and R. Belmont
+
+ This is effectively a 64-voice SCSP, with the following differences:
+ - No FM mode
+ - A third sample format (ADPCM) has been added
+ - Some minor other tweeks
+*/
+
+#include <math.h>
+#include <string.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "aica.h"
+#include "aicadsp.h"
+#include "dc_hw.h"
+
+#define ICLIP16(x) (x<-32768)?-32768:((x>32767)?32767:x)
+
+#define SHIFT	12
+#define FIX(v)	((UINT32) ((float) (1<<SHIFT)*(v)))
+
+
+#define EG_SHIFT	16
+
+#define USEDSP
+
+// include the LFO handling code
+#include "aicalfo.c"
+
+/*
+ AICA features 64 programmable slots
+ that can generate PCM and ADPCM (from ROM/RAM) sound
+*/
+
+//SLOT PARAMETERS
+#define KEYONEX(slot)		((slot->udata.data[0x0]>>0x0)&0x8000)
+#define KEYONB(slot)		((slot->udata.data[0x0]>>0x0)&0x4000)
+#define SSCTL(slot)		((slot->udata.data[0x0]>>0xA)&0x0001)
+#define LPCTL(slot)		((slot->udata.data[0x0]>>0x9)&0x0001)
+#define PCMS(slot)		((slot->udata.data[0x0]>>0x7)&0x0003)
+
+#define SA(slot)		(((slot->udata.data[0x0]&0x7F)<<16)|(slot->udata.data[0x4/2]))
+
+#define LSA(slot)		(slot->udata.data[0x8/2])
+
+#define LEA(slot)		(slot->udata.data[0xc/2])
+
+#define D2R(slot)		((slot->udata.data[0x10/2]>>0xB)&0x001F)
+#define D1R(slot)		((slot->udata.data[0x10/2]>>0x6)&0x001F)
+#define AR(slot)		((slot->udata.data[0x10/2]>>0x0)&0x001F)
+
+#define LPSLNK(slot)		((slot->udata.data[0x14/2]>>0x0)&0x4000)
+#define KRS(slot)		((slot->udata.data[0x14/2]>>0xA)&0x000F)
+#define DL(slot)		((slot->udata.data[0x14/2]>>0x5)&0x001F)
+#define RR(slot)		((slot->udata.data[0x14/2]>>0x0)&0x001F)
+
+#define TL(slot)		((slot->udata.data[0x28/2]>>0x8)&0x00FF)
+
+#define OCT(slot)		((slot->udata.data[0x18/2]>>0xB)&0x000F)
+#define FNS(slot)		((slot->udata.data[0x18/2]>>0x0)&0x03FF)
+
+#define LFORE(slot)		((slot->udata.data[0x1c/2]>>0x0)&0x8000)
+#define LFOF(slot)		((slot->udata.data[0x1c/2]>>0xA)&0x001F)
+#define PLFOWS(slot)		((slot->udata.data[0x1c/2]>>0x8)&0x0003)
+#define PLFOS(slot)		((slot->udata.data[0x1c/2]>>0x5)&0x0007)
+#define ALFOWS(slot)		((slot->udata.data[0x1c/2]>>0x3)&0x0003)
+#define ALFOS(slot)		((slot->udata.data[0x1c/2]>>0x0)&0x0007)
+
+#define ISEL(slot)		((slot->udata.data[0x20/2]>>0x0)&0x000F)
+#define IMXL(slot)		((slot->udata.data[0x20/2]>>0x4)&0x000F)
+
+#define DISDL(slot)		((slot->udata.data[0x24/2]>>0x8)&0x000F)
+#define DIPAN(slot)		((slot->udata.data[0x24/2]>>0x0)&0x001F)
+
+#define EFSDL(slot)		((AICA->EFSPAN[slot*4]>>8)&0x000f)
+#define EFPAN(slot)		((AICA->EFSPAN[slot*4]>>0)&0x001f) 
+
+//Envelope times in ms
+static const double ARTimes[64]={100000/*infinity*/,100000/*infinity*/,8100.0,6900.0,6000.0,4800.0,4000.0,3400.0,3000.0,2400.0,2000.0,1700.0,1500.0,
+					1200.0,1000.0,860.0,760.0,600.0,500.0,430.0,380.0,300.0,250.0,220.0,190.0,150.0,130.0,110.0,95.0,
+					76.0,63.0,55.0,47.0,38.0,31.0,27.0,24.0,19.0,15.0,13.0,12.0,9.4,7.9,6.8,6.0,4.7,3.8,3.4,3.0,2.4,
+					2.0,1.8,1.6,1.3,1.1,0.93,0.85,0.65,0.53,0.44,0.40,0.35,0.0,0.0};
+static const double DRTimes[64]={100000/*infinity*/,100000/*infinity*/,118200.0,101300.0,88600.0,70900.0,59100.0,50700.0,44300.0,35500.0,29600.0,25300.0,22200.0,17700.0,
+					14800.0,12700.0,11100.0,8900.0,7400.0,6300.0,5500.0,4400.0,3700.0,3200.0,2800.0,2200.0,1800.0,1600.0,1400.0,1100.0,
+					920.0,790.0,690.0,550.0,460.0,390.0,340.0,270.0,230.0,200.0,170.0,140.0,110.0,98.0,85.0,68.0,57.0,49.0,43.0,34.0,
+					28.0,25.0,22.0,18.0,14.0,12.0,11.0,8.5,7.1,6.1,5.4,4.3,3.6,3.1};
+static UINT32 FNS_Table[0x400];
+static INT32 EG_TABLE[0x400];
+
+typedef enum {ATTACK,DECAY1,DECAY2,RELEASE} _STATE;
+struct _EG
+{
+	int volume;	//
+	_STATE state;
+	int step;
+	//step vals
+	int AR;		//Attack
+	int D1R;	//Decay1
+	int D2R;	//Decay2
+	int RR;		//Release
+
+	int DL;		//Decay level
+	UINT8 LPLINK;
+};
+
+struct _SLOT
+{
+	union
+	{
+		UINT16 data[0x40];	//only 0x1a bytes used
+		UINT8 datab[0x80];
+	} udata;
+	UINT8 active;	//this slot is currently playing
+	UINT8 *base;		//samples base address
+	UINT32 prv_addr; // previous play address (for ADPCM)
+	UINT32 cur_addr;	//current play address (24.8)
+	UINT32 nxt_addr;	//next play address
+	UINT32 step;		//pitch step (24.8)
+	UINT8 Backwards;	//the wave is playing backwards
+	struct _EG EG;			//Envelope
+	struct _EG FEG;			//filter envelope
+	struct _LFO PLFO;		//Phase LFO
+	struct _LFO ALFO;		//Amplitude LFO
+	int slot;
+	int cur_sample; //current ADPCM sample
+	int cur_quant; //current ADPCM step
+	int curstep;
+	int cur_lpquant, cur_lpsample, cur_lpstep;
+	UINT8 *adbase, *adlpbase;
+	UINT8 mslc;			// monitored?
+};
+
+
+#define MEM4B(aica)		((aica->udata.data[0]>>0x0)&0x0200)
+#define DAC18B(aica)		((aica->udata.data[0]>>0x0)&0x0100)
+#define MVOL(aica)		((aica->udata.data[0]>>0x0)&0x000F)
+#define RBL(aica)		((aica->udata.data[2]>>0xD)&0x0003)
+#define RBP(aica)		((aica->udata.data[2]>>0x0)&0x0fff)
+#define MOFULL(aica) 		((aica->udata.data[4]>>0x0)&0x1000)
+#define MOEMPTY(aica)		((aica->udata.data[4]>>0x0)&0x0800)
+#define MIOVF(aica)		((aica->udata.data[4]>>0x0)&0x0400)
+#define MIFULL(aica)		((aica->udata.data[4]>>0x0)&0x0200)
+#define MIEMPTY(aica)		((aica->udata.data[4]>>0x0)&0x0100)
+
+#define AFSEL(aica)		((aica->udata.data[6]>>0x0)&0x4000)
+#define MSLC(aica)		((aica->udata.data[6]>>0x8)&0x3F)
+
+#define SCILV0(aica) 	((aica->udata.data[0xa8/2]>>0x0)&0xff)
+#define SCILV1(aica) 	((aica->udata.data[0xac/2]>>0x0)&0xff)
+#define SCILV2(aica) 	((aica->udata.data[0xb0/2]>>0x0)&0xff)
+
+#define SCIEX0	0
+#define SCIEX1	1
+#define SCIEX2	2
+#define SCIMID	3
+#define SCIDMA	4
+#define SCIIRQ	5
+#define SCITMA	6
+#define SCITMB	7
+
+struct _AICA
+{
+	union
+	{
+		UINT16 data[0xc0/2];
+		UINT8 datab[0xc0];
+	} udata;
+	UINT16 IRQL, IRQR;
+	UINT16 EFSPAN[0x48];
+	struct _SLOT Slots[64];
+	signed short RINGBUF[64];
+	unsigned char BUFPTR;
+	unsigned char *AICARAM;
+	UINT32 AICARAM_LENGTH;
+	char Master;
+	void (*IntARMCB)(struct sARM7 *cpu, int irq);
+
+	INT32 *buffertmpl, *buffertmpr;
+
+	UINT32 IrqTimA;
+	UINT32 IrqTimBC;
+	UINT32 IrqMidi;
+
+	UINT8 MidiOutW,MidiOutR;
+	UINT8 MidiStack[16];
+	UINT8 MidiW,MidiR;
+
+	int LPANTABLE[0x20000];
+	int RPANTABLE[0x20000];
+
+	int TimPris[3];
+	int TimCnt[3];
+
+	// DMA stuff
+	UINT32 aica_dmea;
+	UINT16 aica_drga;
+	UINT16 aica_dtlg;
+
+	int ARTABLE[64], DRTABLE[64];
+
+	struct _AICADSP DSP;
+
+	struct sARM7 *cpu;
+
+ INT16 *bufferl;
+ INT16 *bufferr;
+
+ int length;
+
+ signed short *RBUFDST;	//this points to where the sample will be stored in the RingBuf
+};
+
+//static struct _AICA *AllocedAICA;
+
+static const float SDLT[16]={-1000000.0,-42.0,-39.0,-36.0,-33.0,-30.0,-27.0,-24.0,-21.0,-18.0,-15.0,-12.0,-9.0,-6.0,-3.0,0.0};
+
+static unsigned char DecodeSCI(struct _AICA *AICA, unsigned char irq)
+{
+	unsigned char SCI=0;
+	unsigned char v;
+	v=(SCILV0((AICA))&(1<<irq))?1:0;
+	SCI|=v;
+	v=(SCILV1((AICA))&(1<<irq))?1:0;
+	SCI|=v<<1;
+	v=(SCILV2((AICA))&(1<<irq))?1:0;
+	SCI|=v<<2;
+	return SCI;
+}
+
+static void ResetInterrupts(struct _AICA *AICA)
+{
+#if 0
+	UINT32 reset = AICA->udata.data[0xa4/2];
+	if (reset & 0x40)
+		AICA->IntARMCB(-AICA->IrqTimA);
+	if (reset & 0x180)
+		AICA->IntARMCB(-AICA->IrqTimBC);
+#endif
+}
+
+static void CheckPendingIRQ(struct _AICA *AICA)
+{
+	UINT32 pend=AICA->udata.data[0xa0/2];
+	UINT32 en=AICA->udata.data[0x9c/2];
+	if(AICA->MidiW!=AICA->MidiR)
+	{
+		AICA->IRQL = AICA->IrqMidi;
+		AICA->IntARMCB(AICA->cpu, 1);
+		return;
+	}
+	if(!pend)
+		return;
+	if(pend&0x40)
+		if(en&0x40)
+		{
+			AICA->IRQL = AICA->IrqTimA;
+			AICA->IntARMCB(AICA->cpu, 1);
+			return;
+		}
+	if(pend&0x80)
+		if(en&0x80)
+		{
+			AICA->IRQL = AICA->IrqTimBC;
+			AICA->IntARMCB(AICA->cpu, 1);
+			return;
+		}
+	if(pend&0x100)
+		if(en&0x100)
+		{
+			AICA->IRQL = AICA->IrqTimBC;
+			AICA->IntARMCB(AICA->cpu, 1);
+			return;
+		}
+}
+
+static int Get_AR(struct _AICA *AICA,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return AICA->ARTABLE[Rate];
+}
+
+static int Get_DR(struct _AICA *AICA,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return AICA->DRTABLE[Rate];
+}
+
+static int Get_RR(struct _AICA *AICA,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return AICA->DRTABLE[Rate];
+}
+
+static void Compute_EG(struct _AICA *AICA,struct _SLOT *slot)
+{
+	int octave=OCT(slot);
+	int rate;
+	if(octave&8) octave=octave-16;
+	if(KRS(slot)!=0xf)
+		rate=octave+2*KRS(slot)+((FNS(slot)>>9)&1);
+	else
+		rate=0; //rate=((FNS(slot)>>9)&1);
+
+	slot->EG.volume=0x17f<<EG_SHIFT;
+	slot->EG.AR=Get_AR(AICA,rate,AR(slot));
+	slot->EG.D1R=Get_DR(AICA,rate,D1R(slot));
+	slot->EG.D2R=Get_DR(AICA,rate,D2R(slot));
+	slot->EG.RR=Get_RR(AICA,rate,RR(slot));
+	slot->EG.DL=0x1f-DL(slot);
+}
+
+static void AICA_StopSlot(struct _SLOT *slot,int keyoff);
+
+static int EG_Update(struct _SLOT *slot)
+{
+	switch(slot->EG.state)
+	{
+		case ATTACK:
+			slot->EG.volume+=slot->EG.AR;
+			if(slot->EG.volume>=(0x3ff<<EG_SHIFT))
+			{
+				if (!LPSLNK(slot)) 
+				{
+					slot->EG.state=DECAY1;
+					if(slot->EG.D1R>=(1024<<EG_SHIFT)) //Skip DECAY1, go directly to DECAY2
+						slot->EG.state=DECAY2;
+				}
+				slot->EG.volume=0x3ff<<EG_SHIFT;
+			}
+			break;
+		case DECAY1:
+			slot->EG.volume-=slot->EG.D1R;
+			if(slot->EG.volume<=0)
+				slot->EG.volume=0;
+			if(slot->EG.volume>>(EG_SHIFT+5)<slot->EG.DL)
+				slot->EG.state=DECAY2;
+			break;
+		case DECAY2:
+			if(D2R(slot)==0)
+				return (slot->EG.volume>>EG_SHIFT)<<(SHIFT-10);
+			slot->EG.volume-=slot->EG.D2R;
+			if(slot->EG.volume<=0)
+				slot->EG.volume=0;
+
+			break;
+		case RELEASE:
+			slot->EG.volume-=slot->EG.RR;
+			if(slot->EG.volume<=0)
+			{
+ 				slot->EG.volume=0;
+				AICA_StopSlot(slot,0);
+//				slot->EG.volume=0x17f<<EG_SHIFT;
+//				slot->EG.state=ATTACK;
+			}
+			break;
+		default:
+			return 1<<SHIFT;
+	}
+	return (slot->EG.volume>>EG_SHIFT)<<(SHIFT-10);
+}
+
+static UINT32 AICA_Step(struct _SLOT *slot)
+{
+	int octave=OCT(slot);
+	UINT32 Fn;
+
+	Fn=(FNS_Table[FNS(slot)]);	//24.8
+	if(octave&8)
+		Fn>>=(16-octave);
+	else
+		Fn<<=octave;
+
+	return Fn/(44100);
+}
+
+
+static void Compute_LFO(struct _SLOT *slot)
+{
+	if(PLFOS(slot)!=0)
+		AICALFO_ComputeStep(&(slot->PLFO),LFOF(slot),PLFOWS(slot),PLFOS(slot),0);
+	if(ALFOS(slot)!=0)
+		AICALFO_ComputeStep(&(slot->ALFO),LFOF(slot),ALFOWS(slot),ALFOS(slot),1);
+}
+
+#define ADPCMSHIFT	8
+#define ADFIX(f)	(int) ((float) f*(float) (1<<ADPCMSHIFT))
+
+const int TableQuant[8]={ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(0.8984375),ADFIX(1.19921875),ADFIX(1.59765625),ADFIX(2.0),ADFIX(2.3984375)};
+const int quant_mul[16]= { 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15};
+
+void InitADPCM(int *PrevSignal, int *PrevQuant)
+{
+	*PrevSignal=0;
+	*PrevQuant=0x7f;
+}
+
+INLINE signed short DecodeADPCM(int *PrevSignal, unsigned char Delta, int *PrevQuant)
+{
+	int x = *PrevQuant * quant_mul [Delta & 15];
+ x = *PrevSignal + ((int)(x + ((UINT32)x >> 29)) >> 3);
+	*PrevSignal=ICLIP16(x);
+	*PrevQuant=(*PrevQuant*TableQuant[Delta&7])>>ADPCMSHIFT;
+	*PrevQuant=(*PrevQuant<0x7f)?0x7f:((*PrevQuant>0x6000)?0x6000:*PrevQuant);
+	return *PrevSignal;
+}
+
+static void AICA_StartSlot(struct _AICA *AICA, struct _SLOT *slot)
+{
+	UINT64 start_offset;
+
+	slot->active=1;
+	slot->Backwards=0;
+	slot->cur_addr=0; slot->nxt_addr=1<<SHIFT; slot->prv_addr=-1;
+	start_offset = SA(slot);	// AICA can play 16-bit samples from any boundry
+	slot->base=&AICA->AICARAM[start_offset];
+	slot->step=AICA_Step(slot);
+	Compute_EG(AICA,slot);
+	slot->EG.state=ATTACK;
+	slot->EG.volume=0x17f<<EG_SHIFT;
+	Compute_LFO(slot);
+
+	if (PCMS(slot) >= 2)
+	{
+		UINT8 *base;
+		UINT32 curstep, steps_to_go;
+
+		slot->curstep = 0;
+		slot->adbase = (unsigned char *) (AICA->AICARAM+((SA(slot))&0x7fffff));
+		InitADPCM(&(slot->cur_sample), &(slot->cur_quant));
+		InitADPCM(&(slot->cur_lpsample), &(slot->cur_lpquant));
+
+		// walk to the ADPCM state at LSA
+		curstep = 0;
+		base = slot->adbase;
+		steps_to_go = LSA(slot);
+
+		while (curstep < steps_to_go)
+		{
+			int shift1, delta1;
+			shift1 = 4*((curstep&1));
+			delta1 = (*base>>shift1)&0xf;
+			DecodeADPCM(&(slot->cur_lpsample),delta1,&(slot->cur_lpquant));
+			curstep++;
+			if (!(curstep & 1))
+			{
+				base++;
+			}
+		}
+
+		slot->cur_lpstep = curstep;
+		slot->adlpbase = base;
+
+		// on real hardware this creates undefined behavior.
+		if (LSA(slot) > LEA(slot))
+		{
+			slot->udata.data[0xc/2] = 0xffff;
+		}
+	}
+}
+
+static void AICA_StopSlot(struct _SLOT *slot,int keyoff)
+{
+	if(keyoff /*&& slot->EG.state!=RELEASE*/)
+	{
+		slot->EG.state=RELEASE;
+	}
+	else
+	{
+		slot->active=0;
+	}
+	slot->udata.data[0]&=~0x4000;
+	
+}
+
+#define log_base_2(n) (log((float) n)/log((float) 2))
+
+static void AICA_Init(struct _AICA *AICA, const struct AICAinterface *intf)
+{
+	int i=0;
+
+	AICA->IrqTimA = AICA->IrqTimBC = AICA->IrqMidi = 0;
+	AICA->MidiR=AICA->MidiW=0;
+	AICA->MidiOutR=AICA->MidiOutW=0;
+
+	// get AICA RAM
+	{
+		memset(AICA,0,sizeof(*AICA));
+
+		if (!i)
+		{
+			AICA->Master=1;
+		}
+		else
+		{
+			AICA->Master=0;
+		}
+
+		if (intf->region)
+		{
+			AICA->AICARAM = &intf->cpu->dc_ram[0];
+			AICA->AICARAM_LENGTH = 2*1024*1024;
+			AICA->DSP.AICARAM = (UINT16 *)AICA->AICARAM;
+			AICA->DSP.AICARAM_LENGTH = (2*1024*1024)/2;
+			AICA->cpu = intf->cpu;
+		}
+	}
+
+	for(i=0;i<0x400;++i)
+	{
+		float fcent=(double) 1200.0*log_base_2((double)(((double) 1024.0+(double)i)/(double)1024.0));
+		fcent=(double) 44100.0*pow(2.0,fcent/1200.0);
+		FNS_Table[i]=(float) (1<<SHIFT) *fcent;
+	}
+
+	for(i=0;i<0x400;++i)
+	{
+		float envDB=((float)(3*(i-0x3ff)))/32.0;
+		float scale=(float)(1<<SHIFT);
+		EG_TABLE[i]=(INT32)(pow(10.0,envDB/20.0)*scale);
+	}
+
+	for(i=0;i<0x20000;++i)
+	{
+		int iTL =(i>>0x0)&0xff;
+		int iPAN=(i>>0x8)&0x1f;
+		int iSDL=(i>>0xD)&0x0F;
+		float TL=1.0;
+		float SegaDB=0;
+		float fSDL=1.0;
+		float PAN=1.0;
+		float LPAN,RPAN;
+
+		if(iTL&0x01) SegaDB-=0.4;
+		if(iTL&0x02) SegaDB-=0.8;
+		if(iTL&0x04) SegaDB-=1.5;
+		if(iTL&0x08) SegaDB-=3;
+		if(iTL&0x10) SegaDB-=6;
+		if(iTL&0x20) SegaDB-=12;
+		if(iTL&0x40) SegaDB-=24;
+		if(iTL&0x80) SegaDB-=48;
+
+		TL=pow(10.0,SegaDB/20.0);
+
+		SegaDB=0;
+		if(iPAN&0x1) SegaDB-=3;
+		if(iPAN&0x2) SegaDB-=6;
+		if(iPAN&0x4) SegaDB-=12;
+		if(iPAN&0x8) SegaDB-=24;
+
+		if((iPAN&0xf)==0xf) PAN=0.0;
+		else PAN=pow(10.0,SegaDB/20.0);
+
+		if(iPAN<0x10)
+		{
+			LPAN=PAN;
+			RPAN=1.0;
+		}
+		else
+		{
+			RPAN=PAN;
+			LPAN=1.0;
+		}
+
+		if(iSDL)
+			fSDL=pow(10.0,(SDLT[iSDL])/20.0);
+		else
+			fSDL=0.0;
+
+		AICA->LPANTABLE[i]=FIX((4.0*LPAN*TL*fSDL));
+		AICA->RPANTABLE[i]=FIX((4.0*RPAN*TL*fSDL));
+	}
+
+	AICA->ARTABLE[0]=AICA->DRTABLE[0]=0;	//Infinite time
+	AICA->ARTABLE[1]=AICA->DRTABLE[1]=0;	//Infinite time
+	for(i=2;i<64;++i)
+	{
+		double t,step,scale;
+		t=ARTimes[i];	//In ms
+		if(t!=0.0)
+		{
+			step=(1023*1000.0)/((float) 44100.0f*t);
+			scale=(double) (1<<EG_SHIFT);
+			AICA->ARTABLE[i]=(int) (step*scale);
+		}
+		else
+			AICA->ARTABLE[i]=1024<<EG_SHIFT;
+
+		t=DRTimes[i];	//In ms
+		step=(1023*1000.0)/((float) 44100.0f*t);
+		scale=(double) (1<<EG_SHIFT);
+		AICA->DRTABLE[i]=(int) (step*scale);
+	}
+
+	// make sure all the slots are off
+	for(i=0;i<64;++i)
+	{
+		AICA->Slots[i].slot=i;
+		AICA->Slots[i].active=0;
+		AICA->Slots[i].base=NULL;
+		AICA->Slots[i].EG.state=RELEASE;
+		AICA->Slots[i].mslc=0;
+	}
+
+	AICALFO_Init();
+	AICA->buffertmpl=(signed int*) malloc(44100*sizeof(signed int));
+	AICA->buffertmpr=(signed int*) malloc(44100*sizeof(signed int));
+	memset(AICA->buffertmpl,0,44100*sizeof(signed int));
+	memset(AICA->buffertmpr,0,44100*sizeof(signed int));
+
+	// no "pend"
+	AICA[0].udata.data[0xa0/2] = 0;
+	//AICA[1].udata.data[0x20/2] = 0;
+	AICA->TimCnt[0] = 0xffff;
+	AICA->TimCnt[1] = 0xffff;
+	AICA->TimCnt[2] = 0xffff;
+}
+
+static void AICA_UpdateSlotReg(struct _AICA *AICA,int s,int r)
+{
+	struct _SLOT *slot=AICA->Slots+s;
+	int sl;
+	switch(r&0x7f)
+	{
+		case 0:
+		case 1:
+			if(KEYONEX(slot))
+			{
+				for(sl=0;sl<64;++sl)
+				{
+					struct _SLOT *s2=AICA->Slots+sl;
+					{
+						if(KEYONB(s2) && s2->EG.state==RELEASE/*&& !s2->active*/)
+						{
+							if(s2->mslc) AICA->udata.data[0x10] &= 0x7FFF; // reset LP at KEY_ON
+							AICA_StartSlot(AICA, s2);
+
+							#if 0
+							printf("StartSlot[%02X]: SSCTL %01X SA %06X LSA %04X LEA %04X PCMS %01X LPCTL %01X\n",sl,SSCTL(s2),SA(s2),LSA(s2),LEA(s2),PCMS(s2),LPCTL(s2));
+							printf(" AR %02X D1R %02X D2R %02X RR %02X DL %02X KRS %01X LPSLNK %01X\n",AR(s2),D1R(s2),D2R(s2),RR(s2),DL(s2),KRS(s2),LPSLNK(s2)>>14);
+							printf(" TL %02X OCT %01X FNS %03X\n",TL(s2),OCT(s2),FNS(s2));
+							printf(" LFORE %01X LFOF %02X ALFOWS %01X ALFOS %01X PLFOWS %01X PLFOS %01X\n",LFORE(s2),LFOF(s2),ALFOWS(s2),ALFOS(s2),PLFOWS(s2),PLFOS(s2));
+							printf(" IMXL %01X ISEL %01X DISDL %01X DIPAN %02X\n",IMXL(s2),ISEL(s2),DISDL(s2),DIPAN(s2));
+							printf("\n");
+							fflush(stdout);
+							#endif
+						}
+						if(!KEYONB(s2) /*&& s2->active*/)
+						{
+							AICA_StopSlot(s2,1);
+						}
+					}
+				}
+				slot->udata.data[0]&=~0x8000;
+			}
+			break;
+		case 0x18:
+		case 0x19:
+			slot->step=AICA_Step(slot);
+			break;
+		case 0x14:
+		case 0x15:
+			slot->EG.RR=Get_RR(AICA,0,RR(slot));
+			slot->EG.DL=0x1f-DL(slot);
+			break;
+		case 0x1c:
+		case 0x1d:
+			Compute_LFO(slot);
+			break;
+		case 0x24:
+//			printf("[%02d]: %x to DISDL/DIPAN (PC=%x)\n", s, slot->udata.data[0x24/2], arm7_get_register(15));
+			break;
+	}
+}
+
+static void AICA_UpdateReg(struct _AICA *AICA, int reg)
+{
+	switch(reg&0xff)
+	{
+		case 0x4:
+		case 0x5:
+			{
+				unsigned int v=RBL(AICA);
+				AICA->DSP.RBP=RBP(AICA);
+				if(v==0)
+					AICA->DSP.RBL=8*1024;
+				else if(v==1)
+					AICA->DSP.RBL=16*1024;
+				else if(v==2)
+					AICA->DSP.RBL=32*1024;
+				else if(v==3)
+					AICA->DSP.RBL=64*1024;
+			}
+			break;
+		case 0x8:
+		case 0x9:
+			AICA_MidiIn(AICA, 0, AICA->udata.data[0x8/2]&0xff, 0);
+			break;
+		case 0x12:
+		case 0x13:
+		case 0x14:
+		case 0x15:
+		case 0x16:
+		case 0x17:
+			break;
+		case 0x90:
+		case 0x91:
+			if(AICA->Master)
+			{
+				AICA->TimPris[0]=1<<((AICA->udata.data[0x90/2]>>8)&0x7);
+				AICA->TimCnt[0]=(AICA->udata.data[0x90/2]&0xff)<<8;
+			}
+			break;
+		case 0x94:
+		case 0x95:
+			if(AICA->Master)
+			{
+				AICA->TimPris[1]=1<<((AICA->udata.data[0x94/2]>>8)&0x7);
+				AICA->TimCnt[1]=(AICA->udata.data[0x94/2]&0xff)<<8;
+			}
+			break;
+		case 0x98:
+		case 0x99:
+			if(AICA->Master)
+			{
+				AICA->TimPris[2]=1<<((AICA->udata.data[0x98/2]>>8)&0x7);
+				AICA->TimCnt[2]=(AICA->udata.data[0x98/2]&0xff)<<8;
+			}
+			break;
+		case 0xa4:	//SCIRE
+		case 0xa5:
+
+			if(AICA->Master)		 
+			{
+				AICA->udata.data[0xa0/2] &= ~AICA->udata.data[0xa4/2];
+				ResetInterrupts(AICA);
+
+				// behavior from real hardware (SCSP, assumed to carry over): if you SCIRE a timer that's expired,
+				// it'll immediately pop up again
+				if (AICA->TimCnt[0] >= 0xff00)
+				{
+					AICA->udata.data[0xa0/2] |= 0x40;
+				}
+				if (AICA->TimCnt[1] >= 0xff00)
+				{
+					AICA->udata.data[0xa0/2] |= 0x80;
+				}
+				if (AICA->TimCnt[2] >= 0xff00)
+				{
+					AICA->udata.data[0xa0/2] |= 0x100;
+				}
+			}
+			break;
+		case 0xa8:
+		case 0xa9:
+		case 0xac:
+		case 0xad:
+		case 0xb0:
+		case 0xb1:
+			if(AICA->Master)
+			{
+				AICA->IrqTimA=DecodeSCI(AICA,SCITMA);
+				AICA->IrqTimBC=DecodeSCI(AICA,SCITMB);
+				AICA->IrqMidi=DecodeSCI(AICA,SCIMID);
+			}
+			break;
+	}
+}
+
+static void AICA_UpdateSlotRegR(struct _AICA *AICA, int slot,int reg)
+{
+
+}
+
+static void AICA_UpdateRegR(struct _AICA *AICA, int reg)
+{
+	switch(reg&0xff)
+	{
+		case 8:
+		case 9:
+			{
+				unsigned short v=AICA->udata.data[0x8/2];
+				v&=0xff00;
+				v|=AICA->MidiStack[AICA->MidiR];
+				AICA->IntARMCB(AICA->cpu, 0);	// cancel the IRQ
+				if(AICA->MidiR!=AICA->MidiW)
+				{
+					++AICA->MidiR;
+					AICA->MidiR&=15;
+				}
+				AICA->udata.data[0x8/2]=v;
+			}
+			break;
+
+		case 0x10:	// LP check
+		case 0x11:
+			{
+				//int MSLC = (AICA->udata.data[0xc/2]>>8) & 0x3f;	// which slot are we monitoring?
+			}
+			break;
+			
+		case 0x14:	// CA (slot address)
+		case 0x15:
+			{
+				int MSLC = (AICA->udata.data[0xc/2]>>8) & 0x3f;	// which slot are we monitoring?
+				unsigned int CA = AICA->Slots[MSLC].cur_addr>>(SHIFT+12);
+
+				AICA->udata.data[0x14/2] = CA;
+			}
+			break;
+	}
+}
+
+static void AICA_w16(struct _AICA *AICA,unsigned int addr,unsigned short val)
+{
+	addr&=0xffff;
+	if(addr<0x2000)
+	{
+		int slot=addr/0x80;
+		addr&=0x7f;
+//		printf("%x to slot %d offset %x\n", val, slot, addr);
+		*((unsigned short *) (AICA->Slots[slot].udata.datab+(addr))) = val;
+		AICA_UpdateSlotReg(AICA,slot,addr&0x7f);
+	}
+	else if (addr < 0x2800)
+	{
+		if (addr <= 0x2044)
+		{
+//			printf("%x to EFSxx slot %d (addr %x)\n", val, (addr-0x2000)/4, addr&0x7f);
+			AICA->EFSPAN[addr&0x7f] = val;
+		}
+	}
+	else if(addr<0x3000)
+	{
+		if (addr < 0x28be)
+		{
+//			printf("%x to AICA global @ %x\n", val, addr & 0xff);
+			*((unsigned short *) (AICA->udata.datab+((addr&0xff)))) = val;
+			AICA_UpdateReg(AICA, addr&0xff);
+		}
+		else if (addr == 0x2d00)
+		{
+			AICA->IRQL = val;
+		}
+		else if (addr == 0x2d04)
+		{
+			AICA->IRQR = val;
+
+			if (val)
+			{
+				AICA->IntARMCB(AICA->cpu, 0);
+			}
+		}
+	}
+	else
+	{
+		//DSP
+		if(addr<0x3200)	//COEF
+			*((unsigned short *) (AICA->DSP.COEF+(addr-0x3000)/2))=val;
+		else if(addr<0x3400)
+			*((unsigned short *) (AICA->DSP.MADRS+(addr-0x3200)/2))=val;
+		else if(addr<0x3c00)
+		{
+			*((unsigned short *) (AICA->DSP.MPRO+(addr-0x3400)/2))=val;
+
+			if (addr == 0x3bfe)
+			{
+				AICADSP_Start(&AICA->DSP);
+			}
+		}
+	}
+}
+
+static unsigned short AICA_r16(struct _AICA *AICA, unsigned int addr)
+{
+	unsigned short v=0;
+	addr&=0xffff;
+	if(addr<0x2000)
+	{
+		int slot=addr/0x80;
+		addr&=0x7f;
+		AICA_UpdateSlotRegR(AICA, slot,addr&0x7f);
+		v=*((unsigned short *) (AICA->Slots[slot].udata.datab+(addr)));
+	}
+	else if(addr<0x3000)
+	{
+		if (addr <= 0x2044)
+		{
+			v = AICA->EFSPAN[addr&0x7f];
+		}
+		else if (addr < 0x28be)
+		{
+			AICA_UpdateRegR(AICA, addr&0xff);
+			v= *((unsigned short *) (AICA->udata.datab+((addr&0xff))));
+			if((addr&0xfe)==0x10) AICA->udata.data[0x10/2] &= 0x7FFF;	// reset LP on read
+		}
+		else if (addr == 0x2d00)
+		{
+			return AICA->IRQL;
+		}
+		else if (addr == 0x2d04)
+		{
+			return AICA->IRQR;
+		}
+	}
+//	else if (addr<0x700)
+//		v=AICA->RINGBUF[(addr-0x600)/2];
+	return v;
+}
+
+
+#define REVSIGN(v) ((~v)+1)
+
+void AICA_TimersAddTicks(struct _AICA *AICA, int ticks)
+{
+	if(AICA->TimCnt[0]<=0xff00)
+	{
+ 		AICA->TimCnt[0] += ticks << (8-((AICA->udata.data[0x90/2]>>8)&0x7));
+		if (AICA->TimCnt[0] >= 0xFF00)
+		{
+			AICA->TimCnt[0] = 0xFFFF;
+			AICA->udata.data[0xa0/2]|=0x40;
+		}
+		AICA->udata.data[0x90/2]&=0xff00;
+		AICA->udata.data[0x90/2]|=AICA->TimCnt[0]>>8;
+	}
+
+	if(AICA->TimCnt[1]<=0xff00)
+	{
+		AICA->TimCnt[1] += ticks << (8-((AICA->udata.data[0x94/2]>>8)&0x7));
+		if (AICA->TimCnt[1] >= 0xFF00)
+		{
+			AICA->TimCnt[1] = 0xFFFF;
+			AICA->udata.data[0xa0/2]|=0x80;
+		}
+		AICA->udata.data[0x94/2]&=0xff00;
+		AICA->udata.data[0x94/2]|=AICA->TimCnt[1]>>8;
+	}
+
+	if(AICA->TimCnt[2]<=0xff00)
+	{
+		AICA->TimCnt[2] += ticks << (8-((AICA->udata.data[0x98/2]>>8)&0x7));
+		if (AICA->TimCnt[2] >= 0xFF00)
+		{
+			AICA->TimCnt[2] = 0xFFFF;
+			AICA->udata.data[0xa0/2]|=0x100;
+		}
+		AICA->udata.data[0x98/2]&=0xff00;
+		AICA->udata.data[0x98/2]|=AICA->TimCnt[2]>>8;
+	}
+}
+
+INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot)
+{
+	INT32 sample, fpart;
+	int cur_sample; //current sample
+	int nxt_sample; //next sample
+	int step=slot->step;
+	UINT32 addr1,addr2; // current and next sample addresses
+
+	if(SSCTL(slot)!=0)	//no FM or noise yet
+		return 0;
+
+	if(PLFOS(slot)!=0)
+	{
+		step=step*AICAPLFO_Step(&(slot->PLFO));
+		step>>=SHIFT;
+	}
+
+	if(PCMS(slot) == 0) 
+	{
+		addr1=(slot->cur_addr>>(SHIFT-1))&0x7ffffe;
+		addr2=(slot->nxt_addr>>(SHIFT-1))&0x7ffffe;
+	}
+	else
+	{
+		addr1=slot->cur_addr>>SHIFT;
+		addr2=slot->nxt_addr>>SHIFT;
+	}
+
+	if(PCMS(slot) == 1)	// 8-bit signed
+	{
+		INT8 *p1=(signed char *) (AICA->AICARAM+(((SA(slot)+addr1))&0x7fffff));
+		INT8 *p2=(signed char *) (AICA->AICARAM+(((SA(slot)+addr2))&0x7fffff));
+		cur_sample = p1[0] << 8;
+		nxt_sample = p2[0] << 8;
+	}
+	else if (PCMS(slot) == 0)	//16 bit signed
+	{
+		INT16 *p1=(signed short *) (AICA->AICARAM+((SA(slot)+addr1)&0x7fffff));
+		INT16 *p2=(signed short *) (AICA->AICARAM+((SA(slot)+addr2)&0x7fffff));
+		cur_sample = LE16(p1[0]);
+		nxt_sample = LE16(p2[0]);
+	}
+	else	// 4-bit ADPCM
+	{
+		UINT8 *base= slot->adbase;
+		UINT32 steps_to_go = addr2, curstep = slot->curstep;
+
+		if (base)
+		{
+			cur_sample = slot->cur_sample; // may already contains current decoded sample 
+
+			// seek to the interpolation sample
+			while (curstep < steps_to_go)
+			{
+				int shift1, delta1;
+				shift1 = 4*((curstep&1));
+				delta1 = (*base>>shift1)&0xf;
+				DecodeADPCM(&(slot->cur_sample),delta1,&(slot->cur_quant));
+				curstep++;
+				if (!(curstep & 1))
+				{
+					base++;
+				}
+				if (curstep == addr1)
+					cur_sample = slot->cur_sample;
+			}
+			nxt_sample = slot->cur_sample;
+
+			slot->adbase = base;
+			slot->curstep = curstep;
+		}
+		else
+		{
+			cur_sample = nxt_sample = 0;
+		}
+	}
+	fpart = slot->cur_addr & ((1<<SHIFT)-1);
+	sample=cur_sample*((1<<SHIFT)-fpart)+nxt_sample*fpart;
+	sample>>=SHIFT;	
+
+	slot->prv_addr=slot->cur_addr;
+	slot->cur_addr+=step;
+	slot->nxt_addr=slot->cur_addr+(1<<SHIFT);
+
+	addr1=slot->cur_addr>>SHIFT;
+	addr2=slot->nxt_addr>>SHIFT;
+
+	if(addr1>=LSA(slot))
+	{
+		if(LPSLNK(slot) && slot->EG.state==ATTACK)
+			slot->EG.state = DECAY1;
+	}
+
+	switch(LPCTL(slot))
+	{
+	case 0:	//no loop
+		if(addr2>=LSA(slot) && addr2>=LEA(slot)) // if next sample exceed then current must exceed too
+		{
+		//slot->active=0;
+		if(slot->mslc) AICA->udata.data[8] |= 0x8000;
+		AICA_StopSlot(slot,0);
+		}
+		break;
+	case 1: //normal loop
+		if(addr2>=LEA(slot))
+		{
+			INT32 rem_addr;
+			if(slot->mslc) AICA->udata.data[8] |= 0x8000;
+			rem_addr = slot->nxt_addr - (LEA(slot)<<SHIFT);
+			slot->nxt_addr = (LSA(slot)<<SHIFT) + rem_addr;
+			if(addr1>=LEA(slot))
+			{
+				rem_addr = slot->cur_addr - (LEA(slot)<<SHIFT);
+				slot->cur_addr = (LSA(slot)<<SHIFT) + rem_addr;
+			}
+				
+			if(PCMS(slot)>=2)
+			{
+				// restore the state @ LSA - the sampler will naturally walk to (LSA + remainder)
+				slot->adbase = &AICA->AICARAM[SA(slot)+(LSA(slot)/2)];
+				slot->curstep = LSA(slot);
+				if (PCMS(slot) == 2)
+				{
+					slot->cur_sample = slot->cur_lpsample;
+					slot->cur_quant = slot->cur_lpquant;
+				}
+//printf("Looping: slot_addr %x LSA %x LEA %x step %x base %x\n", slot->cur_addr>>SHIFT, LSA(slot), LEA(slot), slot->curstep, slot->adbase);
+			}
+		}
+		break;
+	}
+
+	if(ALFOS(slot)!=0)
+	{
+		sample=sample*AICAALFO_Step(&(slot->ALFO));
+		sample>>=SHIFT;
+	}
+
+	if(slot->EG.state==ATTACK)
+		sample=(sample*EG_Update(slot))>>SHIFT;
+	else
+		sample=(sample*EG_TABLE[EG_Update(slot)>>(SHIFT-10)])>>SHIFT;
+		
+	if(slot->mslc) 
+	{
+		AICA->udata.data[0x14/2] = addr1;
+		if (!(AFSEL(AICA)))
+		{
+			UINT16 res;
+
+			AICA->udata.data[0x10/2] |= slot->EG.state<<13;
+
+			res = 0x3FF - (slot->EG.volume>>EG_SHIFT);
+
+			res *= 959;
+			res /= 1024;
+
+			if (res > 959) res = 959;
+
+			AICA->udata.data[0x10/2] = res;
+
+			//AICA->udata.data[0x10/2] |= 0x3FF - (slot->EG.volume>>EG_SHIFT);
+		}
+	}
+
+	return sample;
+}
+
+static void AICA_DoMasterSamples(struct _AICA *AICA, int nsamples)
+{
+	INT16 *bufr,*bufl;
+	int sl, s, i;
+
+	bufr=AICA->bufferr;
+	bufl=AICA->bufferl;
+
+	for(s=0;s<nsamples;++s)
+	{
+ 		INT32 smpl, smpr;
+
+		smpl = smpr = 0;
+
+		// mix slots' direct output
+		for(sl=0;sl<64;++sl)
+		{
+			struct _SLOT *slot=AICA->Slots+sl;
+			slot->mslc = (MSLC(AICA)==sl);
+			AICA->RBUFDST=AICA->RINGBUF+AICA->BUFPTR;
+			if(AICA->Slots[sl].active)
+			{
+				unsigned int Enc;
+				signed int sample;
+
+				sample=AICA_UpdateSlot(AICA, slot);
+
+				Enc=((TL(slot))<<0x0)|((IMXL(slot))<<0xd);
+				AICADSP_SetSample(&AICA->DSP,(sample*AICA->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
+				{
+					smpl+=(sample*AICA->LPANTABLE[Enc])>>SHIFT;
+					smpr+=(sample*AICA->RPANTABLE[Enc])>>SHIFT;
+				}
+			}
+			
+			AICA->BUFPTR&=63;
+		}
+
+		// process the DSP
+		AICADSP_Step(&AICA->DSP);
+
+		// mix DSP output
+		for(i=0;i<16;++i)
+		{
+			if(EFSDL(i))
+			{
+				unsigned int Enc=((EFPAN(i))<<0x8)|((EFSDL(i))<<0xd);
+				smpl+=(AICA->DSP.EFREG[i]*AICA->LPANTABLE[Enc])>>SHIFT;
+				smpr+=(AICA->DSP.EFREG[i]*AICA->RPANTABLE[Enc])>>SHIFT;
+			}
+		}
+
+		*bufl++ = ICLIP16(smpl>>3);
+		*bufr++ = ICLIP16(smpr>>3);
+
+		AICA_TimersAddTicks(AICA, 1);
+		CheckPendingIRQ(AICA);
+	}
+}
+
+int AICA_IRQCB(void *param)
+{
+	CheckPendingIRQ(param);
+	return -1;
+}
+
+void AICA_Update(struct _AICA *AICA, void *param, INT16 **inputs, INT16 **buf, int samples)
+{
+	AICA->bufferl = buf[0];
+	AICA->bufferr = buf[1];
+	AICA->length = samples;
+	AICA_DoMasterSamples(AICA, samples);
+}
+
+void *aica_start(const void *config)
+{
+	const struct AICAinterface *intf;
+
+	struct _AICA *AICA;
+
+	AICA = malloc(sizeof(*AICA));
+	memset(AICA, 0, sizeof(*AICA));
+
+	intf = config;
+
+	// init the emulation
+	AICA_Init(AICA, intf);
+
+	// set up the IRQ callbacks
+	{
+		AICA->IntARMCB = intf->irq_callback[0];
+
+//		AICA->stream = stream_create(0, 2, 44100, AICA, AICA_Update);
+	}
+
+	return AICA;
+}
+
+void aica_stop(struct _AICA *AICA)
+{
+ if (AICA->buffertmpl) {
+ free (AICA->buffertmpl);
+ }
+ if (AICA->buffertmpr) {
+ free (AICA->buffertmpr);
+ }
+	free(AICA);
+}
+
+void AICA_set_ram_base(struct _AICA *AICA, int which, void *base)
+{
+	if (AICA)
+	{
+		AICA->AICARAM = base;
+		AICA->DSP.AICARAM = base;
+	}
+}
+
+READ16_HANDLER( AICA_0_r )
+{
+	UINT16 res = AICA_r16(AICA, offset*2);
+
+//	printf("Read AICA @ %x => %x (PC=%x, R5=%x)\n", offset*2, res, arm7_get_register(15), arm7_get_register(5));
+
+	return res;
+}
+
+extern UINT32* stv_scu;
+
+WRITE16_HANDLER( AICA_0_w )
+{
+	UINT16 tmp;
+
+	tmp = AICA_r16(AICA, offset*2);
+	COMBINE_DATA(&tmp);
+	AICA_w16(AICA,offset*2, tmp);
+}
+
+WRITE16_HANDLER( AICA_MidiIn )
+{
+	AICA->MidiStack[AICA->MidiW++]=data;
+	AICA->MidiW &= 15;
+}
+
+READ16_HANDLER( AICA_MidiOutR )
+{
+	unsigned char val;
+
+	val=AICA->MidiStack[AICA->MidiR++];
+	AICA->MidiR&=7;
+	return val;
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/aica.h Added

@@ -0,0 +1,52 @@
+/*
+
+	Sega/Yamaha AICA emulation	
+*/
+
+#ifndef _AICA_H_
+#define _AICA_H_
+
+#define MAX_AICA	(2)
+
+#define COMBINE_DATA(varptr)	(*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
+
+// convert AO types
+typedef int8 data8_t;
+typedef int16 data16_t;
+typedef int32 data32_t;
+typedef int offs_t;
+struct sARM7;
+
+struct AICAinterface 
+{
+	int num;
+	struct sARM7 *cpu;
+	void *region[MAX_AICA];
+	int mixing_level[MAX_AICA];			/* volume */
+	void (*irq_callback[MAX_AICA])(struct sARM7 *cpu, int state);	/* irq callback */
+};
+
+struct _AICA;
+
+int AICA_sh_start(struct AICAinterface *intf);
+void AICA_sh_stop(void);
+void scsp_stop(void);
+
+#define READ16_HANDLER(name)	data16_t name(struct _AICA *AICA, offs_t offset, data16_t mem_mask)
+#define WRITE16_HANDLER(name)	void     name(struct _AICA *AICA, offs_t offset, data16_t data, data16_t mem_mask)
+
+// AICA register access
+READ16_HANDLER( AICA_0_r );
+WRITE16_HANDLER( AICA_0_w );
+READ16_HANDLER( AICA_1_r );
+WRITE16_HANDLER( AICA_1_w );
+
+// MIDI I/O access (used for comms on Model 2/3)
+WRITE16_HANDLER( AICA_MidiIn );
+READ16_HANDLER( AICA_MidiOutR );
+
+void *aica_start(const void *config);
+void aica_stop(struct _AICA *AICA);
+void AICA_Update(struct _AICA *AICA, void *param, INT16 **inputs, INT16 **buf, int samples);
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/aicadsp.c Added

@@ -0,0 +1,349 @@
+#include <assert.h>
+#include <math.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "aica.h"
+#include "aicadsp.h"
+
+static UINT16 PACK(INT32 val)
+{
+	UINT32 temp;
+	int sign,exponent,k;
+
+	sign = (val >> 23) & 0x1;
+	temp = (val ^ (val << 1)) & 0xFFFFFF;
+	exponent = 0;
+	for (k=0; k<12; k++)
+	{
+		if (temp & 0x800000)
+			break;
+		temp <<= 1;
+		exponent += 1;
+	}
+	if (exponent < 12)
+		val = (val << exponent) & 0x3FFFFF;
+	else
+		val <<= 11;
+	val >>= 11;
+	val |= sign << 15;
+	val |= exponent << 11;
+
+	return (UINT16)val;
+}
+
+static INT32 UNPACK(UINT16 val)
+{
+	int sign,exponent,mantissa;
+	INT32 uval;
+
+	sign = (val >> 15) & 0x1;
+	exponent = (val >> 11) & 0xF;
+	mantissa = val & 0x7FF;
+	uval = mantissa << 11;
+	if (exponent > 11)
+		exponent = 11;
+	else
+		uval |= (sign ^ 1) << 22;
+	uval |= sign << 23;
+	uval <<= 8;
+	uval >>= 8;
+	uval >>= exponent;
+
+	return uval;
+}
+
+void AICADSP_Init(struct _AICADSP *DSP)
+{
+	memset(DSP,0,sizeof(struct _AICADSP));
+	DSP->RBL=0x8000;
+	DSP->Stopped=1;
+}
+
+void AICADSP_Step(struct _AICADSP *DSP)
+{
+	INT32 ACC=0;	//26 bit
+	INT32 SHIFTED=0;	//24 bit
+	INT32 X=0;	//24 bit
+	INT32 Y=0;	//13 bit
+	INT32 B=0;	//26 bit
+	INT32 INPUTS=0;	//24 bit
+	INT32 MEMVAL=0;
+	INT32 FRC_REG=0;	//13 bit
+	INT32 Y_REG=0;		//24 bit
+	UINT32 ADDR=0;
+	UINT32 ADRS_REG=0;	//13 bit
+	int step;
+
+	if(DSP->Stopped)
+		return;
+
+	memset(DSP->EFREG,0,2*16);
+#if 0
+	int dump=0;
+	FILE *f=NULL;
+	if(dump)
+		f=fopen("dsp.txt","wt");
+#endif
+	for(step=0;step</*128*/DSP->LastStep;++step)
+	{
+		UINT16 *IPtr=DSP->MPRO+step*8;
+				
+// if(IPtr[0]==0 && IPtr[1]==0 && IPtr[2]==0 && IPtr[3]==0)
+// break;
+
+		UINT32 TRA=(IPtr[0]>>9)&0x7F;
+		UINT32 TWT=(IPtr[0]>>8)&0x01;
+		UINT32 TWA=(IPtr[0]>>1)&0x7F;
+
+		UINT32 XSEL=(IPtr[2]>>15)&0x01;
+		UINT32 YSEL=(IPtr[2]>>13)&0x03;
+		UINT32 IRA=(IPtr[2]>>7)&0x3F;
+		UINT32 IWT=(IPtr[2]>>6)&0x01;
+		UINT32 IWA=(IPtr[2]>>1)&0x1F;
+
+		UINT32 TABLE=(IPtr[4]>>15)&0x01;
+		UINT32 MWT=(IPtr[4]>>14)&0x01;
+		UINT32 MRD=(IPtr[4]>>13)&0x01;
+		UINT32 EWT=(IPtr[4]>>12)&0x01;
+		UINT32 EWA=(IPtr[4]>>8)&0x0F;
+		UINT32 ADRL=(IPtr[4]>>7)&0x01;
+		UINT32 FRCL=(IPtr[4]>>6)&0x01;
+		UINT32 SHIFT=(IPtr[4]>>4)&0x03;
+		UINT32 YRL=(IPtr[4]>>3)&0x01;
+		UINT32 NEGB=(IPtr[4]>>2)&0x01;
+		UINT32 ZERO=(IPtr[4]>>1)&0x01;
+		UINT32 BSEL=(IPtr[4]>>0)&0x01;
+
+		UINT32 NOFL=(IPtr[6]>>15)&1;		//????
+		UINT32 COEF=step;
+
+		UINT32 MASA=(IPtr[6]>>9)&0x3f;	//???
+		UINT32 ADREB=(IPtr[6]>>8)&0x1;
+		UINT32 NXADR=(IPtr[6]>>7)&0x1;
+		
+		INT64 v;
+
+		//operations are done at 24 bit precision
+#if 0
+		if(MASA)
+			int a=1;
+		if(NOFL)
+			int a=1;
+
+// int dump=0;
+
+		if(f)
+		{
+#define DUMP(v)	fprintf(f," " #v ": %04X",v);
+
+			fprintf(f,"%d: ",step);
+			DUMP(ACC);
+			DUMP(SHIFTED);
+			DUMP(X);
+			DUMP(Y);
+			DUMP(B);
+			DUMP(INPUTS);
+			DUMP(MEMVAL);
+			DUMP(FRC_REG);
+			DUMP(Y_REG);
+			DUMP(ADDR);
+			DUMP(ADRS_REG);
+			fprintf(f,"\n");
+		}
+#endif
+		//INPUTS RW
+		assert(IRA<0x32);
+		if(IRA<=0x1f)
+			INPUTS=DSP->MEMS[IRA];
+		else if(IRA<=0x2F)
+			INPUTS=DSP->MIXS[IRA-0x20]<<4;	//MIXS is 20 bit
+		else if(IRA<=0x31)
+			INPUTS=0;
+
+		INPUTS<<=8;
+		INPUTS>>=8;
+		//if(INPUTS&0x00800000)
+		// INPUTS|=0xFF000000;
+
+		if(IWT)
+		{
+			DSP->MEMS[IWA]=MEMVAL;	//MEMVAL was selected in previous MRD
+			if(IRA==IWA)
+				INPUTS=MEMVAL;
+		}
+
+		//Operand sel
+		//B
+		if(!ZERO)
+		{
+			if(BSEL)
+				B=ACC;
+			else
+			{
+				B=DSP->TEMP[(TRA+DSP->DEC)&0x7F];
+				B<<=8;
+				B>>=8;
+				//if(B&0x00800000)
+				// B|=0xFF000000; //Sign extend
+			}
+			if(NEGB)
+				B=0-B;
+		}
+		else
+			B=0;
+
+		//X
+		if(XSEL)
+			X=INPUTS;
+		else
+		{
+			X=DSP->TEMP[(TRA+DSP->DEC)&0x7F];
+			X<<=8;
+			X>>=8;
+			//if(X&0x00800000)
+			// X|=0xFF000000;
+		}
+
+		//Y
+		if(YSEL==0)
+			Y=FRC_REG;
+		else if(YSEL==1)
+			Y=DSP->COEF[COEF<<1]>>3;	//COEF is 16 bits
+		else if(YSEL==2)
+			Y=(Y_REG>>11)&0x1FFF;
+		else if(YSEL==3)
+			Y=(Y_REG>>4)&0x0FFF;
+
+		if(YRL)
+			Y_REG=INPUTS;
+
+		//Shifter
+		if(SHIFT==0)
+		{
+			SHIFTED=ACC;
+			if(SHIFTED>0x007FFFFF)
+				SHIFTED=0x007FFFFF;
+			if(SHIFTED<(-0x00800000))
+				SHIFTED=-0x00800000;
+		}
+		else if(SHIFT==1)
+		{
+			SHIFTED=ACC*2;
+			if(SHIFTED>0x007FFFFF)
+				SHIFTED=0x007FFFFF;
+			if(SHIFTED<(-0x00800000))
+				SHIFTED=-0x00800000;
+		}
+		else if(SHIFT==2)
+		{
+			SHIFTED=ACC*2;
+			SHIFTED<<=8;
+			SHIFTED>>=8;
+			//SHIFTED&=0x00FFFFFF;
+			//if(SHIFTED&0x00800000)
+			// SHIFTED|=0xFF000000;
+		}
+		else if(SHIFT==3)
+		{
+			SHIFTED=ACC;
+			SHIFTED<<=8;
+			SHIFTED>>=8;
+			//SHIFTED&=0x00FFFFFF;
+			//if(SHIFTED&0x00800000)
+			// SHIFTED|=0xFF000000;
+		}
+
+		//ACCUM
+		Y<<=19;
+		Y>>=19;
+		//if(Y&0x1000)
+		// Y|=0xFFFFF000;
+
+		v=(((INT64) X*(INT64) Y)>>12);
+		ACC=(int) v+B;
+
+		if(TWT)
+			DSP->TEMP[(TWA+DSP->DEC)&0x7F]=SHIFTED;
+
+		if(FRCL)
+		{
+			if(SHIFT==3)
+				FRC_REG=SHIFTED&0x0FFF;
+			else
+				FRC_REG=(SHIFTED>>11)&0x1FFF;
+		}
+
+		if(MRD || MWT)
+		//if(0)
+		{
+			ADDR=DSP->MADRS[MASA<<1];
+			if(!TABLE)
+				ADDR+=DSP->DEC;
+			if(ADREB)
+				ADDR+=ADRS_REG&0x0FFF;
+			if(NXADR)
+				ADDR++;
+			if(!TABLE)
+				ADDR&=DSP->RBL-1;
+			else
+				ADDR&=0xFFFF;
+			//ADDR<<=1;
+			//ADDR+=DSP->RBP<<13;
+			//MEMVAL=DSP->AICARAM[ADDR>>1];
+			ADDR+=DSP->RBP<<10;
+			if(MRD && (step&1))	//memory only allowed on odd? DoA inserts NOPs on even
+			{
+				if(NOFL)
+					MEMVAL=DSP->AICARAM[ADDR]<<8;
+				else
+					MEMVAL=UNPACK(DSP->AICARAM[ADDR]);
+			}
+			if(MWT && (step&1))
+			{
+				if(NOFL)
+					DSP->AICARAM[ADDR]=SHIFTED>>8;
+				else
+					DSP->AICARAM[ADDR]=PACK(SHIFTED);
+			}
+		}
+
+		if(ADRL)
+		{
+			if(SHIFT==3)
+				ADRS_REG=(SHIFTED>>12)&0xFFF;
+			else
+				ADRS_REG=(INPUTS>>16);
+		}
+
+		if(EWT)
+			DSP->EFREG[EWA]+=SHIFTED>>8;
+
+	}
+	--DSP->DEC;
+	memset(DSP->MIXS,0,4*16);
+// if(f)
+// fclose(f);
+}
+
+void AICADSP_SetSample(struct _AICADSP *DSP,INT32 sample,int SEL,int MXL)
+{
+	//DSP->MIXS[SEL]+=sample<<(MXL+1)/*7*/;
+	DSP->MIXS[SEL]+=sample;
+// if(MXL)
+// int a=1;
+}
+
+void AICADSP_Start(struct _AICADSP *DSP)
+{
+	int i;
+	DSP->Stopped=0;
+	for(i=127;i>=0;--i)
+	{
+		UINT16 *IPtr=DSP->MPRO+i*8;
+
+		if(IPtr[0]!=0 || IPtr[2]!=0 || IPtr[4]!=0 || IPtr[6]!=0)
+			break;
+	}
+	DSP->LastStep=i+1;
+
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/aicadsp.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/aicalfo.c Added

@@ -0,0 +1,159 @@
+/*
+	AICA LFO handling
+
+	Part of the AICA emulator package.
+	(not compiled directly, #included from aica.c)
+
+	By ElSemi, kingshriek, and R. Belmont
+*/
+
+#define LFO_SHIFT 	8
+
+struct _LFO
+{
+ unsigned short phase;
+ UINT32 phase_step;
+ int *table;
+ int *scale;
+};
+
+#define LFIX(v)	((unsigned int) ((float) (1<<LFO_SHIFT)*(v)))
+
+//Convert DB to multiply amplitude
+#define DB(v) 	LFIX(pow(10.0,v/20.0))
+
+//Convert cents to step increment
+#define CENTS(v) LFIX(pow(2.0,v/1200.0))
+
+static int PLFO_TRI[256],PLFO_SQR[256],PLFO_SAW[256],PLFO_NOI[256];
+static int ALFO_TRI[256],ALFO_SQR[256],ALFO_SAW[256],ALFO_NOI[256];
+static float LFOFreq[32]={0.17,0.19,0.23,0.27,0.34,0.39,0.45,0.55,0.68,0.78,0.92,1.10,1.39,1.60,1.87,2.27,
+			 2.87,3.31,3.92,4.79,6.15,7.18,8.60,10.8,14.4,17.2,21.5,28.7,43.1,57.4,86.1,172.3};
+static float ASCALE[8]={0.0,0.4,0.8,1.5,3.0,6.0,12.0,24.0};
+static float PSCALE[8]={0.0,7.0,13.5,27.0,55.0,112.0,230.0,494};
+static int PSCALES[8][256];
+static int ASCALES[8][256];
+
+void AICALFO_Init(void)
+{
+ int i,s;
+ for(i=0;i<256;++i)
+ {
+		int a,p;
+//		float TL;
+		//Saw
+		a=255-i;
+		if(i<128)
+			p=i;
+		else
+			p=i-256; 
+		ALFO_SAW[i]=a;
+		PLFO_SAW[i]=p;
+	
+		//Square
+		if(i<128)
+		{
+			a=255;
+			p=127;
+		}
+		else
+		{
+			a=0;
+			p=-128;
+		}
+		ALFO_SQR[i]=a;
+		PLFO_SQR[i]=p;
+	
+		//Tri
+		if(i<128)
+			a=255-(i*2);
+		else
+			a=(i*2)-256;
+		if(i<64)
+			p=i*2;
+		else if(i<128)
+			p=255-i*2;
+		else if(i<192)
+			p=256-i*2;
+		else
+			p=i*2-511;
+		ALFO_TRI[i]=a;
+		PLFO_TRI[i]=p;
+	
+		//noise
+		//a=lfo_noise[i];
+		a=rand()&0xff;
+		p=128-a;
+		ALFO_NOI[i]=a;
+		PLFO_NOI[i]=p;
+ }
+
+	for(s=0;s<8;++s)
+	{
+		float limit=PSCALE[s];
+		for(i=-128;i<128;++i)
+		{
+			PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0));
+		}
+		limit=-ASCALE[s];
+		for(i=0;i<256;++i)
+		{
+			ASCALES[s][i]=DB(((limit*(float) i)/256.0));
+		}
+	}
+}
+
+signed int INLINE AICAPLFO_Step(struct _LFO *LFO)
+{
+	int p;
+
+ LFO->phase+=LFO->phase_step; 
+#if LFO_SHIFT!=8 
+ LFO->phase&=(1<<(LFO_SHIFT+8))-1;
+#endif 
+ p=LFO->table[LFO->phase>>LFO_SHIFT];
+	p=LFO->scale[p+128];
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+signed int INLINE AICAALFO_Step(struct _LFO *LFO)
+{
+	int p;
+ LFO->phase+=LFO->phase_step; 
+#if LFO_SHIFT!=8 
+ LFO->phase&=(1<<(LFO_SHIFT+8))-1;
+#endif 
+ p=LFO->table[LFO->phase>>LFO_SHIFT];
+	p=LFO->scale[p];
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+void AICALFO_ComputeStep(struct _LFO *LFO,UINT32 LFOF,UINT32 LFOWS,UINT32 LFOS,int ALFO)
+{
+ float step=(float) LFOFreq[LFOF]*256.0/(float)44100.0;
+ LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
+ if(ALFO)
+ {
+		switch(LFOWS)
+		{
+			case 0: LFO->table=ALFO_SAW; break;
+			case 1: LFO->table=ALFO_SQR; break;
+			case 2: LFO->table=ALFO_TRI; break;
+			case 3: LFO->table=ALFO_NOI; break;
+			default: printf("Unknown ALFO %d\n", LFOWS);
+		}
+		LFO->scale=ASCALES[LFOS];
+	}
+	else
+	{
+		switch(LFOWS)
+		{
+		 case 0: LFO->table=PLFO_SAW; break;
+		 case 1: LFO->table=PLFO_SQR; break;
+			case 2: LFO->table=PLFO_TRI; break;
+		 case 3: LFO->table=PLFO_NOI; break;
+ 		 default: printf("Unknown PLFO %d\n", LFOWS);
+		}
+		LFO->scale=PSCALES[LFOS];
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7.c Added

@@ -0,0 +1,278 @@
+//
+// ARM7 processor emulator
+// version 1.6 / 2008-02-16
+// (c) Radoslaw Balcewicz
+//
+
+#include "arm7.h"
+#include "arm7i.h"
+
+#ifdef ARM7_THUMB
+#include "arm7thumb.h"
+#endif
+
+ //--------------------------------------------------------------------------
+ // definitions and macros
+
+ /** Macro for accessing banked registers. */
+#define RX_BANK(t,r) (cpu->Rx_bank [t][r - 8])
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // private functions
+
+ /** CPU Reset. */
+static void Reset (struct sARM7 *cpu);
+ //--------------------------------------------------------------------------
+
+ // private variables
+
+ /** Table for decoding bit-coded mode to zero based index. */
+static const int s_tabTryb [32] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, ARM7_MODE_usr, ARM7_MODE_fiq, ARM7_MODE_irq,
+ ARM7_MODE_svc, -1, -1, -1, ARM7_MODE_abt, -1, -1, -1, ARM7_MODE_und,
+ -1, -1, -1, ARM7_MODE_sys};
+ //--------------------------------------------------------------------------
+
+
+ // public functions
+
+struct sARM7* ARM7_Alloc ()
+{
+ struct sARM7 *cpu = malloc (sizeof (struct sARM7));
+ memset (cpu, 0, sizeof (struct sARM7));
+ return cpu;
+}
+
+void ARM7_Free (struct sARM7 *cpu) {
+ free (cpu);
+}
+
+ //--------------------------------------------------------------------------
+ /** ARM7 emulator init. */
+void ARM7_Init (struct sARM7 *cpu)
+ {
+ // sane startup values
+ cpu->fiq = 0;
+ cpu->irq = 0;
+ cpu->carry = 0;
+ cpu->overflow = 0;
+ cpu->flagi = FALSE;
+ cpu->cykle = 0;
+
+ // reset will do the rest
+ ARM7_HardReset (cpu);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Power-ON reset. */
+void ARM7_HardReset (struct sARM7 *cpu)
+ {
+ // CPSR that makes sense
+ cpu->Rx [ARM7_CPSR] = ARM7_CPSR_I | ARM7_CPSR_F | ARM7_CPSR_M_svc;
+ Reset (cpu);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Hardware reset via /RESET line. */
+void ARM7_SoftReset (struct sARM7 *cpu)
+ {
+ Reset (cpu);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** CPSR update, possibly changing operating mode. */
+void ARM7_SetCPSR (struct sARM7 *cpu, ARM7_REG sr)
+ {
+ int stary, nowy;
+
+ stary = s_tabTryb [ARM7_CPSR_M (cpu->Rx [ARM7_CPSR])];
+ nowy = s_tabTryb [ARM7_CPSR_M (sr)];
+ // do we have to change modes?
+ if (nowy != stary)
+ {
+ // save this mode registers
+ RX_BANK (stary, ARM7_SP) = cpu->Rx [ARM7_SP],
+ RX_BANK (stary, ARM7_LR) = cpu->Rx [ARM7_LR],
+ RX_BANK (stary, ARM7_SPSR) = cpu->Rx [ARM7_SPSR];
+ if (stary == ARM7_MODE_fiq)
+ {
+ // copy R8-R12
+ RX_BANK (ARM7_MODE_fiq, 8) = cpu->Rx [8],
+ RX_BANK (ARM7_MODE_fiq, 9) = cpu->Rx [9],
+ RX_BANK (ARM7_MODE_fiq, 10) = cpu->Rx [10],
+ RX_BANK (ARM7_MODE_fiq, 11) = cpu->Rx [11],
+ RX_BANK (ARM7_MODE_fiq, 12) = cpu->Rx [12];
+ cpu->Rx [8] = RX_BANK (ARM7_MODE_usr, 8),
+ cpu->Rx [9] = RX_BANK (ARM7_MODE_usr, 9),
+ cpu->Rx [10] = RX_BANK (ARM7_MODE_usr, 10),
+ cpu->Rx [11] = RX_BANK (ARM7_MODE_usr, 11),
+ cpu->Rx [12] = RX_BANK (ARM7_MODE_usr, 12);
+ }
+
+ // fetch new mode registers
+ cpu->Rx [ARM7_SP] = RX_BANK (nowy, ARM7_SP),
+ cpu->Rx [ARM7_LR] = RX_BANK (nowy, ARM7_LR),
+ cpu->Rx [ARM7_SPSR] = RX_BANK (nowy, ARM7_SPSR);
+ if (nowy == ARM7_MODE_fiq)
+ {
+ // copy R8-R12
+ RX_BANK (ARM7_MODE_usr, 8) = cpu->Rx [8],
+ RX_BANK (ARM7_MODE_usr, 9) = cpu->Rx [9],
+ RX_BANK (ARM7_MODE_usr, 10) = cpu->Rx [10],
+ RX_BANK (ARM7_MODE_usr, 11) = cpu->Rx [11],
+ RX_BANK (ARM7_MODE_usr, 12) = cpu->Rx [12];
+ cpu->Rx [8] = RX_BANK (ARM7_MODE_fiq, 8),
+ cpu->Rx [9] = RX_BANK (ARM7_MODE_fiq, 9),
+ cpu->Rx [10] = RX_BANK (ARM7_MODE_fiq, 10),
+ cpu->Rx [11] = RX_BANK (ARM7_MODE_fiq, 11),
+ cpu->Rx [12] = RX_BANK (ARM7_MODE_fiq, 12);
+ }
+ }
+
+ // new CPSR value
+ cpu->Rx [ARM7_CPSR] = sr;
+
+ // mode change could've enabled interrups, so we test for those and set
+ // appropriate flag for the instruction loop to catch
+ if (cpu->fiq)
+ cpu->flagi |= ARM7_FL_FIQ;
+#ifndef ARM7_DREAMCAST
+ if (cpu->irq)
+ cpu->flagi |= ARM7_FL_IRQ;
+#endif
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Sets FIQ line state. */
+void ARM7_SetFIQ (struct sARM7 *cpu, int stan)
+ {
+ stan = stan ? TRUE : FALSE;
+ // we catch changes only
+ if (stan ^ cpu->fiq)
+ {
+ cpu->fiq = stan;
+ if (cpu->fiq)
+ cpu->flagi |= ARM7_FL_FIQ;
+ }
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Sets IRQ line state. */
+void ARM7_SetIRQ (struct sARM7 *cpu, int stan)
+ {
+ stan = stan ? TRUE : FALSE;
+ // we catch changes only
+ if (stan ^ cpu->irq)
+ {
+ cpu->irq = stan;
+ if (cpu->irq)
+ cpu->flagi |= ARM7_FL_IRQ;
+ }
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Tests for pending interrupts, switches to one if possible. */
+void ARM7_CheckIRQ (struct sARM7 *cpu)
+ {
+ UINT32 sr = cpu->Rx [ARM7_CPSR];
+
+ // clear all interrupt flags
+ cpu->flagi &= ~(ARM7_FL_FIQ | ARM7_FL_IRQ);
+ 
+ // check for pending interrupts we can switch to
+ // (FIQ can interrupt IRQ, but not the other way around)
+ if (cpu->fiq)
+ {
+ if (!(sr & ARM7_CPSR_F))
+ {
+ // FIQ
+ ARM7_SetCPSR (cpu, ARM7_CPSR_MX (sr, ARM7_CPSR_M_fiq) | ARM7_CPSR_F | ARM7_CPSR_I);
+ cpu->Rx [ARM7_SPSR] = sr;
+ // set new PC (return from interrupt will subtract 4)
+ cpu->Rx [ARM7_LR] = cpu->Rx [ARM7_PC] + 4;
+ cpu->Rx [ARM7_PC] = 0x0000001c;
+ }
+ }
+#ifndef ARM7_DREAMCAST
+ if (cpu->irq)
+ {
+ if (!(sr & ARM7_CPSR_I))
+ {
+ // IRQ
+ ARM7_SetCPSR (cpu, ARM7_CPSR_MX (sr, ARM7_CPSR_M_irq) | ARM7_CPSR_I);
+ cpu->Rx [ARM7_SPSR] = sr;
+ // set new PC (return from interrupt will subtract 4)
+ cpu->Rx [ARM7_LR] = cpu->Rx [ARM7_PC] + 4;
+ cpu->Rx [ARM7_PC] = 0x00000018;
+ cpu->irq = 0;
+ }
+ }
+#endif
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Single step. */
+void ARM7_Step (struct sARM7 *cpu)
+{
+ // make a step
+#ifdef ARM7_THUMB
+ if (cpu->Rx[ARM7_CPSR] & ARM7_CPSR_T)
+ {
+	ARM7i_Thumb_Step(cpu);
+ }
+ else
+#endif
+ {
+ ARM7i_Step (cpu);
+ }
+ // and test interrupts
+ ARM7_CheckIRQ (cpu);
+}
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Runs emulation for at least n cycles, returns actual amount of cycles
+ burned - normal interpreter. */
+int ARM7_Execute (struct sARM7 *cpu, int n)
+ {
+ cpu->cykle = 0;
+ while (cpu->cykle < n)
+ {
+ ARM7_CheckIRQ (cpu);
+ while (!cpu->flagi && cpu->cykle < n)
+ // make one step, sum up cycles
+ cpu->cykle += ARM7i_Step (cpu);
+ }
+ return cpu->cykle;
+ }
+ //--------------------------------------------------------------------------
+
+
+ // private functions
+
+
+ //--------------------------------------------------------------------------
+ /** CPU Reset. */
+void Reset (struct sARM7 *cpu)
+ {
+ // clear ALU flags
+ cpu->carry = 0;
+ cpu->overflow = 0;
+ // test CPSR mode and pick a valid one if necessary
+ if (s_tabTryb [ARM7_CPSR_M (cpu->Rx [ARM7_CPSR])] < 0)
+ cpu->Rx [ARM7_CPSR] = ARM7_CPSR_I | ARM7_CPSR_F | ARM7_CPSR_M_svc;
+ // set up registers according to manual
+ RX_BANK (ARM7_MODE_svc, ARM7_LR) = cpu->Rx [ARM7_PC];
+ RX_BANK (ARM7_MODE_svc, ARM7_SPSR) = cpu->Rx [ARM7_CPSR];
+ ARM7_SetCPSR (cpu, ARM7_CPSR_I | ARM7_CPSR_F | ARM7_CPSR_M_svc);
+ cpu->Rx [ARM7_PC] = 0x00000000;
+ }
+ //--------------------------------------------------------------------------

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7.h Added

@@ -0,0 +1,171 @@
+//
+// ARM7 processor emulator
+// version 1.6 / 2008-02-16
+// (c) Radoslaw Balcewicz
+//
+
+#ifndef _ARM7_h_
+#define _ARM7_h_
+
+#include "cpuintrf.h"
+#include "aica.h"
+
+ //--------------------------------------------------------------------------
+ // definitions and macros
+
+ /** If defined, will turn on specific behavior emulation, as well as some
+ optimizations that are valid only for Dreamcast AICA. */
+#define ARM7_DREAMCAST
+
+ /** Define to enable Thumb support for ARM7. */
+//#define ARM7_THUMB
+
+ // sanity tests
+#ifdef ARM7_DREAMCAST
+ #ifdef ARM7_THUMB
+ #warning "Dreamcast ARM7 is a -DI type, it doesn't support Thumb mode."
+ #endif
+#else
+// #warning "Instructions cycle counts might not be correct."
+#endif
+
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // CPU definitions
+
+ /** Status flags in CPSR register. */
+#define ARM7_CPSR_N (1 << 31)
+#define ARM7_CPSR_Z (1 << 30)
+#define ARM7_CPSR_C (1 << 29)
+#define ARM7_CPSR_V (1 << 28)
+#define ARM7_CPSR_I (1 << 7)
+#define ARM7_CPSR_F (1 << 6)
+#define ARM7_CPSR_T (1 << 5)
+ /** CPSR bit mask for current operating mode. */
+#define ARM7_CPSR_M(x) ((x) & 0x1f)
+#define ARM7_CPSR_MX(sr,x) (((sr) & ~0x1f) | ((x) & 0x1f))
+ /** Bit combinations for each operating mode. */
+#define ARM7_CPSR_M_usr 0x10
+#define ARM7_CPSR_M_fiq 0x11
+#define ARM7_CPSR_M_irq 0x12
+#define ARM7_CPSR_M_svc 0x13
+#define ARM7_CPSR_M_abt 0x17
+#define ARM7_CPSR_M_und 0x11
+#define ARM7_CPSR_M_sys 0x1f
+
+ /** Control flags for ARM7 core. */
+#define ARM7_FL_FIQ (1 << 0)
+#define ARM7_FL_IRQ (1 << 1)
+
+ /** Operating modes. */
+#define ARM7_MODE_usr 0
+#define ARM7_MODE_fiq 1
+#define ARM7_MODE_irq 2
+#define ARM7_MODE_svc 3
+#define ARM7_MODE_abt 4
+#define ARM7_MODE_und 5
+#define ARM7_MODE_sys 0
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // register definitions
+
+ /** ARM7 register type (all are 32-bit). */
+typedef INT32 ARM7_REG;
+
+enum
+{
+ ARM7_R0 = 0, ARM7_R1, ARM7_R2, ARM7_R3, ARM7_R4, ARM7_R5, ARM7_R6, ARM7_R7,
+ ARM7_R8, ARM7_R9, ARM7_R10, ARM7_R11, ARM7_R12, ARM7_R13, ARM7_R14, ARM7_R15
+};
+
+ /** R13 is stack pointer. */
+#define ARM7_SP 13
+ /** R14 is link/return address. */
+#define ARM7_LR 14
+ /** R15 is program counter. */
+#define ARM7_PC 15
+ /** CPSR control register. */
+#define ARM7_CPSR 16
+ /** SPSR control register. */
+#define ARM7_SPSR 17
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** ARM7 CPU state structure. */
+struct sARM7
+ {
+ /** All-purpose and control registers (for current mode). */
+ ARM7_REG Rx [18];
+ /** Banked registers for all operating modes. */
+ ARM7_REG Rx_bank [6][10];
+
+ /** FIQ and IRQ interrupt requests. */
+ int fiq, irq;
+
+ /** Carry flag for barrel shifter and ALU operations. */
+ int carry;
+ /** Overflow flag for arithmetic instructions. */
+ int overflow;
+
+ /** Emulation control flags. */
+ int flagi;
+
+ /** Instruction code. */
+ UINT32 kod;
+ /** Cycle counter. */
+ int cykle;
+
+ uint8 dc_ram[8*1024*1024];
+
+ struct AICAinterface aica_interface;
+ struct _AICA *AICA;
+ };
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // public procedures
+
+ /** ARM7 allocate spu state. */
+struct sARM7* ARM7_Alloc (void);
+
+void ARM7_Free (struct sARM7 *cpu);
+
+ /** ARM7 emulator init. */
+void ARM7_Init (struct sARM7 *cpu);
+
+ /** Power-ON reset. */
+void ARM7_HardReset (struct sARM7 *cpu);
+ /** Hardware reset via /RESET line. */
+void ARM7_SoftReset (struct sARM7 *cpu);
+
+ /** CPSR update, possibly changing operating mode. */
+void ARM7_SetCPSR (struct sARM7 *cpu, ARM7_REG sr);
+
+ /** Sets FIQ line state. */
+void ARM7_SetFIQ (struct sARM7 *cpu, int stan);
+ /** Sets IRQ line state. */
+void ARM7_SetIRQ (struct sARM7 *cpu, int stan);
+
+ /** Tests for pending interrupts, switches to one if possible. */
+void ARM7_CheckIRQ (struct sARM7 *cpu);
+
+ /** Single step. */
+void ARM7_Step (struct sARM7 *cpu);
+ /** Runs emulation for at least n cycles, returns actual amount of cycles
+ burned - normal interpreter. */
+int ARM7_Execute (struct sARM7 *cpu, int n);
+ //--------------------------------------------------------------------------
+
+enum
+{
+ ARM7_IRQ_LINE=0, ARM7_FIRQ_LINE,
+ ARM7_NUM_LINES
+};
+
+#ifdef ENABLE_DEBUGGER
+extern UINT32 arm7_disasm( struct sARM7 *cpu, char *pBuf, UINT32 pc, UINT32 opcode );
+extern UINT32 thumb_disasm( struct sARM7 *cpu, char *pBuf, UINT32 pc, UINT16 opcode );
+#endif
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7i.c Added

@@ -0,0 +1,1340 @@
+//
+// ARM7 processor emulator - interpreter core
+// version 1.6 / 2008-02-16
+// (c) Radoslaw Balcewicz
+//
+
+#include "arm7.h"
+#include "arm7i.h"
+#include "dc_hw.h"
+
+ //--------------------------------------------------------------------------
+ // definitions and macros
+
+ /** PC is being incremented after every instruction fetch, so we adjust for
+ that on all stores and jumps. */
+#define PC_ADJUSTMENT (-4)
+
+ /** Memory access routines. */
+#include "arm7memil.c"
+
+ /** Bit shifts compatible with IA32. */
+#define SHL(w, k) (((UINT32)(w)) << (k))
+#define SHR(w, k) (((UINT32)(w)) >> (k))
+#define SAR(w, k) (((INT32)(w)) >> (k))
+#define ROR(w, k) (SHR (w, k) | SHL (w, 32 - (k)))
+
+ /** Byte rotation for unaligned 32-bit read. */
+#define RBOD(w, i) (ROR (w, (i) * 8))
+
+ /** Data processing macros. */
+#define NEG(i) ((i) & (1 << 31))
+#define POS(i) (~(i) & (1 << 31))
+#define ADDCARRY(a, b, c) \
+ ((NEG (a) & NEG (b)) |\
+ (NEG (a) & POS (c)) |\
+ (NEG (b) & POS (c))) ? 1 : 0;
+#define ADDOVERFLOW(a, b, c) \
+ ((NEG (a) & NEG (b) & POS (c)) |\
+ (POS (a) & POS (b) & NEG (c))) ? 1 : 0;
+#define SUBCARRY(a, b, c) \
+ ((NEG (a) & POS (b)) |\
+ (NEG (a) & POS (c)) |\
+ (POS (b) & POS (c))) ? 1 : 0;
+#define SUBOVERFLOW(a, b, c)\
+ ((NEG (a) & POS (b) & POS (c)) |\
+ (POS (a) & NEG (b) & NEG (c))) ? 1 : 0;
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // private functions
+	 
+ /** Condition EQ. */
+static int R_WEQ (struct sARM7 *cpu);
+ /** Condition NE. */
+static int R_WNE (struct sARM7 *cpu);
+ /** Condition CS. */
+static int R_WCS (struct sARM7 *cpu);
+ /** Condition CC. */
+static int R_WCC (struct sARM7 *cpu);
+ /** Condition MI. */
+static int R_WMI (struct sARM7 *cpu);
+ /** Condition PL. */
+static int R_WPL (struct sARM7 *cpu);
+ /** Condition VS. */
+static int R_WVS (struct sARM7 *cpu);
+ /** Condition VC. */
+static int R_WVC (struct sARM7 *cpu);
+ /** Condition HI. */
+static int R_WHI (struct sARM7 *cpu);
+ /** Condition LS. */
+static int R_WLS (struct sARM7 *cpu);
+ /** Condition GE. */
+static int R_WGE (struct sARM7 *cpu);
+ /** Condition LT. */
+static int R_WLT (struct sARM7 *cpu);
+ /** Condition GT. */
+static int R_WGT (struct sARM7 *cpu);
+ /** Condition LE. */
+static int R_WLE (struct sARM7 *cpu);
+ /** Condition AL. */
+static int R_WAL (struct sARM7 *cpu);
+ /** Undefined condition. */
+static int R_Wxx (struct sARM7 *cpu);
+
+ /** Calculates barrel shifter output. */
+static UINT32 WyliczPrzes (struct sARM7 *cpu);
+ /** Logical shift left. */
+static UINT32 LSL_x (struct sARM7 *cpu, UINT32 w, int i);
+ /** Logical shift right. */
+static UINT32 LSR_x (struct sARM7 *cpu, UINT32 w, int i);
+ /** Arithmetic shift right. */
+static UINT32 ASR_x (struct sARM7 *cpu, UINT32 w, int i);
+ /** Rotate right. */
+static UINT32 ROR_x (struct sARM7 *cpu, UINT32 w, int i);
+ /** Rotate right extended. */
+static UINT32 RRX_1 (struct sARM7 *cpu, UINT32 w);
+
+ /** Group 00x opcodes. */
+static void R_G00x (struct sARM7 *cpu);
+ /** Multiply instructions. */
+static void R_MUL_MLA (struct sARM7 *cpu);
+ /** Single data swap. */
+static void R_SWP (struct sARM7 *cpu);
+ /** PSR Transfer. */
+static void R_PSR (struct sARM7 *cpu);
+ /** Data processing instructions. */
+static void R_DP (struct sARM7 *cpu);
+ /** Data processing result writeback. */
+static void R_WynikDP (struct sARM7 *cpu, ARM7_REG w);
+ /** Data processing flags writeback. */
+static void R_FlagiDP (struct sARM7 *cpu, ARM7_REG w);
+ /** Single data transfer. */
+static void R_SDT (struct sARM7 *cpu);
+ /** Rozkaz "Undefined". */
+static void R_Und (struct sARM7 *cpu);
+ /** Block Data Transfer. */
+static void R_BDT (struct sARM7 *cpu);
+ /** Block load instructions. */
+static void R_LDM (struct sARM7 *cpu, int Rn, UINT32 adres);
+ /** Block store instructions. */
+static void R_STM (struct sARM7 *cpu, int Rn, UINT32 adres);
+ /** Branch/Branch with link. */
+static void R_B_BL (struct sARM7 *cpu);
+ /** Group 110 opcodes. */
+static void R_G110 (struct sARM7 *cpu);
+ /** Group 111 opcodes. */
+static void R_G111 (struct sARM7 *cpu);
+
+#ifdef ARM7_THUMB
+ /** Halfword and Signed Data Transfer. */
+static void R_HSDT (struct sARM7 *cpu);
+#endif
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ // private data
+
+ /** Flag testing functions for conditional execution. */
+static int (*s_tabWar [16]) (struct sARM7 *cpu) = {R_WEQ, R_WNE, R_WCS, R_WCC, R_WMI, R_WPL,
+ R_WVS, R_WVC, R_WHI, R_WLS, R_WGE, R_WLT, R_WGT, R_WLE, R_WAL, R_Wxx};
+ /** Handler table for instruction groups. */
+static void (*s_tabGrup [8]) (struct sARM7 *cpu) = {R_G00x, R_G00x, R_SDT, R_SDT, R_BDT,
+ R_B_BL, R_G110, R_G111};
+ /** Data processing instructions split to arithmetic and logical. */
+static int s_tabAL [16] = {FALSE, FALSE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,
+ FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE};
+
+ /** Cycles it took for current instruction to complete. */
+static int s_cykle;
+ //--------------------------------------------------------------------------
+
+
+ // public functions
+
+
+ //--------------------------------------------------------------------------
+ /** Single step, returns number of burned cycles. */
+int ARM7i_Step (struct sARM7 *cpu)
+ {
+ cpu->kod = arm7_read_32 (cpu, cpu->Rx [ARM7_PC] & ~3);
+
+ // we increment PC here, and if there's a load from memory it will simply
+ // overwrite it (all PC modyfing code should be aware of this)
+ cpu->Rx [ARM7_PC] += 4;
+ s_cykle = 2;
+ // condition test and group selection
+ if (s_tabWar [(cpu->kod >> 28) & 15] (cpu))
+ s_tabGrup [(cpu->kod >> 25) & 7] (cpu);
+ return s_cykle;
+ }
+ //--------------------------------------------------------------------------
+
+
+ // private functions
+
+
+ //--------------------------------------------------------------------------
+ /** Condition EQ. */
+int R_WEQ (struct sARM7 *cpu)
+ {
+ // "Z set"
+ return cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition NE. */
+int R_WNE (struct sARM7 *cpu)
+ {
+ // "Z clear"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition CS. */
+int R_WCS (struct sARM7 *cpu)
+ {
+ // "C set"
+ return cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition CC. */
+int R_WCC (struct sARM7 *cpu)
+ {
+ // "C clear"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition MI. */
+int R_WMI (struct sARM7 *cpu)
+ {
+ // "N set"
+ return cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition PL. */
+int R_WPL (struct sARM7 *cpu)
+ {
+ // "N clear"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition VS. */
+int R_WVS (struct sARM7 *cpu)
+ {
+ // "V set"
+ return cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition VC. */
+int R_WVC (struct sARM7 *cpu)
+ {
+ // "V clear"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition HI. */
+int R_WHI (struct sARM7 *cpu)
+ {
+ // "C set and Z clear"
+ return (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) &&\
+ !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition LS. */
+int R_WLS (struct sARM7 *cpu)
+ {
+ // "C clear or Z set"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ||\
+ (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition GE. */
+int R_WGE (struct sARM7 *cpu)
+ {
+ // "N equals V"
+ return (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N) &&\
+ (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V) || !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N) &&\
+ !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition LT. */
+int R_WLT (struct sARM7 *cpu)
+ {
+ // "N not equal to V"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N) &&\
+ (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V) || (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_N) &&\
+ !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_V);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition GT. */
+int R_WGT (struct sARM7 *cpu)
+ {
+ // "Z clear AND (N equals V)"
+ return !(cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z) && R_WGE (cpu);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition LE. */
+int R_WLE (struct sARM7 *cpu)
+ {
+ // "Z set OR (N not equal to V)"
+ return (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_Z) || R_WLT (cpu);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Condition AL. */
+int R_WAL (struct sARM7 *cpu)
+ {
+ // "(ignored)"
+ return TRUE;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Undefined condition. */
+int R_Wxx (struct sARM7 *cpu)
+ {
+ // behaviour undefined
+ return FALSE;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Calculates barrel shifter output. */
+UINT32 WyliczPrzes (struct sARM7 *cpu)
+ {
+ int Rm, Rs, i;
+ UINT32 w;
+
+ // Rm is source for the shift operation
+ Rm = cpu->kod & 15;
+
+ if (cpu->kod & (1 << 4))
+ {
+ s_cykle++;
+ // shift count in Rs (8 lowest bits)
+ if (Rm != ARM7_PC)
+ w = cpu->Rx [Rm];
+ else
+ w = (cpu->Rx [ARM7_PC] & ~3) + 12 + PC_ADJUSTMENT;
+ // Rs can't be PC
+ Rs = (cpu->kod >> 8) & 15;
+ i = (UINT8)cpu->Rx [Rs];
+ if (i == 0)
+ {
+ // special case
+ cpu->carry = (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 1 : 0;
+ return w;
+ }
+
+ switch ((cpu->kod >> 5) & 3)
+ {
+ case 0:
+ w = LSL_x (cpu, w, i);
+ break;
+ case 1:
+ w = LSR_x (cpu, w, i);
+ break;
+ case 2:
+ w = ASR_x (cpu, w, i);
+ break;
+ case 3:
+ w = ROR_x (cpu, w, i);
+ break;
+ }
+ }
+ else
+ {
+ // shift count as immediate in opcode
+ if (Rm != ARM7_PC)
+ w = cpu->Rx [Rm];
+ else
+ w = (cpu->Rx [ARM7_PC] & ~3) + 8 + PC_ADJUSTMENT;
+ i = (cpu->kod >> 7) & 31;
+
+ switch ((cpu->kod >> 5) & 3)
+ {
+ case 0:
+ w = LSL_x (cpu, w, i);
+ break;
+ case 1:
+ if (i > 0)
+ w = LSR_x (cpu, w, i);
+ else
+ w = LSR_x (cpu, w, 32);
+ break;
+ case 2:
+ if (i > 0)
+ w = ASR_x (cpu, w, i);
+ else
+ w = ASR_x (cpu, w, 32);
+ break;
+ case 3:
+ if (i > 0)
+ w = ROR_x (cpu, w, i);
+ else
+ w = RRX_1 (cpu, w);
+ break;
+ }
+ }
+ return w;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Logical shift left. */
+UINT32 LSL_x (struct sARM7 *cpu, UINT32 w, int i)
+{
+	// LSL #0 copies C into carry out and returns unmodified value
+	if (i == 0)
+	{
+		cpu->carry = (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 1 : 0;
+		return w;
+	}
+	// LSL #32 copies LSB to carry out and returns zero
+	if (i == 32)
+	{
+		cpu->carry = w & 1;
+		return 0;
+	}
+	// LSL > #32 returns zero for both carry and output
+	if (i > 32)
+	{
+		cpu->carry = 0;
+		return 0;
+	}
+ // normal shift
+	cpu->carry = (w & (1 << (32 - i))) ? 1 : 0;
+	w = SHL (w, i);
+	return w;
+}
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Logical shift right. */
+UINT32 LSR_x (struct sARM7 *cpu, UINT32 w, int i)
+{
+	// LSR #32 copies MSB to carry out and returns zero
+	if (i == 32)
+	{
+		cpu->carry = (w & (1 << 31)) ? 1 : 0;
+		return 0;
+	}
+	// LSR > #32 returns zero for both carry and output
+	if (i > 32)
+	{
+		cpu->carry = 0;
+		return 0;
+	}
+ // normal shift
+	cpu->carry = (w & (1 << (i - 1))) ? 1 : 0;
+	w = SHR (w, i);
+	return w;
+}
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Arithmetic shift right. */
+UINT32 ASR_x (struct sARM7 *cpu, UINT32 w, int i)
+{
+	// ASR >= #32 carry out and output value depends on the minus sign
+	if (i >= 32)
+	{
+		if (w & (1 << 31))
+		{
+			cpu->carry = 1;
+			return ~0;
+		}
+
+		cpu->carry = 0;
+		return 0;
+	}
+	// normal shift
+	cpu->carry = (w & (1 << (i - 1))) ? 1 : 0;
+	w = SAR (w, i);
+	return w;
+}
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Rotate right. */
+UINT32 ROR_x (struct sARM7 *cpu, UINT32 w, int i)
+{
+	// mask count to [0; 31]
+	i &= 0x1f;
+	// ROR #32,#64,etc. copies MSB into carry out and returns unmodified value
+	if (i == 0)
+	{
+		cpu->carry = (w & (1 << 31)) ? 1 : 0;
+		return w;
+	}
+	// normal shift
+	cpu->carry = (w & (1 << (i-1))) ? 1 : 0;
+	w = ROR (w, i);
+	return w;
+}
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Rotate right extended. */
+UINT32 RRX_1 (struct sARM7 *cpu, UINT32 w)
+ {
+ // same as RCR by 1 in IA32
+ cpu->carry = w & 1;
+ return (w >> 1) | ((cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) << 2);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Group 00x opcodes. */
+void R_G00x (struct sARM7 *cpu)
+ {
+#ifdef ARM7_THUMB
+ // 24 constant bits
+ if ((cpu->kod & 0x0ffffff0) == 0x012fff10)	// BX - branch with possible mode transfer
+ {
+ #ifdef ARM7_THUMB
+ 	int Rn = cpu->Rx[cpu->kod & 0xf];
+
+	// switching to Thumb mode?
+	if (Rn & 1)
+	{
+		ARM7_SetCPSR(cpu->Rx[ARM7_CPSR] | ARM7_CPSR_T);
+	}
+ 
+	cpu->Rx[ARM7_PC] = Rn & ~1;
+ #endif
+ }
+ // 15 constant bits
+ else if ((cpu->kod & 0x0fb00ff0) == 0x01000090)
+ R_SWP (cpu);
+ // 10 constant bits
+ else if ((cpu->kod & 0x0fc000f0) == 0x00000090)
+ R_MUL_MLA (cpu);
+ // 10 constant bits
+ else if ((cpu->kod & 0x0e400f90) == 0x00000090)
+ R_HSDT (cpu);
+ // 9 constant bits
+ else if ((cpu->kod & 0x0f8000f0) == 0x00800090)
+ {
+// logerror("G00x / Multiply long\n");
+ }
+ // 6 constant bits	 
+ else if ((cpu->kod & 0x0e400090) == 0x00400090)
+ R_HSDT (cpu);
+ // 2 constant bits
+ else
+ {
+ if ((cpu->kod & 0x01900000) == 0x01000000)
+ // TST, TEQ, CMP & CMN without S bit are "PSR Transfer"
+ R_PSR (cpu);
+ else
+ // the rest is "Data processing"
+ R_DP (cpu);
+ }
+#else
+ if ((cpu->kod & 0x03b00090) == 0x01000090)
+ R_SWP (cpu);
+ else if ((cpu->kod & 0x03c00090) == 0x00000090)
+ R_MUL_MLA (cpu);
+ else
+ {
+ if ((cpu->kod & 0x01900000) == 0x01000000)
+ // TST, TEQ, CMP & CMN without S bit are "PSR Transfer"
+ R_PSR (cpu);
+ else
+ // the rest is "Data processing"
+ R_DP (cpu);
+ }
+#endif
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Single data swap. */
+void R_SWP (struct sARM7 *cpu)
+ {
+ int Rn, Rd, Rm;
+ UINT32 adres, w;
+
+#define BIT_B (cpu->kod & (1 << 21))
+
+ s_cykle += 4;
+ // none of these can be PC
+ Rn = (cpu->kod >> 16) & 15;
+ Rd = (cpu->kod >> 12) & 15;
+ Rm = cpu->kod & 15;
+ adres = cpu->Rx [Rn];
+
+ if (BIT_B)
+ {
+ // "byte"
+ w = arm7_read_8 (cpu, adres);
+ arm7_write_8 (cpu, adres, (UINT8)cpu->Rx [Rm]);
+ }
+ else
+ {
+ // "word"
+ w = RBOD (arm7_read_32 (cpu, adres & ~3), adres & 3);
+ arm7_write_32 (cpu, adres & ~3, cpu->Rx [Rm]);
+ }
+ cpu->Rx [Rd] = w;
+
+#undef BIT_B
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Multiply instructions. */
+void R_MUL_MLA (struct sARM7 *cpu)
+ {
+ int Rm, Rs, Rn, Rd;
+ UINT32 wynik;
+
+#define BIT_A (cpu->kod & (1 << 21))
+#define BIT_S (cpu->kod & (1 << 20))
+
+ s_cykle += 2;
+ // none of these can be PC, also Rd != Rm
+ Rd = (cpu->kod >> 16) & 15,
+ Rs = (cpu->kod >> 8) & 15,
+ Rm = cpu->kod & 15;
+
+ // MUL
+ wynik = cpu->Rx [Rm] * cpu->Rx [Rs];
+ if (BIT_A)
+ {
+ // MLA
+ Rn = (cpu->kod >> 12) & 15;
+ wynik += cpu->Rx [Rn];
+ }
+ cpu->Rx [Rd] = wynik;
+
+ if (BIT_S)
+ {
+ // V remains unchanged, C is undefined
+ cpu->Rx [ARM7_CPSR] &= ~(ARM7_CPSR_N | ARM7_CPSR_Z);
+ if (wynik == 0)
+ cpu->Rx [ARM7_CPSR] |= ARM7_CPSR_Z;
+ cpu->Rx [ARM7_CPSR] |= wynik & 0x80000000;
+ }
+
+#undef BIT_S
+#undef BIT_A
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** PSR Transfer. */
+void R_PSR (struct sARM7 *cpu)
+ {
+ int Rd, Rm;
+ UINT32 w, arg;
+
+#define BIT_I (cpu->kod & (1 << 25))
+#define BIT_P (cpu->kod & (1 << 22))
+
+ // none of the registers involved can be PC
+
+ if (cpu->kod & (1 << 21))
+ {
+ // MSR
+ Rm = cpu->kod & 15;
+ if (BIT_I)
+ // immediate (lower 12 bits)
+ arg = ROR (cpu->kod & 0xff, ((cpu->kod >> 8) & 0xf) * 2);
+ else
+ // register
+ arg = cpu->Rx [Rm];
+
+ // decode mask bits
+ if (BIT_P)
+ {
+ w = cpu->Rx [ARM7_SPSR];
+ if (ARM7_CPSR_M (cpu->Rx [ARM7_CPSR]) > ARM7_CPSR_M_usr &&\
+ ARM7_CPSR_M (cpu->Rx [ARM7_CPSR]) < ARM7_CPSR_M_sys)
+ {
+ if (cpu->kod & (1 << 16))
+ w = (w & 0xffffff00) | (arg & 0x000000ff);
+ if (cpu->kod & (1 << 17))
+ w = (w & 0xffff00ff) | (arg & 0x0000ff00);
+ if (cpu->kod & (1 << 18))
+ w = (w & 0xff00ffff) | (arg & 0x00ff0000);
+ if (cpu->kod & (1 << 19))
+ // ARMv5E should have 0xf8000000 argument mask
+ w = (w & 0x00ffffff) | (arg & 0xf0000000);
+ }
+ // force valid mode
+ w |= 0x10;
+ cpu->Rx [ARM7_SPSR] = w;
+ }
+ else
+ {
+ w = cpu->Rx [ARM7_CPSR];
+ // only flags can be changed in User mode
+ if (ARM7_CPSR_M (cpu->Rx [ARM7_CPSR]) != ARM7_CPSR_M_usr)
+ {
+ if (cpu->kod & (1 << 16))
+ w = (w & 0xffffff00) | (arg & 0x000000ff);
+ if (cpu->kod & (1 << 17))
+ w = (w & 0xffff00ff) | (arg & 0x0000ff00);
+ if (cpu->kod & (1 << 18))
+ w = (w & 0xff00ffff) | (arg & 0x00ff0000);
+ }
+ if (cpu->kod & (1 << 19))
+ // ARMv5E should have 0xf8000000 argument mask
+ w = (w & 0x00ffffff) | (arg & 0xf0000000);
+ // force valid mode
+ w |= 0x10;
+ ARM7_SetCPSR (cpu, w);
+ }
+ }
+ else
+ {
+ // MRS
+ Rd = (cpu->kod >> 12) & 15;
+ if (BIT_P)
+ cpu->Rx [Rd] = cpu->Rx [ARM7_SPSR];
+ else
+ cpu->Rx [Rd] = cpu->Rx [ARM7_CPSR];
+ }
+
+#undef BIT_P
+#undef BIT_I
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Data processing instructions. */
+void R_DP (struct sARM7 *cpu)
+ {
+ int Rn;
+ ARM7_REG arg1, arg2, w;
+
+#define BIT_I (cpu->kod & (1 << 25))
+
+ // Rn can be PC, so we need to account for that
+ Rn = (cpu->kod >> 16) & 15;
+
+ if (BIT_I)
+ {
+ if (Rn != ARM7_PC)
+ arg1 = cpu->Rx [Rn];
+ else
+ arg1 = (cpu->Rx [ARM7_PC] & ~3) + 8 + PC_ADJUSTMENT;
+ // immediate in lowest 12 bits
+ arg2 = ROR (cpu->kod & 0xff, ((cpu->kod >> 8) & 0xf) * 2);
+ // preload carry out from C
+ cpu->carry = (cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 1 : 0;
+ }
+ else
+ {
+ if (Rn != ARM7_PC)
+ arg1 = cpu->Rx [Rn];
+ else
+ // register or immediate shift?
+ if (cpu->kod & (1 << 4))
+ arg1 = (cpu->Rx [ARM7_PC] & ~3) + 12 + PC_ADJUSTMENT;
+ else
+ arg1 = (cpu->Rx [ARM7_PC] & ~3) + 8 + PC_ADJUSTMENT;
+ // calculate in barrel shifter
+ arg2 = WyliczPrzes (cpu);
+ }
+
+ // decode instruction type
+ switch ((cpu->kod >> 21) & 15)
+ {
+ case 0:
+ // AND
+ R_WynikDP (cpu, arg1 & arg2);
+ break;
+
+ case 1:
+ // EOR
+ R_WynikDP (cpu, arg1 ^ arg2);
+ break;
+
+ case 2:
+ // SUB
+ w = arg1 - arg2;
+ cpu->carry = SUBCARRY (arg1, arg2, w);
+ cpu->overflow = SUBOVERFLOW (arg1, arg2, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 3:
+ // RSB
+ w = arg2 - arg1;
+ cpu->carry = SUBCARRY (arg2, arg1, w);
+ cpu->overflow = SUBOVERFLOW (arg2, arg1, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 4:
+ // ADD
+ w = arg1 + arg2;
+ cpu->carry = ADDCARRY (arg1, arg2, w);
+ cpu->overflow = ADDOVERFLOW (arg1, arg2, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 5:
+ // ADC
+ w = arg1 + arg2 + ((cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 1 : 0);
+ cpu->carry = ADDCARRY (arg1, arg2, w);
+ cpu->overflow = ADDOVERFLOW (arg1, arg2, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 6:
+ // SBC
+ w = arg1 - arg2 - ((cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 0 : 1);
+ cpu->carry = SUBCARRY (arg1, arg2, w);
+ cpu->overflow = SUBOVERFLOW (arg1, arg2, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 7:
+ // RSC
+ w = arg2 - arg1 - ((cpu->Rx [ARM7_CPSR] & ARM7_CPSR_C) ? 0 : 1);
+ cpu->carry = SUBCARRY (arg2, arg1, w);
+ cpu->overflow = SUBOVERFLOW (arg2, arg1, w);
+ R_WynikDP (cpu, w);
+ break;
+
+ case 8:
+ // TST
+ R_FlagiDP (cpu, arg1 & arg2);
+ break;
+
+ case 9:
+ // TEQ
+ R_FlagiDP (cpu, arg1 ^ arg2);
+ break;
+
+ case 10:
+ // CMP
+ w = arg1 - arg2;
+ cpu->carry = SUBCARRY (arg1, arg2, w);
+ cpu->overflow = SUBOVERFLOW (arg1, arg2, w);
+ R_FlagiDP (cpu, w);
+ break;
+
+ case 11:
+ // CMN
+ w = arg1 + arg2;
+ cpu->carry = ADDCARRY (arg1, arg2, w);
+ cpu->overflow = ADDOVERFLOW (arg1, arg2, w);
+ R_FlagiDP (cpu, w);
+ break;
+
+ case 12:
+ // ORR
+ R_WynikDP (cpu, arg1 | arg2);
+ break;
+
+ case 13:
+ // MOV
+ R_WynikDP (cpu, arg2);
+ break;
+
+ case 14:
+ // BIC
+ R_WynikDP (cpu, arg1 & ~arg2);
+ break;
+
+ case 15:
+ // MVN
+ R_WynikDP (cpu, ~arg2);
+ break;
+ }
+
+#undef BIT_I
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Data processing result writeback. */
+void R_WynikDP (struct sARM7 *cpu, ARM7_REG w)
+ {
+ int Rd;
+
+#define BIT_S (cpu->kod & (1 << 20))
+
+ Rd = (cpu->kod >> 12) & 15;
+ cpu->Rx [Rd] = w;
+ if (BIT_S)
+ {
+ if (Rd == ARM7_PC)
+ {
+ s_cykle += 4;
+ // copy current SPSR to CPSR
+ ARM7_SetCPSR (cpu, cpu->Rx [ARM7_SPSR]);
+ }
+ else
+ // save new flags
+ R_FlagiDP (cpu, w);
+ }
+
+#undef BIT_S
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Data processing flags writeback. */
+void R_FlagiDP (struct sARM7 *cpu, ARM7_REG w)
+ {
+ // arithmetic or logical instruction?
+ if (s_tabAL [(cpu->kod >> 21) & 15])
+ {
+ cpu->Rx [ARM7_CPSR] &= ~(ARM7_CPSR_N | ARM7_CPSR_Z | ARM7_CPSR_C |\
+ ARM7_CPSR_V);
+ cpu->Rx [ARM7_CPSR] |= cpu->overflow << 28;
+ }
+ else
+ cpu->Rx [ARM7_CPSR] &= ~(ARM7_CPSR_N | ARM7_CPSR_Z | ARM7_CPSR_C);
+ cpu->Rx [ARM7_CPSR] |= cpu->carry << 29;
+ if (w == 0)
+ cpu->Rx [ARM7_CPSR] |= ARM7_CPSR_Z;
+ cpu->Rx [ARM7_CPSR] |= w & 0x80000000;
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Single data transfer. */
+void R_SDT (struct sARM7 *cpu)
+ {
+ int Rn, Rd, offset;
+ UINT32 adres, w = 0;
+
+#define BIT_I (cpu->kod & (1 << 25))
+#define BIT_P (cpu->kod & (1 << 24))
+#define BIT_U (cpu->kod & (1 << 23))
+#define BIT_B (cpu->kod & (1 << 22))
+#define BIT_W (cpu->kod & (1 << 21))
+#define BIT_L (cpu->kod & (1 << 20))
+
+ if (BIT_I && (cpu->kod & (1 << 4)))
+ {
+ R_Und (cpu);
+ return;
+ }
+
+ Rn = (cpu->kod >> 16) & 15,
+ Rd = (cpu->kod >> 12) & 15;
+ if (Rn != ARM7_PC)
+ adres = cpu->Rx [Rn];
+ else
+ adres = cpu->Rx [ARM7_PC] & ~3;
+ if (!BIT_L)
+ if (Rd != ARM7_PC)
+ w = cpu->Rx [Rd];
+ else
+ w = (cpu->Rx [ARM7_PC] & ~3) + 12 + PC_ADJUSTMENT;
+
+ if (BIT_I)
+ // calculate value in barrel shifter
+ offset = WyliczPrzes (cpu);
+ else
+ // immediate in lowest 12 bits
+ offset = cpu->kod & 0xfff;
+
+ if (!BIT_U)
+ offset = -offset;
+ if (BIT_P)
+ {
+ // "pre-index"
+ adres += offset;
+ if (BIT_W)
+ // "write-back"
+ cpu->Rx [Rn] = adres;
+ }
+ else
+ // "post-index"
+ cpu->Rx [Rn] += offset;
+ if (Rn == ARM7_PC)
+ adres += 8 + PC_ADJUSTMENT;
+
+ if (BIT_L)
+ {
+ s_cykle += 3;
+ // "load"
+ if (BIT_B)
+ // "byte"
+ cpu->Rx [Rd] = arm7_read_8 (cpu, adres);
+ else
+ // "word"
+ cpu->Rx [Rd] = RBOD (arm7_read_32 (cpu, adres & ~3), adres & 3);
+ }
+ else
+ {
+ s_cykle += 2;
+ // "store"
+ if (BIT_B)
+ // "byte"
+ arm7_write_8 (cpu, adres, (UINT8)w);
+ else
+ // "word"
+ arm7_write_32 (cpu, adres & ~3, w);
+ }
+
+#undef BIT_L
+#undef BIT_W
+#undef BIT_B
+#undef BIT_U
+#undef BIT_P
+#undef BIT_I
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Undefined. */
+void R_Und (struct sARM7 *cpu)
+ {
+ UINT32 sr = cpu->Rx [ARM7_CPSR];
+ ARM7_SetCPSR (cpu, ARM7_CPSR_MX (sr, ARM7_CPSR_M_und) | ARM7_CPSR_I);
+ cpu->Rx [ARM7_SPSR] = sr;
+ cpu->Rx [ARM7_LR] = cpu->Rx [ARM7_PC] + 4;
+ cpu->Rx [ARM7_PC] = 0x00000004;
+ }
+ //--------------------------------------------------------------------------
+
+#define BIT_U (cpu->kod & (1 << 23))
+#define BIT_S (cpu->kod & (1 << 22))
+ //--------------------------------------------------------------------------
+ /** Block Data Transfer. */
+void R_BDT (struct sARM7 *cpu)
+ {
+ int Rn, usr = FALSE;
+ UINT32 adres;
+ ARM7_REG cpsr = 0;
+
+#define BIT_L (cpu->kod & (1 << 20))
+
+ // Rn can't be PC
+ Rn = (cpu->kod >> 16) & 15;
+ adres = cpu->Rx [Rn];
+
+ // transfer in User mode
+ if (BIT_S)
+ if (!BIT_L || !(cpu->kod & (1 << ARM7_PC)))
+ usr = TRUE;
+
+ if (usr)
+ {
+//EMU_BLAD (BLAD_WEWNETRZNY, "BDT: user transfer");
+ cpsr = cpu->Rx [ARM7_CPSR];
+ ARM7_SetCPSR (cpu, ARM7_CPSR_MX (cpsr, ARM7_CPSR_M_usr));
+ }
+
+ if (BIT_L)
+ // "load"
+ R_LDM (cpu, Rn, adres);
+ else
+ // "store"
+ R_STM (cpu, Rn, adres);
+
+ if (usr)
+ ARM7_SetCPSR (cpu, cpsr);
+
+#undef BIT_L
+ }
+ //--------------------------------------------------------------------------
+
+#define BIT_P (cpu->kod & (1 << 24))
+#define BIT_W (cpu->kod & (1 << 21))
+ //--------------------------------------------------------------------------
+ /** Block load instructions. */
+void R_LDM (struct sARM7 *cpu, int Rn, UINT32 adres)
+ {
+ int i, n, sp;
+
+ // count registers on the list
+ for (i = 0, n = 0; i < 16; i++)
+ if (cpu->kod & (1 << i))
+ n++;
+ s_cykle += n * 2 + 1;
+
+ n <<= 2;
+ // transfer type
+ sp = BIT_P;
+ if (!BIT_U)
+ {
+ // "down"
+ n = -n;
+ adres += n;
+ sp = !sp;
+ }
+ if (BIT_W)
+ // "write-back"
+ cpu->Rx [Rn] += n;
+
+ // for all registers in mask
+ if (sp)
+ for (i = 0; i < 16; i++)
+ {
+ if (!(cpu->kod & (1 << i)))
+ continue;
+ adres += 4;
+ cpu->Rx [i] = arm7_read_32 (cpu, adres);
+ }
+ else
+ for (i = 0; i < 16; i++)
+ {
+ if (!(cpu->kod & (1 << i)))
+ continue;
+ cpu->Rx [i] = arm7_read_32 (cpu, adres);
+ adres += 4;
+ }
+
+ // special case - mode change when PC is written
+ if ((cpu->kod & (1 << ARM7_PC)) && BIT_S)
+ ARM7_SetCPSR (cpu, cpu->Rx [ARM7_SPSR]);
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Block store instructions. */
+void R_STM (struct sARM7 *cpu, int Rn, UINT32 adres)
+ {
+ int i, n, p, sp;
+
+ // count registers on the list and remember the first one
+ for (i = 0, n = 0, p = -1; i < 16; i++)
+ if (cpu->kod & (1 << i))
+ {
+ n++;
+ if (p < 0)
+ p = i;
+ }
+ s_cykle += n * 2;
+
+ n <<= 2;
+ // transfer type
+ sp = BIT_P;
+ if (!BIT_U)
+ {
+ // "down"
+ n = -n;
+ adres += n;
+ sp = !sp;
+ }
+ // if base register is not the first one to transfer, writeback happens here
+ if (BIT_W && Rn != p)
+ // "write-back"
+ cpu->Rx [Rn] += n;
+
+ // registers R0-R14
+ if (sp)
+ for (i = 0; i < 15; i++)
+ {
+ if (!(cpu->kod & (1 << i)))
+ continue;
+ adres += 4;
+ arm7_write_32 (cpu, adres, cpu->Rx [i]);
+ }
+ else
+ for (i = 0; i < 15; i++)
+ {
+ if (!(cpu->kod & (1 << i)))
+ continue;
+ arm7_write_32 (cpu, adres, cpu->Rx [i]);
+ adres += 4;
+ }
+
+ // PC is a special case
+ if (cpu->kod & (1 << ARM7_PC))
+ {
+ if (sp)
+ {
+ adres += 4;
+ arm7_write_32 (cpu, adres, (cpu->Rx [ARM7_PC] & ~3) + 12 + PC_ADJUSTMENT);
+ }
+ else
+ {
+ arm7_write_32 (cpu, adres, (cpu->Rx [ARM7_PC] & ~3) + 12 + PC_ADJUSTMENT);
+ adres += 4;
+ }
+ }
+
+ // if base register is the first one to transfer, writeback happens here
+ if (BIT_W && Rn == p)
+ // "write-back"
+ cpu->Rx [Rn] += n;
+ }
+ //--------------------------------------------------------------------------
+#undef BIT_W
+#undef BIT_P
+#undef BIT_S
+#undef BIT_U
+
+ //--------------------------------------------------------------------------
+ /** Branch/Branch with link. */
+void R_B_BL (struct sARM7 *cpu)
+ {
+ INT32 offset;
+
+#define BIT_L (cpu->kod & (1 << 24))
+
+ s_cykle += 4;
+ offset = (cpu->kod & 0x00ffffff) << 2;
+ if (offset & 0x02000000)
+ offset |= 0xfc000000;
+ offset += 8 + PC_ADJUSTMENT;
+ if (BIT_L)
+ // "Branch with link"
+ cpu->Rx [ARM7_LR] = (cpu->Rx [ARM7_PC] & ~3) + 4 + PC_ADJUSTMENT;
+ // "Branch"
+ cpu->Rx [ARM7_PC] += offset;
+
+#undef BIT_L
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Group 110 opcodes. */
+void R_G110 (struct sARM7 *cpu)
+ {
+//	logerror("ARM7: G110 / Coprocessor data transfer\n");
+ }
+ //--------------------------------------------------------------------------
+
+ //--------------------------------------------------------------------------
+ /** Group 111 opcodes. */
+void R_G111 (struct sARM7 *cpu)
+ {
+ if ((cpu->kod & 0xf0000000) == 0xe0000000)
+ {
+/* if (cpu->kod & (1 << 4))
+	logerror("ARM7: G111 / Coprocessor register transfer\n");
+ else
+	logerror("ARM7: G111 / Coprocessor data operation\n"); */
+ }
+ else
+ {
+ UINT32 sr = cpu->Rx [ARM7_CPSR];
+ ARM7_SetCPSR (cpu, ARM7_CPSR_MX (sr, ARM7_CPSR_M_svc) | ARM7_CPSR_I);
+ cpu->Rx [ARM7_SPSR] = sr;
+ cpu->Rx [ARM7_LR] = cpu->Rx [ARM7_PC];
+ cpu->Rx [ARM7_PC] = 0x00000008;
+ }
+ }
+ //--------------------------------------------------------------------------
+
+#ifdef ARM7_THUMB
+ //--------------------------------------------------------------------------
+ /** Halfword and Signed Data Transfer. */
+void R_HSDT ()
+ {
+ int Rm, Rd, Rn, offset;
+ uint32_t adres, w;
+
+#define BIT_P (cpu->kod & (1 << 24))
+#define BIT_U (cpu->kod & (1 << 23))
+#define BIT_W (cpu->kod & (1 << 21))
+#define BIT_L (cpu->kod & (1 << 20))
+#define BIT_S (cpu->kod & (1 << 6))
+#define BIT_H (cpu->kod & (1 << 5))
+
+ // Rm can't be PC
+ Rn = (cpu->kod >> 16) & 15;
+ Rd = (cpu->kod >> 12) & 15;
+ if (Rn != ARM7_PC)
+ adres = cpu->Rx [Rn];
+ else
+ adres = cpu->Rx [ARM7_PC] & ~3;
+ if (!BIT_L)
+ if (Rd != ARM7_PC)
+ w = cpu->Rx [Rd];
+ else
+ w = (cpu->Rx [ARM7_PC] & ~3) + 12 + POPRAWKA_PC;
+
+ if (1 << 22)
+ // immediate
+ offset = ((cpu->kod >> 4) & 0xf0) | (cpu->kod & 15);
+ else
+ {
+ // register
+ Rm = cpu->kod & 15;
+ offset = cpu->Rx [Rm];
+ }
+
+ if (!BIT_U)
+ offset = -offset;
+ if (BIT_P)
+ {
+ // "pre-index"
+ adres += offset;
+ if (BIT_W)
+ // "write-back"
+ cpu->Rx [Rn] = adres;
+ }
+ else
+ // "post-index"
+ cpu->Rx [Rn] += offset;
+ if (Rn == ARM7_PC)
+ adres += 8 + POPRAWKA_PC;
+
+ if (BIT_L)
+ {
+ // "load"
+ s_cykle += 3;
+ if (BIT_S)
+ {
+ if (BIT_H)
+ // "signed halfword"
+ cpu->Rx [Rd] = (INT32)(INT16)arm7_read_16 (adres);
+ else
+ // "signed byte"
+ cpu->Rx [Rd] = (INT32)(INT8)arm7_read_8 (cpu, adres);
+ }
+ else
+ // "unsigned halfword"
+ cpu->Rx [Rd] = arm7_read_16 (adres);
+ }
+ else
+ {
+ // store
+ s_cykle += 2;
+ if (BIT_H)
+ // "halfword"
+ arm7_write_16 (adres, (UINT16)w);
+ else
+ // "byte"
+ arm7_write_8 (cpu, adres, (UINT8)w);
+ }
+
+#undef BIT_H
+#undef BIT_S
+#undef BIT_L
+#undef BIT_W
+#undef BIT_U
+#undef BIT_P
+ }
+ //--------------------------------------------------------------------------
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7i.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7memil.c Added

@@ -0,0 +1,56 @@
+// memory inline functions shared by ARM and THUMB modes
+
+static INLINE void arm7_write_32(struct sARM7 *cpu, UINT32 addr, UINT32 data )
+{
+	addr &= ~3;
+	dc_write32(cpu, addr,data);
+}
+
+
+static INLINE void arm7_write_16(struct sARM7 *cpu, UINT32 addr, UINT16 data)
+{
+	addr &= ~1;
+	dc_write16(cpu, addr,data);
+}
+
+static INLINE void arm7_write_8(struct sARM7 *cpu, UINT32 addr, UINT8 data)
+{
+	dc_write8(cpu, addr,data);
+}
+
+static INLINE UINT32 arm7_read_32(struct sARM7 *cpu, UINT32 addr)
+{
+ UINT32 result;
+ int k = (addr & 3) << 3;
+
+ if (k)
+ {
+ result = dc_read32 (cpu, addr & ~3);
+ result = (result >> k) | (result << (32 - k));
+ }
+ else
+ {
+ 	result = dc_read32(cpu, addr);
+ }
+ return result;
+}
+
+static INLINE UINT16 arm7_read_16(struct sARM7 *cpu, UINT32 addr)
+{
+	UINT16 result;
+
+	result = dc_read16(cpu, addr & ~1);
+
+	if (addr & 1)
+	{
+		result = ((result>>8) & 0xff) | ((result&0xff)<<8);
+	}
+
+	return result;
+}
+
+static INLINE UINT8 arm7_read_8(struct sARM7 *cpu, UINT32 addr)
+{
+ return dc_read8(cpu, addr);
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/arm7thumb.h Added

@@ -0,0 +1,117 @@
+#ifndef _ARM7_THUMB_
+#define _ARM7_THUMB_
+
+#define THUMB_INSN_TYPE		((UINT16) 0xf000)
+#define THUMB_COND_TYPE		((UINT16) 0x0f00)
+#define THUMB_GROUP4_TYPE	((UINT16) 0x0c00)
+#define THUMB_GROUP5_TYPE	((UINT16) 0x0e00)
+#define THUMB_GROUP5_RM		((UINT16) 0x01c0)
+#define THUMB_GROUP5_RN		((UINT16) 0x0038)
+#define THUMB_GROUP5_RD		((UINT16) 0x0007)
+#define THUMB_ADDSUB_RNIMM	((UINT16) 0x01c0)
+#define THUMB_ADDSUB_RS		((UINT16) 0x0038)
+#define THUMB_ADDSUB_RD		((UINT16) 0x0007)
+#define THUMB_INSN_ADDSUB	((UINT16) 0x0800)
+#define THUMB_INSN_CMP		((UINT16) 0x0800)
+#define THUMB_INSN_SUB		((UINT16) 0x0800)
+#define THUMB_INSN_IMM_RD	((UINT16) 0x0700)
+#define THUMB_INSN_IMM_S	((UINT16) 0x0080)
+#define THUMB_INSN_IMM		((UINT16) 0x00ff)
+#define THUMB_ADDSUB_TYPE	((UINT16) 0x0600)
+#define THUMB_HIREG_OP		((UINT16) 0x0300)
+#define THUMB_HIREG_H		((UINT16) 0x00c0)
+#define THUMB_HIREG_RS		((UINT16) 0x0038)
+#define THUMB_HIREG_RD		((UINT16) 0x0007)
+#define THUMB_STACKOP_TYPE	((UINT16) 0x0f00)
+#define THUMB_STACKOP_L		((UINT16) 0x0800)
+#define THUMB_STACKOP_RD	((UINT16) 0x0700)
+#define THUMB_ALUOP_TYPE	((UINT16) 0x03c0)
+#define THUMB_BLOP_LO		((UINT16) 0x0800)
+#define THUMB_BLOP_OFFS		((UINT16) 0x07ff)
+#define THUMB_SHIFT_R		((UINT16) 0x0800)
+#define THUMB_SHIFT_AMT		((UINT16) 0x07c0)
+#define THUMB_HALFOP_L		((UINT16) 0x0800)
+#define THUMB_HALFOP_OFFS	((UINT16) 0x07c0)
+#define THUMB_BRANCH_OFFS	((UINT16) 0x07ff)
+#define THUMB_LSOP_L		((UINT16) 0x0800)
+#define THUMB_LSOP_OFFS		((UINT16) 0x07c0)
+#define THUMB_MULTLS		((UINT16) 0x0800)
+#define THUMB_MULTLS_BASE	((UINT16) 0x0700)
+#define THUMB_RELADDR_SP	((UINT16) 0x0800)
+#define THUMB_RELADDR_RD	((UINT16) 0x0700)
+#define THUMB_INSN_TYPE_SHIFT		12
+#define THUMB_COND_TYPE_SHIFT		8
+#define THUMB_GROUP4_TYPE_SHIFT		10
+#define THUMB_GROUP5_TYPE_SHIFT		9
+#define THUMB_ADDSUB_TYPE_SHIFT		9
+#define THUMB_INSN_IMM_RD_SHIFT		8
+#define THUMB_STACKOP_TYPE_SHIFT	8
+#define THUMB_HIREG_OP_SHIFT		8
+#define THUMB_STACKOP_RD_SHIFT		8
+#define THUMB_MULTLS_BASE_SHIFT		8
+#define THUMB_RELADDR_RD_SHIFT		8
+#define THUMB_HIREG_H_SHIFT			6
+#define THUMB_HIREG_RS_SHIFT		3
+#define THUMB_ALUOP_TYPE_SHIFT		6
+#define THUMB_SHIFT_AMT_SHIFT		6
+#define THUMB_HALFOP_OFFS_SHIFT		6
+#define THUMB_LSOP_OFFS_SHIFT		6
+#define THUMB_GROUP5_RM_SHIFT		6
+#define THUMB_GROUP5_RN_SHIFT		3
+#define THUMB_GROUP5_RD_SHIFT		0
+#define THUMB_ADDSUB_RNIMM_SHIFT	6
+#define THUMB_ADDSUB_RS_SHIFT		3
+#define THUMB_ADDSUB_RD_SHIFT		0
+
+#define THUMB_SIGN_BIT				((UINT32)(1<<31))
+#define THUMB_SIGN_BITS_DIFFER(a,b)	(((a)^(b)) >> 31)
+
+#define N_IS_SET(pc) ((pc) & ARM7_CPSR_N)
+#define Z_IS_SET(pc) ((pc) & ARM7_CPSR_Z)
+#define C_IS_SET(pc) ((pc) & ARM7_CPSR_C)
+#define V_IS_SET(pc) ((pc) & ARM7_CPSR_V)
+#define I_IS_SET(pc) ((pc) & ARM7_CPSR_I)
+#define F_IS_SET(pc) ((pc) & ARM7_CPSR_F)
+#define T_IS_SET(pc) ((pc) & ARM7_CPSR_T)
+
+#define N_IS_CLEAR(pc) (!N_IS_SET(pc))
+#define Z_IS_CLEAR(pc) (!Z_IS_SET(pc))
+#define C_IS_CLEAR(pc) (!C_IS_SET(pc))
+#define V_IS_CLEAR(pc) (!V_IS_SET(pc))
+#define I_IS_CLEAR(pc) (!I_IS_SET(pc))
+#define F_IS_CLEAR(pc) (!F_IS_SET(pc))
+#define T_IS_CLEAR(pc) (!T_IS_SET(pc))
+
+enum
+{
+ COND_EQ = 0, /* Z: equal */
+ COND_NE, /* ~Z: not equal */
+ COND_CS, COND_HS = 2, /* C: unsigned higher or same */
+ COND_CC, COND_LO = 3, /* ~C: unsigned lower */
+ COND_MI, /* N: negative */
+ COND_PL, /* ~N: positive or zero */
+ COND_VS, /* V: overflow */
+ COND_VC, /* ~V: no overflow */
+ COND_HI, /* C && ~Z: unsigned higher */
+ COND_LS, /* ~C || Z: unsigned lower or same */
+ COND_GE, /* N == V: greater or equal */
+ COND_LT, /* N != V: less than */
+ COND_GT, /* ~Z && (N == V): greater than */
+ COND_LE, /* Z || (N != V): less than or equal */
+ COND_AL, /* always */
+ COND_NV /* never */
+};
+
+#define GET_CPSR	ARM7.Rx [ARM7_CPSR]
+
+#define GET_REGISTER(r) ARM7.Rx[(r)]
+#define SET_REGISTER(r, v) ARM7.Rx[(r)] = (v)
+
+#define R15 ARM7.Rx[ARM7_PC]
+
+
+// public function
+int ARM7i_Thumb_Step(void);
+
+#endif
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/dc_hw.c Added

@@ -0,0 +1,182 @@
+// dc_hw.c - Hardware found on the ARM7/AICA side of the Dreamcast
+
+#include "ao.h"
+#include "dc_hw.h"
+#include "aica.h"
+
+#define DK_CORE	(1)
+
+#if DK_CORE
+#include "arm7.h"
+#else
+#include "arm7core.h"
+#endif
+
+static void aica_irq(struct sARM7 *cpu, int irq)
+{
+	if (irq > 0)
+	{
+		#if DK_CORE
+		ARM7_SetFIQ(cpu, TRUE);
+		#else
+		set_irq_line(ARM7_FIRQ_LINE, 1);
+		#endif
+	}
+	else
+	{
+		#if DK_CORE
+		ARM7_SetFIQ(cpu, FALSE);
+		#else
+		set_irq_line(ARM7_FIRQ_LINE, 0);
+		#endif
+	}
+}
+
+#define MIXER_PAN_LEFT 1
+#define MIXER_PAN_RIGHT 2
+#define MIXER(level,pan) ((level & 0xff) | ((pan & 0x03) << 8))
+#define YM3012_VOL(LVol,LPan,RVol,RPan) (MIXER(LVol,LPan)|(MIXER(RVol,RPan) << 16))
+
+uint8 dc_read8(struct sARM7 *cpu, int addr)
+{
+	if (addr < 0x800000)
+	{
+		return cpu->dc_ram[addr];
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		int foo = AICA_0_r(cpu->AICA, (addr-0x800000)/2, 0);
+
+		if (addr & 1)
+		{
+			return foo>>8;
+		}
+		else
+		{
+			return foo & 0xff;
+		}
+	}
+
+	printf("R8 @ %x\n", addr);
+	return -1;
+}
+
+uint16 dc_read16(struct sARM7 *cpu, int addr)
+{
+	if (addr < 0x800000)
+	{
+		return cpu->dc_ram[addr] | (cpu->dc_ram[addr+1]<<8);
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		return AICA_0_r(cpu->AICA, (addr-0x800000)/2, 0);
+	}
+
+	printf("R16 @ %x\n", addr);
+	return -1;
+}
+
+uint32 dc_read32(struct sARM7 *cpu, int addr)
+{
+	if (addr < 0x800000)
+	{
+		return cpu->dc_ram[addr] | (cpu->dc_ram[addr+1]<<8) | (cpu->dc_ram[addr+2]<<16) | (cpu->dc_ram[addr+3]<<24);
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		addr &= 0x7fff;
+		return AICA_0_r(cpu->AICA, addr/2, 0) & 0xffff;
+	}
+
+//	printf("R32 @ %x\n", addr);
+	return 0;
+}
+
+void dc_write8(struct sARM7 *cpu, int addr, uint8 data)
+{
+	if (addr < 0x800000)
+	{
+		cpu->dc_ram[addr] = data;
+		return;
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		addr -= 0x800000;
+		if ((addr & 1))
+			AICA_0_w(cpu->AICA, addr>>1, data<<8, 0x00ff);
+		else
+			AICA_0_w(cpu->AICA, addr>>1, data, 0xff00);
+		return;
+	}
+
+	printf("W8 %x @ %x\n", data, addr);
+}
+
+void dc_write16(struct sARM7 *cpu, int addr, uint16 data)
+{
+	if (addr < 0x800000)
+	{
+		cpu->dc_ram[addr] = data&0xff;
+		cpu->dc_ram[addr+1] = (data>>8) & 0xff;
+		return;
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		AICA_0_w(cpu->AICA, (addr-0x800000)/2, data, 0);
+		return;
+	}
+
+	printf("W16 %x @ %x\n", data, addr);
+}
+
+void dc_write32(struct sARM7 *cpu, int addr, uint32 data)
+{
+	if (addr < 0x800000)
+	{
+		cpu->dc_ram[addr] = data&0xff;
+		cpu->dc_ram[addr+1] = (data>>8) & 0xff;
+		cpu->dc_ram[addr+2] = (data>>16) & 0xff;
+		cpu->dc_ram[addr+3] = (data>>24) & 0xff;
+		return;
+	}
+
+	if ((addr >= 0x800000) && (addr <= 0x807fff))
+	{
+		addr -= 0x800000;
+		AICA_0_w(cpu->AICA, (addr>>1), data&0xffff, 0x0000);
+		AICA_0_w(cpu->AICA, (addr>>1)+1, data>>16, 0x0000);
+		return;
+	}
+
+	printf("W32 %x @ %x\n", data, addr);
+}
+
+void dc_hw_init(struct sARM7 *cpu)
+{
+#if 0
+static struct AICAinterface aica_interface =
+{
+	1,
+	{ cpu->dc_ram, },
+	{ YM3012_VOL(100, MIXER_PAN_LEFT, 100, MIXER_PAN_RIGHT) },
+	{ aica_irq, },
+};
+#endif
+
+ cpu->aica_interface.num = 1;
+ cpu->aica_interface.region[0] = cpu->dc_ram;
+ cpu->aica_interface.mixing_level[0] = YM3012_VOL(100, MIXER_PAN_LEFT, 100, MIXER_PAN_RIGHT);
+ cpu->aica_interface.irq_callback[0] = aica_irq;
+ cpu->aica_interface.cpu = cpu;
+	cpu->AICA = aica_start(&cpu->aica_interface);
+}
+
+void dc_hw_free (struct sARM7 *cpu) {
+ aica_stop (cpu->AICA);
+ cpu->AICA = NULL;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/dc_hw.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_dsf/eng_dsf.c Added

@@ -0,0 +1,286 @@
+//
+// Audio Overload
+// Emulated music player
+//
+// (C) 2000-2008 Richard F. Bannister
+//
+
+//
+// eng_dsf.c
+//
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+#include "corlett.h"
+#include "dc_hw.h"
+#include "cpuintrf.h"
+#include "aica.h"
+#include "aicadsp.h"
+
+#define DEBUG_LOADER	(0)
+#define DK_CORE	(1)
+
+#if DK_CORE
+#include "arm7.h"
+#else
+#include "arm7core.h"
+#endif
+
+typedef struct {
+ corlett_t	*c;
+ char 		psfby[256];
+ uint32		decaybegin, decayend, total_samples;
+ struct sARM7 *cpu;
+ uint8 init_dc_ram[8*1024*1024];
+} dsf_synth_t;
+
+void *dsf_start(const char *path, uint8 *buffer, uint32 length)
+{
+ dsf_synth_t *s = malloc (sizeof (dsf_synth_t));
+ memset (s, 0, sizeof (dsf_synth_t));
+
+	uint8 *file = NULL, *lib_decoded = NULL, *lib_raw_file = NULL;
+	uint32 offset, lengthMS, fadeMS;
+	uint64 file_len, lib_len, lib_raw_length;
+	corlett_t *lib;
+	char *libfile;
+	int i;
+
+	// Decode the current SSF
+	if (corlett_decode(buffer, length, &file, &file_len, &s->c) != AO_SUCCESS)
+	{
+ dsf_stop (s);
+		return NULL;
+	}
+
+	#if DEBUG_LOADER
+	printf("%d bytes decoded\n", file_len);
+	#endif
+
+	s->cpu = ARM7_Alloc ();
+	// Get the library file, if any
+	for (i=0; i<9; i++) {
+		libfile = i ? s->c->libaux[i-1] : s->c->lib;
+		if (libfile[0] != 0)
+		{
+			uint64 tmp_length;
+			char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->lib, libpath, sizeof (libpath));
+	
+			#if DEBUG_LOADER	
+			printf("Loading library: %s\n", libpath);
+			#endif
+			if (ao_get_lib(libpath, &lib_raw_file, &tmp_length) != AO_SUCCESS)
+			{
+ dsf_stop (s);
+				return NULL;
+			}
+			lib_raw_length = tmp_length;
+		
+			if (corlett_decode(lib_raw_file, lib_raw_length, &lib_decoded, &lib_len, &lib) != AO_SUCCESS)
+			{
+				free(lib_raw_file);
+ dsf_stop (s);
+				return NULL;
+			}
+				
+			// Free up raw file
+			free(lib_raw_file);
+
+			// patch the file into ram
+			offset = lib_decoded[0] | lib_decoded[1]<<8 | lib_decoded[2]<<16 | lib_decoded[3]<<24;
+			memcpy(&s->cpu->dc_ram[offset], lib_decoded+4, lib_len-4);
+
+			// Dispose the corlett structure for the lib - we don't use it
+			free(lib_decoded);
+			free(lib);
+		}
+	}
+
+	// now patch the file into RAM over the libraries
+	offset = file[3]<<24 | file[2]<<16 | file[1]<<8 | file[0];
+	memcpy(&s->cpu->dc_ram[offset], file+4, file_len-4);
+
+	free(file);
+	
+	// Finally, set psfby/ssfby tag
+	strcpy(s->psfby, "n/a");
+	if (s->c)
+	{
+		for (i = 0; i < MAX_UNKNOWN_TAGS; i++)
+		{
+			if ((!strcasecmp(s->c->tag_name[i], "psfby")) || (!strcasecmp(s->c->tag_name[i], "ssfby")))
+				strcpy(s->psfby, s->c->tag_data[i]);
+		}
+	}
+
+	#if DEBUG_LOADER && 0
+	{
+		FILE *f;
+
+		f = fopen("dcram.bin", "wb");
+		fwrite(s->cpu->dc_ram, 2*1024*1024, 1, f);
+		fclose(f);
+	}
+	#endif
+
+
+ memcpy (s->init_dc_ram, s->cpu->dc_ram, sizeof (s->init_dc_ram));
+	#if DK_CORE
+	ARM7_Init(s->cpu);
+	#else
+	arm7_init(cpu, 0, 45000000, NULL, NULL);
+	arm7_reset(s->cpu);
+	#endif
+	dc_hw_init(s->cpu);
+
+	// now figure out the time in samples for the length/fade
+	lengthMS = psfTimeToMS(s->c->inf_length);
+	fadeMS = psfTimeToMS(s->c->inf_fade);
+	s->total_samples = 0;
+
+	if (lengthMS == 0)
+	{
+		lengthMS = ~0;
+	}
+
+	if (lengthMS == ~0)
+	{
+		s->decaybegin = lengthMS;
+	}
+	else
+	{
+		lengthMS = (lengthMS * 441) / 10;
+		fadeMS = (fadeMS * 441) / 10;
+
+		s->decaybegin = lengthMS;
+		s->decayend = lengthMS + fadeMS;
+	}
+
+	return s;
+}
+
+int32 dsf_gen(void *handle, int16 *buffer, uint32 samples)
+{
+ dsf_synth_t *s = handle;
+
+	int i;
+	int16 output[44100/30], output2[44100/30];
+	int16 *stereo[2];
+	int16 *outp = buffer;
+	int opos;
+
+	opos = 0;
+	for (i = 0; i < samples; i++)
+	{
+		#if DK_CORE
+		ARM7_Execute(s->cpu, (33000000 / 60 / 4) / 735);
+		#else
+		arm7_execute(s->cpu, (33000000 / 60 / 4) / 735);
+		#endif
+		stereo[0] = &output[opos];
+		stereo[1] = &output2[opos];
+		AICA_Update(s->cpu->AICA, NULL, NULL, stereo, 1);
+		opos++;		
+	}
+
+	for (i = 0; i < samples; i++)
+	{
+		// process the fade tags
+		if (s->total_samples >= s->decaybegin)
+		{
+			if (s->total_samples >= s->decayend)
+			{
+				// song is done here, signal your player appropriately!
+//				ao_song_done = 1;
+				output[i] = 0;
+				output2[i] = 0;
+			}
+			else
+			{
+				int32 fader = 256 - (256*(s->total_samples - s->decaybegin)/(s->decayend-s->decaybegin));
+				output[i] = (output[i] * fader)>>8;
+				output2[i] = (output2[i] * fader)>>8;
+
+				s->total_samples++;
+			}
+		}
+		else
+		{
+			s->total_samples++;
+		}
+
+		*outp++ = output[i];
+		*outp++ = output2[i];
+	}
+
+	return AO_SUCCESS;
+}
+
+int32 dsf_stop(void *handle)
+{
+ dsf_synth_t *s = handle;
+ if (s->cpu) {
+ dc_hw_free (s->cpu);
+ ARM7_Free (s->cpu);
+ }
+ if (s->c) {
+ free (s->c);
+ }
+ free (s);
+	return AO_SUCCESS;
+}
+
+int32 dsf_command(void *handle, int32 command, int32 parameter)
+{
+ dsf_synth_t *s = handle;
+	switch (command)
+	{
+		case COMMAND_RESTART:
+ dc_hw_free (s->cpu);
+ memcpy (s->cpu->dc_ram, s->init_dc_ram, sizeof (s->init_dc_ram));
+ ARM7_Init(s->cpu);
+ dc_hw_init (s->cpu);
+ s->total_samples = 0;
+			return AO_SUCCESS;
+		
+	}
+	return AO_FAIL;
+}
+
+int32 dsf_fill_info(void *handle, ao_display_info *info)
+{
+ dsf_synth_t *s = handle;
+	if (s->c == NULL)
+		return AO_FAIL;
+		
+	strcpy(info->title[1], "Name: ");
+	sprintf(info->info[1], "%s", s->c->inf_title);
+
+	strcpy(info->title[2], "Game: ");
+	sprintf(info->info[2], "%s", s->c->inf_game);
+	
+	strcpy(info->title[3], "Artist: ");
+	sprintf(info->info[3], "%s", s->c->inf_artist);
+
+	strcpy(info->title[4], "Copyright: ");
+	sprintf(info->info[4], "%s", s->c->inf_copy);
+
+	strcpy(info->title[5], "Year: ");
+	sprintf(info->info[5], "%s", s->c->inf_year);
+
+	strcpy(info->title[6], "Length: ");
+	sprintf(info->info[6], "%s", s->c->inf_length);
+
+	strcpy(info->title[7], "Fade: ");
+	sprintf(info->info[7], "%s", s->c->inf_fade);
+
+	strcpy(info->title[8], "Ripper: ");
+	sprintf(info->info[8], "%s", s->psfby);
+
+	return AO_SUCCESS;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_protos.h Added

@@ -0,0 +1,53 @@
+//
+// Audio Overload
+// Emulated music player
+//
+// (C) 2000-2007 Richard F. Bannister
+//
+
+//
+// eng_protos.h
+//
+
+void *psf_start(const char *path, uint8 *, uint32 length);
+int32 psf_gen(void *, int16 *, uint32);
+int32 psf_stop(void *);
+int32 psf_command(void *, int32, int32);
+int32 psf_fill_info(void *, ao_display_info *);
+
+void *psf2_start(const char *path, uint8 *, uint32 length);
+int32 psf2_gen(void *, int16 *, uint32);
+int32 psf2_stop(void *);
+int32 psf2_command(void *, int32, int32);
+int32 psf2_fill_info(void *, ao_display_info *);
+
+void *qsf_start(const char *path, uint8 *, uint32 length);
+int32 qsf_gen(void *, int16 *, uint32);
+int32 qsf_stop(void *);
+int32 qsf_command(void *, int32, int32);
+int32 qsf_fill_info(void*, ao_display_info *);
+
+void *ssf_start(const char *path, uint8 *, uint32 length);
+int32 ssf_gen(void *, int16 *, uint32);
+int32 ssf_stop(void *);
+int32 ssf_command(void *, int32, int32);
+int32 ssf_fill_info(void *, ao_display_info *);
+
+void *spu_start(const char *path, uint8 *, uint32 length);
+int32 spu_gen(void *, int16 *, uint32);
+int32 spu_stop(void *);
+int32 spu_command(void *, int32, int32);
+int32 spu_fill_info(void *, ao_display_info *);
+
+uint8 qsf_memory_read(uint16 addr);
+uint8 qsf_memory_readop(uint16 addr);
+uint8 qsf_memory_readport(uint16 addr);
+void qsf_memory_write(uint16 addr, uint8 byte);
+void qsf_memory_writeport(uint16 addr, uint8 byte);
+
+void *dsf_start(const char *path, uint8 *, uint32 length);
+int32 dsf_gen(void *, int16 *, uint32);
+int32 dsf_stop(void *);
+int32 dsf_command(void *, int32, int32);
+int32 dsf_fill_info(void *, ao_display_info *);
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/cpuintrf.h Added

@@ -0,0 +1,668 @@
+#ifndef CPUINTRF_H
+#define CPUINTRF_H
+
+#include "osd_cpu.h"
+
+/* The old system is obsolete and no longer supported by the core */
+#define NEW_INTERRUPT_SYSTEM 1
+
+#define MAX_IRQ_LINES 8 /* maximum number of IRQ lines per CPU */
+
+#define CLEAR_LINE		0		/* clear (a fired, held or pulsed) line */
+#define ASSERT_LINE 1 /* assert an interrupt immediately */
+#define HOLD_LINE 2 /* hold interrupt line until enable is true */
+#define PULSE_LINE		3		/* pulse interrupt line for one instruction */
+
+#define MAX_REGS		64		/* maximum number of register of any CPU */
+
+#define	IRQ_LINE_NMI	10
+/* Values passed to the cpu_info function of a core to retrieve information */
+enum {
+	CPU_INFO_REG,
+	CPU_INFO_FLAGS=MAX_REGS,
+	CPU_INFO_NAME,
+ CPU_INFO_FAMILY,
+ CPU_INFO_VERSION,
+ CPU_INFO_FILE,
+ CPU_INFO_CREDITS,
+ CPU_INFO_REG_LAYOUT,
+	CPU_INFO_WIN_LAYOUT
+};
+
+#define CPU_IS_LE		0	/* emulated CPU is little endian */
+#define CPU_IS_BE		1	/* emulated CPU is big endian */
+
+/*
+ * This value is passed to cpu_get_reg to retrieve the previous
+ * program counter value, ie. before a CPU emulation started
+ * to fetch opcodes and arguments for the current instrution.
+ */
+#define REG_PREVIOUSPC	-1
+
+/*
+ * This value is passed to cpu_get_reg/cpu_set_reg, instead of one of
+ * the names from the enum a CPU core defines for it's registers,
+ * to get or set the contents of the memory pointed to by a stack pointer.
+ * You can specify the n'th element on the stack by (REG_SP_CONTENTS-n),
+ * ie. lower negative values. The actual element size (UINT16 or UINT32)
+ * depends on the CPU core.
+ * This is also used to replace the cpu_geturnpc() function.
+ */
+#define REG_SP_CONTENTS -2
+
+/*
+ * These flags can be defined in the makefile (or project) to
+ * exclude (zero) or include (non zero) specific CPU cores
+ */
+#ifndef HAS_GENSYNC
+#define HAS_GENSYNC		0
+#endif
+#ifndef HAS_Z80
+#define HAS_Z80 		0
+#endif
+#ifndef HAS_Z80_VM
+#define HAS_Z80_VM		0
+#endif
+#ifndef HAS_8080
+#define HAS_8080		0
+#endif
+#ifndef HAS_8085A
+#define HAS_8085A		0
+#endif
+#ifndef HAS_M6502
+#define HAS_M6502		0
+#endif
+#ifndef HAS_M65C02
+#define HAS_M65C02		0
+#endif
+#ifndef HAS_M65SC02
+#define HAS_M65SC02		0
+#endif
+#ifndef HAS_M65CE02
+#define HAS_M65CE02		0
+#endif
+#ifndef HAS_M6509
+#define HAS_M6509		0
+#endif
+#ifndef HAS_M6510
+#define HAS_M6510		0
+#endif
+#ifndef HAS_N2A03
+#define HAS_N2A03		0
+#endif
+#ifndef HAS_H6280
+#define HAS_H6280		0
+#endif
+#ifndef HAS_I86
+#define HAS_I86 		0
+#endif
+#ifndef HAS_V20
+#define HAS_V20 		0
+#endif
+#ifndef HAS_V30
+#define HAS_V30 		0
+#endif
+#ifndef HAS_V33
+#define HAS_V33 		0
+#endif
+#ifndef HAS_I8035
+#define HAS_I8035		0
+#endif
+#ifndef HAS_I8039
+#define HAS_I8039		0
+#endif
+#ifndef HAS_I8048
+#define HAS_I8048		0
+#endif
+#ifndef HAS_N7751
+#define HAS_N7751		0
+#endif
+#ifndef HAS_M6800
+#define HAS_M6800		0
+#endif
+#ifndef HAS_M6801
+#define HAS_M6801		0
+#endif
+#ifndef HAS_M6802
+#define HAS_M6802		0
+#endif
+#ifndef HAS_M6803
+#define HAS_M6803		0
+#endif
+#ifndef HAS_M6808
+#define HAS_M6808		0
+#endif
+#ifndef HAS_HD63701
+#define HAS_HD63701 	0
+#endif
+#ifndef HAS_M6805
+#define HAS_M6805		0
+#endif
+#ifndef HAS_M68705
+#define HAS_M68705		0
+#endif
+#ifndef HAS_HD63705
+#define HAS_HD63705 	0
+#endif
+#ifndef HAS_HD6309
+#define HAS_HD6309		0
+#endif
+#ifndef HAS_M6809
+#define HAS_M6809		0
+#endif
+#ifndef HAS_KONAMI
+#define HAS_KONAMI		0
+#endif
+#ifndef HAS_M68000
+#define HAS_M68000		0
+#endif
+#ifndef HAS_M68010
+#define HAS_M68010		0
+#endif
+#ifndef HAS_M68020
+#define HAS_M68020		0
+#endif
+#ifndef HAS_T11
+#define HAS_T11 		0
+#endif
+#ifndef HAS_S2650
+#define HAS_S2650		0
+#endif
+#ifndef HAS_TMS34010
+#define HAS_TMS34010	0
+#endif
+#ifndef HAS_TMS9900
+#define HAS_TMS9900 	0
+#endif
+#ifndef HAS_TMS9940
+#define HAS_TMS9940 	0
+#endif
+#ifndef HAS_TMS9980
+#define HAS_TMS9980 	0
+#endif
+#ifndef HAS_TMS9985
+#define HAS_TMS9985 	0
+#endif
+#ifndef HAS_TMS9989
+#define HAS_TMS9989 	0
+#endif
+#ifndef HAS_TMS9995
+#define HAS_TMS9995 	0
+#endif
+#ifndef HAS_TMS99105A
+#define HAS_TMS99105A 	0
+#endif
+#ifndef HAS_TMS99110A
+#define HAS_TMS99110A 	0
+#endif
+#ifndef HAS_Z8000
+#define HAS_Z8000		0
+#endif
+#ifndef HAS_TMS320C10
+#define HAS_TMS320C10	0
+#endif
+#ifndef HAS_CCPU
+#define HAS_CCPU		0
+#endif
+#ifndef HAS_PDP1
+#define HAS_PDP1		0
+#endif
+#ifndef HAS_ADSP2100
+#define HAS_ADSP2100	0
+#endif
+
+/* ASG 971222 -- added this generic structure */
+struct cpu_interface
+{
+ unsigned cpu_num;
+ void (*reset)(void *param);
+ void (*exit)(void);
+ int (*execute)(int cycles);
+ void (*burn)(int cycles);
+ unsigned (*get_context)(void *reg);
+ void (*set_context)(void *reg);
+ unsigned (*get_pc)(void);
+ void (*set_pc)(unsigned val);
+ unsigned (*get_sp)(void);
+ void (*set_sp)(unsigned val);
+ unsigned (*get_reg)(int regnum);
+ void (*set_reg)(int regnum, unsigned val);
+ void (*set_nmi_line)(int linestate);
+ void (*set_irq_line)(int irqline, int linestate);
+ void (*set_irq_callback)(int(*callback)(int irqline));
+ void (*internal_interrupt)(int type);
+ void (*cpu_state_save)(void *file);
+ void (*cpu_state_load)(void *file);
+ const char* (*cpu_info)(void *context,int regnum);
+ unsigned (*cpu_dasm)(char *buffer,unsigned pc);
+	unsigned num_irqs;
+	int default_vector;
+ int *icount;
+ double overclock;
+ int no_int, irq_int, nmi_int;
+ int (*memory_read)(int offset);
+ void (*memory_write)(int offset, int data);
+ void (*set_op_base)(int pc);
+	int address_shift;
+	unsigned address_bits, endianess, align_unit, max_inst_len;
+ unsigned abits1, abits2, abitsmin;
+};
+
+extern struct cpu_interface cpuintf[];
+
+void cpu_init(void);
+void cpu_run(void);
+
+/* optional watchdog */
+void watchdog_reset_w(int offset,int data);
+int watchdog_reset_r(int offset);
+/* Use this function to reset the machine */
+void machine_reset(void);
+/* Use this function to reset a single CPU */
+void cpu_set_reset_line(int cpu,int state);
+/* Use this function to halt a single CPU */
+void cpu_set_halt_line(int cpu,int state);
+
+/* This function returns CPUNUM current status (running or halted) */
+int cpu_getstatus(int cpunum);
+int cpu_gettotalcpu(void);
+int cpu_getactivecpu(void);
+void cpu_setactivecpu(int cpunum);
+
+/* Returns the current program counter */
+unsigned cpu_get_pc(void);
+/* Set the current program counter */
+void cpu_set_pc(unsigned val);
+
+/* Returns the current stack pointer */
+unsigned cpu_get_sp(void);
+/* Set the current stack pointer */
+void cpu_set_sp(unsigned val);
+
+/* Get the active CPUs context and return it's size */
+unsigned cpu_get_context(void *context);
+/* Set the active CPUs context */
+void cpu_set_context(void *context);
+
+/* Returns a specific register value (mamedbg) */
+unsigned cpu_get_reg(int regnum);
+/* Sets a specific register value (mamedbg) */
+void cpu_set_reg(int regnum, unsigned val);
+
+/* Returns previous pc (start of opcode causing read/write) */
+/* int cpu_getpreviouspc(void); */
+#define cpu_getpreviouspc() cpu_get_reg(REG_PREVIOUSPC)
+
+/* Returns the return address from the top of the stack (Z80 only) */
+/* int cpu_getreturnpc(void); */
+/* This can now be handled with a generic function */
+#define cpu_geturnpc() cpu_get_reg(REG_SP_CONTENTS)
+
+int cycles_currently_ran(void);
+int cycles_left_to_run(void);
+
+/* Returns the number of CPU cycles which take place in one video frame */
+int cpu_gettotalcycles(void);
+/* Returns the number of CPU cycles before the next interrupt handler call */
+int cpu_geticount(void);
+/* Returns the number of CPU cycles before the end of the current video frame */
+int cpu_getfcount(void);
+/* Returns the number of CPU cycles in one video frame */
+int cpu_getfperiod(void);
+/* Scales a given value by the ratio of fcount / fperiod */
+int cpu_scalebyfcount(int value);
+/* Returns the current scanline number */
+int cpu_getscanline(void);
+/* Returns the amount of time until a given scanline */
+double cpu_getscanlinetime(int scanline);
+/* Returns the duration of a single scanline */
+double cpu_getscanlineperiod(void);
+/* Returns the duration of a single scanline in cycles */
+int cpu_getscanlinecycles(void);
+/* Returns the number of cycles since the beginning of this frame */
+int cpu_getcurrentcycles(void);
+/* Returns the current horizontal beam position in pixels */
+int cpu_gethorzbeampos(void);
+/*
+ Returns the number of times the interrupt handler will be called before
+ the end of the current video frame. This is can be useful to interrupt
+ handlers to synchronize their operation. If you call this from outside
+ an interrupt handler, add 1 to the result, i.e. if it returns 0, it means
+ that the interrupt handler will be called once.
+*/
+int cpu_getiloops(void);
+
+/* Returns the current VBLANK state */
+int cpu_getvblank(void);
+
+/* Returns the number of the video frame we are currently playing */
+int cpu_getcurrentframe(void);
+
+
+/* generate a trigger after a specific period of time */
+void cpu_triggertime (double duration, int trigger);
+/* generate a trigger now */
+void cpu_trigger (int trigger);
+
+/* burn CPU cycles until a timer trigger */
+void cpu_spinuntil_trigger (int trigger);
+/* burn CPU cycles until the next interrupt */
+void cpu_spinuntil_int (void);
+/* burn CPU cycles until our timeslice is up */
+void cpu_spin (void);
+/* burn CPU cycles for a specific period of time */
+void cpu_spinuntil_time (double duration);
+
+/* yield our timeslice for a specific period of time */
+void cpu_yielduntil_trigger (int trigger);
+/* yield our timeslice until the next interrupt */
+void cpu_yielduntil_int (void);
+/* yield our current timeslice */
+void cpu_yield (void);
+/* yield our timeslice for a specific period of time */
+void cpu_yielduntil_time (double duration);
+
+/* set the NMI line state for a CPU, normally use PULSE_LINE */
+void cpu_set_nmi_line(int cpunum, int state);
+/* set the IRQ line state for a specific irq line of a CPU */
+/* normally use state HOLD_LINE, irqline 0 for first IRQ type of a cpu */
+void cpu_set_irq_line(int cpunum, int irqline, int state);
+/* this is to be called by CPU cores only! */
+void cpu_generate_internal_interrupt(int cpunum, int type);
+/* set the vector to be returned during a CPU's interrupt acknowledge cycle */
+void cpu_irq_line_vector_w(int cpunum, int irqline, int vector);
+
+/* use these in your write memory/port handles to set an IRQ vector */
+/* offset corresponds to the irq line number here */
+void cpu_0_irq_line_vector_w(int offset, int data);
+void cpu_1_irq_line_vector_w(int offset, int data);
+void cpu_2_irq_line_vector_w(int offset, int data);
+void cpu_3_irq_line_vector_w(int offset, int data);
+void cpu_4_irq_line_vector_w(int offset, int data);
+void cpu_5_irq_line_vector_w(int offset, int data);
+void cpu_6_irq_line_vector_w(int offset, int data);
+void cpu_7_irq_line_vector_w(int offset, int data);
+
+/* Obsolete functions: avoid to use them in new drivers if possible. */
+
+/* cause an interrupt on a CPU */
+void cpu_cause_interrupt(int cpu,int type);
+void cpu_clear_pending_interrupts(int cpu);
+void interrupt_enable_w(int offset,int data);
+void interrupt_vector_w(int offset,int data);
+int interrupt(void);
+int nmi_interrupt(void);
+int m68_level1_irq(void);
+int m68_level2_irq(void);
+int m68_level3_irq(void);
+int m68_level4_irq(void);
+int m68_level5_irq(void);
+int m68_level6_irq(void);
+int m68_level7_irq(void);
+int ignore_interrupt(void);
+
+/* CPU context access */
+void* cpu_getcontext (int _activecpu);
+int cpu_is_saving_context(int _activecpu);
+
+/***************************************************************************
+ * Get information for the currently active CPU
+ * cputype is a value from the CPU enum in driver.h
+ ***************************************************************************/
+/* Return number of address bits */
+unsigned cpu_address_bits(void);
+/* Return address mask */
+unsigned cpu_address_mask(void);
+/* Return address shift factor (TMS34010 bit addressing mode) */
+int cpu_address_shift(void);
+/* Return endianess of the emulated CPU (CPU_IS_LE or CPU_IS_BE) */
+unsigned cpu_endianess(void);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cpu_align_unit(void);
+/* Return maximum instruction length */
+unsigned cpu_max_inst_len(void);
+
+/* Return name of the active CPU */
+const char *cpu_name(void);
+/* Return family name of the active CPU */
+const char *cpu_core_family(void);
+/* Return core version of the active CPU */
+const char *cpu_core_version(void);
+/* Return core filename of the active CPU */
+const char *cpu_core_file(void);
+/* Return credits info for of the active CPU */
+const char *cpu_core_credits(void);
+/* Return register layout definition for the active CPU */
+const char *cpu_reg_layout(void);
+/* Return (debugger) window layout definition for the active CPU */
+const char *cpu_win_layout(void);
+
+/* Disassemble an instruction at PC into the given buffer */
+unsigned cpu_dasm(char *buffer, unsigned pc);
+/* Return a string describing the currently set flag (status) bits of the active CPU */
+const char *cpu_flags(void);
+/* Return a string with a register name and hex value for the active CPU */
+/* regnum is a value defined in the CPU cores header files */
+const char *cpu_dump_reg(int regnum);
+/* Return a string describing the active CPUs current state */
+const char *cpu_dump_state(void);
+
+/***************************************************************************
+ * Get information for a specific CPU type
+ * cputype is a value from the CPU enum in driver.h
+ ***************************************************************************/
+/* Return address shift factor */
+/* TMS320C10 -1: word addressing mode, TMS34010 3: bit addressing mode */
+int cputype_address_shift(int cputype);
+/* Return number of address bits */
+unsigned cputype_address_bits(int cputype);
+/* Return address mask */
+unsigned cputype_address_mask(int cputype);
+/* Return endianess of the emulated CPU (CPU_IS_LE or CPU_IS_BE) */
+unsigned cputype_endianess(int cputype);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cputype_align_unit(int cputype);
+/* Return maximum instruction length */
+unsigned cputype_max_inst_len(int cputype);
+
+/* Return name of the CPU */
+const char *cputype_name(int cputype);
+/* Return family name of the CPU */
+const char *cputype_core_family(int cputype);
+/* Return core version number of the CPU */
+const char *cputype_core_version(int cputype);
+/* Return core filename of the CPU */
+const char *cputype_core_file(int cputype);
+/* Return credits for the CPU core */
+const char *cputype_core_credits(int cputype);
+/* Return register layout definition for the CPU core */
+const char *cputype_reg_layout(int cputype);
+/* Return (debugger) window layout definition for the CPU core */
+const char *cputype_win_layout(int cputype);
+
+/***************************************************************************
+ * Get (or set) information for a numbered CPU of the running machine
+ * cpunum is a value between 0 and cpu_gettotalcpu() - 1
+ ***************************************************************************/
+/* Return number of address bits */
+unsigned cpunum_address_bits(int cputype);
+/* Return address mask */
+unsigned cpunum_address_mask(int cputype);
+/* Return endianess of the emulated CPU (CPU_LSB_FIRST or CPU_MSB_FIRST) */
+unsigned cpunum_endianess(int cputype);
+/* Return opcode align unit (1 byte, 2 word, 4 dword) */
+unsigned cpunum_align_unit(int cputype);
+/* Return maximum instruction length */
+unsigned cpunum_max_inst_len(int cputype);
+
+/* Get a register value for the specified CPU number of the running machine */
+unsigned cpunum_get_reg(int cpunum, int regnum);
+/* Set a register value for the specified CPU number of the running machine */
+void cpunum_set_reg(int cpunum, int regnum, unsigned val);
+
+/* Return (debugger) register layout definition for the CPU core */
+const char *cpunum_reg_layout(int cpunum);
+/* Return (debugger) window layout definition for the CPU core */
+const char *cpunum_win_layout(int cpunum);
+
+unsigned cpunum_dasm(int cpunum,char *buffer,unsigned pc);
+/* Return a string describing the currently set flag (status) bits of the CPU */
+const char *cpunum_flags(int cpunum);
+/* Return a string with a register name and value */
+/* regnum is a value defined in the CPU cores header files */
+const char *cpunum_dump_reg(int cpunum, int regnum);
+/* Return a string describing the CPUs current state */
+const char *cpunum_dump_state(int cpunum);
+/* Return a name for the specified cpu number */
+const char *cpunum_name(int cpunum);
+/* Return a family name for the specified cpu number */
+const char *cpunum_core_family(int cpunum);
+/* Return a version for the specified cpu number */
+const char *cpunum_core_version(int cpunum);
+/* Return a the source filename for the specified cpu number */
+const char *cpunum_core_file(int cpunum);
+/* Return a the credits for the specified cpu number */
+const char *cpunum_core_credits(int cpunum);
+
+/* Dump all of the running machines CPUs state to stderr */
+void cpu_dump_states(void);
+
+/* daisy-chain link */
+typedef struct {
+ void (*reset)(int); /* reset callback */
+ int (*interrupt_entry)(int); /* entry callback */
+ void (*interrupt_reti)(int); /* reti callback */
+ int irq_param; /* callback paramater */
+}	Z80_DaisyChain;
+
+#define Z80_MAXDAISY	4		/* maximum of daisy chan device */
+
+#define Z80_INT_REQ 0x01 /* interrupt request mask */
+#define Z80_INT_IEO 0x02 /* interrupt disable mask(IEO) */
+
+#define Z80_VECTOR(device,state) (((device)<<8)|(state))
+
+#ifndef INLINE
+#define INLINE 		inline
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#define cpu_readmem16		memory_read
+#define cpu_readport16		memory_readport
+#define cpu_writeport16		memory_writeport
+#define cpu_writemem16		memory_write
+#define cpu_readop			memory_readop
+#define cpu_readop_arg		memory_read
+#define logerror(x, ...)
+#define change_pc16(x)
+#define CALL_MAME_DEBUG
+
+#define ADDRESS_SPACES			3						/* maximum number of address spaces */
+#define ADDRESS_SPACE_PROGRAM	0						/* program address space */
+#define ADDRESS_SPACE_DATA		1						/* data address space */
+#define ADDRESS_SPACE_IO		2						/* I/O address space */
+
+enum
+{
+	/* internal flags (not for use by drivers!) */
+	INTERNAL_CLEAR_LINE = 100 + CLEAR_LINE,
+	INTERNAL_ASSERT_LINE = 100 + ASSERT_LINE,
+
+	/* input lines */
+	MAX_INPUT_LINES = 32+3,
+	INPUT_LINE_IRQ0 = 0,
+	INPUT_LINE_IRQ1 = 1,
+	INPUT_LINE_IRQ2 = 2,
+	INPUT_LINE_IRQ3 = 3,
+	INPUT_LINE_IRQ4 = 4,
+	INPUT_LINE_IRQ5 = 5,
+	INPUT_LINE_IRQ6 = 6,
+	INPUT_LINE_IRQ7 = 7,
+	INPUT_LINE_IRQ8 = 8,
+	INPUT_LINE_IRQ9 = 9,
+	INPUT_LINE_NMI = MAX_INPUT_LINES - 3,
+
+	/* special input lines that are implemented in the core */
+	INPUT_LINE_RESET = MAX_INPUT_LINES - 2,
+	INPUT_LINE_HALT = MAX_INPUT_LINES - 1,
+
+	/* output lines */
+	MAX_OUTPUT_LINES = 32
+};
+
+enum
+{
+	/* --- the following bits of info are returned as 64-bit signed integers --- */
+	CPUINFO_INT_FIRST = 0x00000,
+
+	CPUINFO_INT_CONTEXT_SIZE = CPUINFO_INT_FIRST,		/* R/O: size of CPU context in bytes */
+	CPUINFO_INT_INPUT_LINES,							/* R/O: number of input lines */
+	CPUINFO_INT_OUTPUT_LINES,							/* R/O: number of output lines */
+	CPUINFO_INT_DEFAULT_IRQ_VECTOR,						/* R/O: default IRQ vector */
+	CPUINFO_INT_ENDIANNESS,								/* R/O: either CPU_IS_BE or CPU_IS_LE */
+	CPUINFO_INT_CLOCK_DIVIDER,							/* R/O: internal clock divider */
+	CPUINFO_INT_MIN_INSTRUCTION_BYTES,					/* R/O: minimum bytes per instruction */
+	CPUINFO_INT_MAX_INSTRUCTION_BYTES,					/* R/O: maximum bytes per instruction */
+	CPUINFO_INT_MIN_CYCLES,								/* R/O: minimum cycles for a single instruction */
+	CPUINFO_INT_MAX_CYCLES,								/* R/O: maximum cycles for a single instruction */
+
+	CPUINFO_INT_DATABUS_WIDTH,							/* R/O: data bus size for each address space (8,16,32,64) */
+	CPUINFO_INT_DATABUS_WIDTH_LAST = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACES - 1,
+	CPUINFO_INT_ADDRBUS_WIDTH,							/* R/O: address bus size for each address space (12-32) */
+	CPUINFO_INT_ADDRBUS_WIDTH_LAST = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACES - 1,
+	CPUINFO_INT_ADDRBUS_SHIFT,							/* R/O: shift applied to addresses each address space (+3 means >>3, -1 means <<1) */
+	CPUINFO_INT_ADDRBUS_SHIFT_LAST = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACES - 1,
+
+	CPUINFO_INT_SP,										/* R/W: the current stack pointer value */
+	CPUINFO_INT_PC,										/* R/W: the current PC value */
+	CPUINFO_INT_PREVIOUSPC,								/* R/W: the previous PC value */
+	CPUINFO_INT_INPUT_STATE,							/* R/W: states for each input line */
+	CPUINFO_INT_INPUT_STATE_LAST = CPUINFO_INT_INPUT_STATE + MAX_INPUT_LINES - 1,
+	CPUINFO_INT_OUTPUT_STATE,							/* R/W: states for each output line */
+	CPUINFO_INT_OUTPUT_STATE_LAST = CPUINFO_INT_OUTPUT_STATE + MAX_OUTPUT_LINES - 1,
+	CPUINFO_INT_REGISTER,								/* R/W: values of up to MAX_REGs registers */
+	CPUINFO_INT_REGISTER_LAST = CPUINFO_INT_REGISTER + MAX_REGS - 1,
+
+	CPUINFO_INT_CPU_SPECIFIC = 0x08000,					/* R/W: CPU-specific values start here */
+
+	/* --- the following bits of info are returned as pointers to data or functions --- */
+	CPUINFO_PTR_FIRST = 0x10000,
+
+	CPUINFO_PTR_SET_INFO = CPUINFO_PTR_FIRST,			/* R/O: void (*set_info)(UINT32 state, INT64 data, void *ptr) */
+	CPUINFO_PTR_GET_CONTEXT,							/* R/O: void (*get_context)(void *buffer) */
+	CPUINFO_PTR_SET_CONTEXT,							/* R/O: void (*set_context)(void *buffer) */
+	CPUINFO_PTR_INIT,									/* R/O: void (*init)(void) */
+	CPUINFO_PTR_RESET,									/* R/O: void (*reset)(void *param) */
+	CPUINFO_PTR_EXIT,									/* R/O: void (*exit)(void) */
+	CPUINFO_PTR_EXECUTE,								/* R/O: int (*execute)(int cycles) */
+	CPUINFO_PTR_BURN,									/* R/O: void (*burn)(int cycles) */
+	CPUINFO_PTR_DISASSEMBLE,							/* R/O: void (*disassemble)(char *buffer, offs_t pc) */
+	CPUINFO_PTR_IRQ_CALLBACK,							/* R/W: int (*irqcallback)(int state) */
+	CPUINFO_PTR_INSTRUCTION_COUNTER,					/* R/O: int *icount */
+	CPUINFO_PTR_REGISTER_LAYOUT,						/* R/O: struct debug_register_layout *layout */
+	CPUINFO_PTR_WINDOW_LAYOUT,							/* R/O: struct debug_window_layout *layout */
+	CPUINFO_PTR_INTERNAL_MEMORY_MAP,					/* R/O: construct_map_t map */
+	CPUINFO_PTR_INTERNAL_MEMORY_MAP_LAST = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1,
+	CPUINFO_PTR_DEBUG_REGISTER_LIST,					/* R/O: int *list: list of registers for NEW_DEBUGGER */
+
+	CPUINFO_PTR_CPU_SPECIFIC = 0x18000,					/* R/W: CPU-specific values start here */
+
+	/* --- the following bits of info are returned as NULL-terminated strings --- */
+	CPUINFO_STR_FIRST = 0x20000,
+
+	CPUINFO_STR_NAME = CPUINFO_STR_FIRST,				/* R/O: name of the CPU */
+	CPUINFO_STR_CORE_FAMILY,							/* R/O: family of the CPU */
+	CPUINFO_STR_CORE_VERSION,							/* R/O: version of the CPU core */
+	CPUINFO_STR_CORE_FILE,								/* R/O: file containing the CPU core */
+	CPUINFO_STR_CORE_CREDITS,							/* R/O: credits for the CPU core */
+	CPUINFO_STR_FLAGS,									/* R/O: string representation of the main flags value */
+	CPUINFO_STR_REGISTER,								/* R/O: string representation of up to MAX_REGs registers */
+	CPUINFO_STR_REGISTER_LAST = CPUINFO_STR_REGISTER + MAX_REGS - 1,
+
+	CPUINFO_STR_CPU_SPECIFIC = 0x28000					/* R/W: CPU-specific values start here */
+};
+
+#endif	/* CPUINTRF_H */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/eng_psf.c Added

@@ -0,0 +1,494 @@
+/*
+	Audio Overload SDK - PSF file format engine
+
+	Copyright (c) 2007 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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 <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+#include "cpuintrf.h"
+#include "psx.h"
+
+#include "peops/stdafx.h"
+#include "peops/externals.h"
+#include "peops/regs.h"
+#include "peops/registers.h"
+#include "peops/spu.h"
+
+
+#include "corlett.h"
+
+#define DEBUG_LOADER	(0)
+
+#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+//#define trace(fmt,...)
+
+typedef struct {
+ corlett_t	*c;
+ char psfby[256];
+ mips_cpu_context *mips_cpu;
+ char *spu_pOutput;
+ uint32 initialPC, initialGP, initialSP;
+} psf_synth_t;
+
+
+static void spu_update (unsigned char* pSound,long lBytes,void *data)
+{
+ psf_synth_t *s = data;
+	memcpy(s->spu_pOutput, pSound, lBytes);
+}
+
+void
+ao_getlibpath (const char *path, const char *libname, char *libpath, int size) {
+ const char *e = strrchr (path, ':');
+ if (!e) {
+ e = strrchr (path, '/');
+ }
+ if (e) {
+ e++;
+ memcpy (libpath, path, e-path);
+ libpath[e-path] = 0;
+ strcat (libpath, libname);
+ }
+ else {
+ strcpy (libpath, libname);
+ }
+}
+
+void *psf_start(const char *path, uint8 *buffer, uint32 length)
+{
+ psf_synth_t *s = malloc (sizeof (psf_synth_t));
+ memset (s, 0, sizeof (psf_synth_t));
+
+	uint8 *file = NULL, *lib_decoded = NULL, *lib_raw_file = NULL, *alib_decoded = NULL;
+	uint32 offset, plength, PC, SP, GP, lengthMS, fadeMS;
+	uint64 file_len, lib_len, lib_raw_length, alib_len;
+	corlett_t *lib = NULL;
+	int i;
+	union cpuinfo mipsinfo;
+
+//	printf("Length = %d\n", length);
+
+	// Decode the current GSF
+	if (corlett_decode(buffer, length, &file, &file_len, &s->c) != AO_SUCCESS)
+	{
+ psf_stop (s);
+		return NULL;
+	}
+
+//	printf("file_len %d reserve %d\n", file_len, c->res_size);
+
+	// check for PSX EXE signature
+	if (strncmp((char *)file, "PS-X EXE", 8))
+	{
+ psf_stop (s);
+		return NULL;
+	}
+
+	#if DEBUG_LOADER
+	offset = file[0x18] | file[0x19]<<8 | file[0x1a]<<16 | file[0x1b]<<24;
+	printf("Text section start: %x\n", offset);
+	offset = file[0x1c] | file[0x1d]<<8 | file[0x1e]<<16 | file[0x1f]<<24;
+	printf("Text section size: %x\n", offset);
+	printf("Region: [%s]\n", &file[0x4c]);
+	printf("refresh: [%s]\n", c->inf_refresh);			
+	#endif
+
+	PC = file[0x10] | file[0x11]<<8 | file[0x12]<<16 | file[0x13]<<24;
+	GP = file[0x14] | file[0x15]<<8 | file[0x16]<<16 | file[0x17]<<24;
+	SP = file[0x30] | file[0x31]<<8 | file[0x32]<<16 | file[0x33]<<24;
+
+	#if DEBUG_LOADER
+	printf("Top level: PC %x GP %x SP %x\n", PC, GP, SP);
+	#endif
+
+	s->mips_cpu = mips_alloc();
+ s->mips_cpu->psf_refresh = -1;
+	if (s->c->inf_refresh[0] == '5')
+	{
+		s->mips_cpu->psf_refresh = 50;
+	}
+	if (s->c->inf_refresh[0] == '6')
+	{
+		s->mips_cpu->psf_refresh = 60;
+	}
+
+	// Get the library file, if any
+	if (s->c->lib[0] != 0)
+	{
+		uint64 tmp_length;
+ char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->lib, libpath, sizeof (libpath));
+	
+		if (ao_get_lib(libpath, &lib_raw_file, &tmp_length) != AO_SUCCESS)
+		{
+ psf_stop (s);
+ return NULL;
+		}
+		lib_raw_length = tmp_length;
+		
+		if (corlett_decode(lib_raw_file, lib_raw_length, &lib_decoded, &lib_len, &lib) != AO_SUCCESS)
+		{
+			free(lib_raw_file);
+ psf_stop (s);
+ return NULL;
+		}
+				
+		// Free up raw file
+		free(lib_raw_file);
+
+		if (strncmp((char *)lib_decoded, "PS-X EXE", 8))
+		{
+			printf("Major error! PSF was OK, but referenced library is not!\n");
+			free(lib);
+ psf_stop (s);
+ return NULL;
+		}
+
+		#if DEBUG_LOADER	
+		offset = lib_decoded[0x18] | lib_decoded[0x19]<<8 | lib_decoded[0x1a]<<16 | lib_decoded[0x1b]<<24;
+		printf("Text section start: %x\n", offset);
+		offset = lib_decoded[0x1c] | lib_decoded[0x1d]<<8 | lib_decoded[0x1e]<<16 | lib_decoded[0x1f]<<24;
+		printf("Text section size: %x\n", offset);
+		printf("Region: [%s]\n", &lib_decoded[0x4c]);
+		printf("refresh: [%s]\n", lib->inf_refresh);			
+		#endif
+
+		// if the original file had no refresh tag, give the lib a shot
+		if (s->mips_cpu->psf_refresh == -1)
+		{
+			if (lib->inf_refresh[0] == '5')
+			{
+				s->mips_cpu->psf_refresh = 50;
+			}
+			if (lib->inf_refresh[0] == '6')
+			{
+				s->mips_cpu->psf_refresh = 60;
+			}
+		}
+
+		PC = lib_decoded[0x10] | lib_decoded[0x11]<<8 | lib_decoded[0x12]<<16 | lib_decoded[0x13]<<24;
+		GP = lib_decoded[0x14] | lib_decoded[0x15]<<8 | lib_decoded[0x16]<<16 | lib_decoded[0x17]<<24;
+		SP = lib_decoded[0x30] | lib_decoded[0x31]<<8 | lib_decoded[0x32]<<16 | lib_decoded[0x33]<<24;
+
+		#if DEBUG_LOADER
+		printf("Library: PC %x GP %x SP %x\n", PC, GP, SP);
+		#endif
+
+		// 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;
+		#if DEBUG_LOADER
+		printf("library offset: %x plength: %d\n", offset, plength);
+		#endif
+		memcpy(&s->mips_cpu->psx_ram[offset/4], lib_decoded+2048, plength);
+		
+		// Dispose the corlett structure for the lib - we don't use it
+		free(lib);
+		lib = NULL;
+	}
+
+	// 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(&s->mips_cpu->psx_ram[offset/4], file+2048, plength);
+
+	// load any auxiliary libraries now
+	for (i = 0; i < 8; i++)
+	{
+		if (s->c->libaux[i][0] != 0)
+		{
+			uint64 tmp_length;
+ char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->libaux[i], libpath, sizeof (libpath));
+		
+			if (ao_get_lib(libpath, &lib_raw_file, &tmp_length) != AO_SUCCESS)
+			{
+ psf_stop (s);
+ return NULL;
+			}
+			lib_raw_length = tmp_length;
+		
+			if (corlett_decode(lib_raw_file, lib_raw_length, &alib_decoded, &alib_len, &lib) != AO_SUCCESS)
+			{
+				free(lib_raw_file);
+ psf_stop (s);
+ return NULL;
+			}
+				
+			// Free up raw file
+			free(lib_raw_file);
+
+			if (strncmp((char *)alib_decoded, "PS-X EXE", 8))
+			{
+				printf("Major error! PSF was OK, but referenced library is not!\n");
+				free(lib);
+ psf_stop (s);
+ return NULL;
+			}
+
+			#if DEBUG_LOADER	
+			offset = alib_decoded[0x18] | alib_decoded[0x19]<<8 | alib_decoded[0x1a]<<16 | alib_decoded[0x1b]<<24;
+			printf("Text section start: %x\n", offset);
+			offset = alib_decoded[0x1c] | alib_decoded[0x1d]<<8 | alib_decoded[0x1e]<<16 | alib_decoded[0x1f]<<24;
+			printf("Text section size: %x\n", offset);
+			printf("Region: [%s]\n", &alib_decoded[0x4c]);
+			#endif
+
+			// 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(&s->mips_cpu->psx_ram[offset/4], alib_decoded+2048, plength);
+		
+			// Dispose the corlett structure for the lib - we don't use it
+			free(lib);
+			lib = NULL;
+			free (alib_decoded);
+			alib_decoded = NULL;
+		}
+	}
+
+	free(file);
+	file = NULL;
+	free(lib_decoded);
+	lib_decoded = NULL;
+	
+	// Finally, set psfby tag
+	strcpy(s->psfby, "n/a");
+	if (s->c)
+	{
+		int i;
+		for (i = 0; i < MAX_UNKNOWN_TAGS; i++)
+		{
+			if (!strcasecmp(s->c->tag_name[i], "psfby"))
+				strcpy(s->psfby, s->c->tag_data[i]);
+		}
+	}
+
+	mips_init (s->mips_cpu);
+	mips_reset(s->mips_cpu, NULL);
+//	// clear PSX work RAM before we start scribbling in it
+//	memset(s->mips_cpu->psx_ram, 0, 2*1024*1024);
+
+
+	// set the initial PC, SP, GP
+	#if DEBUG_LOADER	
+	printf("Initial PC %x, GP %x, SP %x\n", PC, GP, SP);
+	printf("Refresh = %d\n", psf_refresh);
+	#endif
+	mipsinfo.i = PC;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_PC, &mipsinfo);
+
+	// set some reasonable default for the stack
+	if (SP == 0)
+	{
+		SP = 0x801fff00;
+	}
+
+	mipsinfo.i = SP;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+
+	mipsinfo.i = GP;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R28, &mipsinfo);
+
+	#if DEBUG_LOADER && 1
+	{
+		FILE *f;
+
+		f = fopen("psxram.bin", "wb");
+		fwrite(psx_ram, 2*1024*1024, 1, f);
+		fclose(f);
+	}
+	#endif
+
+	psx_hw_init(s->mips_cpu);
+	SPUinit(s->mips_cpu, spu_update, s);
+	SPUopen(s->mips_cpu);
+
+	lengthMS = psfTimeToMS(s->c->inf_length);
+	fadeMS = psfTimeToMS(s->c->inf_fade);
+
+	#if DEBUG_LOADER
+	printf("length %d fade %d\n", lengthMS, fadeMS);
+	#endif
+
+	if (lengthMS == 0) 
+	{
+		lengthMS = ~0;
+	}
+
+	setlength(s->mips_cpu->spu, lengthMS, fadeMS);
+
+	// patch illegal Chocobo Dungeon 2 code - CaitSith2 put a jump in the delay slot from a BNE
+	// and rely on Highly Experimental's buggy-ass CPU to rescue them. Verified on real hardware
+	// that the initial code is wrong.
+	if (s->c->inf_game)
+	{
+		if (!strcmp(s->c->inf_game, "Chocobo Dungeon 2"))
+		{
+			if (s->mips_cpu->psx_ram[0xbc090/4] == LE32(0x0802f040))
+			{
+		 		s->mips_cpu->psx_ram[0xbc090/4] = LE32(0);
+				s->mips_cpu->psx_ram[0xbc094/4] = LE32(0x0802f040);
+				s->mips_cpu->psx_ram[0xbc098/4] = LE32(0);
+			}
+		}
+	}
+
+//	psx_ram[0x118b8/4] = LE32(0);	// crash 2 hack
+
+	// backup the initial state for restart
+	memcpy(s->mips_cpu->initial_ram, s->mips_cpu->psx_ram, 2*1024*1024);
+	memcpy(s->mips_cpu->initial_scratch, s->mips_cpu->psx_scratch, 0x400);
+	s->initialPC = PC;
+	s->initialGP = GP;
+	s->initialSP = SP;
+
+	mips_execute(s->mips_cpu, 5000);
+	
+	return s;
+}
+
+int32 psf_gen(void *handle, int16 *buffer, uint32 samples)
+{	
+ psf_synth_t *s = handle;
+	int i;
+
+	for (i = 0; i < samples; i++)
+	{
+		psx_hw_slice(s->mips_cpu);
+		SPUasync(s->mips_cpu, 384);
+	}
+
+ s->spu_pOutput = (char *)buffer;
+	SPU_flushboot(s->mips_cpu);
+
+	psx_hw_frame(s->mips_cpu);
+
+	return AO_SUCCESS;
+}
+
+int32 psf_stop(void *handle)
+{
+ psf_synth_t *s = handle;
+ if (s->mips_cpu) {
+ SPUclose(s->mips_cpu);
+ mips_exit (s->mips_cpu);
+ }
+	free(s->c);
+	free (s);
+
+	return AO_SUCCESS;
+}
+
+int32 psf_command(void *handle, int32 command, int32 parameter)
+{
+ psf_synth_t *s = handle;
+	union cpuinfo mipsinfo;
+	uint32 lengthMS, fadeMS;
+
+	switch (command)
+	{
+		case COMMAND_RESTART:
+			SPUclose(s->mips_cpu);
+
+			memcpy(s->mips_cpu->psx_ram, s->mips_cpu->initial_ram, 2*1024*1024);
+			memcpy(s->mips_cpu->psx_scratch, s->mips_cpu->initial_scratch, 0x400);
+
+//			mips_init();
+			mips_reset(s->mips_cpu, NULL);
+			psx_hw_init(s->mips_cpu);
+ SPUinit(s->mips_cpu, spu_update, s);
+ SPUopen(s->mips_cpu);
+
+			lengthMS = psfTimeToMS(s->c->inf_length);
+			fadeMS = psfTimeToMS(s->c->inf_fade);
+
+			if (lengthMS == 0) 
+			{
+				lengthMS = ~0;
+			}
+			setlength(s->mips_cpu->spu, lengthMS, fadeMS);
+
+			mipsinfo.i = s->initialPC;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_PC, &mipsinfo);
+			mipsinfo.i = s->initialSP;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+			mipsinfo.i = s->initialGP;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R28, &mipsinfo);
+
+			mips_execute(s->mips_cpu, 5000);
+
+			return AO_SUCCESS;
+		
+	}
+	return AO_FAIL;
+}
+
+int32 psf_fill_info(void *handle, ao_display_info *info)
+{
+ psf_synth_t *s = handle;
+	if (s->c == NULL)
+		return AO_FAIL;
+		
+	strcpy(info->title[1], "Name: ");
+	sprintf(info->info[1], "%s", s->c->inf_title);
+
+	strcpy(info->title[2], "Game: ");
+	sprintf(info->info[2], "%s", s->c->inf_game);
+	
+	strcpy(info->title[3], "Artist: ");
+	sprintf(info->info[3], "%s", s->c->inf_artist);
+
+	strcpy(info->title[4], "Copyright: ");
+	sprintf(info->info[4], "%s", s->c->inf_copy);
+
+	strcpy(info->title[5], "Year: ");
+	sprintf(info->info[5], "%s", s->c->inf_year);
+
+	strcpy(info->title[6], "Length: ");
+	sprintf(info->info[6], "%s", s->c->inf_length);
+
+	strcpy(info->title[7], "Fade: ");
+	sprintf(info->info[7], "%s", s->c->inf_fade);
+
+	strcpy(info->title[8], "Ripper: ");
+	sprintf(info->info[8], "%s", s->psfby);
+
+	return AO_SUCCESS;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/eng_psf2.c Added

@@ -0,0 +1,735 @@
+/*
+	Audio Overload SDK - PSF2 file format engine
+
+	Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+//
+// Audio Overload
+// Emulated music player
+//
+// (C) 2000-2008 Richard F. Bannister
+//
+
+//
+// eng_psf2.c
+//
+// References:
+// psf_format.txt v1.6 by Neill Corlett (s->filesystem and decompression info)
+// Intel ELF format specs ELF.PS (general ELF parsing info)
+// http://ps2dev.org/kb.x?T=457 (IRX relocation and inter-module call info)
+// http://ps2dev.org/ (the whole site - lots of IOP info)
+// spu2regs.txt (comes with SexyPSF source: IOP hardware info)
+// 64-bit ELF Object File Specification: http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf (MIPS ELF relocation types)
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <zlib.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+#include "cpuintrf.h"
+#include "psx.h"
+
+#include "peops2/stdafx.h"
+#include "peops2/externals.h"
+#include "peops2/regs.h"
+#include "peops2/registers.h"
+#include "peops2/spu.h"
+
+#include "corlett.h"
+
+#define DEBUG_LOADER	(0)
+#define MAX_FS		(32)	// maximum # of s->filesystems (libs and subdirectories)
+
+// ELF relocation helpers
+#define ELF32_R_SYM(val) ((val) >> 8)
+#define ELF32_R_TYPE(val) ((val) & 0xff)
+
+// main RAM
+static uint32 loadAddr, lengthMS, fadeMS;
+static uint8 *filesys[MAX_FS];
+static uint32 fssize[MAX_FS];
+static int num_fs;
+
+typedef struct {
+ corlett_t	*c;
+ char 		psfby[256];
+ uint32 initialPC, initialSP;
+
+ uint8 *lib_raw_file;
+ mips_cpu_context *mips_cpu;
+ char		*spu_pOutput;
+} psf2_synth_t;
+
+void ps2_update(unsigned char *pSound, long lBytes, void *data)
+{
+ psf2_synth_t *s = data;
+	memcpy(s->spu_pOutput, pSound, lBytes);	// (for direct 44.1kHz output)
+}
+
+#if 0
+static uint32 secname(uint8 *start, uint32 strndx, uint32 shoff, uint32 shentsize, uint32 name)
+{
+	uint32 offset, shent;
+
+	// get string table section
+	shent = shoff + (shentsize * strndx);
+
+	// find the offset to the section
+	offset = start[shent+16] | start[shent+17]<<8 | start[shent+18]<<16 | start[shent+19]<<24; 
+
+	offset += name;
+	
+	return offset;	
+}
+#endif
+
+static void do_iopmod(uint8 *start, uint32 offset)
+{
+	uint32 nameoffs, saddr, heap, tsize, dsize, bsize, vers2;
+
+	nameoffs = start[offset] | start[offset+1]<<8 | start[offset+2]<<16 | start[offset+3]<<24;
+
+	saddr = start[offset+4] | start[offset+5]<<8 | start[offset+6]<<16 | start[offset+7]<<24;
+	heap = start[offset+8] | start[offset+9]<<8 | start[offset+10]<<16 | start[offset+11]<<24;
+	tsize = start[offset+12] | start[offset+13]<<8 | start[offset+14]<<16 | start[offset+15]<<24; 
+	dsize = start[offset+16] | start[offset+17]<<8 | start[offset+18]<<16 | start[offset+19]<<24; 
+	bsize = start[offset+20] | start[offset+21]<<8 | start[offset+22]<<16 | start[offset+23]<<24; 
+	vers2 = start[offset+24] | start[offset+25]<<8;
+
+//	printf("nameoffs %08x saddr %08x heap %08x tsize %08x dsize %08x bsize %08x\n", nameoffs, saddr, heap, tsize, dsize, bsize);
+	#if DEBUG_LOADER
+	printf("vers: %04x name [%s]\n", vers2, &start[offset+26]);
+	#endif
+}
+
+uint32 psf2_load_elf(mips_cpu_context *cpu, uint8 *start, uint32 len)
+{
+	uint32 entry, phoff, shoff, phentsize, shentsize, phnum, shnum, shstrndx;
+	uint32 name, type, flags, addr, offset, size, shent;
+	uint32 totallen;
+	int i, rec;
+//	FILE *f;
+
+	if (loadAddr & 3)
+	{
+		loadAddr &= ~3;
+		loadAddr += 4;
+	}
+
+	#if DEBUG_LOADER
+	printf("psf2_load_elf: starting at %08x\n", loadAddr | 0x80000000);
+	#endif
+
+	if ((start[0] != 0x7f) || (start[1] != 'E') || (start[2] != 'L') || (start[3] != 'F'))
+	{
+		printf("Not an ELF file\n");
+		return 0xffffffff;
+	}
+
+	entry = start[24] | start[25]<<8 | start[26]<<16 | start[27]<<24;	// 0x18
+	phoff = start[28] | start[29]<<8 | start[30]<<16 | start[31]<<24; 	// 0x1c
+	shoff = start[32] | start[33]<<8 | start[34]<<16 | start[35]<<24; 	// 0x20
+		
+//	printf("Entry: %08x phoff %08x shoff %08x\n", entry, phoff, shoff);
+
+	phentsize = start[42] | start[43]<<8;			// 0x2a
+	phnum = start[44] | start[45]<<8;			// 0x2c
+	shentsize = start[46] | start[47]<<8;			// 0x2e
+	shnum = start[48] | start[49]<<8;			// 0x30
+	shstrndx = start[50] | start[51]<<8;			// 0x32
+
+//	printf("phentsize %08x phnum %d shentsize %08x shnum %d shstrndx %d\n", phentsize, phnum, shentsize, shnum, shstrndx);	
+
+	// process ELF sections
+	shent = shoff;
+	totallen = 0;
+	for (i = 0; i < shnum; i++)
+	{
+		name = start[shent] | start[shent+1]<<8 | start[shent+2]<<16 | start[shent+3]<<24;
+		type = start[shent+4] | start[shent+5]<<8 | start[shent+6]<<16 | start[shent+7]<<24;
+		flags = start[shent+8] | start[shent+9]<<8 | start[shent+10]<<16 | start[shent+11]<<24;
+		addr = start[shent+12] | start[shent+13]<<8 | start[shent+14]<<16 | start[shent+15]<<24;
+		offset = start[shent+16] | start[shent+17]<<8 | start[shent+18]<<16 | start[shent+19]<<24;
+		size = start[shent+20] | start[shent+21]<<8 | start[shent+22]<<16 | start[shent+23]<<24;
+
+//		printf("Section %02d: name %08x [%s] type %08x flags %08x addr %08x offset %08x size %08x\n", i, name, &start[secname(start, shstrndx, shoff, shentsize, name)], type, flags, addr, offset, size);
+
+		switch (type)
+		{
+			case 0:			// section table header - do nothing
+				break;
+
+			case 1:			// PROGBITS: copy data to destination
+				memcpy(&cpu->psx_ram[(loadAddr + addr)/4], &start[offset], size);
+				totallen += size;
+				break;
+
+			case 2:			// SYMTAB: ignore
+				break;
+
+			case 3:			// STRTAB: ignore
+				break;
+
+			case 8:			// NOBITS: BSS region, zero out destination
+				memset(&cpu->psx_ram[(loadAddr + addr)/4], 0, size);
+				totallen += size;
+				break;
+
+			case 9:			// REL: short relocation data
+		 		for (rec = 0; rec < (size/8); rec++)
+				{
+					uint32 offs, info, target, temp, val, vallo;
+					static uint32 hi16offs = 0, hi16target = 0;
+
+					offs = start[offset+(rec*8)] | start[offset+1+(rec*8)]<<8 | start[offset+2+(rec*8)]<<16 | start[offset+3+(rec*8)]<<24;
+					info = start[offset+4+(rec*8)] | start[offset+5+(rec*8)]<<8 | start[offset+6+(rec*8)]<<16 | start[offset+7+(rec*8)]<<24;
+					target = LE32(cpu->psx_ram[(loadAddr+offs)/4]);
+					
+//					printf("[%04d] offs %08x type %02x info %08x => %08x\n", rec, offs, ELF32_R_TYPE(info), ELF32_R_SYM(info), target);
+
+					switch (ELF32_R_TYPE(info))
+					{
+						case 2:	 	// R_MIPS_32
+							target += loadAddr;
+//							target |= 0x80000000;
+							break;
+
+						case 4:		// R_MIPS_26
+							temp = (target & 0x03ffffff);
+							target &= 0xfc000000;
+							temp += (loadAddr>>2);
+							target |= temp;
+							break;
+
+						case 5:		// R_MIPS_HI16
+							hi16offs = offs;
+							hi16target = target;
+							break;
+
+						case 6:		// R_MIPS_LO16
+							vallo = ((target & 0xffff) ^ 0x8000) - 0x8000;
+
+							val = ((hi16target & 0xffff) << 16) +	vallo;
+							val += loadAddr;
+//							val |= 0x80000000;
+
+							/* Account for the sign extension that will happen in the low bits. */
+							val = ((val >> 16) + ((val & 0x8000) != 0)) & 0xffff;
+
+							hi16target = (hi16target & ~0xffff) | val;
+
+							/* Ok, we're done with the HI16 relocs. Now deal with the LO16. */
+							val = loadAddr + vallo;
+							target = (target & ~0xffff) | (val & 0xffff);
+
+							cpu->psx_ram[(loadAddr+hi16offs)/4] = LE32(hi16target);
+							break;
+
+						default:
+							printf("FATAL: Unknown MIPS ELF relocation!\n");
+							return 0xffffffff;
+							break;
+					}
+
+					cpu->psx_ram[(loadAddr+offs)/4] = LE32(target);
+				}						
+				break;
+
+			case 0x70000080:	// .iopmod
+				do_iopmod(start, offset);
+				break;
+
+			default:
+				#if DEBUG_LOADER
+				printf("Unhandled ELF section type %d\n", type);
+				#endif
+				break;
+		}
+
+		shent += shentsize;
+	}	
+
+	entry += loadAddr;
+	entry |= 0x80000000;
+	loadAddr += totallen;
+
+	#if DEBUG_LOADER
+	printf("psf2_load_elf: entry PC %08x\n", entry);
+	#endif
+	return entry;
+}
+
+static uint32 load_file_ex(uint8 *top, uint8 *start, uint32 len, char *file, uint8 *buf, uint32 buflen)
+{
+	int32 numfiles, i, j;
+	uint8 *cptr;
+	uint32 offs, uncomp, bsize, cofs, uofs;
+	uint32 X;
+	uLongf dlength;
+	int uerr;
+	char matchname[512], *remainder;
+
+	// strip out to only the directory name
+	i = 0;
+	while ((file[i] != '/') && (file[i] != '\\') && (file[i] != '\0'))
+	{
+		matchname[i] = file[i];
+		i++;
+	}
+	matchname[i] = '\0';
+	remainder = &file[i+1];
+	
+	cptr = start + 4; 
+
+	numfiles = start[0] | start[1]<<8 | start[2]<<16 | start[3]<<24;
+
+	for (i = 0; i < numfiles; i++)
+	{
+		offs = cptr[36] | cptr[37]<<8 | cptr[38]<<16 | cptr[39]<<24;
+		uncomp = cptr[40] | cptr[41]<<8 | cptr[42]<<16 | cptr[43]<<24;
+		bsize = cptr[44] | cptr[45]<<8 | cptr[46]<<16 | cptr[47]<<24;
+
+		#if DEBUG_LOADER
+		printf("[%s vs %s]: ofs %08x uncomp %08x bsize %08x\n", cptr, matchname, offs, uncomp, bsize);
+		#endif
+		
+		if (!strcasecmp((char *)cptr, matchname))
+		{
+			if ((uncomp == 0) && (bsize == 0))
+			{
+				#if DEBUG_LOADER
+				printf("Drilling into subdirectory [%s] with [%s] at offset %x\n", matchname, remainder, offs);
+				#endif
+				return load_file_ex(top, &top[offs], len-offs, remainder, buf, buflen);
+			}
+
+			X = (uncomp + bsize - 1) / bsize;
+			
+			cofs = offs + (X*4);
+			uofs = 0;
+			for (j = 0; j < X; j++)
+			{
+				uint32 usize;
+
+				usize = top[offs+(j*4)] | top[offs+1+(j*4)]<<8 | top[offs+2+(j*4)]<<16 | top[offs+3+(j*4)]<<24;
+
+				dlength = buflen - uofs;
+		
+				uerr = uncompress(&buf[uofs], &dlength, &top[cofs], usize);
+				if (uerr != Z_OK)
+				{
+					printf("Decompress fail: %x %d!\n", (unsigned int)dlength, uerr);
+					return 0xffffffff;
+				}
+
+				cofs += usize;
+				uofs += dlength;
+			}
+
+			return uncomp;
+		}
+		else
+		{
+			cptr += 48;
+		}
+	}
+
+	return 0xffffffff;
+}
+
+static uint32 load_file(int fs, char *file, uint8 *buf, uint32 buflen)
+{
+	return load_file_ex(filesys[fs], filesys[fs], fssize[fs], file, buf, buflen);
+}
+
+#if 0
+static dump_files(int fs, uint8 *buf, uint32 buflen)
+{
+	int32 numfiles, i, j;
+	uint8 *cptr;
+	uint32 offs, uncomp, bsize, cofs, uofs;
+	uint32 X;
+	uLongf dlength;
+	int uerr;
+	uint8 *start;
+	uint32 len;
+	FILE *f;
+	char tfn[128];
+
+	printf("Dumping FS %d\n", fs);
+		
+	start = s->filesys[fs];
+	len = s->fssize[fs];
+
+	cptr = start + 4; 
+
+	numfiles = start[0] | start[1]<<8 | start[2]<<16 | start[3]<<24;
+
+	for (i = 0; i < numfiles; i++)
+	{
+		offs = cptr[36] | cptr[37]<<8 | cptr[38]<<16 | cptr[39]<<24;
+		uncomp = cptr[40] | cptr[41]<<8 | cptr[42]<<16 | cptr[43]<<24;
+		bsize = cptr[44] | cptr[45]<<8 | cptr[46]<<16 | cptr[47]<<24;
+
+		if (bsize > 0)		
+		{
+			X = (uncomp + bsize - 1) / bsize;
+
+			printf("[dump %s]: ofs %08x uncomp %08x bsize %08x\n", cptr, offs, uncomp, bsize);
+
+			cofs = offs + (X*4);
+			uofs = 0;
+			for (j = 0; j < X; j++)
+			{
+				uint32 usize;
+
+				usize = start[offs+(j*4)] | start[offs+1+(j*4)]<<8 | start[offs+2+(j*4)]<<16 | start[offs+3+(j*4)]<<24;
+
+				dlength = buflen - uofs;
+		
+				uerr = uncompress(&buf[uofs], &dlength, &start[cofs], usize);
+				if (uerr != Z_OK)
+				{
+					printf("Decompress fail: %x %d!\n", dlength, uerr);
+					return 0xffffffff;
+				}
+
+				cofs += usize;
+				uofs += dlength;
+			}
+
+			sprintf(tfn, "iopfiles/%s", cptr);
+			f = fopen(tfn, "wb");
+			fwrite(buf, uncomp, 1, f);
+			fclose(f);
+		}
+		else
+		{
+			printf("[subdir %s]: ofs %08x uncomp %08x bsize %08x\n", cptr, offs, uncomp, bsize);
+		}
+
+		cptr += 48;
+	}
+
+	return 0xffffffff;
+}
+#endif
+
+// find a file on our filesystems
+uint32 psf2_load_file(mips_cpu_context *cpu, char *file, uint8 *buf, uint32 buflen)
+{
+	int i;
+	uint32 flen;
+
+	for (i = 0; i < num_fs; i++)
+	{
+		flen = load_file(i, file, buf, buflen);
+		if (flen != 0xffffffff)
+		{
+			return flen;
+		}
+	}
+
+	return 0xffffffff;
+}
+
+void *psf2_start(const char *path, uint8 *buffer, uint32 length)
+{
+ psf2_synth_t *s = malloc (sizeof (psf2_synth_t));
+ memset (s, 0, sizeof (psf2_synth_t));
+
+	uint8 *file = NULL, *lib_decoded;
+	uint32 irx_len;
+	uint64 file_len, lib_raw_length, lib_len;
+	uint8 *buf;
+	union cpuinfo mipsinfo;
+	corlett_t *lib = NULL;
+
+	loadAddr = 0x23f00;	// this value makes allocations work out similarly to how they would 
+				// in Highly Experimental (as per Shadow Hearts' hard-coded assumptions)
+
+	// Decode the current PSF2
+	if (corlett_decode(buffer, length, &file, &file_len, &s->c) != AO_SUCCESS)
+	{
+ free (s);
+		return NULL;
+	}
+	if (file) {
+ free (file);
+ file = NULL;
+ }
+
+	if (file_len > 0) printf("ERROR: PSF2 can't have a program section! ps %08x\n", (unsigned int)file_len);
+
+	#if DEBUG_LOADER
+	printf("FS section: size %x\n", s->c->res_size);
+	#endif
+
+	num_fs = 1;
+	filesys[0] = (uint8 *)s->c->res_section;
+	fssize[0] = s->c->res_size;
+
+	// Get the library file, if any
+	if (s->c->lib[0] != 0)
+	{
+		uint64 tmp_length;
+ char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->lib, libpath, sizeof (libpath));
+	
+		#if DEBUG_LOADER	
+		printf("Loading library: %s\n", s->c->lib);
+		#endif
+		if (ao_get_lib(libpath, &s->lib_raw_file, &tmp_length) != AO_SUCCESS)
+		{
+ free (s);
+ return NULL;
+		}
+		lib_raw_length = tmp_length;
+
+		if (corlett_decode(s->lib_raw_file, lib_raw_length, &lib_decoded, &lib_len, &lib) != AO_SUCCESS)
+		{
+			free(s->lib_raw_file);
+ free (s);
+ return NULL;
+		}
+
+		#if DEBUG_LOADER
+		printf("Lib FS section: size %x bytes\n", lib->res_size);
+		#endif
+
+		num_fs++;
+		filesys[1] = (uint8 *)lib->res_section;
+ 		fssize[1] = lib->res_size;
+ 		free (lib);
+ 		lib = NULL;
+	}
+
+	// dump all files
+	#if 0
+	buf = (uint8 *)malloc(16*1024*1024);
+	dump_files(0, buf, 16*1024*1024);
+	if (s->c->lib[0] != 0)
+		dump_files(1, buf, 16*1024*1024);
+	free(buf);
+	#endif
+
+	s->mips_cpu = mips_alloc ();
+	mips_init(s->mips_cpu);
+	mips_reset(s->mips_cpu, NULL);
+
+	// load psf2.irx, which kicks everything off
+	buf = (uint8 *)malloc(512*1024);
+	irx_len = psf2_load_file(s->mips_cpu, "psf2.irx", buf, 512*1024);
+
+	if (irx_len != 0xffffffff)
+	{
+		s->initialPC = psf2_load_elf(s->mips_cpu, buf, irx_len);
+		s->initialSP = 0x801ffff0;
+	}
+	free(buf);
+
+	if (s->initialPC == 0xffffffff)
+	{
+ free (s);
+ return NULL;
+	}
+
+	lengthMS = psfTimeToMS(s->c->inf_length);
+	fadeMS = psfTimeToMS(s->c->inf_fade);
+	if (lengthMS == 0) 
+	{
+		lengthMS = ~0;
+	}
+
+	mipsinfo.i = s->initialPC;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_PC, &mipsinfo);
+
+	mipsinfo.i = s->initialSP;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+
+	// set RA
+	mipsinfo.i = 0x80000000;
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+
+	// set A0 & A1 to point to "aofile:/"
+	mipsinfo.i = 2;	// argc
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+
+	mipsinfo.i = 0x80000004;	// argv
+	mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
+	s->mips_cpu->psx_ram[1] = LE32(0x80000008);
+	
+	buf = (uint8 *)(&s->mips_cpu->psx_ram[2]);
+	strcpy((char *)buf, "aofile:/");		
+
+	s->mips_cpu->psx_ram[0] = LE32(FUNCT_HLECALL);
+
+	// back up initial RAM image to quickly restart songs
+	memcpy(s->mips_cpu->initial_ram, s->mips_cpu->psx_ram, 2*1024*1024);
+
+	psx_hw_init(s->mips_cpu);
+	SPU2init(s->mips_cpu, ps2_update, s);
+	SPU2open(s->mips_cpu, NULL);
+	setlength2(s->mips_cpu->spu2, lengthMS, fadeMS);
+
+	return s;
+}
+
+int32 psf2_gen(void *handle, int16 *buffer, uint32 samples)
+{	
+	int i;
+	psf2_synth_t *s = handle;
+
+//	memset (buffer, 0, samples * 4);
+//	return AO_SUCCESS;
+//
+	s->spu_pOutput = (char *)buffer;
+
+	for (i = 0; i < samples; i++)
+	{
+		SPU2async(s->mips_cpu, 1);
+		ps2_hw_slice(s->mips_cpu);
+	}
+
+	ps2_hw_frame(s->mips_cpu);
+	
+	return AO_SUCCESS;
+}
+
+int32 psf2_stop(void *handle)
+{
+ psf2_synth_t *s = handle;
+	SPU2close(s->mips_cpu);
+	SPU2free(s->mips_cpu);
+	if (s->c->lib[0] != 0)
+	{
+		free(s->lib_raw_file);
+	}
+	free(s->c);
+	if (s->mips_cpu) {
+ mips_exit (s->mips_cpu);
+ }
+	free (s);
+
+	return AO_SUCCESS;
+}
+
+int32 psf2_command(void *handle, int32 command, int32 parameter)
+{
+ psf2_synth_t *s = handle;
+	union cpuinfo mipsinfo;
+	uint32 lengthMS, fadeMS;
+
+	switch (command)
+	{
+		case COMMAND_RESTART:
+			SPU2close(s->mips_cpu);
+
+			memcpy(s->mips_cpu->psx_ram, s->mips_cpu->initial_ram, 2*1024*1024);
+
+			mips_init(s->mips_cpu);
+			mips_reset(s->mips_cpu, NULL);
+			psx_hw_init(s->mips_cpu);
+			SPU2init(s->mips_cpu, ps2_update, s);
+			SPU2open(s->mips_cpu, NULL);
+
+			mipsinfo.i = s->initialPC;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_PC, &mipsinfo);
+
+			mipsinfo.i = s->initialSP;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+
+			// set RA
+			mipsinfo.i = 0x80000000;
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+
+			// set A0 & A1 to point to "aofile:/"
+			mipsinfo.i = 2;	// argc
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+
+			mipsinfo.i = 0x80000004;	// argv
+			mips_set_info(s->mips_cpu, CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
+
+			psx_hw_init(s->mips_cpu);
+
+			lengthMS = psfTimeToMS(s->c->inf_length);
+			fadeMS = psfTimeToMS(s->c->inf_fade);
+			if (lengthMS == 0) 
+			{
+				lengthMS = ~0;
+			}
+			setlength2(s->mips_cpu->spu2, lengthMS, fadeMS);
+
+			return AO_SUCCESS;
+		
+	}
+	return AO_FAIL;
+}
+
+int32 psf2_fill_info(void *handle, ao_display_info *info)
+{
+ psf2_synth_t *s = handle;
+	if (s->c == NULL)
+		return AO_FAIL;
+		
+	strcpy(info->title[1], "Name: ");
+	sprintf(info->info[1], "%s", s->c->inf_title);
+
+	strcpy(info->title[2], "Game: ");
+	sprintf(info->info[2], "%s", s->c->inf_game);
+	
+	strcpy(info->title[3], "Artist: ");
+	sprintf(info->info[3], "%s", s->c->inf_artist);
+
+	strcpy(info->title[4], "Copyright: ");
+	sprintf(info->info[4], "%s", s->c->inf_copy);
+
+	strcpy(info->title[5], "Year: ");
+	sprintf(info->info[5], "%s", s->c->inf_year);
+
+	strcpy(info->title[6], "Length: ");
+	sprintf(info->info[6], "%s", s->c->inf_length);
+
+	strcpy(info->title[7], "Fade: ");
+	sprintf(info->info[7], "%s", s->c->inf_fade);
+
+	strcpy(info->title[8], "Ripper: ");
+	sprintf(info->info[8], "%s", s->psfby);
+
+	return AO_SUCCESS;
+}
+
+uint32 psf2_get_loadaddr(void)
+{
+	return loadAddr;
+}
+
+void psf2_set_loadaddr(uint32 new)
+{
+	loadAddr = new;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/eng_spu.c Added

@@ -0,0 +1,348 @@
+/*
+	Audio Overload SDK - SPU file format engine
+
+	Copyright (c) 2007 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+//
+// eng_spu.c
+//
+// Note: support for old-format files is not tested and may not work. All the rips I could find
+// are in the newer format. Also, CDDA and XA commands do not work - I've not found a rip using them.
+//
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+#include "cpuintrf.h"
+#include "psx.h"
+#include "peops/externals.h"
+#include "peops/spu.h"
+#include "peops/regs.h"
+
+typedef struct {
+ uint8 *start_of_file, *song_ptr;
+ uint32 cur_tick, cur_event, num_events, next_tick, end_tick;
+ int old_fmt;
+ char name[128], song[128], company[128];
+ char *spu_pOutput;
+ mips_cpu_context *mips_cpu;
+} spu_synth_t;
+
+
+static void spu_update (unsigned char* pSound,long lBytes,void *data)
+{
+ spu_synth_t *s = data;
+	memcpy(s->spu_pOutput, pSound, lBytes);
+}
+
+
+void *spu_start(const char *path, uint8 *buffer, uint32 length)
+{
+ spu_synth_t *s = malloc (sizeof (spu_synth_t));
+ memset (s, 0, sizeof (spu_synth_t));
+
+	int i;
+	uint16 reg;
+
+	if (strncmp((char *)buffer, "SPU", 3))
+	{
+		spu_stop (s);
+		return NULL;
+	}
+
+	s->start_of_file = buffer;
+
+ s->mips_cpu = mips_alloc ();
+	SPUinit(s->mips_cpu, spu_update, s);
+	SPUopen(s->mips_cpu);
+	setlength(s->mips_cpu->spu, ~0, 0);
+
+	// upload the SPU RAM image
+	SPUinjectRAMImage(s->mips_cpu, (unsigned short *)&buffer[0]);
+
+	// apply the register image	
+	for (i = 0; i < 512; i += 2)
+	{
+		reg = buffer[0x80000+i] | buffer[0x80000+i+1]<<8;
+
+		SPUwriteRegister(s->mips_cpu, (i/2)+0x1f801c00, reg);
+	}
+
+	s->old_fmt = 1;
+
+	if ((buffer[0x80200] != 0x44) || (buffer[0x80201] != 0xac) || (buffer[0x80202] != 0x00) || (buffer[0x80203] != 0x00))
+	{
+		s->old_fmt = 0;
+	}
+
+	if (s->old_fmt)
+	{
+		s->num_events = buffer[0x80204] | buffer[0x80205]<<8 | buffer[0x80206]<<16 | buffer[0x80207]<<24;
+
+		if (((s->num_events * 12) + 0x80208) > length)
+		{
+			s->old_fmt = 0;
+		}
+		else
+		{
+			s->cur_tick = 0;
+		}
+	}
+
+	if (!s->old_fmt)
+	{
+		s->end_tick = buffer[0x80200] | buffer[0x80201]<<8 | buffer[0x80202]<<16 | buffer[0x80203]<<24; 
+		s->cur_tick = buffer[0x80204] | buffer[0x80205]<<8 | buffer[0x80206]<<16 | buffer[0x80207]<<24; 
+		s->next_tick = s->cur_tick;
+	}
+
+	s->song_ptr = &buffer[0x80208];
+	s->cur_event = 0;
+
+	strncpy((char *)&buffer[4], s->name, 128);
+	strncpy((char *)&buffer[0x44], s->song, 128);
+	strncpy((char *)&buffer[0x84], s->company, 128);
+
+	return s;
+}
+
+static void spu_tick(spu_synth_t *s)
+{
+	uint32 time, reg, size;
+	uint16 rdata;
+	uint8 opcode;
+
+	if (s->old_fmt)
+	{
+		time = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24;
+
+		while ((time == s->cur_tick) && (s->cur_event < s->num_events))
+		{
+			reg = s->song_ptr[4] | s->song_ptr[5]<<8 | s->song_ptr[6]<<16 | s->song_ptr[7]<<24;
+			rdata = s->song_ptr[8] | s->song_ptr[9]<<8;
+
+			SPUwriteRegister(s->mips_cpu, reg, rdata);
+
+			s->cur_event++;
+			s->song_ptr += 12;
+
+			time = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24;
+		}
+	}
+	else
+	{
+		if (s->cur_tick < s->end_tick)
+		{
+			while (s->cur_tick == s->next_tick)
+			{
+				opcode = s->song_ptr[0];
+				s->song_ptr++;
+
+				switch (opcode)
+				{
+					case 0:	// write register
+						reg = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24;
+						rdata = s->song_ptr[4] | s->song_ptr[5]<<8;
+
+						SPUwriteRegister(s->mips_cpu, reg, rdata);
+
+						s->next_tick = s->song_ptr[6] | s->song_ptr[7]<<8 | s->song_ptr[8]<<16 | s->song_ptr[9]<<24; 
+						s->song_ptr += 10;
+						break;
+
+					case 1:	// read register
+				 		reg = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24;
+						SPUreadRegister(s->mips_cpu, reg);
+						s->next_tick = s->song_ptr[4] | s->song_ptr[5]<<8 | s->song_ptr[6]<<16 | s->song_ptr[7]<<24; 
+						s->song_ptr += 8;
+						break;
+
+					case 2: // dma write
+						size = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24; 
+						s->song_ptr += (4 + size);
+						s->next_tick = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24; 
+						s->song_ptr += 4;
+						break;
+
+					case 3: // dma read
+						s->next_tick = s->song_ptr[4] | s->song_ptr[5]<<8 | s->song_ptr[6]<<16 | s->song_ptr[7]<<24; 
+						s->song_ptr += 8;
+						break;
+
+					case 4: // xa play
+						s->song_ptr += (32 + 16384);
+						s->next_tick = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24; 
+						s->song_ptr += 4;
+						break;
+
+					case 5: // cdda play
+						size = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24; 
+						s->song_ptr += (4 + size);
+						s->next_tick = s->song_ptr[0] | s->song_ptr[1]<<8 | s->song_ptr[2]<<16 | s->song_ptr[3]<<24; 
+						s->song_ptr += 4;
+						break;
+
+					default:
+						printf("Unknown opcode %d\n", opcode);
+						exit(-1);
+						break;
+				}
+			}
+		}
+		else
+		{
+//			ao_s->song_done = 1;
+		}
+	}
+
+	s->cur_tick++;
+}
+
+int32 spu_gen(void *handle, int16 *buffer, uint32 samples)
+{
+ spu_synth_t *s = handle;
+	int i, run = 1;
+
+	if (s->old_fmt)
+	{
+		if (s->cur_event >= s->num_events)
+		{
+			run = 0;
+		}
+	}
+	else
+	{
+		if (s->cur_tick >= s->end_tick)
+		{
+			run = 0;
+		}
+	}
+
+	if (run)
+	{
+		for (i = 0; i < samples; i++)
+		{
+		 	spu_tick(s);
+			SPUasync(s->mips_cpu, 384);
+		}
+
+		s->spu_pOutput = (char *)buffer;
+		SPU_flushboot(s->mips_cpu);
+	}
+	else
+	{
+		memset(buffer, 0, samples*2*sizeof(int16));
+	}
+
+	return AO_SUCCESS;
+}
+
+int32 spu_stop(void *handle)
+{
+ spu_synth_t *s = handle;
+ if (s) {
+ if (s->mips_cpu) {
+ SPUclose(s->mips_cpu);
+ free (s->mips_cpu);
+ }
+ free (s);
+ }
+	return AO_SUCCESS;
+}
+
+int32 spu_command(void *handle, int32 command, int32 parameter)
+{
+ spu_synth_t *s = handle;
+	switch (command)
+	{
+		case COMMAND_GET_MIN:
+		case COMMAND_GET_MAX:
+		{
+			return 0;
+		}
+		break;
+		
+		case COMMAND_HAS_PREV:
+		case COMMAND_HAS_NEXT:
+		case COMMAND_PREV:
+		case COMMAND_NEXT:
+		case COMMAND_JUMP:
+		{
+			return AO_FAIL;
+		}
+		break;
+		
+		case COMMAND_RESTART:
+		{
+ printf ("eng_spu restart\n");
+ uint8 *buffer = s->start_of_file;
+ int i;
+ uint16 reg;
+
+ // apply the register image	
+ for (i = 0; i < 512; i += 2)
+ {
+ reg = buffer[0x80000+i] | buffer[0x80000+i+1]<<8;
+
+ SPUwriteRegister(s->mips_cpu, (i/2)+0x1f801c00, reg);
+ }
+
+ if (!s->old_fmt)
+ {
+ s->end_tick = buffer[0x80200] | buffer[0x80201]<<8 | buffer[0x80202]<<16 | buffer[0x80203]<<24; 
+ s->cur_tick = buffer[0x80204] | buffer[0x80205]<<8 | buffer[0x80206]<<16 | buffer[0x80207]<<24; 
+ s->next_tick = s->cur_tick;
+ }
+
+ s->song_ptr = &buffer[0x80208];
+ s->cur_event = 0;
+			return AO_SUCCESS;
+		}
+		break;
+		
+#if VERBOSE
+		default:
+			printf("Unknown command executed!\n");
+			break;
+#endif		
+	}
+	
+	return AO_FAIL;
+}
+
+int32 spu_fill_info(void *handle, ao_display_info *info)
+{
+ spu_synth_t *s = handle;
+	strcpy(info->title[1], "Game: ");
+	sprintf(info->info[1], "%.128s", s->name);
+	strcpy(info->title[2], "Song: ");
+	sprintf(info->info[2], "%.128s", s->song);
+	strcpy(info->title[3], "Company: ");
+	sprintf(info->info[3], "%.128s", s->company);
+
+	return AO_SUCCESS;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/mamemem.h Added

@@ -0,0 +1,662 @@
+#ifndef _MEMORY_H
+#define _MEMORY_H
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __GNU__
+#define UNUSEDARG __attribute__((__unused__))
+#else
+#define UNUSEDARG
+#endif
+
+#define MAX_BANKS		20
+
+
+/* obsolete, to be removed */
+#define READ_WORD(a)		 (*(UINT16 *)(a))
+#define WRITE_WORD(a,d) 	 (*(UINT16 *)(a) = (d))
+#define COMBINE_WORD(w,d)	 (((w) & ((d) >> 16)) | ((d) & 0xffff))
+#define COMBINE_WORD_MEM(a,d) (WRITE_WORD((a), (READ_WORD(a) & ((d) >> 16)) | (d)))
+
+#define ASSERT_LINE (1)
+#define CLEAR_LINE (0)
+#define TIME_NEVER (0)
+
+#define TIME_IN_HZ(hz) (1.0 / (double)(hz))
+#define TIME_IN_MSEC(ms) ((double)(ms) * (1.0 / 1000.0))
+#define TIME_IN_USEC(us) ((double)(us) * (1.0 / 1000000.0))
+
+/***************************************************************************
+
+Note that the memory hooks are not passed the actual memory address where
+the operation takes place, but the offset from the beginning of the block
+they are assigned to. This makes handling of mirror addresses easier, and
+makes the handlers a bit more "object oriented". If you handler needs to
+read/write the main memory area, provide a "base" pointer: it will be
+initialized by the main engine to point to the beginning of the memory block
+assigned to the handler. You may also provided a pointer to "size": it
+will be set to the length of the memory area processed by the handler.
+
+***************************************************************************/
+
+#define MEMORY_WIDTH_MASK		0x00000003
+#define MEMORY_WIDTH_8			0x00000001
+#define MEMORY_WIDTH_16 		0x00000002
+#define MEMORY_WIDTH_32 		0x00000003
+
+#define MEMORY_TYPE_MASK		0x30000000
+#define MEMORY_TYPE_MEM 		0x10000000
+#define MEMORY_TYPE_IO			0x20000000
+
+#define MEMORY_DIRECTION_MASK 0xc0000000
+#define MEMORY_DIRECTION_READ 0x40000000
+#define MEMORY_DIRECTION_WRITE 0x80000000
+
+typedef unsigned int offs_t;
+typedef offs_t (*opbase_handler)(UNUSEDARG offs_t address);
+
+/***************************************************************************
+	8-BIT	Core memory read/write/opbase handler types
+***************************************************************************/
+
+typedef unsigned char data8_t;
+typedef unsigned short data16_t;
+
+typedef data8_t (*mem_read_handler)(UNUSEDARG offs_t offset);
+typedef void (*mem_write_handler)(UNUSEDARG offs_t offset, UNUSEDARG data8_t data);
+
+#define READ_HANDLER(name) data8_t name(UNUSEDARG offs_t offset)
+#define WRITE_HANDLER(name) void name(UNUSEDARG offs_t offset, UNUSEDARG data8_t data)
+#define OPBASE_HANDLER(name) offs_t name(UNUSEDARG offs_t address)
+
+#define READ16_HANDLER(name) data16_t name(UNUSEDARG offs_t offset, UNUSEDARG UINT32 mem_mask)
+#define WRITE16_HANDLER(name) void name(UNUSEDARG offs_t offset, UNUSEDARG data16_t data, UNUSEDARG UINT32 mem_mask)
+#define OPBASE16_HANDLER(name) offs_t name(UNUSEDARG offs_t address)
+
+#define MRA_NOP 0 /* don't care, return 0 */
+#define MWA_NOP 0							/* do nothing */
+#define MRA_RAM ((mem_read_handler)-1)		/* plain RAM location (return its contents) */
+#define MWA_RAM ((mem_write_handler)-1) 	/* plain RAM location (store the value) */
+#define MRA_ROM ((mem_read_handler)-2)		/* plain ROM location (return its contents) */
+#define MWA_ROM ((mem_write_handler)-2) 	/* plain ROM location (do nothing) */
+/**************************************************************************
+ * If the CPU opcodes are encrypted, they are fetched from a different
+ * memory space. In such a case, if the program dynamically creates code
+ * in RAM and executes it, it won't work unless you use MWA_RAMROM
+ * to affect both memory spaces.
+ **************************************************************************/
+#define MWA_RAMROM ((mem_write_handler)-3)
+
+/* bank memory */
+#define MRA_BANK1 ((mem_read_handler)-10)
+#define MWA_BANK1 ((mem_write_handler)-10)
+#define MRA_BANK2 ((mem_read_handler)-11)
+#define MWA_BANK2 ((mem_write_handler)-11)
+#define MRA_BANK3 ((mem_read_handler)-12)
+#define MWA_BANK3 ((mem_write_handler)-12)
+#define MRA_BANK4 ((mem_read_handler)-13)
+#define MWA_BANK4 ((mem_write_handler)-13)
+#define MRA_BANK5 ((mem_read_handler)-14)
+#define MWA_BANK5 ((mem_write_handler)-14)
+#define MRA_BANK6 ((mem_read_handler)-15)
+#define MWA_BANK6 ((mem_write_handler)-15)
+#define MRA_BANK7 ((mem_read_handler)-16)
+#define MWA_BANK7 ((mem_write_handler)-16)
+#define MRA_BANK8 ((mem_read_handler)-17)
+#define MWA_BANK8 ((mem_write_handler)-17)
+#define MRA_BANK9 ((mem_read_handler)-18)
+#define MWA_BANK9 ((mem_write_handler)-18)
+#define MRA_BANK10 ((mem_read_handler)-19)
+#define MWA_BANK10 ((mem_write_handler)-19)
+#define MRA_BANK11 ((mem_read_handler)-20)
+#define MWA_BANK11 ((mem_write_handler)-20)
+#define MRA_BANK12 ((mem_read_handler)-21)
+#define MWA_BANK12 ((mem_write_handler)-21)
+#define MRA_BANK13 ((mem_read_handler)-22)
+#define MWA_BANK13 ((mem_write_handler)-22)
+#define MRA_BANK14 ((mem_read_handler)-23)
+#define MWA_BANK14 ((mem_write_handler)-23)
+#define MRA_BANK15 ((mem_read_handler)-24)
+#define MWA_BANK15 ((mem_write_handler)-24)
+#define MRA_BANK16 ((mem_read_handler)-25)
+#define MWA_BANK16 ((mem_write_handler)-25)
+#define MRA_BANK17 ((mem_read_handler)-26)
+#define MWA_BANK17 ((mem_write_handler)-26)
+#define MRA_BANK18 ((mem_read_handler)-27)
+#define MWA_BANK18 ((mem_write_handler)-27)
+#define MRA_BANK19 ((mem_read_handler)-28)
+#define MWA_BANK19 ((mem_write_handler)-28)
+#define MRA_BANK20 ((mem_read_handler)-29)
+#define MWA_BANK20 ((mem_write_handler)-29)
+
+struct Memory_ReadAddress
+{
+	offs_t start, end;
+	mem_read_handler handler;				/* see special values above */
+};
+
+struct Memory_WriteAddress
+{
+ offs_t start, end;
+	mem_write_handler handler;				/* see special values above */
+	data8_t **base;							/* optional (see explanation above) */
+ size_t *size; /* optional (see explanation above) */
+};
+
+#define MEMORY_MARKER ((offs_t)~0)
+
+#define MEMORY_END { MEMORY_MARKER, 0 } };
+
+#define IS_MEMORY_MARKER( ma ) ((ma)->start == MEMORY_MARKER && (ma)->end < MEMORY_MARKER)
+#define IS_MEMORY_END( ma ) ((ma)->start == MEMORY_MARKER && (ma)->end == 0)
+
+#define MEMORY_READ_START(name) const struct Memory_ReadAddress name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_READ | MEMORY_TYPE_MEM | MEMORY_WIDTH_8 },
+#define MEMORY_WRITE_START(name) const struct Memory_WriteAddress name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_WRITE | MEMORY_TYPE_MEM | MEMORY_WIDTH_8 },
+
+/***************************************************************************
+	16-BIT	Core memory read/write/opbase handler types
+***************************************************************************/
+
+typedef data16_t (*mem_read16_handler)(UNUSEDARG offs_t offset);
+typedef void (*mem_write16_handler)(UNUSEDARG offs_t offset, UNUSEDARG data16_t data, UNUSEDARG UINT32 mem_mask);
+
+#define READ16_HANDLER(name) data16_t name(UNUSEDARG offs_t offset, UNUSEDARG UINT32 mem_mask)
+#define WRITE16_HANDLER(name) void name(UNUSEDARG offs_t offset, UNUSEDARG data16_t data, UNUSEDARG UINT32 mem_mask)
+#define OPBASE16_HANDLER(name) offs_t name(UNUSEDARG offs_t address)
+
+#define MRA16_NOP 0 						/* don't care, return 0 */
+#define MWA16_NOP 0 						/* do nothing */
+#define MRA16_RAM ((mem_read16_handler)-1) /* plain RAM location (return its contents) */
+#define MWA16_RAM ((mem_write16_handler)-1) /* plqain RAM location (store the value) */
+#define MRA16_ROM ((mem_read16_handler)-2)	/* plain ROM location (return its contents) */
+#define MWA16_ROM ((mem_write16_handler)-2) /* plain ROM location (do nothing) */
+/**************************************************************************
+ * If the CPU opcodes are encrypted, they are fetched from a different
+ * memory space. In such a case, if the program dynamically creates code
+ * in RAM and executes it, it won't work unless you use MWA_RAMROM
+ * to affect both memory spaces.
+ **************************************************************************/
+#define MWA16_RAMROM ((mem_write16_handler)-3)
+
+/* bank memory */
+#define MRA16_BANK1 ((mem_read16_handler)-10)
+#define MWA16_BANK1 ((mem_write16_handler)-10)
+#define MRA16_BANK2 ((mem_read16_handler)-11)
+#define MWA16_BANK2 ((mem_write16_handler)-11)
+#define MRA16_BANK3 ((mem_read16_handler)-12)
+#define MWA16_BANK3 ((mem_write16_handler)-12)
+#define MRA16_BANK4 ((mem_read16_handler)-13)
+#define MWA16_BANK4 ((mem_write16_handler)-13)
+#define MRA16_BANK5 ((mem_read16_handler)-14)
+#define MWA16_BANK5 ((mem_write16_handler)-14)
+#define MRA16_BANK6 ((mem_read16_handler)-15)
+#define MWA16_BANK6 ((mem_write16_handler)-15)
+#define MRA16_BANK7 ((mem_read16_handler)-16)
+#define MWA16_BANK7 ((mem_write16_handler)-16)
+#define MRA16_BANK8 ((mem_read16_handler)-17)
+#define MWA16_BANK8 ((mem_write16_handler)-17)
+#define MRA16_BANK9 ((mem_read16_handler)-18)
+#define MWA16_BANK9 ((mem_write16_handler)-18)
+#define MRA16_BANK10 ((mem_read16_handler)-19)
+#define MWA16_BANK10 ((mem_write16_handler)-19)
+#define MRA16_BANK11 ((mem_read16_handler)-20)
+#define MWA16_BANK11 ((mem_write16_handler)-20)
+#define MRA16_BANK12 ((mem_read16_handler)-21)
+#define MWA16_BANK12 ((mem_write16_handler)-21)
+#define MRA16_BANK13 ((mem_read16_handler)-22)
+#define MWA16_BANK13 ((mem_write16_handler)-22)
+#define MRA16_BANK14 ((mem_read16_handler)-23)
+#define MWA16_BANK14 ((mem_write16_handler)-23)
+#define MRA16_BANK15 ((mem_read16_handler)-24)
+#define MWA16_BANK15 ((mem_write16_handler)-24)
+#define MRA16_BANK16 ((mem_read16_handler)-25)
+#define MWA16_BANK16 ((mem_write16_handler)-25)
+#define MRA16_BANK17 ((mem_read16_handler)-26)
+#define MWA16_BANK17 ((mem_write16_handler)-26)
+#define MRA16_BANK18 ((mem_read16_handler)-27)
+#define MWA16_BANK18 ((mem_write16_handler)-27)
+#define MRA16_BANK19 ((mem_read16_handler)-28)
+#define MWA16_BANK19 ((mem_write16_handler)-28)
+#define MRA16_BANK20 ((mem_read16_handler)-29)
+#define MWA16_BANK20 ((mem_write16_handler)-29)
+
+struct Memory_ReadAddress16
+{
+	offs_t start, end;
+	mem_read16_handler handler; 			/* see special values above */
+};
+
+struct Memory_WriteAddress16
+{
+	offs_t start, end;
+	mem_write16_handler handler;			/* see special values above */
+	data16_t **base;						/* optional (see explanation above) */
+ size_t *size; /* optional (see explanation above) */
+};
+
+#define MEMORY_READ16_START(name) const struct Memory_ReadAddress16 name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_READ | MEMORY_TYPE_MEM | MEMORY_WIDTH_16 },
+#define MEMORY_WRITE16_START(name) const struct Memory_WriteAddress16 name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_WRITE | MEMORY_TYPE_MEM | MEMORY_WIDTH_16 },
+
+/***************************************************************************
+	32-BIT	Core memory read/write/opbase handler types
+***************************************************************************/
+
+typedef UINT32 data32_t;
+
+typedef data32_t (*mem_read32_handler)(UNUSEDARG offs_t offset);
+typedef void (*mem_write32_handler)(UNUSEDARG offs_t offset, UNUSEDARG data32_t data, UNUSEDARG UINT32 mem_mask);
+
+#define READ32_HANDLER(name) data32_t name(UNUSEDARG offs_t offset, UNUSEDARG UINT32 mem_mask)
+#define WRITE32_HANDLER(name) void name(UNUSEDARG offs_t offset, UNUSEDARG data32_t data, UNUSEDARG UINT32 mem_mask)
+#define OPBASE32_HANDLER(name) offs_t name(UNUSEDARG offs_t address)
+
+#define MRA32_NOP 0 						/* don't care, return 0 */
+#define MWA32_NOP 0 						/* do nothing */
+#define MRA32_RAM ((mem_read32_handler)-1) /* plain RAM location (return its contents) */
+#define MWA32_RAM ((mem_write32_handler)-1) /* plain RAM location (store the value) */
+#define MRA32_ROM ((mem_read32_handler)-2)	/* plain ROM location (return its contents) */
+#define MWA32_ROM ((mem_write32_handler)-2) /* plain ROM location (do nothing) */
+/**************************************************************************
+ * If the CPU opcodes are encrypted, they are fetched from a different
+ * memory space. In such a case, if the program dynamically creates code
+ * in RAM and executes it, it won't work unless you use MWA_RAMROM
+ * to affect both memory spaces.
+ **************************************************************************/
+#define MWA32_RAMROM ((mem_write32_handler)-3)
+
+/* bank memory */
+#define MRA32_BANK1 ((mem_read32_handler)-10)
+#define MWA32_BANK1 ((mem_write32_handler)-10)
+#define MRA32_BANK2 ((mem_read32_handler)-11)
+#define MWA32_BANK2 ((mem_write32_handler)-11)
+#define MRA32_BANK3 ((mem_read32_handler)-12)
+#define MWA32_BANK3 ((mem_write32_handler)-12)
+#define MRA32_BANK4 ((mem_read32_handler)-13)
+#define MWA32_BANK4 ((mem_write32_handler)-13)
+#define MRA32_BANK5 ((mem_read32_handler)-14)
+#define MWA32_BANK5 ((mem_write32_handler)-14)
+#define MRA32_BANK6 ((mem_read32_handler)-15)
+#define MWA32_BANK6 ((mem_write32_handler)-15)
+#define MRA32_BANK7 ((mem_read32_handler)-16)
+#define MWA32_BANK7 ((mem_write32_handler)-16)
+#define MRA32_BANK8 ((mem_read32_handler)-17)
+#define MWA32_BANK8 ((mem_write32_handler)-17)
+#define MRA32_BANK9 ((mem_read32_handler)-18)
+#define MWA32_BANK9 ((mem_write32_handler)-18)
+#define MRA32_BANK10 ((mem_read32_handler)-19)
+#define MWA32_BANK10 ((mem_write32_handler)-19)
+#define MRA32_BANK11 ((mem_read32_handler)-20)
+#define MWA32_BANK11 ((mem_write32_handler)-20)
+#define MRA32_BANK12 ((mem_read32_handler)-21)
+#define MWA32_BANK12 ((mem_write32_handler)-21)
+#define MRA32_BANK13 ((mem_read32_handler)-22)
+#define MWA32_BANK13 ((mem_write32_handler)-22)
+#define MRA32_BANK14 ((mem_read32_handler)-23)
+#define MWA32_BANK14 ((mem_write32_handler)-23)
+#define MRA32_BANK15 ((mem_read32_handler)-24)
+#define MWA32_BANK15 ((mem_write32_handler)-24)
+#define MRA32_BANK32 ((mem_read32_handler)-25)
+#define MWA32_BANK32 ((mem_write32_handler)-25)
+#define MRA32_BANK17 ((mem_read32_handler)-26)
+#define MWA32_BANK17 ((mem_write32_handler)-26)
+#define MRA32_BANK18 ((mem_read32_handler)-27)
+#define MWA32_BANK18 ((mem_write32_handler)-27)
+#define MRA32_BANK19 ((mem_read32_handler)-28)
+#define MWA32_BANK19 ((mem_write32_handler)-28)
+#define MRA32_BANK20 ((mem_read32_handler)-29)
+#define MWA32_BANK20 ((mem_write32_handler)-29)
+
+struct Memory_ReadAddress32
+{
+	offs_t start, end;
+	mem_read32_handler handler; 			/* see special values above */
+};
+
+struct Memory_WriteAddress32
+{
+	offs_t start, end;
+	mem_write32_handler handler;			/* see special values above */
+	data32_t **base;						/* optional (see explanation above) */
+	size_t *size;							/* optional (see explanation above) */
+};
+
+#define MEMORY_READ32_START(name) const struct Memory_ReadAddress32 name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_READ | MEMORY_TYPE_MEM | MEMORY_WIDTH_32 },
+#define MEMORY_WRITE32_START(name) const struct Memory_WriteAddress32 name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_WRITE | MEMORY_TYPE_MEM | MEMORY_WIDTH_32 },
+
+/***************************************************************************
+
+IN and OUT ports are handled like memory accesses, the hook template is the
+same so you can interchange them. Of course there is no 'base' pointer for
+IO ports.
+
+***************************************************************************/
+
+struct IO_ReadPort
+{
+	offs_t start,end;
+	mem_read_handler handler;				/* see special values below */
+};
+
+#define IORP_NOP 0	/* don't care, return 0 */
+
+
+struct IO_WritePort
+{
+	offs_t start,end;
+	mem_write_handler handler;				/* see special values below */
+};
+
+#define IOWP_NOP 0	/* do nothing */
+
+#define PORT_READ_START(name) const struct IO_ReadPort name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_READ | MEMORY_TYPE_IO | MEMORY_WIDTH_8 },
+#define PORT_WRITE_START(name) const struct IO_WritePort name[] = { \
+	{ MEMORY_MARKER, MEMORY_DIRECTION_WRITE | MEMORY_TYPE_IO | MEMORY_WIDTH_8 },
+#define PORT_END	MEMORY_END
+
+/***************************************************************************
+
+If a memory region contains areas that are outside of the ROM region for
+an address space, the memory system will allocate an array of structures
+to track the external areas.
+
+***************************************************************************/
+
+#define MAX_EXT_MEMORY 64
+
+struct ExtMemory
+{
+	offs_t start,end,region;
+ UINT8 *data;
+};
+
+extern struct ExtMemory ext_memory[MAX_EXT_MEMORY];
+
+
+
+/***************************************************************************
+
+For a given number of address bits, we need to determine how many elements
+there are in the first and second-order lookup tables. We also need to know
+how many low-order bits to ignore. The ABITS* values represent these
+constants for each address space type we support.
+
+***************************************************************************/
+
+/* memory element block size */
+#define MH_SBITS		8			/* sub element bank size */
+#define MH_PBITS		8			/* port current element size */
+#define MH_ELEMAX		64			/* sub elements limit */
+#define MH_HARDMAX		64			/* hardware functions limit */
+
+/* 16 bits address */
+#define ABITS1_16		12
+#define ABITS2_16		4
+#define ABITS_MIN_16	0			/* minimum memory block is 1 byte */
+/* 16 bits address (word access) */
+#define ABITS1_16W	12
+#define ABITS2_16W	3
+#define ABITS_MIN_16W 1			/* minimum memory block is 2 bytes */
+/* 20 bits address */
+#define ABITS1_20		12
+#define ABITS2_20		8
+#define ABITS_MIN_20	0			/* minimum memory block is 1 byte */
+/* 21 bits address */
+#define ABITS1_21		13
+#define ABITS2_21		8
+#define ABITS_MIN_21	0			/* minimum memory block is 1 byte */
+/* 24 bits address */
+#define ABITS1_24		16
+#define ABITS2_24		8
+#define ABITS_MIN_24	0			/* minimum memory block is 1 byte */
+/* 24 bits address (word access) */
+#define ABITS1_24W	15
+#define ABITS2_24W	8
+#define ABITS_MIN_24W 1			/* minimum memory block is 2 bytes */
+/* 24 bits address (dword access) */
+#define ABITS1_24DW	14
+#define ABITS2_24DW	8
+#define ABITS_MIN_24DW 2			/* minimum memory block is 4 bytes */
+/* 26 bits address (dword access) */
+#define ABITS1_26DW	16
+#define ABITS2_26DW	8
+#define ABITS_MIN_26DW 2			/* minimum memory block is 4 bytes */
+/* 29 bits address (word access) */
+#define ABITS1_29W	20
+#define ABITS2_29W	8
+#define ABITS_MIN_29W	1			/* minimum memory block is 2 bytes */
+/* 32 bits address (word access) */
+#define ABITS1_32W	23
+#define ABITS2_32W	8
+#define ABITS_MIN_32W	1			/* minimum memory block is 2 bytes */
+/* 32 bits address (dword access) */
+#define ABITS1_32DW	22
+#define ABITS2_32DW	8
+#define ABITS_MIN_32DW	2			/* minimum memory block is 4 bytes */
+/* mask bits */
+#define MHMASK(abits)	 (0xffffffff >> (32 - abits))
+
+
+/***************************************************************************
+
+	Global variables
+
+***************************************************************************/
+
+typedef unsigned char MHELE;
+
+extern MHELE ophw;				/* opcode handler */
+extern MHELE *cur_mrhard;		/* current set of read handlers */
+extern MHELE *cur_mwhard;		/* current set of write handlers */
+
+extern UINT8 *OP_RAM;			/* opcode RAM base */
+extern UINT8 *OP_ROM;			/* opcode ROM base */
+extern UINT8 *cpu_bankbase[];	/* array of bank bases */
+
+
+/* global memory access width and mask (16-bit and 32-bit under-size accesses) */
+//extern UINT32 mem_width;
+//extern UINT32 mem_mask;
+//extern UINT32 mem_offs;
+
+/***************************************************************************
+
+	Macros
+
+***************************************************************************/
+
+/* ----- 16-bit memory accessing ----- */
+#define COMBINE_DATA(varptr)	(*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
+#define ACCESSING_LSB ((mem_mask & 0x00ff) == 0)
+#define ACCESSING_MSB ((mem_mask & 0xff00) == 0)
+
+//extern unsigned char prgrom[128*1024];
+
+/* ----- opcode reading ----- */
+#define cpu_readop cpu_readmem16
+//#define cpu_readop16(A) 	READ_WORD(&prgrom[A&0x3fff])
+//#define cpu_readop32(A) 	READ_DWORD(&prgrom[A&0x3fff])
+
+/* ----- opcode argument reading ----- */
+#define cpu_readop_arg cpu_readmem16
+//#define cpu_readop_arg16(A) READ_WORD(&prgrom[A&0x3fff])
+//#define cpu_readop_arg32(A) READ_DWORD(&prgrom[A&0x3fff])
+
+/* ----- bank switching for CPU cores ----- */
+#define change_pc_generic(pc,abits2,abitsmin,shift,setop)	\
+{															\
+	if (cur_mrhard[(pc)>>(abits2+abitsmin+shift)] != ophw)	\
+		setop(pc);											\
+}
+#define change_pc16(pc) 	 
+//change_pc_generic(pc, ABITS2_16, ABITS_MIN_16, 0, cpu_setOPbase16)
+#define change_pc20(pc) 	 change_pc_generic(pc, ABITS2_20, ABITS_MIN_20, 0, cpu_setOPbase20)
+#define change_pc21(pc) 	 change_pc_generic(pc, ABITS2_21, ABITS_MIN_21, 0, cpu_setOPbase21)
+#define change_pc24(pc) 	 change_pc_generic(pc, ABITS2_24, ABITS_MIN_24, 0, cpu_setOPbase24)
+#define change_pc16bew(pc)	 change_pc_generic(pc, ABITS2_16W, ABITS_MIN_16W, 0, cpu_setOPbase16bew)
+#define change_pc16lew(pc)	 change_pc_generic(pc, ABITS2_16W, ABITS_MIN_16W, 0, cpu_setOPbase16lew)
+#define change_pc24bew(pc)	 change_pc_generic(pc, ABITS2_24W, ABITS_MIN_24W, 0, cpu_setOPbase24bew)
+#define change_pc29lew(pc) change_pc_generic(pc, ABITS2_29W, ABITS_MIN_29W, 3, cpu_setOPbase29lew)
+#define change_pc32bew(pc) 	 change_pc_generic(pc, ABITS2_32W, ABITS_MIN_32W, 0, cpu_setOPbase32bew)
+#define change_pc32lew(pc)	 change_pc_generic(pc, ABITS2_32W, ABITS_MIN_32W, 0, cpu_setOPbase32lew)
+#define change_pc24bedw(pc)	 change_pc_generic(pc, ABITS2_24DW, ABITS_MIN_24DW, 0, cpu_setOPbase24bedw)
+#define change_pc26ledw(pc)	 change_pc_generic(pc, ABITS2_26DW, ABITS_MIN_26DW, 0, cpu_setOPbase26ledw)
+#define change_pc32bedw(pc) change_pc_generic(pc, ABITS2_32DW, ABITS_MIN_32DW, 0, cpu_setOPbase32bedw)
+
+/* backward compatibility */
+#define change_pc(pc)
+// change_pc16(pc)
+
+/* ----- for use OPbaseOverride driver, request override callback to next cpu_setOPbase ----- */
+#define catch_nextBranch()	(ophw = 0xff)
+
+/* ----- bank switching macro ----- */
+#define cpu_setbank(bank, base) 						\
+{														\
+	if (bank >= 1 && bank <= MAX_BANKS) 				\
+	{													\
+		cpu_bankbase[bank] = (UINT8 *)(base);			\
+		if (ophw == bank)								\
+		{												\
+			ophw = 0xff;								\
+			cpu_set_op_base(cpu_get_pc());				\
+		}												\
+	}													\
+}
+
+
+/***************************************************************************
+
+	Function prototypes
+
+***************************************************************************/
+
+/* ----- memory setup function ----- */
+
+/* ----- memory read functions ----- */
+data8_t cpu_readmem16(offs_t address);
+data8_t cpu_readmem20(offs_t address);
+data8_t cpu_readmem21(offs_t address);
+data8_t cpu_readmem24(offs_t address);
+
+data16_t cpu_readmem16bew(offs_t address);
+data16_t cpu_readmem16bew_word(offs_t address);
+data16_t cpu_readmem16lew(offs_t address);
+data16_t cpu_readmem16lew_word(offs_t address);
+data16_t cpu_readmem24bew(offs_t address);
+data16_t cpu_readmem24bew_word(offs_t address);
+data16_t cpu_readmem29lew(offs_t address);
+data16_t cpu_readmem29lew_word(offs_t address);
+data16_t cpu_readmem32bew(offs_t address);
+data16_t cpu_readmem32bew_word(offs_t address);
+data16_t cpu_readmem32lew(offs_t address);
+data16_t cpu_readmem32lew_word(offs_t address);
+
+data32_t cpu_readmem24bedw(offs_t address);
+data32_t cpu_readmem24bedw_word(offs_t address);
+data32_t cpu_readmem24bedw_dword(offs_t address);
+data32_t cpu_readmem26ledw(offs_t address);
+data32_t cpu_readmem26ledw_word(offs_t address);
+data32_t cpu_readmem26ledw_dword(offs_t address);
+data32_t cpu_readmem27bedw(offs_t address);
+data32_t cpu_readmem27bedw_word(offs_t address);
+data32_t cpu_readmem27bedw_dword(offs_t address);
+data32_t cpu_readmem32bedw(offs_t address);
+data32_t cpu_readmem32bedw_word(offs_t address);
+data32_t cpu_readmem32bedw_dword(offs_t address);
+
+/* ----- memory write functions ----- */
+void cpu_writemem16(offs_t address,data8_t data);
+void cpu_writemem20(offs_t address,data8_t data);
+void cpu_writemem21(offs_t address,data8_t data);
+void cpu_writemem24(offs_t address,data8_t data);
+
+void cpu_writemem16bew(offs_t address,data16_t data);
+void cpu_writemem16bew_word(offs_t address,data16_t data);
+void cpu_writemem16lew(offs_t address,data16_t data);
+void cpu_writemem16lew_word(offs_t address,data16_t data);
+void cpu_writemem24bew(offs_t address,data16_t data);
+void cpu_writemem24bew_word(offs_t address,data16_t data);
+void cpu_writemem29lew(offs_t address,data16_t data);
+void cpu_writemem29lew_word(offs_t address,data16_t data);
+void cpu_writemem32bew(offs_t address,data16_t data);
+void cpu_writemem32bew_word(offs_t address,data16_t data);
+void cpu_writemem32lew(offs_t address,data16_t data);
+void cpu_writemem32lew_word(offs_t address,data16_t data);
+
+void cpu_writemem24bedw(offs_t address,data32_t data);
+void cpu_writemem24bedw_word(offs_t address,data32_t data);
+void cpu_writemem24bedw_dword(offs_t address,data32_t data);
+void cpu_writemem26ledw(offs_t address,data32_t data);
+void cpu_writemem26ledw_word(offs_t address,data32_t data);
+void cpu_writemem26ledw_dword(offs_t address,data32_t data);
+void cpu_writemem27bedw(offs_t address,data32_t data);
+void cpu_writemem27bedw_word(offs_t address,data32_t data);
+void cpu_writemem27bedw_dword(offs_t address,data32_t data);
+void cpu_writemem32bedw(offs_t address,data32_t data);
+void cpu_writemem32bedw_word(offs_t address,data32_t data);
+void cpu_writemem32bedw_dword(offs_t address,data32_t data);
+
+/* ----- port I/O functions ----- */
+int cpu_readport(int port);
+void cpu_writeport(int port, int value);
+
+/* ----- dynamic memory/port mapping ----- */
+void *install_mem_read_handler(int cpu, int start, int end, mem_read_handler handler);
+void *install_mem_read16_handler(int cpu, int start, int end, mem_read16_handler handler);
+void *install_mem_read32_handler(int cpu, int start, int end, mem_read32_handler handler);
+void *install_mem_write_handler(int cpu, int start, int end, mem_write_handler handler);
+void *install_mem_write16_handler(int cpu, int start, int end, mem_write16_handler handler);
+void *install_mem_write32_handler(int cpu, int start, int end, mem_write32_handler handler);
+void *install_port_read_handler(int cpu, int start, int end, mem_read_handler handler);
+void *install_port_write_handler(int cpu, int start, int end, mem_write_handler handler);
+
+/* ----- dynamic bank handlers ----- */
+void cpu_setbankhandler_r(int bank, mem_read_handler handler);
+void cpu_setbankhandler_w(int bank, mem_write_handler handler);
+
+/* ----- opcode base control ---- */
+void cpu_setOPbase16(offs_t pc);
+void cpu_setOPbase20(offs_t pc);
+void cpu_setOPbase21(offs_t pc);
+void cpu_setOPbase24(offs_t pc);
+void cpu_setOPbase16bew(offs_t pc);
+void cpu_setOPbase16lew(offs_t pc);
+void cpu_setOPbase24bew(offs_t pc);
+void cpu_setOPbase24bedw(offs_t pc);
+void cpu_setOPbase26ledw(offs_t pc);
+void cpu_setOPbase29lew(offs_t pc);
+void cpu_setOPbase32bew(offs_t pc);
+void cpu_setOPbase32lew(offs_t pc);
+void cpu_setOPbaseoverride(int cpu, opbase_handler function);
+
+/* ----- harder-to-explain functions ---- */
+
+/* use this to set the a different opcode base address when using a CPU with
+ opcodes and data encrypted separately */
+void memory_set_opcode_base(int cpu, void *base);
+
+/* look up a chunk of memory and get its start/end addresses, and its base.
+Pass in the cpu number and the offset. It will find the chunk containing
+that offset and return the start and end addresses, along with a pointer to
+the base of the memory.
+This can be used (carefully!) by drivers that wish to access memory directly
+without going through the readmem/writemem accessors (e.g., blitters). */
+void *findmemorychunk(int cpu, int offset, int *chunkstart, int *chunkend);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* !_MEMORY_H */
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/adsr.c Added

@@ -0,0 +1,618 @@
+/***************************************************************************
+ adsr.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2003/01/06 - Pete
+// - added Neill's ADSR timings
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define _IN_ADSR
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// ADSR func
+////////////////////////////////////////////////////////////////////////
+
+static u32 RateTable[160];
+
+static void InitADSR(void) // INIT ADSR
+{
+ u32 r,rs,rd;int i;
+
+ memset(RateTable,0,sizeof(u32)*160); // build the rate table according to Neill's rules (see at bottom of file)
+
+ r=3;rs=1;rd=0;
+
+ for(i=32;i<160;i++) // we start at pos 32 with the real values... everything before is 0
+ {
+ if(r<0x3FFFFFFF)
+ {
+ r+=rs;
+ rd++;if(rd==5) {rd=1;rs*=2;}
+ }
+ if(r>0x3FFFFFFF) r=0x3FFFFFFF;
+
+ RateTable[i]=r;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void StartADSR(spu_state_t *spu, int ch) // MIX ADSR
+{
+ spu->s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
+ spu->s_chan[ch].ADSRX.State=0;
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE int MixADSR(spu_state_t *spu, int ch) // MIX ADSR
+{ 
+ static const int sexytable[8]=
+	{0,4,6,8,9,10,11,12};
+
+ if(spu->s_chan[ch].bStop) // should be stopped:
+ { // do release
+ if(spu->s_chan[ch].ADSRX.ReleaseModeExp)
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18+32+sexytable[(spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7]];
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x0C + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ spu->s_chan[ch].bOn=0;
+ spu->s_chan[ch].bNoise=0;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ else // not stopped yet?
+ {
+ if(spu->s_chan[ch].ADSRX.State==0) // -> attack
+ {
+ if(spu->s_chan[ch].ADSRX.AttackModeExp)
+ {
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
+ else
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x18 + 32];
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
+ spu->s_chan[ch].ADSRX.State=1;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ //--------------------------------------------------//
+ if(spu->s_chan[ch].ADSRX.State==1) // -> decay
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+32+sexytable[(spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7]];
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ if(((spu->s_chan[ch].ADSRX.EnvelopeVol>>27)&0xF) <= spu->s_chan[ch].ADSRX.SustainLevel)
+ {
+ spu->s_chan[ch].ADSRX.State=2;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ //--------------------------------------------------//
+ if(spu->s_chan[ch].ADSRX.State==2) // -> sustain
+ {
+ if(spu->s_chan[ch].ADSRX.SustainIncrease)
+ {
+ if(spu->s_chan[ch].ADSRX.SustainModeExp)
+ {
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
+ else
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x18 + 32];
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
+ }
+ }
+ else
+ {
+ if(spu->s_chan[ch].ADSRX.SustainModeExp)
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B+32+sexytable[(spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7]];
+ else
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x0F + 32];
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ }
+ }
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ }
+ return 0;
+}
+
+#endif
+
+/*
+James Higgs ADSR investigations:
+
+PSX SPU Envelope Timings
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, here is an extract from doomed's SPU doc, which explains the basics
+of the SPU "volume envelope": 
+
+*** doomed doc extract start ***
+
+--------------------------------------------------------------------------
+Voices.
+--------------------------------------------------------------------------
+The SPU has 24 hardware voices. These voices can be used to reproduce sample
+data, noise or can be used as frequency modulator on the next voice.
+Each voice has it's own programmable ADSR envelope filter. The main volume
+can be programmed independently for left and right output.
+
+The ADSR envelope filter works as follows:
+Ar = Attack rate, which specifies the speed at which the volume increases
+ from zero to it's maximum value, as soon as the note on is given. The
+ slope can be set to lineair or exponential.
+Dr = Decay rate specifies the speed at which the volume decreases to the
+ sustain level. Decay is always decreasing exponentially.
+Sl = Sustain level, base level from which sustain starts.
+Sr = Sustain rate is the rate at which the volume of the sustained note
+ increases or decreases. This can be either lineair or exponential.
+Rr = Release rate is the rate at which the volume of the note decreases
+ as soon as the note off is given.
+
+ lvl |
+ ^ | /\Dr __
+ Sl _| _ / _ \__--- \
+ | / ---__ \ Rr
+ | /Ar Sr \ \
+ | / \\
+ |/___________________\________
+ ->time
+
+The overal volume can also be set to sweep up or down lineairly or
+exponentially from it's current value. This can be done seperately
+for left and right.
+
+Relevant SPU registers:
+-------------------------------------------------------------
+$1f801xx8 Attack/Decay/Sustain level
+bit |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|
+desc.|Am| Ar |Dr |Sl |
+
+Am 0 Attack mode Linear
+ 1 Exponential
+
+Ar 0-7f attack rate
+Dr 0-f decay rate
+Sl 0-f sustain level
+-------------------------------------------------------------
+$1f801xxa Sustain rate, Release Rate.
+bit |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|
+desc.|Sm|Sd| 0| Sr |Rm|Rr |
+
+Sm 0 sustain rate mode linear
+ 1 exponential
+Sd 0 sustain rate mode increase
+ 1 decrease
+Sr 0-7f Sustain Rate
+Rm 0 Linear decrease
+ 1 Exponential decrease
+Rr 0-1f Release Rate
+
+Note: decay mode is always Expontial decrease, and thus cannot
+be set.
+-------------------------------------------------------------
+$1f801xxc Current ADSR volume
+bit |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
+desc.|ADSRvol |
+
+ADSRvol Returns the current envelope volume when
+ read.
+-- James' Note: return range: 0 -> 32767
+
+*** 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:
+
+1. Attack rate value (linear mode)
+
+ Attack value range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 | | 80 |
+ -----------------------------------------------------------------
+ Frames | 11 | 21 | 42 | 84 | 169| 338| 676| |2890|
+
+ Note: frames is no. of PAL frames to reach full volume (100%
+ amplitude)
+
+ Hmm, noticing that the time taken to reach full volume doubles
+ every time we add 4 to our attack value, we know the equation is
+ of form:
+ frames = k * 2 ^ (value / 4)
+
+ (You may ponder about envelope generator hardware at this point,
+ or maybe not... :)
+
+ By substituting some stuff and running some checks, we get:
+
+ k = 0.00257 (close enuf)
+
+ therefore,
+ frames = 0.00257 * 2 ^ (value / 4)
+ If you just happen to be writing an emulator, then you can probably
+ use an equation like:
+
+ %volume_increase_per_tick = 1 / frames
+
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*514)/10000
+ ------------------------------------
+
+2. Decay rate value (only has log mode)
+
+ Decay value range: 0 -> 15
+
+ Value | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 |
+ ------------------------------------------------
+ frames | | | | | 6 | 12 | 24 | 47 |
+
+ Note: frames here is no. of PAL frames to decay to 50% volume.
+
+ formula: frames = k * 2 ^ (value)
+
+ Substituting, we get: k = 0.00146
+
+ Further info on logarithmic nature:
+ 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
+ 50% volume.
+
+ Frag it - just use linear approx.
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*292)/10000
+ ------------------------------------
+
+
+3. Sustain rate value (linear mode)
+
+ Sustain rate range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 |
+ -------------------------------------------
+ frames | 9 | 19 | 37 | 74 | 147| 293| 587|
+
+ Here, frames = no. of PAL frames for volume amplitude to go from 100%
+ to 0% (or vice-versa).
+
+ Same formula as for attack value, just a different value for k:
+
+ k = 0.00225
+
+ ie: frames = 0.00225 * 2 ^ (value / 4)
+
+ For emulation purposes:
+
+ %volume_increase_or_decrease_per_tick = 1 / frames
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*450)/10000
+ ------------------------------------
+
+
+4. Release rate (linear mode)
+
+ Release rate range: 0 -> 31
+
+ Value | 13 | 14 | 15 | 16 | 17 |
+ ---------------------------------------------------------------
+ frames | 18 | 36 | 73 | 146| 292|
+
+ Here, frames = no. of PAL frames to decay from 100% vol to 0% vol
+ after "note-off" is triggered.
+
+ Formula: frames = k * 2 ^ (value)
+
+ And so: k = 0.00223
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*446)/10000
+ ------------------------------------
+
+
+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
+approx.
+
+To get timings in millisecs, multiply frames by 20.
+
+
+
+- James Higgs 17/6/2000
+james7780@yahoo.com
+
+//---------------------------------------------------------------
+
+OLD adsr mixing according to james' rules... has to be called
+every one millisecond
+
+
+ i32 v,v2,lT,l1,l2,l3;
+
+ if(spu->s_chan[ch].bStop) // psx wants to stop? -> release phase
+ {
+ if(spu->s_chan[ch].ADSR.ReleaseVal!=0) // -> release not 0: do release (if 0: stop right now)
+ {
+ if(!spu->s_chan[ch].ADSR.ReleaseVol) // --> release just started? set up the release stuff
+ {
+ spu->s_chan[ch].ADSR.ReleaseStartTime=spu->s_chan[ch].ADSR.lTime;
+ spu->s_chan[ch].ADSR.ReleaseVol=spu->s_chan[ch].ADSR.lVolume;
+ spu->s_chan[ch].ADSR.ReleaseTime = // --> calc how long does it take to reach the wanted sus level
+ (spu->s_chan[ch].ADSR.ReleaseTime*
+ spu->s_chan[ch].ADSR.ReleaseVol)/1024;
+ }
+ // -> NO release exp mode used (yet)
+ v=spu->s_chan[ch].ADSR.ReleaseVol; // -> get last volume
+ lT=spu->s_chan[ch].ADSR.lTime- // -> how much time is past?
+ spu->s_chan[ch].ADSR.ReleaseStartTime;
+ l1=spu->s_chan[ch].ADSR.ReleaseTime;
+ 
+ if(lT<l1) // -> we still have to release
+ {
+ v=v-((v*lT)/l1); // --> calc new volume
+ }
+ else // -> release is over: now really stop that sample
+ {v=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;}
+ }
+ else // -> release IS 0: release at once
+ {
+ v=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;
+ }
+ }
+ else 
+ {//--------------------------------------------------// not in release phase:
+ v=1024;
+ lT=spu->s_chan[ch].ADSR.lTime;
+ l1=spu->s_chan[ch].ADSR.AttackTime;
+ 
+ if(lT<l1) // attack
+ { // no exp mode used (yet)
+// if(spu->s_chan[ch].ADSR.AttackModeExp)
+// {
+// v=(v*lT)/l1;
+// }
+// else
+ {
+ v=(v*lT)/l1;
+ }
+ if(v==0) v=1;
+ }
+ else // decay
+ { // should be exp, but who cares? ;)
+ l2=spu->s_chan[ch].ADSR.DecayTime;
+ v2=spu->s_chan[ch].ADSR.SustainLevel;
+
+ lT-=l1;
+ if(lT<l2)
+ {
+ v-=(((v-v2)*lT)/l2);
+ }
+ else // sustain
+ { // no exp mode used (yet)
+ l3=spu->s_chan[ch].ADSR.SustainTime;
+ lT-=l2;
+ if(spu->s_chan[ch].ADSR.SustainModeDec>0)
+ {
+ if(l3!=0) v2+=((v-v2)*lT)/l3;
+ else v2=v;
+ }
+ else
+ {
+ if(l3!=0) v2-=(v2*lT)/l3;
+ else v2=v;
+ }
+
+ if(v2>v) v2=v;
+ if(v2<=0) {v2=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;}
+
+ v=v2;
+ }
+ }
+ }
+
+ //----------------------------------------------------// 
+ // ok, done for this channel, so increase time
+
+ spu->s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
+
+ if(v>1024) v=1024; // adjust volume
+ if(v<0) v=0; 
+ spu->s_chan[ch].ADSR.lVolume=v; // store act volume
+
+ return v; // return the volume factor
+*/
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+
+/*
+-----------------------------------------------------------------------------
+Neill Corlett
+Playstation SPU envelope timing notes
+-----------------------------------------------------------------------------
+
+This is preliminary. This may be wrong. But the model described herein fits
+all of my experimental data, and it's just simple enough to sound right.
+
+ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.
+The value returned by channel reg 0xC is (envelope_level>>16).
+
+Each sample, an increment or decrement value will be added to or
+subtracted from this envelope level.
+
+Create the rate log table. The values double every 4 entries.
+ entry #0 = 4
+
+ 4, 5, 6, 7,
+ 8,10,12,14,
+ 16,20,24,28, ...
+
+ entry #40 = 4096...
+ entry #44 = 8192...
+ entry #48 = 16384...
+ entry #52 = 32768...
+ entry #56 = 65536...
+
+increments and decrements are in terms of ratelogtable[n]
+n may exceed the table bounds (plan on n being between -32 and 127).
+table values are all clipped between 0x00000000 and 0x3FFFFFFF
+
+when you "voice on", the envelope is always fully reset.
+(yes, it may click. the real thing does this too.)
+
+envelope level begins at zero.
+
+each state happens for at least 1 cycle
+(transitions are not instantaneous)
+this may result in some oddness: if the decay rate is uberfast, it will cut
+the envelope from full down to half in one sample, potentially skipping over
+the sustain level
+
+ATTACK
+------
+- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and
+ proceed to DECAY.
+
+Linear attack mode:
+- line extends upward to 0x7FFFFFFF
+- increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+
+Logarithmic attack mode:
+if envelope_level < 0x60000000:
+ - line extends upward to 0x60000000
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+else:
+ - line extends upward to 0x7FFFFFFF
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x18]
+
+DECAY
+-----
+- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.
+ Do not clip to the sustain level.
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Dr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Dr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Dr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Dr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Dr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Dr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Dr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Dr^0x1F))-0x18+12]
+ (note that this is the same as the release rate formula, except that
+ decay rates 10-1F aren't possible... those would be slower in theory)
+
+SUSTAIN
+-------
+- no terminating condition except for voice off
+- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.
+- Sd=1 (decrease) behavior:
+Linear sustain decrease:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]
+Logarithmic sustain decrease:
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(Sr^0x7F)-0x1B+0]
+ 1: ratelogtable[(Sr^0x7F)-0x1B+4]
+ 2: ratelogtable[(Sr^0x7F)-0x1B+6]
+ 3: ratelogtable[(Sr^0x7F)-0x1B+8]
+ 4: ratelogtable[(Sr^0x7F)-0x1B+9]
+ 5: ratelogtable[(Sr^0x7F)-0x1B+10]
+ 6: ratelogtable[(Sr^0x7F)-0x1B+11]
+ 7: ratelogtable[(Sr^0x7F)-0x1B+12]
+
+RELEASE
+-------
+- if the envelope level has overflowed to negative, clip to 0 and QUIT.
+
+Linear release mode:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]
+
+Logarithmic release mode:
+- line extends to (envelope_level & 0x0FFFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Rr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Rr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Rr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Rr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Rr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Rr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Rr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Rr^0x1F))-0x18+12]
+
+-----------------------------------------------------------------------------
+*/

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/adsr.h Added

@@ -0,0 +1,28 @@
+/***************************************************************************
+                           adsr.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+static INLINE void StartADSR(spu_state_t *spu, int ch);
+static INLINE int  MixADSR(spu_state_t *spu, int ch);

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/dma.c Added

@@ -0,0 +1,77 @@
+/***************************************************************************
+ dma.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "../peops/stdafx.h"
+
+#define _IN_DMA
+
+////////////////////////////////////////////////////////////////////////
+// READ DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+void SPUreadDMAMem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+ ram16[usPSXMem>>1]=cpu->spu->spuMem[cpu->spu->spuAddr>>1];		// spu addr got by writeregister
+ usPSXMem+=2;
+ cpu->spu->spuAddr+=2; // inc spu addr
+ if(cpu->spu->spuAddr>0x7ffff) cpu->spu->spuAddr=0; // wrap
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+// to investigate: do sound data updates by writedma affect spu
+// irqs? Will an irq be triggered, if new data is written to
+// the memory irq address?
+
+////////////////////////////////////////////////////////////////////////
+// WRITE DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+void SPUwriteDMAMem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+// printf("main RAM %x => SPU %x\n", usPSXMem, spuAddr);
+ cpu->spu->spuMem[cpu->spu->spuAddr>>1] = ram16[usPSXMem>>1];
+ usPSXMem+=2; 			// spu addr got by writeregister
+ cpu->spu->spuAddr+=2; // inc spu addr
+ if(cpu->spu->spuAddr>0x7ffff) cpu->spu->spuAddr=0; // wrap
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/dma.h Added

@@ -0,0 +1,32 @@
+/***************************************************************************
+                            dma.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "../psx.h"
+
+u16 CALLBACK SPUreadDMA(mips_cpu_context *cpu);
+void CALLBACK SPUreadDMAMem(mips_cpu_context *cpu, u16 * pusPSXMem,int iSize);
+void CALLBACK SPUwriteDMA(mips_cpu_context *cpu, u16 val);
+void CALLBACK SPUwriteDMAMem(mips_cpu_context *cpu, u16 * pusPSXMem,int iSize);

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/externals.h Added

@@ -0,0 +1,181 @@
+/***************************************************************************
+ externals.h - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+#include "ao.h"
+
+#ifndef PEOPS_EXTERNALS
+#define PEOPS_EXTERNALS
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+
+////////////////////////////////////////////////////////////////////////
+// spu defines
+////////////////////////////////////////////////////////////////////////
+
+// num of channels
+#define MAXCHAN 24
+
+///////////////////////////////////////////////////////////
+// struct defines
+///////////////////////////////////////////////////////////
+
+// ADSR INFOS PER CHANNEL
+typedef struct
+{
+ int AttackModeExp;
+ s32 AttackTime;
+ s32 DecayTime;
+ s32 SustainLevel;
+ int SustainModeExp;
+ s32 SustainModeDec;
+ s32 SustainTime;
+ int ReleaseModeExp;
+ u32 ReleaseVal;
+ s32 ReleaseTime;
+ s32 ReleaseStartTime; 
+ s32 ReleaseVol; 
+ s32 lTime;
+ s32 lVolume;
+} ADSRInfo;
+
+typedef struct
+{
+ int State;
+ int AttackModeExp;
+ int AttackRate;
+ int DecayRate;
+ int SustainLevel;
+ int SustainModeExp;
+ int SustainIncrease;
+ int SustainRate;
+ int ReleaseModeExp;
+ int ReleaseRate;
+ int EnvelopeVol;
+ s32 lVolume;
+ s32 lDummy1;
+ s32 lDummy2;
+} ADSRInfoEx;
+ 
+///////////////////////////////////////////////////////////
+
+// Tmp Flags
+
+// used for debug channel muting
+#define FLAG_MUTE 1
+
+///////////////////////////////////////////////////////////
+
+// MAIN CHANNEL STRUCT
+typedef struct
+{
+ int bNew; // start flag
+
+ int iSBPos; // mixing stuff
+ int spos;
+ int sinc;
+ int SB[32+1];
+ int sval;
+
+ u8 * pStart; // start ptr into sound mem
+ u8 * pCurr; // current pos in sound mem
+ u8 * pLoop; // loop ptr in sound mem
+
+ int bOn; // is channel active (sample playing?)
+ int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)
+ int iActFreq; // current psx pitch
+ int iUsedFreq; // current pc pitch
+ int iLeftVolume; // left volume
+ int iLeftVolRaw; // left psx volume value
+ int bIgnoreLoop; // ignore loop bit, if an external loop address is used
+ int iRightVolume; // right volume
+ int iRightVolRaw; // right psx volume value
+ int iRawPitch; // raw pitch (0...3fff)
+ int iIrqDone; // debug irq done flag
+ int s_1; // last decoding infos
+ int s_2;
+ int bRVBActive; // reverb active flag
+ int iRVBOffset; // reverb offset
+ int iRVBRepeat; // reverb repeat
+ int bNoise; // noise active flag
+ int bFMod; // freq mod (0=off, 1=sound channel, 2=freq channel)
+ int iOldNoise; // old noise val for this channel 
+ ADSRInfo ADSR; // active ADSR settings
+ ADSRInfoEx ADSRX; // next ADSR settings (will be moved to active on sample start)
+
+} SPUCHAN;
+
+///////////////////////////////////////////////////////////
+
+typedef struct
+{
+ int StartAddr; // reverb area start addr in samples
+ int CurrAddr; // reverb area curr addr in samples
+
+ int Enabled;
+ int VolLeft;
+ int VolRight;
+ int iLastRVBLeft;
+ int iLastRVBRight;
+ int iRVBLeft;
+ int iRVBRight;
+
+
+ int FB_SRC_A; // (offset)
+ int FB_SRC_B; // (offset)
+ int IIR_ALPHA; // (coef.)
+ int ACC_COEF_A; // (coef.)
+ int ACC_COEF_B; // (coef.)
+ int ACC_COEF_C; // (coef.)
+ int ACC_COEF_D; // (coef.)
+ int IIR_COEF; // (coef.)
+ int FB_ALPHA; // (coef.)
+ int FB_X; // (coef.)
+ int IIR_DEST_A0; // (offset)
+ int IIR_DEST_A1; // (offset)
+ int ACC_SRC_A0; // (offset)
+ int ACC_SRC_A1; // (offset)
+ int ACC_SRC_B0; // (offset)
+ int ACC_SRC_B1; // (offset)
+ int IIR_SRC_A0; // (offset)
+ int IIR_SRC_A1; // (offset)
+ int IIR_DEST_B0; // (offset)
+ int IIR_DEST_B1; // (offset)
+ int ACC_SRC_C0; // (offset)
+ int ACC_SRC_C1; // (offset)
+ int ACC_SRC_D0; // (offset)
+ int ACC_SRC_D1; // (offset)
+ int IIR_SRC_B1; // (offset)
+ int IIR_SRC_B0; // (offset)
+ int MIX_DEST_A0; // (offset)
+ int MIX_DEST_A1; // (offset)
+ int MIX_DEST_B0; // (offset)
+ int MIX_DEST_B1; // (offset)
+ int IN_COEF_L; // (coef.)
+ int IN_COEF_R; // (coef.)
+} REVERBInfo;
+
+#endif // PEOPS_EXTERNALS

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/gauss_i.h Added

@@ -0,0 +1,163 @@
+/***************************************************************************
+                          gauss_i.h  -  description
+                           -----------------------
+    begin                : Sun Feb 08 2003
+    copyright            : (C) 2003 by Chris Moeller, eh, whatever
+    email                : chris@kode54.tk
+ ***************************************************************************/
+                       
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+                           
+//*************************************************************************//
+// History of changes:
+//
+// 2003/02/08 - kode54
+// - generated by interleaving table from gauss.h from the libopenspc
+//   project; a gaussian bell curve table logged from the SPC-700,
+//   though Neill says he logged the same curve from a PSX SPU. Also
+//   says that interleaving the coefficients together runs faster. Meh.
+//
+//*************************************************************************//
+
+#ifndef GAUSS_H
+#define GAUSS_H
+
+// 1024 entries
+const int gauss[]={
+	0x172, 0x519, 0x176, 0x000, 0x16E, 0x519, 0x17A, 0x000, 
+	0x16A, 0x518, 0x17D, 0x000, 0x166, 0x518, 0x181, 0x000, 
+	0x162, 0x518, 0x185, 0x000, 0x15F, 0x518, 0x189, 0x000, 
+	0x15B, 0x518, 0x18D, 0x000, 0x157, 0x517, 0x191, 0x000, 
+	0x153, 0x517, 0x195, 0x000, 0x150, 0x517, 0x19A, 0x000, 
+	0x14C, 0x516, 0x19E, 0x000, 0x148, 0x516, 0x1A2, 0x000, 
+	0x145, 0x515, 0x1A6, 0x000, 0x141, 0x514, 0x1AA, 0x000, 
+	0x13E, 0x514, 0x1AE, 0x000, 0x13A, 0x513, 0x1B2, 0x000, 
+	0x137, 0x512, 0x1B7, 0x001, 0x133, 0x511, 0x1BB, 0x001, 
+	0x130, 0x511, 0x1BF, 0x001, 0x12C, 0x510, 0x1C3, 0x001, 
+	0x129, 0x50F, 0x1C8, 0x001, 0x125, 0x50E, 0x1CC, 0x001, 
+	0x122, 0x50D, 0x1D0, 0x001, 0x11E, 0x50C, 0x1D5, 0x001, 
+	0x11B, 0x50B, 0x1D9, 0x001, 0x118, 0x50A, 0x1DD, 0x001, 
+	0x114, 0x508, 0x1E2, 0x001, 0x111, 0x507, 0x1E6, 0x002, 
+	0x10E, 0x506, 0x1EB, 0x002, 0x10B, 0x504, 0x1EF, 0x002, 
+	0x107, 0x503, 0x1F3, 0x002, 0x104, 0x502, 0x1F8, 0x002, 
+	0x101, 0x500, 0x1FC, 0x002, 0x0FE, 0x4FF, 0x201, 0x002, 
+	0x0FB, 0x4FD, 0x205, 0x003, 0x0F8, 0x4FB, 0x20A, 0x003, 
+	0x0F5, 0x4FA, 0x20F, 0x003, 0x0F2, 0x4F8, 0x213, 0x003, 
+	0x0EF, 0x4F6, 0x218, 0x003, 0x0EC, 0x4F5, 0x21C, 0x004, 
+	0x0E9, 0x4F3, 0x221, 0x004, 0x0E6, 0x4F1, 0x226, 0x004, 
+	0x0E3, 0x4EF, 0x22A, 0x004, 0x0E0, 0x4ED, 0x22F, 0x004, 
+	0x0DD, 0x4EB, 0x233, 0x005, 0x0DA, 0x4E9, 0x238, 0x005, 
+	0x0D7, 0x4E7, 0x23D, 0x005, 0x0D4, 0x4E5, 0x241, 0x005, 
+	0x0D2, 0x4E3, 0x246, 0x006, 0x0CF, 0x4E0, 0x24B, 0x006, 
+	0x0CC, 0x4DE, 0x250, 0x006, 0x0C9, 0x4DC, 0x254, 0x006, 
+	0x0C7, 0x4D9, 0x259, 0x007, 0x0C4, 0x4D7, 0x25E, 0x007, 
+	0x0C1, 0x4D5, 0x263, 0x007, 0x0BF, 0x4D2, 0x267, 0x008, 
+	0x0BC, 0x4D0, 0x26C, 0x008, 0x0BA, 0x4CD, 0x271, 0x008, 
+	0x0B7, 0x4CB, 0x276, 0x009, 0x0B4, 0x4C8, 0x27B, 0x009, 
+	0x0B2, 0x4C5, 0x280, 0x009, 0x0AF, 0x4C3, 0x284, 0x00A, 
+	0x0AD, 0x4C0, 0x289, 0x00A, 0x0AB, 0x4BD, 0x28E, 0x00A, 
+	0x0A8, 0x4BA, 0x293, 0x00B, 0x0A6, 0x4B7, 0x298, 0x00B, 
+	0x0A3, 0x4B5, 0x29D, 0x00B, 0x0A1, 0x4B2, 0x2A2, 0x00C, 
+	0x09F, 0x4AF, 0x2A6, 0x00C, 0x09C, 0x4AC, 0x2AB, 0x00D, 
+	0x09A, 0x4A9, 0x2B0, 0x00D, 0x098, 0x4A6, 0x2B5, 0x00E, 
+	0x096, 0x4A2, 0x2BA, 0x00E, 0x093, 0x49F, 0x2BF, 0x00F, 
+	0x091, 0x49C, 0x2C4, 0x00F, 0x08F, 0x499, 0x2C9, 0x00F, 
+	0x08D, 0x496, 0x2CE, 0x010, 0x08B, 0x492, 0x2D3, 0x010, 
+	0x089, 0x48F, 0x2D8, 0x011, 0x086, 0x48C, 0x2DC, 0x011, 
+	0x084, 0x488, 0x2E1, 0x012, 0x082, 0x485, 0x2E6, 0x013, 
+	0x080, 0x481, 0x2EB, 0x013, 0x07E, 0x47E, 0x2F0, 0x014, 
+	0x07C, 0x47A, 0x2F5, 0x014, 0x07A, 0x477, 0x2FA, 0x015, 
+	0x078, 0x473, 0x2FF, 0x015, 0x076, 0x470, 0x304, 0x016, 
+	0x075, 0x46C, 0x309, 0x017, 0x073, 0x468, 0x30E, 0x017, 
+	0x071, 0x465, 0x313, 0x018, 0x06F, 0x461, 0x318, 0x018, 
+	0x06D, 0x45D, 0x31D, 0x019, 0x06B, 0x459, 0x322, 0x01A, 
+	0x06A, 0x455, 0x326, 0x01B, 0x068, 0x452, 0x32B, 0x01B, 
+	0x066, 0x44E, 0x330, 0x01C, 0x064, 0x44A, 0x335, 0x01D, 
+	0x063, 0x446, 0x33A, 0x01D, 0x061, 0x442, 0x33F, 0x01E, 
+	0x05F, 0x43E, 0x344, 0x01F, 0x05E, 0x43A, 0x349, 0x020, 
+	0x05C, 0x436, 0x34E, 0x020, 0x05A, 0x432, 0x353, 0x021, 
+	0x059, 0x42E, 0x357, 0x022, 0x057, 0x42A, 0x35C, 0x023, 
+	0x056, 0x425, 0x361, 0x024, 0x054, 0x421, 0x366, 0x024, 
+	0x053, 0x41D, 0x36B, 0x025, 0x051, 0x419, 0x370, 0x026, 
+	0x050, 0x415, 0x374, 0x027, 0x04E, 0x410, 0x379, 0x028, 
+	0x04D, 0x40C, 0x37E, 0x029, 0x04C, 0x408, 0x383, 0x02A, 
+	0x04A, 0x403, 0x388, 0x02B, 0x049, 0x3FF, 0x38C, 0x02C, 
+	0x047, 0x3FB, 0x391, 0x02D, 0x046, 0x3F6, 0x396, 0x02E, 
+	0x045, 0x3F2, 0x39B, 0x02F, 0x043, 0x3ED, 0x39F, 0x030, 
+	0x042, 0x3E9, 0x3A4, 0x031, 0x041, 0x3E5, 0x3A9, 0x032, 
+	0x040, 0x3E0, 0x3AD, 0x033, 0x03E, 0x3DC, 0x3B2, 0x034, 
+	0x03D, 0x3D7, 0x3B7, 0x035, 0x03C, 0x3D2, 0x3BB, 0x036, 
+	0x03B, 0x3CE, 0x3C0, 0x037, 0x03A, 0x3C9, 0x3C5, 0x038, 
+	0x038, 0x3C5, 0x3C9, 0x03A, 0x037, 0x3C0, 0x3CE, 0x03B, 
+	0x036, 0x3BB, 0x3D2, 0x03C, 0x035, 0x3B7, 0x3D7, 0x03D, 
+	0x034, 0x3B2, 0x3DC, 0x03E, 0x033, 0x3AD, 0x3E0, 0x040, 
+	0x032, 0x3A9, 0x3E5, 0x041, 0x031, 0x3A4, 0x3E9, 0x042, 
+	0x030, 0x39F, 0x3ED, 0x043, 0x02F, 0x39B, 0x3F2, 0x045, 
+	0x02E, 0x396, 0x3F6, 0x046, 0x02D, 0x391, 0x3FB, 0x047, 
+	0x02C, 0x38C, 0x3FF, 0x049, 0x02B, 0x388, 0x403, 0x04A, 
+	0x02A, 0x383, 0x408, 0x04C, 0x029, 0x37E, 0x40C, 0x04D, 
+	0x028, 0x379, 0x410, 0x04E, 0x027, 0x374, 0x415, 0x050, 
+	0x026, 0x370, 0x419, 0x051, 0x025, 0x36B, 0x41D, 0x053, 
+	0x024, 0x366, 0x421, 0x054, 0x024, 0x361, 0x425, 0x056, 
+	0x023, 0x35C, 0x42A, 0x057, 0x022, 0x357, 0x42E, 0x059, 
+	0x021, 0x353, 0x432, 0x05A, 0x020, 0x34E, 0x436, 0x05C, 
+	0x020, 0x349, 0x43A, 0x05E, 0x01F, 0x344, 0x43E, 0x05F, 
+	0x01E, 0x33F, 0x442, 0x061, 0x01D, 0x33A, 0x446, 0x063, 
+	0x01D, 0x335, 0x44A, 0x064, 0x01C, 0x330, 0x44E, 0x066, 
+	0x01B, 0x32B, 0x452, 0x068, 0x01B, 0x326, 0x455, 0x06A, 
+	0x01A, 0x322, 0x459, 0x06B, 0x019, 0x31D, 0x45D, 0x06D, 
+	0x018, 0x318, 0x461, 0x06F, 0x018, 0x313, 0x465, 0x071, 
+	0x017, 0x30E, 0x468, 0x073, 0x017, 0x309, 0x46C, 0x075, 
+	0x016, 0x304, 0x470, 0x076, 0x015, 0x2FF, 0x473, 0x078, 
+	0x015, 0x2FA, 0x477, 0x07A, 0x014, 0x2F5, 0x47A, 0x07C, 
+	0x014, 0x2F0, 0x47E, 0x07E, 0x013, 0x2EB, 0x481, 0x080, 
+	0x013, 0x2E6, 0x485, 0x082, 0x012, 0x2E1, 0x488, 0x084, 
+	0x011, 0x2DC, 0x48C, 0x086, 0x011, 0x2D8, 0x48F, 0x089, 
+	0x010, 0x2D3, 0x492, 0x08B, 0x010, 0x2CE, 0x496, 0x08D, 
+	0x00F, 0x2C9, 0x499, 0x08F, 0x00F, 0x2C4, 0x49C, 0x091, 
+	0x00F, 0x2BF, 0x49F, 0x093, 0x00E, 0x2BA, 0x4A2, 0x096, 
+	0x00E, 0x2B5, 0x4A6, 0x098, 0x00D, 0x2B0, 0x4A9, 0x09A, 
+	0x00D, 0x2AB, 0x4AC, 0x09C, 0x00C, 0x2A6, 0x4AF, 0x09F, 
+	0x00C, 0x2A2, 0x4B2, 0x0A1, 0x00B, 0x29D, 0x4B5, 0x0A3, 
+	0x00B, 0x298, 0x4B7, 0x0A6, 0x00B, 0x293, 0x4BA, 0x0A8, 
+	0x00A, 0x28E, 0x4BD, 0x0AB, 0x00A, 0x289, 0x4C0, 0x0AD, 
+	0x00A, 0x284, 0x4C3, 0x0AF, 0x009, 0x280, 0x4C5, 0x0B2, 
+	0x009, 0x27B, 0x4C8, 0x0B4, 0x009, 0x276, 0x4CB, 0x0B7, 
+	0x008, 0x271, 0x4CD, 0x0BA, 0x008, 0x26C, 0x4D0, 0x0BC, 
+	0x008, 0x267, 0x4D2, 0x0BF, 0x007, 0x263, 0x4D5, 0x0C1, 
+	0x007, 0x25E, 0x4D7, 0x0C4, 0x007, 0x259, 0x4D9, 0x0C7, 
+	0x006, 0x254, 0x4DC, 0x0C9, 0x006, 0x250, 0x4DE, 0x0CC, 
+	0x006, 0x24B, 0x4E0, 0x0CF, 0x006, 0x246, 0x4E3, 0x0D2, 
+	0x005, 0x241, 0x4E5, 0x0D4, 0x005, 0x23D, 0x4E7, 0x0D7, 
+	0x005, 0x238, 0x4E9, 0x0DA, 0x005, 0x233, 0x4EB, 0x0DD, 
+	0x004, 0x22F, 0x4ED, 0x0E0, 0x004, 0x22A, 0x4EF, 0x0E3, 
+	0x004, 0x226, 0x4F1, 0x0E6, 0x004, 0x221, 0x4F3, 0x0E9, 
+	0x004, 0x21C, 0x4F5, 0x0EC, 0x003, 0x218, 0x4F6, 0x0EF, 
+	0x003, 0x213, 0x4F8, 0x0F2, 0x003, 0x20F, 0x4FA, 0x0F5, 
+	0x003, 0x20A, 0x4FB, 0x0F8, 0x003, 0x205, 0x4FD, 0x0FB, 
+	0x002, 0x201, 0x4FF, 0x0FE, 0x002, 0x1FC, 0x500, 0x101, 
+	0x002, 0x1F8, 0x502, 0x104, 0x002, 0x1F3, 0x503, 0x107, 
+	0x002, 0x1EF, 0x504, 0x10B, 0x002, 0x1EB, 0x506, 0x10E, 
+	0x002, 0x1E6, 0x507, 0x111, 0x001, 0x1E2, 0x508, 0x114, 
+	0x001, 0x1DD, 0x50A, 0x118, 0x001, 0x1D9, 0x50B, 0x11B, 
+	0x001, 0x1D5, 0x50C, 0x11E, 0x001, 0x1D0, 0x50D, 0x122, 
+	0x001, 0x1CC, 0x50E, 0x125, 0x001, 0x1C8, 0x50F, 0x129, 
+	0x001, 0x1C3, 0x510, 0x12C, 0x001, 0x1BF, 0x511, 0x130, 
+	0x001, 0x1BB, 0x511, 0x133, 0x001, 0x1B7, 0x512, 0x137, 
+	0x000, 0x1B2, 0x513, 0x13A, 0x000, 0x1AE, 0x514, 0x13E, 
+	0x000, 0x1AA, 0x514, 0x141, 0x000, 0x1A6, 0x515, 0x145, 
+	0x000, 0x1A2, 0x516, 0x148, 0x000, 0x19E, 0x516, 0x14C, 
+	0x000, 0x19A, 0x517, 0x150, 0x000, 0x195, 0x517, 0x153, 
+	0x000, 0x191, 0x517, 0x157, 0x000, 0x18D, 0x518, 0x15B, 
+	0x000, 0x189, 0x518, 0x15F, 0x000, 0x185, 0x518, 0x162, 
+	0x000, 0x181, 0x518, 0x166, 0x000, 0x17D, 0x518, 0x16A, 
+	0x000, 0x17A, 0x519, 0x16E, 0x000, 0x176, 0x519, 0x172};
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/registers.c Added

@@ -0,0 +1,499 @@
+/***************************************************************************
+ registers.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+/* ChangeLog 
+
+ February 8, 2004	-	xodnizel
+ - Fixed setting of reverb volume. Just typecast val("u16") to s16.
+ Also adjusted the normal channel volume to be one less than what it was before when the 
+ "phase invert" bit is set. I'm assuming it's just in two's complement.
+
+ 2003/02/09 - kode54
+ - removed &0x3fff from reverb volume registers, fixes a few games,
+ hopefully won't be breaking anything
+
+ 2003/01/19 - Pete
+ - added Neill's reverb
+
+ 2003/01/06 - Pete
+ - added Neill's ADSR timings
+
+ 2002/05/15 - Pete
+ - generic cleanup for the Peops release
+
+*/
+
+#include "stdafx.h"
+
+#define _IN_REGISTERS
+
+#include "../peops/externals.h"
+#include "../peops/registers.h"
+#include "../peops/regs.h"
+
+static void SoundOn(spu_state_t *spu, int start,int end,u16 val);
+static void SoundOff(spu_state_t *spu, int start,int end,u16 val);
+static void FModOn(spu_state_t *spu, int start,int end,u16 val);
+static void NoiseOn(spu_state_t *spu, int start,int end,u16 val);
+static void SetVolumeLR(spu_state_t *spu, int right, u8 ch,s16 vol);
+static void SetPitch(spu_state_t *spu, int ch,u16 val);
+
+////////////////////////////////////////////////////////////////////////
+// WRITE REGISTERS: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+void SPUwriteRegister(mips_cpu_context *cpu, u32 reg, u16 val)
+{
+ const u32 r=reg&0xfff;
+ cpu->spu->regArea[(r-0xc00)>>1] = val;
+
+// printf("SPUwrite: r %x val %x\n", r, val);
+
+ if(r>=0x0c00 && r<0x0d80) // some channel info?
+ {
+ int ch=(r>>4)-0xc0; // calc channel
+
+ //if(ch==20) printf("%08x: %04x\n",reg,val);
+
+ switch(r&0x0f)
+ {
+ //------------------------------------------------// r volume
+ case 0: 
+ SetVolumeLR(cpu->spu, 0,(u8)ch,val);
+ break;
+ //------------------------------------------------// l volume
+ case 2: 
+ SetVolumeLR(cpu->spu, 1,(u8)ch,val);
+ break;
+ //------------------------------------------------// pitch
+ case 4: 
+ SetPitch(cpu->spu, ch,val);
+ break;
+ //------------------------------------------------// start
+ case 6: 
+ cpu->spu->s_chan[ch].pStart=cpu->spu->spuMemC+((u32) val<<3);
+ break;
+ //------------------------------------------------// level with pre-calcs
+ case 8:
+ {
+ const u32 lval=val; // DEBUG CHECK
+ //---------------------------------------------//
+ cpu->spu->s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; 
+ cpu->spu->s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;
+ cpu->spu->s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;
+ cpu->spu->s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;
+ //---------------------------------------------//
+ }
+ break;
+ //------------------------------------------------// adsr times with pre-calcs
+ case 10:
+ {
+ const u32 lval=val; // DEBUG CHECK
+
+ //----------------------------------------------//
+ cpu->spu->s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;
+ cpu->spu->s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;
+ cpu->spu->s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;
+ cpu->spu->s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;
+ cpu->spu->s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;
+ //----------------------------------------------//
+ }
+ break;
+ //------------------------------------------------// adsr volume... mmm have to investigate this
+ //case 0xC:
+ // break;
+ //------------------------------------------------//
+ case 0xE: // loop?
+ cpu->spu->s_chan[ch].pLoop=cpu->spu->spuMemC+((u32) val<<3);
+ cpu->spu->s_chan[ch].bIgnoreLoop=1;
+ break;
+ //------------------------------------------------//
+ }
+ return;
+ }
+
+ switch(r)
+ {
+ //-------------------------------------------------//
+ case H_SPUaddr:
+ cpu->spu->spuAddr = (u32) val<<3;
+ break;
+ //-------------------------------------------------//
+ case H_SPUdata:
+ cpu->spu->spuMem[cpu->spu->spuAddr>>1] = BFLIP16(val);
+ cpu->spu->spuAddr+=2;
+ if(cpu->spu->spuAddr>0x7ffff) cpu->spu->spuAddr=0;
+ break;
+ //-------------------------------------------------//
+ case H_SPUctrl:
+ cpu->spu->spuCtrl=val;
+ break;
+ //-------------------------------------------------//
+ case H_SPUstat:
+ cpu->spu->spuStat=val & 0xf800;
+ break;
+ //-------------------------------------------------//
+ case H_SPUReverbAddr:
+ if(val==0xFFFF || val<=0x200)
+ {cpu->spu->rvb.StartAddr=cpu->spu->rvb.CurrAddr=0;}
+ else
+ {
+ const s32 iv=(u32)val<<2;
+ if(cpu->spu->rvb.StartAddr!=iv)
+ {
+ cpu->spu->rvb.StartAddr=(u32)val<<2;
+ cpu->spu->rvb.CurrAddr=cpu->spu->rvb.StartAddr;
+ }
+ }
+ break;
+ //-------------------------------------------------//
+ case H_SPUirqAddr:
+ cpu->spu->spuIrq = val;
+ cpu->spu->pSpuIrq=cpu->spu->spuMemC+((u32) val<<3);
+ break;
+ //-------------------------------------------------//
+ /* Volume settings appear to be at least 15-bit unsigned in this case. 
+ Definitely NOT 15-bit signed. Probably 16-bit signed, so s16 type cast.
+ Check out "Chrono Cross: Shadow's End Forest"
+ */
+ case H_SPUrvolL:
+ cpu->spu->rvb.VolLeft=(s16)val;
+ //printf("%d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUrvolR:
+ cpu->spu->rvb.VolRight=(s16)val;
+ //printf("%d\n",val);
+ break;
+ //-------------------------------------------------//
+
+/*
+ case H_ExtLeft:
+ //auxprintf("EL %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_ExtRight:
+ //auxprintf("ER %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolL:
+ //auxprintf("ML %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolR:
+ //auxprintf("MR %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute1:
+ //printf("M0 %04x\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute2:
+ // printf("M1 %04x\n",val);
+ break;
+*/
+ //-------------------------------------------------//
+ case H_SPUon1:
+ SoundOn(cpu->spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUon2:
+	// printf("Boop: %08x: %04x\n",reg,val);
+ SoundOn(cpu->spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff1:
+ SoundOff(cpu->spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff2:
+ SoundOff(cpu->spu, 16,24,val);
+	// printf("Boop: %08x: %04x\n",reg,val);
+ break;
+ //-------------------------------------------------//
+ case H_FMod1:
+ FModOn(cpu->spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_FMod2:
+ FModOn(cpu->spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise1:
+ NoiseOn(cpu->spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise2:
+ NoiseOn(cpu->spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_RVBon1:
+ cpu->spu->rvb.Enabled&=~0xFFFF;
+ cpu->spu->rvb.Enabled|=val;
+ break;
+
+ //-------------------------------------------------//
+ case H_RVBon2:
+ cpu->spu->rvb.Enabled&=0xFFFF;
+ cpu->spu->rvb.Enabled|=val<<16;
+ break;
+
+ //-------------------------------------------------//
+ case H_Reverb+0:
+ cpu->spu->rvb.FB_SRC_A=val;
+ break;
+
+ case H_Reverb+2 : cpu->spu->rvb.FB_SRC_B=(s16)val; break;
+ case H_Reverb+4 : cpu->spu->rvb.IIR_ALPHA=(s16)val; break;
+ case H_Reverb+6 : cpu->spu->rvb.ACC_COEF_A=(s16)val; break;
+ case H_Reverb+8 : cpu->spu->rvb.ACC_COEF_B=(s16)val; break;
+ case H_Reverb+10 : cpu->spu->rvb.ACC_COEF_C=(s16)val; break;
+ case H_Reverb+12 : cpu->spu->rvb.ACC_COEF_D=(s16)val; break;
+ case H_Reverb+14 : cpu->spu->rvb.IIR_COEF=(s16)val; break;
+ case H_Reverb+16 : cpu->spu->rvb.FB_ALPHA=(s16)val; break;
+ case H_Reverb+18 : cpu->spu->rvb.FB_X=(s16)val; break;
+ case H_Reverb+20 : cpu->spu->rvb.IIR_DEST_A0=(s16)val; break;
+ case H_Reverb+22 : cpu->spu->rvb.IIR_DEST_A1=(s16)val; break;
+ case H_Reverb+24 : cpu->spu->rvb.ACC_SRC_A0=(s16)val; break;
+ case H_Reverb+26 : cpu->spu->rvb.ACC_SRC_A1=(s16)val; break;
+ case H_Reverb+28 : cpu->spu->rvb.ACC_SRC_B0=(s16)val; break;
+ case H_Reverb+30 : cpu->spu->rvb.ACC_SRC_B1=(s16)val; break;
+ case H_Reverb+32 : cpu->spu->rvb.IIR_SRC_A0=(s16)val; break;
+ case H_Reverb+34 : cpu->spu->rvb.IIR_SRC_A1=(s16)val; break;
+ case H_Reverb+36 : cpu->spu->rvb.IIR_DEST_B0=(s16)val; break;
+ case H_Reverb+38 : cpu->spu->rvb.IIR_DEST_B1=(s16)val; break;
+ case H_Reverb+40 : cpu->spu->rvb.ACC_SRC_C0=(s16)val; break;
+ case H_Reverb+42 : cpu->spu->rvb.ACC_SRC_C1=(s16)val; break;
+ case H_Reverb+44 : cpu->spu->rvb.ACC_SRC_D0=(s16)val; break;
+ case H_Reverb+46 : cpu->spu->rvb.ACC_SRC_D1=(s16)val; break;
+ case H_Reverb+48 : cpu->spu->rvb.IIR_SRC_B1=(s16)val; break;
+ case H_Reverb+50 : cpu->spu->rvb.IIR_SRC_B0=(s16)val; break;
+ case H_Reverb+52 : cpu->spu->rvb.MIX_DEST_A0=(s16)val; break;
+ case H_Reverb+54 : cpu->spu->rvb.MIX_DEST_A1=(s16)val; break;
+ case H_Reverb+56 : cpu->spu->rvb.MIX_DEST_B0=(s16)val; break;
+ case H_Reverb+58 : cpu->spu->rvb.MIX_DEST_B1=(s16)val; break;
+ case H_Reverb+60 : cpu->spu->rvb.IN_COEF_L=(s16)val; break;
+ case H_Reverb+62 : cpu->spu->rvb.IN_COEF_R=(s16)val; break;
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////
+// READ REGISTER: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+u16 SPUreadRegister(mips_cpu_context *cpu, u32 reg)
+{
+ const u32 r=reg&0xfff;
+
+ if(r>=0x0c00 && r<0x0d80)
+ {
+ switch(r&0x0f)
+ {
+ case 0xC: // get adsr vol
+ {
+ const int ch=(r>>4)-0xc0;
+ if(cpu->spu->s_chan[ch].bNew) return 1; // we are started, but not processed? return 1
+ if(cpu->spu->s_chan[ch].ADSRX.lVolume && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+ !cpu->spu->s_chan[ch].ADSRX.EnvelopeVol) 
+ return 1;
+ return (u16)(cpu->spu->s_chan[ch].ADSRX.EnvelopeVol>>16);
+ }
+
+ case 0xE: // get loop address
+ {
+ const int ch=(r>>4)-0xc0;
+ if(cpu->spu->s_chan[ch].pLoop==NULL) return 0;
+ return (u16)((cpu->spu->s_chan[ch].pLoop-cpu->spu->spuMemC)>>3);
+ }
+ }
+ }
+
+ switch(r)
+ {
+ case H_SPUctrl:
+ return cpu->spu->spuCtrl;
+
+ case H_SPUstat:
+ return cpu->spu->spuStat;
+ 
+ case H_SPUaddr:
+ return (u16)(cpu->spu->spuAddr>>3);
+
+ case H_SPUdata:
+ {
+ u16 s=BFLIP16(cpu->spu->spuMem[cpu->spu->spuAddr>>1]);
+ cpu->spu->spuAddr+=2;
+ if(cpu->spu->spuAddr>0x7ffff) cpu->spu->spuAddr=0;
+ return s;
+ }
+
+ case H_SPUirqAddr:
+ return cpu->spu->spuIrq;
+
+ //case H_SPUIsOn1:
+ // return IsSoundOn(0,16);
+
+ //case H_SPUIsOn2:
+ // return IsSoundOn(16,24);
+ 
+ }
+
+ return cpu->spu->regArea[(r-0xc00)>>1];
+}
+ 
+////////////////////////////////////////////////////////////////////////
+// SOUND ON register write
+////////////////////////////////////////////////////////////////////////
+
+static void SoundOn(spu_state_t *spu, int start,int end,u16 val) // SOUND ON PSX COMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if((val&1) && spu->s_chan[ch].pStart) // mmm... start has to be set before key on !?!
+ {
+ spu->s_chan[ch].bIgnoreLoop=0;
+ spu->s_chan[ch].bNew=1;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// SOUND OFF register write
+////////////////////////////////////////////////////////////////////////
+
+static void SoundOff(spu_state_t *spu, int start,int end,u16 val) // SOUND OFF PSX COMMAND
+{
+ int ch;
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // && cpu->spu->s_chan[i].bOn) mmm...
+ {
+ spu->s_chan[ch].bStop=1;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// FMOD register write
+////////////////////////////////////////////////////////////////////////
+
+static void FModOn(spu_state_t *spu, int start,int end,u16 val) // FMOD ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> fmod on/off
+ {
+ if(ch>0) 
+ {
+ spu->s_chan[ch].bFMod=1; // --> sound channel
+ spu->s_chan[ch-1].bFMod=2; // --> freq channel
+ }
+ }
+ else
+ {
+ spu->s_chan[ch].bFMod=0; // --> turn off fmod
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// NOISE register write
+////////////////////////////////////////////////////////////////////////
+
+static void NoiseOn(spu_state_t *spu, int start,int end,u16 val) // NOISE ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> noise on/off
+ {
+ spu->s_chan[ch].bNoise=1;
+ }
+ else 
+ {
+ spu->s_chan[ch].bNoise=0;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// LEFT VOLUME register write
+////////////////////////////////////////////////////////////////////////
+
+// please note: sweep is wrong.
+
+static void SetVolumeLR(spu_state_t *spu, int right, u8 ch,s16 vol) // LEFT VOLUME
+{
+ //if(vol&0xc000)
+ //printf("%d %08x\n",right,vol);
+ if(right)
+ spu->s_chan[ch].iRightVolRaw=vol;
+ else
+ spu->s_chan[ch].iLeftVolRaw=vol;
+
+ if(vol&0x8000) // sweep?
+ {
+ s16 sInc=1; // -> sweep up?
+ if(vol&0x2000) sInc=-1; // -> or down?
+ if(vol&0x1000) vol^=0xffff; // -> mmm... phase inverted? have to investigate this
+ vol=((vol&0x7f)+1)/2; // -> sweep: 0..127 -> 0..64
+ vol+=vol/(2*sInc); // -> HACK: we don't sweep right now, so we just raise/lower the volume by the half!
+ vol*=128;
+ vol&=0x3fff;
+ //puts("Sweep");
+ }
+ else // no sweep:
+ {
+ if(vol&0x4000)
+ vol=(vol&0x3FFF)-0x4000;
+ else
+ vol&=0x3FFF;
+
+ //if(vol&0x4000) // -> mmm... phase inverted? have to investigate this
+ // vol=0-(0x3fff-(vol&0x3fff));
+ //else
+ // vol&=0x3fff;
+ }
+ if(right)
+ spu->s_chan[ch].iRightVolume=vol;
+ else
+ spu->s_chan[ch].iLeftVolume=vol; // store volume
+}
+
+////////////////////////////////////////////////////////////////////////
+// PITCH register write
+////////////////////////////////////////////////////////////////////////
+
+static void SetPitch(spu_state_t *spu, int ch,u16 val) // SET PITCH
+{
+ int NP;
+ if(val>0x3fff) NP=0x3fff; // get pitch val
+ else NP=val;
+
+ spu->s_chan[ch].iRawPitch=NP;
+
+ NP=(44100L*NP)/4096L; // calc frequency
+ if(NP<1) NP=1; // some security
+ spu->s_chan[ch].iActFreq=NP; // store frequency
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/registers.h Added

@@ -0,0 +1,153 @@
+/***************************************************************************
+                         registers.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define H_SPUReverbAddr  0x0da2
+#define H_SPUirqAddr     0x0da4
+#define H_SPUaddr        0x0da6
+#define H_SPUdata        0x0da8
+#define H_SPUctrl        0x0daa
+#define H_SPUstat        0x0dae
+#define H_SPUmvolL       0x0d80
+#define H_SPUmvolR       0x0d82
+#define H_SPUrvolL       0x0d84
+#define H_SPUrvolR       0x0d86
+#define H_SPUon1         0x0d88
+#define H_SPUon2         0x0d8a
+#define H_SPUoff1        0x0d8c
+#define H_SPUoff2        0x0d8e
+#define H_FMod1          0x0d90
+#define H_FMod2          0x0d92
+#define H_Noise1         0x0d94
+#define H_Noise2         0x0d96
+#define H_RVBon1         0x0d98
+#define H_RVBon2         0x0d9a
+#define H_SPUMute1       0x0d9c
+#define H_SPUMute2       0x0d9e
+#define H_CDLeft         0x0db0
+#define H_CDRight        0x0db2
+#define H_ExtLeft        0x0db4
+#define H_ExtRight       0x0db6
+#define H_Reverb         0x0dc0
+#define H_SPUPitch0      0x0c04
+#define H_SPUPitch1      0x0c14
+#define H_SPUPitch2      0x0c24
+#define H_SPUPitch3      0x0c34
+#define H_SPUPitch4      0x0c44
+#define H_SPUPitch5      0x0c54
+#define H_SPUPitch6      0x0c64
+#define H_SPUPitch7      0x0c74
+#define H_SPUPitch8      0x0c84
+#define H_SPUPitch9      0x0c94
+#define H_SPUPitch10     0x0ca4
+#define H_SPUPitch11     0x0cb4
+#define H_SPUPitch12     0x0cc4
+#define H_SPUPitch13     0x0cd4
+#define H_SPUPitch14     0x0ce4
+#define H_SPUPitch15     0x0cf4
+#define H_SPUPitch16     0x0d04
+#define H_SPUPitch17     0x0d14
+#define H_SPUPitch18     0x0d24
+#define H_SPUPitch19     0x0d34
+#define H_SPUPitch20     0x0d44
+#define H_SPUPitch21     0x0d54
+#define H_SPUPitch22     0x0d64
+#define H_SPUPitch23     0x0d74
+
+#define H_SPUStartAdr0   0x0c06
+#define H_SPUStartAdr1   0x0c16
+#define H_SPUStartAdr2   0x0c26
+#define H_SPUStartAdr3   0x0c36
+#define H_SPUStartAdr4   0x0c46
+#define H_SPUStartAdr5   0x0c56
+#define H_SPUStartAdr6   0x0c66
+#define H_SPUStartAdr7   0x0c76
+#define H_SPUStartAdr8   0x0c86
+#define H_SPUStartAdr9   0x0c96
+#define H_SPUStartAdr10  0x0ca6
+#define H_SPUStartAdr11  0x0cb6
+#define H_SPUStartAdr12  0x0cc6
+#define H_SPUStartAdr13  0x0cd6
+#define H_SPUStartAdr14  0x0ce6
+#define H_SPUStartAdr15  0x0cf6
+#define H_SPUStartAdr16  0x0d06
+#define H_SPUStartAdr17  0x0d16
+#define H_SPUStartAdr18  0x0d26
+#define H_SPUStartAdr19  0x0d36
+#define H_SPUStartAdr20  0x0d46
+#define H_SPUStartAdr21  0x0d56
+#define H_SPUStartAdr22  0x0d66
+#define H_SPUStartAdr23  0x0d76
+
+#define H_SPULoopAdr0   0x0c0e
+#define H_SPULoopAdr1   0x0c1e
+#define H_SPULoopAdr2   0x0c2e
+#define H_SPULoopAdr3   0x0c3e
+#define H_SPULoopAdr4   0x0c4e
+#define H_SPULoopAdr5   0x0c5e
+#define H_SPULoopAdr6   0x0c6e
+#define H_SPULoopAdr7   0x0c7e
+#define H_SPULoopAdr8   0x0c8e
+#define H_SPULoopAdr9   0x0c9e
+#define H_SPULoopAdr10  0x0cae
+#define H_SPULoopAdr11  0x0cbe
+#define H_SPULoopAdr12  0x0cce
+#define H_SPULoopAdr13  0x0cde
+#define H_SPULoopAdr14  0x0cee
+#define H_SPULoopAdr15  0x0cfe
+#define H_SPULoopAdr16  0x0d0e
+#define H_SPULoopAdr17  0x0d1e
+#define H_SPULoopAdr18  0x0d2e
+#define H_SPULoopAdr19  0x0d3e
+#define H_SPULoopAdr20  0x0d4e
+#define H_SPULoopAdr21  0x0d5e
+#define H_SPULoopAdr22  0x0d6e
+#define H_SPULoopAdr23  0x0d7e
+
+#define H_SPU_ADSRLevel0   0x0c08
+#define H_SPU_ADSRLevel1   0x0c18
+#define H_SPU_ADSRLevel2   0x0c28
+#define H_SPU_ADSRLevel3   0x0c38
+#define H_SPU_ADSRLevel4   0x0c48
+#define H_SPU_ADSRLevel5   0x0c58
+#define H_SPU_ADSRLevel6   0x0c68
+#define H_SPU_ADSRLevel7   0x0c78
+#define H_SPU_ADSRLevel8   0x0c88
+#define H_SPU_ADSRLevel9   0x0c98
+#define H_SPU_ADSRLevel10  0x0ca8
+#define H_SPU_ADSRLevel11  0x0cb8
+#define H_SPU_ADSRLevel12  0x0cc8
+#define H_SPU_ADSRLevel13  0x0cd8
+#define H_SPU_ADSRLevel14  0x0ce8
+#define H_SPU_ADSRLevel15  0x0cf8
+#define H_SPU_ADSRLevel16  0x0d08
+#define H_SPU_ADSRLevel17  0x0d18
+#define H_SPU_ADSRLevel18  0x0d28
+#define H_SPU_ADSRLevel19  0x0d38
+#define H_SPU_ADSRLevel20  0x0d48
+#define H_SPU_ADSRLevel21  0x0d58
+#define H_SPU_ADSRLevel22  0x0d68
+#define H_SPU_ADSRLevel23  0x0d78
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/regs.h Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                           regs.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "../psx.h"
+
+void SPUwriteRegister(mips_cpu_context *cpu, u32 reg, u16 val);

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/reverb.c Added

@@ -0,0 +1,383 @@
+/***************************************************************************
+ reverb.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2003/03/17 - xodnizel
+// - Implemented Neill's 44.1Khz-22050Hz downsampling data
+// I also need to check if the ~4 sample delay doesn't screw any sounds
+// up by making things too out of phase. It could be fixed easily(elsewhere).
+//
+// 2003/01/19 - Pete
+// - added Neill's reverb (see at the end of file)
+//
+// 2002/12/26 - Pete
+// - adjusted reverb handling
+//
+// 2002/08/14 - Pete
+// - added extra reverb
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define _IN_REVERB
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+
+// REVERB info and timing vars...
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE s64 g_buffer(spu_state_t *spu, int iOff) // get_buffer content helper: takes care about wraps
+{
+ s16 * p=(s16 *)spu->spuMem;
+ iOff=(iOff*4)+spu->rvb.CurrAddr;
+ while(iOff>0x3FFFF) iOff=spu->rvb.StartAddr+(iOff-0x40000);
+ while(iOff<spu->rvb.StartAddr) iOff=0x3ffff-(spu->rvb.StartAddr-iOff);
+ return (int)(s16)BFLIP16(*(p+iOff));
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer(spu_state_t *spu, int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
+{
+ s16 * p=(s16 *)spu->spuMem;
+ iOff=(iOff*4)+spu->rvb.CurrAddr;
+ while(iOff>0x3FFFF) iOff=spu->rvb.StartAddr+(iOff-0x40000);
+ while(iOff<spu->rvb.StartAddr) iOff=0x3ffff-(spu->rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;
+ if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(s16)BFLIP16((s16)iVal);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void s_buffer1(spu_state_t *spu, int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+{
+ s16 * p=(s16 *)spu->spuMem;
+ iOff=(iOff*4)+spu->rvb.CurrAddr+1;
+ while(iOff>0x3FFFF) iOff=spu->rvb.StartAddr+(iOff-0x40000);
+ while(iOff<spu->rvb.StartAddr) iOff=0x3ffff-(spu->rvb.StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(s16)BFLIP16((s16)iVal);
+}
+
+static INLINE void MixREVERBLeftRight(spu_state_t *spu, s32 *oleft, s32 *oright, s32 inleft, s32 inright)
+{
+ static s32 downbuf[2][8];
+ static s32 upbuf[2][8];
+ static int dbpos=0,ubpos=0;
+ static s32 downcoeffs[8]={ /* Symmetry is sexy. */
+				1283,5344,10895,15243,
+				15243,10895,5344,1283
+			 };
+ int x;
+
+ if(!spu->rvb.StartAddr) // reverb is off
+ {
+ spu->rvb.iRVBLeft=spu->rvb.iRVBRight=0;
+ return;
+ }
+
+ //if(inleft<-32767 || inleft>32767) printf("%d\n",inleft);
+ //if(inright<-32767 || inright>32767) printf("%d\n",inright);
+ downbuf[0][dbpos]=inleft;
+ downbuf[1][dbpos]=inright;
+ dbpos=(dbpos+1)&7;
+
+ if(dbpos&1) // we work on every second left value: downsample to 22 khz
+ {
+ if(spu->spuCtrl&0x80) // -> reverb on? oki
+ {
+ int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
+ s32 INPUT_SAMPLE_L=0; 
+ s32 INPUT_SAMPLE_R=0;
+
+ for(x=0;x<8;x++)
+ {
+ INPUT_SAMPLE_L+=(downbuf[0][(dbpos+x)&7]*downcoeffs[x])>>8; /* Lose insignificant
+							 digits to prevent
+							 overflow(check this) */
+ INPUT_SAMPLE_R+=(downbuf[1][(dbpos+x)&7]*downcoeffs[x])>>8;
+ }
+
+ INPUT_SAMPLE_L>>=(16-8);
+ INPUT_SAMPLE_R>>=(16-8);
+ {
+ const s64 IIR_INPUT_A0 = ((g_buffer(spu, spu->rvb.IIR_SRC_A0) * spu->rvb.IIR_COEF)>>15) + ((INPUT_SAMPLE_L * spu->rvb.IN_COEF_L)>>15);
+ const s64 IIR_INPUT_A1 = ((g_buffer(spu, spu->rvb.IIR_SRC_A1) * spu->rvb.IIR_COEF)>>15) + ((INPUT_SAMPLE_R * spu->rvb.IN_COEF_R)>>15);
+ const s64 IIR_INPUT_B0 = ((g_buffer(spu, spu->rvb.IIR_SRC_B0) * spu->rvb.IIR_COEF)>>15) + ((INPUT_SAMPLE_L * spu->rvb.IN_COEF_L)>>15);
+ const s64 IIR_INPUT_B1 = ((g_buffer(spu, spu->rvb.IIR_SRC_B1) * spu->rvb.IIR_COEF)>>15) + ((INPUT_SAMPLE_R * spu->rvb.IN_COEF_R)>>15);
+ const s64 IIR_A0 = ((IIR_INPUT_A0 * spu->rvb.IIR_ALPHA)>>15) + ((g_buffer(spu, spu->rvb.IIR_DEST_A0) * (32768L - spu->rvb.IIR_ALPHA))>>15);
+ const s64 IIR_A1 = ((IIR_INPUT_A1 * spu->rvb.IIR_ALPHA)>>15) + ((g_buffer(spu, spu->rvb.IIR_DEST_A1) * (32768L - spu->rvb.IIR_ALPHA))>>15);
+ const s64 IIR_B0 = ((IIR_INPUT_B0 * spu->rvb.IIR_ALPHA)>>15) + ((g_buffer(spu, spu->rvb.IIR_DEST_B0) * (32768L - spu->rvb.IIR_ALPHA))>>15);
+ const s64 IIR_B1 = ((IIR_INPUT_B1 * spu->rvb.IIR_ALPHA)>>15) + ((g_buffer(spu, spu->rvb.IIR_DEST_B1) * (32768L - spu->rvb.IIR_ALPHA))>>15);
+
+ s_buffer1(spu, spu->rvb.IIR_DEST_A0, IIR_A0);
+ s_buffer1(spu, spu->rvb.IIR_DEST_A1, IIR_A1);
+ s_buffer1(spu, spu->rvb.IIR_DEST_B0, IIR_B0);
+ s_buffer1(spu, spu->rvb.IIR_DEST_B1, IIR_B1);
+ 
+ ACC0 = ((g_buffer(spu, spu->rvb.ACC_SRC_A0) * spu->rvb.ACC_COEF_A)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_B0) * spu->rvb.ACC_COEF_B)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_C0) * spu->rvb.ACC_COEF_C)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_D0) * spu->rvb.ACC_COEF_D)>>15);
+ ACC1 = ((g_buffer(spu, spu->rvb.ACC_SRC_A1) * spu->rvb.ACC_COEF_A)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_B1) * spu->rvb.ACC_COEF_B)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_C1) * spu->rvb.ACC_COEF_C)>>15) +
+ ((g_buffer(spu, spu->rvb.ACC_SRC_D1) * spu->rvb.ACC_COEF_D)>>15);
+
+ FB_A0 = g_buffer(spu, spu->rvb.MIX_DEST_A0 - spu->rvb.FB_SRC_A);
+ FB_A1 = g_buffer(spu, spu->rvb.MIX_DEST_A1 - spu->rvb.FB_SRC_A);
+ FB_B0 = g_buffer(spu, spu->rvb.MIX_DEST_B0 - spu->rvb.FB_SRC_B);
+ FB_B1 = g_buffer(spu, spu->rvb.MIX_DEST_B1 - spu->rvb.FB_SRC_B);
+
+ s_buffer(spu, spu->rvb.MIX_DEST_A0, ACC0 - ((FB_A0 * spu->rvb.FB_ALPHA)>>15));
+ s_buffer(spu, spu->rvb.MIX_DEST_A1, ACC1 - ((FB_A1 * spu->rvb.FB_ALPHA)>>15));
+ 
+ s_buffer(spu, spu->rvb.MIX_DEST_B0, ((spu->rvb.FB_ALPHA * ACC0)>>15) - ((FB_A0 * (int)(spu->rvb.FB_ALPHA^0xFFFF8000))>>15) - ((FB_B0 * spu->rvb.FB_X)>>15));
+ s_buffer(spu, spu->rvb.MIX_DEST_B1, ((spu->rvb.FB_ALPHA * ACC1)>>15) - ((FB_A1 * (int)(spu->rvb.FB_ALPHA^0xFFFF8000))>>15) - ((FB_B1 * spu->rvb.FB_X)>>15));
+ 
+ spu->rvb.iRVBLeft = (g_buffer(spu, spu->rvb.MIX_DEST_A0)+g_buffer(spu, spu->rvb.MIX_DEST_B0))/3;
+ spu->rvb.iRVBRight = (g_buffer(spu, spu->rvb.MIX_DEST_A1)+g_buffer(spu, spu->rvb.MIX_DEST_B1))/3;
+
+ spu->rvb.iRVBLeft = ((s64)spu->rvb.iRVBLeft * spu->rvb.VolLeft) >> 14;
+ spu->rvb.iRVBRight = ((s64)spu->rvb.iRVBRight * spu->rvb.VolRight) >> 14;
+
+ upbuf[0][ubpos]=spu->rvb.iRVBLeft;
+ upbuf[1][ubpos]=spu->rvb.iRVBRight;
+ ubpos=(ubpos+1)&7;
+ } // Bracket hack(et).
+ }
+ else // -> reverb off
+ {
+ spu->rvb.iRVBLeft=spu->rvb.iRVBRight=0;
+ return;
+ }
+ spu->rvb.CurrAddr++;
+ if(spu->rvb.CurrAddr>0x3ffff) spu->rvb.CurrAddr=spu->rvb.StartAddr;
+ }
+ else
+ {
+ upbuf[0][ubpos]=0;
+ upbuf[1][ubpos]=0;
+ ubpos=(ubpos+1)&7;
+ }
+ {
+ s32 retl=0,retr=0;
+ for(x=0;x<8;x++)
+ {
+ retl+=(upbuf[0][(ubpos+x)&7]*downcoeffs[x])>>8;
+ retr+=(upbuf[1][(ubpos+x)&7]*downcoeffs[x])>>8;
+ }
+ retl>>=(16-8-1); /* -1 To adjust for the null padding. */
+ retr>>=(16-8-1);
+
+ *oleft+=retl;
+ *oright+=retr;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
+
+/*
+-----------------------------------------------------------------------------
+PSX reverb hardware notes
+by Neill Corlett
+-----------------------------------------------------------------------------
+
+Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway
+yadda yadda.
+
+-----------------------------------------------------------------------------
+
+Basics
+------
+
+- The reverb buffer is 22khz 16-bit mono PCM.
+- It starts at the reverb address given by 1DA2, extends to
+ the end of sound RAM, and wraps back to the 1DA2 address.
+
+Setting the address at 1DA2 resets the current reverb work address.
+
+This work address ALWAYS increments every 1/22050 sec., regardless of
+whether reverb is enabled (bit 7 of 1DAA set).
+
+And the contents of the reverb buffer ALWAYS play, scaled by the
+"reverberation depth left/right" volumes (1D84/1D86).
+(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)
+
+-----------------------------------------------------------------------------
+
+Register names
+--------------
+
+These are probably not their real names.
+These are probably not even correct names.
+We will use them anyway, because we can.
+
+1DC0: FB_SRC_A (offset)
+1DC2: FB_SRC_B (offset)
+1DC4: IIR_ALPHA (coef.)
+1DC6: ACC_COEF_A (coef.)
+1DC8: ACC_COEF_B (coef.)
+1DCA: ACC_COEF_C (coef.)
+1DCC: ACC_COEF_D (coef.)
+1DCE: IIR_COEF (coef.)
+1DD0: FB_ALPHA (coef.)
+1DD2: FB_X (coef.)
+1DD4: IIR_DEST_A0 (offset)
+1DD6: IIR_DEST_A1 (offset)
+1DD8: ACC_SRC_A0 (offset)
+1DDA: ACC_SRC_A1 (offset)
+1DDC: ACC_SRC_B0 (offset)
+1DDE: ACC_SRC_B1 (offset)
+1DE0: IIR_SRC_A0 (offset)
+1DE2: IIR_SRC_A1 (offset)
+1DE4: IIR_DEST_B0 (offset)
+1DE6: IIR_DEST_B1 (offset)
+1DE8: ACC_SRC_C0 (offset)
+1DEA: ACC_SRC_C1 (offset)
+1DEC: ACC_SRC_D0 (offset)
+1DEE: ACC_SRC_D1 (offset)
+1DF0: IIR_SRC_B1 (offset)
+1DF2: IIR_SRC_B0 (offset)
+1DF4: MIX_DEST_A0 (offset)
+1DF6: MIX_DEST_A1 (offset)
+1DF8: MIX_DEST_B0 (offset)
+1DFA: MIX_DEST_B1 (offset)
+1DFC: IN_COEF_L (coef.)
+1DFE: IN_COEF_R (coef.)
+
+The coefficients are signed fractional values.
+-32768 would be -1.0
+ 32768 would be 1.0 (if it were possible... the highest is of course 32767)
+
+The offsets are (byte/8) offsets into the reverb buffer.
+i.e. you multiply them by 8, you get byte offsets.
+You can also think of them as (samples/4) offsets.
+They appear to be signed. They can be negative.
+None of the documented presets make them negative, though.
+
+Yes, 1DF0 and 1DF2 appear to be backwards. Not a typo.
+
+-----------------------------------------------------------------------------
+
+What it does
+------------
+
+We take all reverb sources:
+- regular channels that have the reverb bit on
+- cd and external sources, if their reverb bits are on
+and mix them into one stereo 44100hz signal.
+
+Lowpass/downsample that to 22050hz. The PSX uses a proper bandlimiting
+algorithm here, but I haven't figured out the hysterically exact specifics.
+I use an 8-tap filter with these coefficients, which are nice but probably
+not the real ones:
+
+0.037828187894
+0.157538631280
+0.321159685278
+0.449322115345
+0.449322115345
+0.321159685278
+0.157538631280
+0.037828187894
+
+So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.
+
+* IN MY EMULATION, I divide these by 2 to make it clip less.
+ (and of course the L/R output coefficients are adjusted to compensate)
+ The real thing appears to not do this.
+
+At every 22050hz tick:
+- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb
+ steady-state algorithm described below
+- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer
+ (This part may not be exactly right and I guessed at the coefs. TODO: check later.)
+ L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])
+ R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])
+- Advance the current buffer position by 1 sample
+
+The wet out L and R are then upsampled to 44100hz and played at the
+"reverberation depth left/right" (1D84/1D86) volume, independent of the main
+volume.
+
+-----------------------------------------------------------------------------
+
+Reverb steady-state
+-------------------
+
+The reverb steady-state algorithm is fairly clever, and of course by
+"clever" I mean "batshit insane".
+
+buffer[x] is relative to the current buffer position, not the beginning of
+the buffer. Note that all buffer offsets must wrap around so they're
+contained within the reverb work area.
+
+Clipping is performed at the end... maybe also sooner, but definitely at
+the end.
+
+IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+
+IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);
+IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);
+IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);
+IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);
+
+buffer[IIR_DEST_A0 + 1sample] = IIR_A0;
+buffer[IIR_DEST_A1 + 1sample] = IIR_A1;
+buffer[IIR_DEST_B0 + 1sample] = IIR_B0;
+buffer[IIR_DEST_B1 + 1sample] = IIR_B1;
+
+ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +
+ buffer[ACC_SRC_B0] * ACC_COEF_B +
+ buffer[ACC_SRC_C0] * ACC_COEF_C +
+ buffer[ACC_SRC_D0] * ACC_COEF_D;
+ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +
+ buffer[ACC_SRC_B1] * ACC_COEF_B +
+ buffer[ACC_SRC_C1] * ACC_COEF_C +
+ buffer[ACC_SRC_D1] * ACC_COEF_D;
+
+FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];
+FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];
+FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];
+FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];
+
+buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;
+buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;
+buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;
+buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;
+
+-----------------------------------------------------------------------------
+*/
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/spu.c Added

@@ -0,0 +1,628 @@
+/***************************************************************************
+ spu.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+ 
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+ 
+//*************************************************************************//
+// History of changes:
+//
+// 2003/03/01 - linuzappz
+// - libraryName changes using ALSA
+//
+// 2003/02/28 - Pete
+// - added option for type of interpolation
+// - adjusted spu irqs again (Thousant Arms, Valkyrie Profile)
+// - added MONO support for MSWindows DirectSound
+//
+// 2003/02/20 - kode54
+// - amended interpolation code, goto GOON could skip initialization of gpos and cause segfault
+//
+// 2003/02/19 - kode54
+// - moved SPU IRQ handler and changed sample flag processing
+//
+// 2003/02/18 - kode54
+// - moved ADSR calculation outside of the sample decode loop, somehow I doubt that
+// ADSR timing is relative to the frequency at which a sample is played... I guess
+// this remains to be seen, and I don't know whether ADSR is applied to noise channels...
+//
+// 2003/02/09 - kode54
+// - one-shot samples now process the end block before stopping
+// - in light of removing fmod hack, now processing ADSR on frequency channel as well
+//
+// 2003/02/08 - kode54
+// - replaced easy interpolation with gaussian
+// - removed fmod averaging hack
+// - changed .sinc to be updated from .iRawPitch, no idea why it wasn't done this way already (<- Pete: because I sometimes fail to see the obvious, haharhar :)
+//
+// 2003/02/08 - linuzappz
+// - small bugfix for one usleep that was 1 instead of 1000
+// - added iDisStereo for no stereo (Linux)
+//
+// 2003/01/22 - Pete
+// - added easy interpolation & small noise adjustments
+//
+// 2003/01/19 - Pete
+// - added Neill's reverb
+//
+// 2003/01/12 - Pete
+// - added recording window handlers
+//
+// 2003/01/06 - Pete
+// - added Neill's ADSR timings
+//
+// 2002/12/28 - Pete
+// - adjusted spu irq handling, fmod handling and loop handling
+//
+// 2002/08/14 - Pete
+// - added extra reverb
+//
+// 2002/06/08 - linuzappz
+// - SPUupdate changed for SPUasync
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define _IN_SPU
+
+#include "../peops/stdafx.h"
+#include "../peops/externals.h"
+#include "../peops/regs.h"
+#include "../peops/registers.h"
+#include "../peops/spu.h"
+
+void SPUirq(void) ;
+
+//#include "PsxMem.h"
+//#include "driver.h"
+
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+static const int f[5][2] = { 
+ { 0, 0 },
+ { 60, 0 },
+ { 115, -52 },
+ { 98, -55 },
+ { 122, -60 } };
+
+////////////////////////////////////////////////////////////////////////
+// CODE AREA
+////////////////////////////////////////////////////////////////////////
+
+// dirty inline func includes
+
+#include "ao.h"
+
+#include "../peops/reverb.c" 
+#include "../peops/adsr.c"
+
+// Try this to increase speed.
+#include "../peops/registers.c"
+#include "../peops/dma.c"
+
+////////////////////////////////////////////////////////////////////////
+// helpers for so-called "gauss interpolation"
+
+#define gval0 (((int *)(&spu->s_chan[ch].SB[29]))[gpos])
+#define gval(x) (((int *)(&spu->s_chan[ch].SB[29]))[(gpos+x)&3])
+
+#include "gauss_i.h"
+
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// START SOUND... called by main thread to setup a new sound on a channel
+////////////////////////////////////////////////////////////////////////
+
+static INLINE void StartSound(spu_state_t *spu, int ch)
+{
+ StartADSR(spu, ch);
+
+ spu->s_chan[ch].pCurr=spu->s_chan[ch].pStart; // set sample start
+ 
+ spu->s_chan[ch].s_1=0; // init mixing vars
+ spu->s_chan[ch].s_2=0;
+ spu->s_chan[ch].iSBPos=28;
+
+ spu->s_chan[ch].bNew=0; // init channel flags
+ spu->s_chan[ch].bStop=0; 
+ spu->s_chan[ch].bOn=1;
+
+ spu->s_chan[ch].SB[29]=0; // init our interpolation helpers
+ spu->s_chan[ch].SB[30]=0;
+
+ spu->s_chan[ch].spos=0x40000L;spu->s_chan[ch].SB[28]=0; // -> start with more decoding
+}
+
+////////////////////////////////////////////////////////////////////////
+// MAIN SPU FUNCTION
+// here is the main job handler... thread, timer or direct func call
+// basically the whole sound processing is done in this fat func!
+////////////////////////////////////////////////////////////////////////
+
+// Counting to 65536 results in full volume offage.
+void setlength(spu_state_t *spu, s32 stop, s32 fade)
+{
+ if(stop==~0)
+ {
+ spu->decaybegin=~0;
+ }
+ else
+ {
+ stop=(stop*441)/10;
+ fade=(fade*441)/10;
+
+ spu->decaybegin=stop;
+ spu->decayend=stop+fade;
+ }
+}
+
+#define CLIP(_x) {if(_x>32767) _x=32767; if(_x<-32767) _x=-32767;}
+int SPUasync(mips_cpu_context *cpu, u32 cycles)
+{
+ spu_state_t *spu = cpu->spu;
+ int volmul=spu->iVolume;
+ s32 temp;
+
+ spu->ttemp+=cycles;
+ spu->dosampies=spu->ttemp/384;
+ if(!spu->dosampies) return(1);
+ spu->ttemp-=spu->dosampies*384;
+ temp=spu->dosampies;
+
+ while(temp)
+ {
+ s32 revLeft=0, revRight=0;
+ s32 sl=0, sr=0;
+ int ch,fa;
+
+ temp--;
+ //--------------------------------------------------//
+ //- main channel loop -// 
+ //--------------------------------------------------//
+ {
+ for(ch=0;ch<MAXCHAN;ch++) // loop em all.
+ {
+ if(spu->s_chan[ch].bNew) StartSound(spu, ch); // start new sound
+ if(!spu->s_chan[ch].bOn) continue; // channel not playing? next
+
+
+ if(spu->s_chan[ch].iActFreq!=spu->s_chan[ch].iUsedFreq) // new psx frequency?
+ {
+ spu->s_chan[ch].iUsedFreq=spu->s_chan[ch].iActFreq; // -> take it and calc steps
+ spu->s_chan[ch].sinc=spu->s_chan[ch].iRawPitch<<4;
+ if(!spu->s_chan[ch].sinc) spu->s_chan[ch].sinc=1;
+ }
+
+ while(spu->s_chan[ch].spos>=0x10000L)
+ {
+ if(spu->s_chan[ch].iSBPos==28) // 28 reached?
+ {
+	 int predict_nr,shift_factor,flags,d,s;
+	 u8* start;unsigned int nSample;
+	 int s_1,s_2;
+
+ start=spu->s_chan[ch].pCurr; // set up the current pos
+
+ if (start == (u8*)-1) // special "stop" sign
+ {
+ spu->s_chan[ch].bOn=0; // -> turn everything off
+ spu->s_chan[ch].ADSRX.lVolume=0;
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ goto ENDX; // -> and done for this channel
+ }
+
+ spu->s_chan[ch].iSBPos=0;	// Reset buffer play index.
+
+ //////////////////////////////////////////// spu irq handler here? mmm... do it later
+
+ s_1=spu->s_chan[ch].s_1;
+ s_2=spu->s_chan[ch].s_2;
+
+ predict_nr=(int)*start;start++; 
+ shift_factor=predict_nr&0xf;
+ predict_nr >>= 4;
+ flags=(int)*start;start++;
+
+ // -------------------------------------- // 
+	 // Decode new samples into spu->s_chan[ch].SB[0 through 27]
+ for (nSample=0;nSample<28;start++) 
+ {
+ d=(int)*start;
+ s=((d&0xf)<<12);
+ if(s&0x8000) s|=0xffff0000;
+
+ 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=((d & 0xf0) << 8);
+
+ spu->s_chan[ch].SB[nSample++]=fa;
+
+ if(s&0x8000) s|=0xffff0000;
+ 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;
+
+ spu->s_chan[ch].SB[nSample++]=fa;
+ } 
+
+ //////////////////////////////////////////// irq check
+
+ if(spu->spuCtrl&0x40) 			// irq active?
+ {
+ if((spu->pSpuIrq > start-16 && // irq address reached?
+ spu->pSpuIrq <= start) ||
+ ((flags&1) && // special: irq on looping addr, when stop/loop flag is set 
+ (spu->pSpuIrq > spu->s_chan[ch].pLoop-16 && 
+ spu->pSpuIrq <= spu->s_chan[ch].pLoop)))
+ {
+		 //extern s32 spuirqvoodoo;
+ spu->s_chan[ch].iIrqDone=1; // -> debug flag
+		 SPUirq();
+		//puts("IRQ");
+		 //if(spuirqvoodoo!=-1)
+		 //{
+		 // spuirqvoodoo=temp*384;
+		 // temp=0;
+		 //}
+ }
+ }
+ 
+ //////////////////////////////////////////// flag handler
+
+ if((flags&4) && (!spu->s_chan[ch].bIgnoreLoop))
+ spu->s_chan[ch].pLoop=start-16; // loop adress
+
+ if(flags&1) // 1: stop/loop
+ {
+ // We play this block out first...
+ //if(!(flags&2)) // 1+2: do loop... otherwise: stop
+ if(flags!=3 || spu->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
+ start = (u8*)-1;
+ }
+ else
+ {
+ start = spu->s_chan[ch].pLoop;
+ }
+ }
+
+ spu->s_chan[ch].pCurr=start; // store values for next cycle
+ spu->s_chan[ch].s_1=s_1;
+ spu->s_chan[ch].s_2=s_2; 
+
+ ////////////////////////////////////////////
+ }
+
+ fa=spu->s_chan[ch].SB[spu->s_chan[ch].iSBPos++]; // get sample data
+
+ if((spu->spuCtrl&0x4000)==0) fa=0; // muted?
+	 else CLIP(fa);
+
+	 {
+	 int gpos;
+ gpos = spu->s_chan[ch].SB[28];
+ gval0 = fa;
+ gpos = (gpos+1) & 3;
+ spu->s_chan[ch].SB[28] = gpos;
+	 }
+ spu->s_chan[ch].spos -= 0x10000L;
+ }
+
+ ////////////////////////////////////////////////
+ // noise handler... just produces some noise data
+ // surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
+ // and sometimes the noise will be used as fmod modulation... pfff
+
+ if(spu->s_chan[ch].bNoise)
+ {
+	 //puts("Noise");
+ if((spu->dwNoiseVal<<=1)&0x80000000L)
+ {
+ spu->dwNoiseVal^=0x0040001L;
+ fa=((spu->dwNoiseVal>>2)&0x7fff);
+ fa=-fa;
+ }
+ else fa=(spu->dwNoiseVal>>2)&0x7fff;
+
+ // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
+ fa=spu->s_chan[ch].iOldNoise+((fa-spu->s_chan[ch].iOldNoise)/((0x001f-((spu->spuCtrl&0x3f00)>>9))+1));
+ if(fa>32767L) fa=32767L;
+ if(fa<-32767L) fa=-32767L; 
+ spu->s_chan[ch].iOldNoise=fa;
+
+ } //----------------------------------------
+ else // NO NOISE (NORMAL SAMPLE DATA) HERE 
+ {
+ int vl, vr, gpos;
+ vl = (spu->s_chan[ch].spos >> 6) & ~3;
+ gpos = spu->s_chan[ch].SB[28];
+ vr=(gauss[vl]*gval0)>>9;
+ vr+=(gauss[vl+1]*gval(1))>>9;
+ vr+=(gauss[vl+2]*gval(2))>>9;
+ vr+=(gauss[vl+3]*gval(3))>>9;
+ fa = vr>>2;
+ }
+
+ spu->s_chan[ch].sval = (MixADSR(spu, ch) * fa)>>10; // / 1023; // add adsr
+ if(spu->s_chan[ch].bFMod==2) // fmod freq channel
+ {
+ int NP=spu->s_chan[ch+1].iRawPitch;
+ NP=((32768L+spu->s_chan[ch].sval)*NP)>>15; ///32768L;
+
+ if(NP>0x3fff) NP=0x3fff;
+ if(NP<0x1) NP=0x1;
+ 
+	 // mmmm... if I do this, all is screwed 
+	 // spu->s_chan[ch+1].iRawPitch=NP;
+
+ NP=(44100L*NP)/(4096L); // calc frequency
+
+ spu->s_chan[ch+1].iActFreq=NP;
+ spu->s_chan[ch+1].iUsedFreq=NP;
+ spu->s_chan[ch+1].sinc=(((NP/10)<<16)/4410);
+ if(!spu->s_chan[ch+1].sinc) spu->s_chan[ch+1].sinc=1;
+
+		// mmmm... set up freq decoding positions?
+		// spu->s_chan[ch+1].iSBPos=28;
+		// spu->s_chan[ch+1].spos=0x10000L;
+ } 
+ else
+ { 
+ //////////////////////////////////////////////
+ // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
+	 int tmpl,tmpr;
+
+		if (1) //ao_channel_enable[ch+PSF_1]) {
+		{
+			tmpl=(spu->s_chan[ch].sval*spu->s_chan[ch].iLeftVolume)>>14;
+			tmpr=(spu->s_chan[ch].sval*spu->s_chan[ch].iRightVolume)>>14;
+		} else {
+			tmpl = 0;
+			tmpr = 0;
+		}
+	 sl+=tmpl;
+	 sr+=tmpr;
+
+	 if(((spu->rvb.Enabled>>ch)&1) && (spu->spuCtrl&0x80))
+	 {
+	 revLeft+=tmpl;
+	 revRight+=tmpr;
+	 }
+ }
+
+ spu->s_chan[ch].spos += spu->s_chan[ch].sinc; 
+ ENDX: ; 
+ }
+ } 
+
+ ///////////////////////////////////////////////////////
+ // mix all channels (including reverb) into one buffer
+ MixREVERBLeftRight(spu, &sl,&sr,revLeft,revRight);
+// printf("sampcount %d decaybegin %d decayend %d\n", sampcount, decaybegin, decayend);
+ if(spu->sampcount>=spu->decaybegin)
+ {
+ s32 dmul;
+ if(spu->decaybegin!=~0) // Is anyone REALLY going to be playing a song
+		 // for 13 hours?
+ {
+ if(spu->sampcount>=spu->decayend) 
+ {
+// 	 ao_song_done = 1;
+	 return(0);
+ }
+ dmul=256-(256*(spu->sampcount-spu->decaybegin)/(spu->decayend-spu->decaybegin));
+ sl=(sl*dmul)>>8;
+ sr=(sr*dmul)>>8;
+ }
+ }
+
+ spu->sampcount++;
+ sl=(sl*volmul)>>8;
+ sr=(sr*volmul)>>8;
+
+ //{
+ // static double asl=0;
+ // static double asr=0;
+ 
+ // asl+=(sl-asl)/5;
+ // asr+=(sl-asr)/5;
+
+ //sl-=asl;
+ //sr-=asr;
+
+ // if(sl>32767 || sl < -32767) printf("Left: %d, %f\n",sl,asl);
+ // if(sr>32767 || sr < -32767) printf("Right: %d, %f\n",sl,asl);
+ //}
+
+ if(sl>32767) sl=32767; if(sl<-32767) sl=-32767;
+ if(sr>32767) sr=32767; if(sr<-32767) sr=-32767;
+
+ *spu->pS++=sl;
+ *spu->pS++=sr;
+ }
+
+ return(1);
+}
+
+void SPU_flushboot(mips_cpu_context *cpu)
+{
+ spu_state_t *spu = cpu->spu;
+ if((u8*)spu->pS>((u8*)spu->pSpuBuffer+1024))
+ {
+ //spu_update(cpu, (u8*)pSpuBuffer,(u8*)pS-(u8*)pSpuBuffer);
+ cpu->spu_callback ((u8*)spu->pSpuBuffer,(u8*)spu->pS-(u8*)spu->pSpuBuffer, cpu->spu_callback_data);
+ spu->pS=(s16 *)spu->pSpuBuffer;
+ }
+} 
+
+#ifdef TIMEO
+static u64 begintime;
+static u64 gettime64(void)
+{
+ struct timeval tv;
+ u64 ret;
+
+ gettimeofday(&tv,0);
+ ret=tv.tv_sec;
+ ret*=1000000;
+ ret+=tv.tv_usec;
+ return(ret);
+}
+#endif
+////////////////////////////////////////////////////////////////////////
+// INIT/EXIT STUFF
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// SPUINIT: this func will be called first by the main emu
+////////////////////////////////////////////////////////////////////////
+ 
+int SPUinit(mips_cpu_context *cpu, void (*update_cb)(unsigned char *pSound, long lBytes, void *data), void *data)
+{
+ cpu->spu_callback = update_cb;
+ cpu->spu_callback_data = data;
+ cpu->spu = malloc (sizeof (spu_state_t));
+ memset (cpu->spu, 0, sizeof (spu_state_t));
+ cpu->spu->dwNoiseVal = 1;
+ cpu->spu->spuAddr = 0xffffffff;
+ cpu->spu->spuMemC=(u8*)cpu->spu->spuMem; // just small setup
+ memset((void *)cpu->spu->s_chan,0,MAXCHAN*sizeof(SPUCHAN));
+ memset((void *)&cpu->spu->rvb,0,sizeof(REVERBInfo));
+ memset(cpu->spu->regArea,0,sizeof(cpu->spu->regArea));
+ memset(cpu->spu->spuMem,0,sizeof(cpu->spu->spuMem));
+ InitADSR();
+ cpu->spu->sampcount = cpu->spu->ttemp=0;
+ #ifdef TIMEO
+ begintime=gettime64();
+ #endif
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SETUPSTREAMS: init most of the spu buffers
+////////////////////////////////////////////////////////////////////////
+
+void SetupStreams(spu_state_t *spu)
+{ 
+ int i;
+
+ spu->pSpuBuffer=(u8*)malloc(32768); // alloc mixing buffer
+ spu->pS=(s16 *)spu->pSpuBuffer;
+
+ for(i=0;i<MAXCHAN;i++) // loop sound channels
+ {
+ spu->s_chan[i].ADSRX.SustainLevel = 1024; // -> init sustain
+ spu->s_chan[i].iIrqDone=0;
+ spu->s_chan[i].pLoop=spu->spuMemC;
+ spu->s_chan[i].pStart=spu->spuMemC;
+ spu->s_chan[i].pCurr=spu->spuMemC;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// REMOVESTREAMS: free most buffer
+////////////////////////////////////////////////////////////////////////
+
+void RemoveStreams(spu_state_t *spu)
+{ 
+ free(spu->pSpuBuffer); // free mixing buffer
+ spu->pSpuBuffer=NULL;
+
+ #ifdef TIMEO
+ {
+ u64 tmp;
+ tmp=gettime64();
+ tmp-=begintime;
+ if(tmp)
+ tmp=(u64)sampcount*1000000/tmp;
+ printf("%lld samples per second\n",tmp);
+ }
+ #endif
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// SPUOPEN: called by main emu after init
+////////////////////////////////////////////////////////////////////////
+ 
+int SPUopen(mips_cpu_context *cpu)
+{
+ spu_state_t *spu = cpu->spu;
+ if(spu->bSPUIsOpen) return 0; // security for some stupid main emus
+ spu->spuIrq=0; 
+
+ spu->spuStat=spu->spuCtrl=0;
+ spu->spuAddr=0xffffffff;
+ spu->dwNoiseVal=1;
+
+ spu->spuMemC=(u8*)spu->spuMem; 
+ memset((void *)spu->s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN));
+ spu->pSpuIrq=0;
+
+ spu->iVolume=255; //85;
+ SetupStreams(spu); // prepare streaming
+
+ spu->bSPUIsOpen=1;
+
+ return 1;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// SPUCLOSE: called before shutdown
+////////////////////////////////////////////////////////////////////////
+
+int SPUclose(mips_cpu_context *cpu)
+{
+ spu_state_t *spu = cpu->spu;
+ if (!spu) {
+ return 0;
+ }
+ if(!spu->bSPUIsOpen) return 0; // some security
+
+ spu->bSPUIsOpen=0; // no more open
+
+ RemoveStreams(spu); // no more streaming
+ free (spu);
+ cpu->spu = NULL;
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SPUSHUTDOWN: called by main emu on final exit
+////////////////////////////////////////////////////////////////////////
+
+int SPUshutdown(mips_cpu_context *cpu)
+{
+ return 0;
+}
+
+void SPUinjectRAMImage(mips_cpu_context *cpu, u16 *pIncoming)
+{
+ spu_state_t *spu = cpu->spu;
+	int i;
+
+	for (i = 0; i < (256*1024); i++)
+	{
+		spu->spuMem[i] = pIncoming[i];
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/spu.h Added

@@ -0,0 +1,74 @@
+/***************************************************************************
+                            spu.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "externals.h"
+#include "../psx.h"
+void sexyd_update(unsigned char* pSound,long lBytes);
+
+typedef struct spu_state_s {
+    // psx buffer / addresses
+    u16  regArea[0x200];
+    u16  spuMem[256*1024];
+    u8 * spuMemC;
+    u8 * pSpuIrq;
+    u8 * pSpuBuffer;
+
+    // user settings          
+    int             iVolume;
+
+    // MAIN infos struct for each channel
+
+    SPUCHAN         s_chan[MAXCHAN+1];                     // channel + 1 infos (1 is security for fmod handling)
+    REVERBInfo      rvb;
+
+    u32   dwNoiseVal;//=1;                          // global noise generator
+
+    u16  spuCtrl;                             // some vars to store psx reg infos
+    u16  spuStat;
+    u16  spuIrq;             
+    u32  spuAddr; //=0xffffffff;                    // address into spu mem
+    int  bSPUIsOpen;
+
+    s16 * pS;
+    s32 ttemp;
+    u32 sampcount;
+    u32 decaybegin;
+    u32 decayend;
+
+    s32 dosampies;
+} spu_state_t;
+
+int SPUasync(mips_cpu_context *cpu, u32 cycles);
+void SPU_flushboot(mips_cpu_context *cpu);
+int SPUinit(mips_cpu_context *cpu, void (*update_cb)(unsigned char *pSound, long lBytes, void *data), void *data);
+int SPUopen(mips_cpu_context *cpu);
+int SPUclose(mips_cpu_context *cpu);
+int SPUshutdown(mips_cpu_context *cpu);
+void SPUinjectRAMImage(mips_cpu_context *cpu, u16 *pIncoming);
+void SPUreadDMAMem(mips_cpu_context *cpu, u32 usPSXMem,int iSize);
+void SPUwriteDMAMem(mips_cpu_context *cpu, u32 usPSXMem,int iSize);
+u16 SPUreadRegister(mips_cpu_context *cpu, u32 reg);
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops/stdafx.h Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+ StdAfx.h - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include <stdlib.h>
+#include <string.h> 
+#include <math.h>

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2 Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/adsr.h Added

@@ -0,0 +1,28 @@
+/***************************************************************************
+                           adsr.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+INLINE void StartADSR(int ch);
+INLINE int  MixADSR(int ch);

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/adsr2.c Added

@@ -0,0 +1,656 @@
+/***************************************************************************
+ adsr.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2003/05/14 - xodnizel
+// - removed stopping of reverb on sample end
+//
+// 2003/01/06 - Pete
+// - added Neill's ADSR timings
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_ADSR
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// ADSR func
+////////////////////////////////////////////////////////////////////////
+
+unsigned long RateTable[160];
+
+void InitADSR(void) // INIT ADSR
+{
+ unsigned long r,rs,rd;int i;
+
+ memset(RateTable,0,sizeof(unsigned long)*160); // build the rate table according to Neill's rules (see at bottom of file)
+
+ r=3;rs=1;rd=0;
+
+ for(i=32;i<160;i++) // we start at pos 32 with the real values... everything before is 0
+ {
+ if(r<0x3FFFFFFF)
+ {
+ r+=rs;
+ rd++;if(rd==5) {rd=1;rs*=2;}
+ }
+ if(r>0x3FFFFFFF) r=0x3FFFFFFF;
+
+ RateTable[i]=r;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ADSR
+{
+ spu->s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
+ spu->s_chan[ch].ADSRX.State=0;
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE int MixADSR(spu2_state_t *spu, int ch) // MIX ADSR
+{ 
+ if(spu->s_chan[ch].bStop) // should be stopped:
+ { // do release
+ if(spu->s_chan[ch].ADSRX.ReleaseModeExp)
+ {
+ switch((spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
+ {
+ case 0: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +0 + 32]; break;
+ case 1: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +4 + 32]; break;
+ case 2: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +6 + 32]; break;
+ case 3: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +8 + 32]; break;
+ case 4: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +9 + 32]; break;
+ case 5: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +10+ 32]; break;
+ case 6: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +11+ 32]; break;
+ case 7: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x18 +12+ 32]; break;
+ }
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x0C + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ spu->s_chan[ch].bOn=0;
+ //spu->s_chan[ch].bReverb=0;
+ //spu->s_chan[ch].bNoise=0;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ else // not stopped yet?
+ {
+ if(spu->s_chan[ch].ADSRX.State==0) // -> attack
+ {
+ if(spu->s_chan[ch].ADSRX.AttackModeExp)
+ {
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
+ else
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x18 + 32];
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
+ spu->s_chan[ch].ADSRX.State=1;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ //--------------------------------------------------//
+ if(spu->s_chan[ch].ADSRX.State==1) // -> decay
+ {
+ switch((spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
+ {
+ case 0: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+0 + 32]; break;
+ case 1: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+4 + 32]; break;
+ case 2: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+6 + 32]; break;
+ case 3: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+8 + 32]; break;
+ case 4: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+9 + 32]; break;
+ case 5: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+10+ 32]; break;
+ case 6: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+11+ 32]; break;
+ case 7: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(spu->s_chan[ch].ADSRX.DecayRate^0x1F))-0x18+12+ 32]; break;
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ if(((spu->s_chan[ch].ADSRX.EnvelopeVol>>27)&0xF) <= spu->s_chan[ch].ADSRX.SustainLevel)
+ {
+ spu->s_chan[ch].ADSRX.State=2;
+ }
+
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ //--------------------------------------------------//
+ if(spu->s_chan[ch].ADSRX.State==2) // -> sustain
+ {
+ if(spu->s_chan[ch].ADSRX.SustainIncrease)
+ {
+ if(spu->s_chan[ch].ADSRX.SustainModeExp)
+ {
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
+ else
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x18 + 32];
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(spu->s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
+ }
+ }
+ else
+ {
+ if(spu->s_chan[ch].ADSRX.SustainModeExp)
+ {
+ switch((spu->s_chan[ch].ADSRX.EnvelopeVol>>28)&0x7)
+ {
+ case 0: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +0 + 32];break;
+ case 1: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +4 + 32];break;
+ case 2: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +6 + 32];break;
+ case 3: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +8 + 32];break;
+ case 4: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +9 + 32];break;
+ case 5: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +10+ 32];break;
+ case 6: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +11+ 32];break;
+ case 7: spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x1B +12+ 32];break;
+ }
+ }
+ else
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((spu->s_chan[ch].ADSRX.SustainRate^0x7F))-0x0F + 32];
+ }
+
+ if(spu->s_chan[ch].ADSRX.EnvelopeVol<0) 
+ {
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ }
+ }
+ spu->s_chan[ch].ADSRX.lVolume=spu->s_chan[ch].ADSRX.EnvelopeVol>>21;
+ return spu->s_chan[ch].ADSRX.lVolume;
+ }
+ }
+ return 0;
+}
+
+#endif
+
+/*
+James Higgs ADSR investigations:
+
+PSX SPU Envelope Timings
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, here is an extract from doomed's SPU doc, which explains the basics
+of the SPU "volume envelope": 
+
+*** doomed doc extract start ***
+
+--------------------------------------------------------------------------
+Voices.
+--------------------------------------------------------------------------
+The SPU has 24 hardware voices. These voices can be used to reproduce sample
+data, noise or can be used as frequency modulator on the next voice.
+Each voice has it's own programmable ADSR envelope filter. The main volume
+can be programmed independently for left and right output.
+
+The ADSR envelope filter works as follows:
+Ar = Attack rate, which specifies the speed at which the volume increases
+ from zero to it's maximum value, as soon as the note on is given. The
+ slope can be set to lineair or exponential.
+Dr = Decay rate specifies the speed at which the volume decreases to the
+ sustain level. Decay is always decreasing exponentially.
+Sl = Sustain level, base level from which sustain starts.
+Sr = Sustain rate is the rate at which the volume of the sustained note
+ increases or decreases. This can be either lineair or exponential.
+Rr = Release rate is the rate at which the volume of the note decreases
+ as soon as the note off is given.
+
+ lvl |
+ ^ | /\Dr __
+ Sl _| _ / _ \__--- \
+ | / ---__ \ Rr
+ | /Ar Sr \ \
+ | / \\
+ |/___________________\________
+ ->time
+
+The overal volume can also be set to sweep up or down lineairly or
+exponentially from it's current value. This can be done seperately
+for left and right.
+
+Relevant SPU registers:
+-------------------------------------------------------------
+$1f801xx8 Attack/Decay/Sustain level
+bit |0f|0e 0d 0c 0b 0a 09 08|07 06 05 04|03 02 01 00|
+desc.|Am| Ar |Dr |Sl |
+
+Am 0 Attack mode Linear
+ 1 Exponential
+
+Ar 0-7f attack rate
+Dr 0-f decay rate
+Sl 0-f sustain level
+-------------------------------------------------------------
+$1f801xxa Sustain rate, Release Rate.
+bit |0f|0e|0d|0c 0b 0a 09 08 07 06|05|04 03 02 01 00|
+desc.|Sm|Sd| 0| Sr |Rm|Rr |
+
+Sm 0 sustain rate mode linear
+ 1 exponential
+Sd 0 sustain rate mode increase
+ 1 decrease
+Sr 0-7f Sustain Rate
+Rm 0 Linear decrease
+ 1 Exponential decrease
+Rr 0-1f Release Rate
+
+Note: decay mode is always Expontial decrease, and thus cannot
+be set.
+-------------------------------------------------------------
+$1f801xxc Current ADSR volume
+bit |0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
+desc.|ADSRvol |
+
+ADSRvol Returns the current envelope volume when
+ read.
+-- James' Note: return range: 0 -> 32767
+
+*** 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:
+
+1. Attack rate value (linear mode)
+
+ Attack value range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 | | 80 |
+ -----------------------------------------------------------------
+ Frames | 11 | 21 | 42 | 84 | 169| 338| 676| |2890|
+
+ Note: frames is no. of PAL frames to reach full volume (100%
+ amplitude)
+
+ Hmm, noticing that the time taken to reach full volume doubles
+ every time we add 4 to our attack value, we know the equation is
+ of form:
+ frames = k * 2 ^ (value / 4)
+
+ (You may ponder about envelope generator hardware at this point,
+ or maybe not... :)
+
+ By substituting some stuff and running some checks, we get:
+
+ k = 0.00257 (close enuf)
+
+ therefore,
+ frames = 0.00257 * 2 ^ (value / 4)
+ If you just happen to be writing an emulator, then you can probably
+ use an equation like:
+
+ %volume_increase_per_tick = 1 / frames
+
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*514)/10000
+ ------------------------------------
+
+2. Decay rate value (only has log mode)
+
+ Decay value range: 0 -> 15
+
+ Value | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 |
+ ------------------------------------------------
+ frames | | | | | 6 | 12 | 24 | 47 |
+
+ Note: frames here is no. of PAL frames to decay to 50% volume.
+
+ formula: frames = k * 2 ^ (value)
+
+ Substituting, we get: k = 0.00146
+
+ Further info on logarithmic nature:
+ 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
+ 50% volume.
+
+ Frag it - just use linear approx.
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*292)/10000
+ ------------------------------------
+
+
+3. Sustain rate value (linear mode)
+
+ Sustain rate range: 0 -> 127
+
+ Value | 48 | 52 | 56 | 60 | 64 | 68 | 72 |
+ -------------------------------------------
+ frames | 9 | 19 | 37 | 74 | 147| 293| 587|
+
+ Here, frames = no. of PAL frames for volume amplitude to go from 100%
+ to 0% (or vice-versa).
+
+ Same formula as for attack value, just a different value for k:
+
+ k = 0.00225
+
+ ie: frames = 0.00225 * 2 ^ (value / 4)
+
+ For emulation purposes:
+
+ %volume_increase_or_decrease_per_tick = 1 / frames
+
+ ------------------------------------
+ Pete:
+ ms=((1<<(value>>2))*450)/10000
+ ------------------------------------
+
+
+4. Release rate (linear mode)
+
+ Release rate range: 0 -> 31
+
+ Value | 13 | 14 | 15 | 16 | 17 |
+ ---------------------------------------------------------------
+ frames | 18 | 36 | 73 | 146| 292|
+
+ Here, frames = no. of PAL frames to decay from 100% vol to 0% vol
+ after "note-off" is triggered.
+
+ Formula: frames = k * 2 ^ (value)
+
+ And so: k = 0.00223
+
+ ------------------------------------
+ Pete:
+ ms=((1<<value)*446)/10000
+ ------------------------------------
+
+
+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
+approx.
+
+To get timings in millisecs, multiply frames by 20.
+
+
+
+- James Higgs 17/6/2000
+james7780@yahoo.com
+
+//---------------------------------------------------------------
+
+OLD adsr mixing according to james' rules... has to be called
+every one millisecond
+
+
+ long v,v2,lT,l1,l2,l3;
+
+ if(spu->s_chan[ch].bStop) // psx wants to stop? -> release phase
+ {
+ if(spu->s_chan[ch].ADSR.ReleaseVal!=0) // -> release not 0: do release (if 0: stop right now)
+ {
+ if(!spu->s_chan[ch].ADSR.ReleaseVol) // --> release just started? set up the release stuff
+ {
+ spu->s_chan[ch].ADSR.ReleaseStartTime=spu->s_chan[ch].ADSR.lTime;
+ spu->s_chan[ch].ADSR.ReleaseVol=spu->s_chan[ch].ADSR.lVolume;
+ spu->s_chan[ch].ADSR.ReleaseTime = // --> calc how long does it take to reach the wanted sus level
+ (spu->s_chan[ch].ADSR.ReleaseTime*
+ spu->s_chan[ch].ADSR.ReleaseVol)/1024;
+ }
+ // -> NO release exp mode used (yet)
+ v=spu->s_chan[ch].ADSR.ReleaseVol; // -> get last volume
+ lT=spu->s_chan[ch].ADSR.lTime- // -> how much time is past?
+ spu->s_chan[ch].ADSR.ReleaseStartTime;
+ l1=spu->s_chan[ch].ADSR.ReleaseTime;
+ 
+ if(lT<l1) // -> we still have to release
+ {
+ v=v-((v*lT)/l1); // --> calc new volume
+ }
+ else // -> release is over: now really stop that sample
+ {v=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;}
+ }
+ else // -> release IS 0: release at once
+ {
+ v=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;
+ }
+ }
+ else 
+ {//--------------------------------------------------// not in release phase:
+ v=1024;
+ lT=spu->s_chan[ch].ADSR.lTime;
+ l1=spu->s_chan[ch].ADSR.AttackTime;
+ 
+ if(lT<l1) // attack
+ { // no exp mode used (yet)
+// if(spu->s_chan[ch].ADSR.AttackModeExp)
+// {
+// v=(v*lT)/l1;
+// }
+// else
+ {
+ v=(v*lT)/l1;
+ }
+ if(v==0) v=1;
+ }
+ else // decay
+ { // should be exp, but who cares? ;)
+ l2=spu->s_chan[ch].ADSR.DecayTime;
+ v2=spu->s_chan[ch].ADSR.SustainLevel;
+
+ lT-=l1;
+ if(lT<l2)
+ {
+ v-=(((v-v2)*lT)/l2);
+ }
+ else // sustain
+ { // no exp mode used (yet)
+ l3=spu->s_chan[ch].ADSR.SustainTime;
+ lT-=l2;
+ if(spu->s_chan[ch].ADSR.SustainModeDec>0)
+ {
+ if(l3!=0) v2+=((v-v2)*lT)/l3;
+ else v2=v;
+ }
+ else
+ {
+ if(l3!=0) v2-=(v2*lT)/l3;
+ else v2=v;
+ }
+
+ if(v2>v) v2=v;
+ if(v2<=0) {v2=0;spu->s_chan[ch].bOn=0;spu->s_chan[ch].ADSR.ReleaseVol=0;spu->s_chan[ch].bNoise=0;}
+
+ v=v2;
+ }
+ }
+ }
+
+ //----------------------------------------------------// 
+ // ok, done for this channel, so increase time
+
+ spu->s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
+
+ if(v>1024) v=1024; // adjust volume
+ if(v<0) v=0; 
+ spu->s_chan[ch].ADSR.lVolume=v; // store act volume
+
+ return v; // return the volume factor
+*/
+
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+
+/*
+-----------------------------------------------------------------------------
+Neill Corlett
+Playstation SPU envelope timing notes
+-----------------------------------------------------------------------------
+
+This is preliminary. This may be wrong. But the model described herein fits
+all of my experimental data, and it's just simple enough to sound right.
+
+ADSR envelope level ranges from 0x00000000 to 0x7FFFFFFF internally.
+The value returned by channel reg 0xC is (envelope_level>>16).
+
+Each sample, an increment or decrement value will be added to or
+subtracted from this envelope level.
+
+Create the rate log table. The values double every 4 entries.
+ entry #0 = 4
+
+ 4, 5, 6, 7,
+ 8,10,12,14,
+ 16,20,24,28, ...
+
+ entry #40 = 4096...
+ entry #44 = 8192...
+ entry #48 = 16384...
+ entry #52 = 32768...
+ entry #56 = 65536...
+
+increments and decrements are in terms of ratelogtable[n]
+n may exceed the table bounds (plan on n being between -32 and 127).
+table values are all clipped between 0x00000000 and 0x3FFFFFFF
+
+when you "voice on", the envelope is always fully reset.
+(yes, it may click. the real thing does this too.)
+
+envelope level begins at zero.
+
+each state happens for at least 1 cycle
+(transitions are not instantaneous)
+this may result in some oddness: if the decay rate is uberfast, it will cut
+the envelope from full down to half in one sample, potentially skipping over
+the sustain level
+
+ATTACK
+------
+- if the envelope level has overflowed past the max, clip to 0x7FFFFFFF and
+ proceed to DECAY.
+
+Linear attack mode:
+- line extends upward to 0x7FFFFFFF
+- increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+
+Logarithmic attack mode:
+if envelope_level < 0x60000000:
+ - line extends upward to 0x60000000
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x10]
+else:
+ - line extends upward to 0x7FFFFFFF
+ - increment per sample is ratelogtable[(Ar^0x7F)-0x18]
+
+DECAY
+-----
+- if ((envelope_level>>27)&0xF) <= Sl, proceed to SUSTAIN.
+ Do not clip to the sustain level.
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Dr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Dr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Dr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Dr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Dr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Dr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Dr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Dr^0x1F))-0x18+12]
+ (note that this is the same as the release rate formula, except that
+ decay rates 10-1F aren't possible... those would be slower in theory)
+
+SUSTAIN
+-------
+- no terminating condition except for voice off
+- Sd=0 (increase) behavior is identical to ATTACK for both log and linear.
+- Sd=1 (decrease) behavior:
+Linear sustain decrease:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(Sr^0x7F)-0x0F]
+Logarithmic sustain decrease:
+- current line ends at (envelope_level & 0x07FFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(Sr^0x7F)-0x1B+0]
+ 1: ratelogtable[(Sr^0x7F)-0x1B+4]
+ 2: ratelogtable[(Sr^0x7F)-0x1B+6]
+ 3: ratelogtable[(Sr^0x7F)-0x1B+8]
+ 4: ratelogtable[(Sr^0x7F)-0x1B+9]
+ 5: ratelogtable[(Sr^0x7F)-0x1B+10]
+ 6: ratelogtable[(Sr^0x7F)-0x1B+11]
+ 7: ratelogtable[(Sr^0x7F)-0x1B+12]
+
+RELEASE
+-------
+- if the envelope level has overflowed to negative, clip to 0 and QUIT.
+
+Linear release mode:
+- line extends to 0x00000000
+- decrement per sample is ratelogtable[(4*(Rr^0x1F))-0x0C]
+
+Logarithmic release mode:
+- line extends to (envelope_level & 0x0FFFFFFF)
+- decrement per sample depends on (envelope_level>>28)&0x7
+ 0: ratelogtable[(4*(Rr^0x1F))-0x18+0]
+ 1: ratelogtable[(4*(Rr^0x1F))-0x18+4]
+ 2: ratelogtable[(4*(Rr^0x1F))-0x18+6]
+ 3: ratelogtable[(4*(Rr^0x1F))-0x18+8]
+ 4: ratelogtable[(4*(Rr^0x1F))-0x18+9]
+ 5: ratelogtable[(4*(Rr^0x1F))-0x18+10]
+ 6: ratelogtable[(4*(Rr^0x1F))-0x18+11]
+ 7: ratelogtable[(4*(Rr^0x1F))-0x18+12]
+
+-----------------------------------------------------------------------------
+*/
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/dma.h Added

@@ -0,0 +1,29 @@
+/***************************************************************************
+                            dma.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+void InterruptDMA4(mips_cpu_context *cpu);
+void InterruptDMA7(mips_cpu_context *cpu); 
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/dma2.c Added

@@ -0,0 +1,183 @@
+/***************************************************************************
+ dma.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "../peops2/stdafx.h"
+
+#define _IN_DMA
+
+#include "../peops2/externals.h"
+#include "../peops2/registers.h"
+//#include "debug.h"
+#include "../psx.h"
+#include "../peops2/spu.h"
+
+//extern uint32 psx_ram[(2*1024*1024)/4];
+
+////////////////////////////////////////////////////////////////////////
+// READ DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2readDMA4Mem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ spu2_state_t *spu = cpu->spu2;
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+ ram16[usPSXMem>>1]=spu->spuMem[spu->spuAddr2[0]]; // spu addr 0 got by writeregister
+ usPSXMem+=2;
+ spu->spuAddr2[0]++; // inc spu addr
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0; // wrap
+ }
+
+ spu->spuAddr2[0]+=0x20; //?????
+ 
+
+ spu->iSpuAsyncWait=0;
+
+ // got from J.F. and Kanodin... is it needed?
+ spu->regArea[(PS2_C0_ADMAS)>>1]=0; // Auto DMA complete
+ spu->spuStat2[0]=0x80; // DMA complete
+}
+
+EXPORT_GCC void CALLBACK SPU2readDMA7Mem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ spu2_state_t *spu = cpu->spu2;
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+ ram16[usPSXMem>>1]=spu->spuMem[spu->spuAddr2[1]]; // spu addr 1 got by writeregister
+ usPSXMem+=2;
+ spu->spuAddr2[1]++; // inc spu addr
+ if(spu->spuAddr2[1]>0xfffff) spu->spuAddr2[1]=0; // wrap
+ }
+
+ spu->spuAddr2[1]+=0x20; //?????
+
+ spu->iSpuAsyncWait=0;
+
+ // got from J.F. and Kanodin... is it needed?
+ spu->regArea[(PS2_C1_ADMAS)>>1]=0; // Auto DMA complete
+ spu->spuStat2[1]=0x80; // DMA complete
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+// to investigate: do sound data updates by writedma affect spu
+// irqs? Will an irq be triggered, if new data is written to
+// the memory irq address?
+
+////////////////////////////////////////////////////////////////////////
+// WRITE DMA (many values)
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2writeDMA4Mem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ spu2_state_t *spu = cpu->spu2;
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+ spu->spuMem[spu->spuAddr2[0]] = ram16[usPSXMem>>1]; // spu addr 0 got by writeregister
+ usPSXMem+=2;
+ spu->spuAddr2[0]++; // inc spu addr
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0; // wrap
+ }
+ 
+ spu->iSpuAsyncWait=0;
+
+ // got from J.F. and Kanodin... is it needed?
+ spu->spuStat2[0]=0x80; // DMA complete
+}
+
+EXPORT_GCC void CALLBACK SPU2writeDMA7Mem(mips_cpu_context *cpu, u32 usPSXMem,int iSize)
+{
+ spu2_state_t *spu = cpu->spu2;
+ int i;
+ u16 *ram16 = (u16 *)&cpu->psx_ram[0];
+
+ for(i=0;i<iSize;i++)
+ {
+ spu->spuMem[spu->spuAddr2[1]] = ram16[usPSXMem>>1]; // spu addr 1 got by writeregister
+ spu->spuAddr2[1]++; // inc spu addr
+ if(spu->spuAddr2[1]>0xfffff) spu->spuAddr2[1]=0; // wrap
+ }
+ 
+ spu->iSpuAsyncWait=0;
+
+ // got from J.F. and Kanodin... is it needed?
+ spu->spuStat2[1]=0x80; // DMA complete
+}
+
+////////////////////////////////////////////////////////////////////////
+// INTERRUPTS
+////////////////////////////////////////////////////////////////////////
+
+void InterruptDMA4(mips_cpu_context *cpu) 
+{
+ spu2_state_t *spu = cpu->spu2;
+// taken from linuzappz NULL spu2
+//	spu2Rs16(CORE0_ATTR)&= ~0x30;
+//	spu2Rs16(REG__1B0) = 0;
+//	spu2Rs16(SPU2_STATX_WRDY_M)|= 0x80;
+
+ spu->spuCtrl2[0]&=~0x30;
+ spu->regArea[(PS2_C0_ADMAS)>>1]=0;
+ spu->spuStat2[0]|=0x80;
+}
+ 
+EXPORT_GCC void CALLBACK SPU2interruptDMA4(mips_cpu_context *cpu) 
+{
+ InterruptDMA4(cpu);
+}
+
+void InterruptDMA7(mips_cpu_context *cpu) 
+{
+ spu2_state_t *spu = cpu->spu2;
+// taken from linuzappz NULL spu2
+//	spu2Rs16(CORE1_ATTR)&= ~0x30;
+//	spu2Rs16(REG__5B0) = 0;
+//	spu2Rs16(SPU2_STATX_DREQ)|= 0x80;
+
+ spu->spuCtrl2[1]&=~0x30;
+ spu->regArea[(PS2_C1_ADMAS)>>1]=0;
+ spu->spuStat2[1]|=0x80;
+}
+
+EXPORT_GCC void CALLBACK SPU2interruptDMA7(mips_cpu_context *cpu) 
+{
+ InterruptDMA7(cpu);
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/externals.h Added

@@ -0,0 +1,307 @@
+/***************************************************************************
+ externals.h - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2002/04/04 - Pete
+// - increased channel struct for interpolation
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#ifndef PEOPS2_EXTERNALS
+#define PEOPS2_EXTERNALS
+
+#include "ao.h"
+
+//#if LSB_FIRST
+//static INLINE u16 BFLIP16(u16 x)
+//{
+// return x;
+//}
+//#else
+//static INLINE u16 BFLIP16(u16 x)
+//{
+// return( ((x>>8)&0xFF)| ((x&0xFF)<<8) );
+//}
+//#endif
+
+/////////////////////////////////////////////////////////
+// generic defines
+/////////////////////////////////////////////////////////
+
+//#define PSE_LT_SPU 4
+//#define PSE_SPU_ERR_SUCCESS 0
+//#define PSE_SPU_ERR -60
+//#define PSE_SPU_ERR_NOTCONFIGURED PSE_SPU_ERR - 1
+//#define PSE_SPU_ERR_INIT PSE_SPU_ERR - 2
+
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+////////////////////////////////////////////////////////////////////////
+// spu defines
+////////////////////////////////////////////////////////////////////////
+
+// sound buffer sizes
+// 400 ms complete sound buffer
+#define SOUNDSIZE 76800
+// 137 ms test buffer... if less than that is buffered, a new upload will happen
+#define TESTSIZE 26304
+
+// num of channels
+#define MAXCHAN 48
+#define HLFCHAN 24
+
+// ~ 1 ms of data (was 45)
+#define NSSIZE 	1
+//45
+
+///////////////////////////////////////////////////////////
+// struct defines
+///////////////////////////////////////////////////////////
+
+// ADSR INFOS PER CHANNEL
+typedef struct
+{
+ int AttackModeExp;
+ long AttackTime;
+ long DecayTime;
+ long SustainLevel;
+ int SustainModeExp;
+ long SustainModeDec;
+ long SustainTime;
+ int ReleaseModeExp;
+ unsigned long ReleaseVal;
+ long ReleaseTime;
+ long ReleaseStartTime; 
+ long ReleaseVol; 
+ long lTime;
+ long lVolume;
+} ADSRInfo;
+
+typedef struct
+{
+ int State;
+ int AttackModeExp;
+ int AttackRate;
+ int DecayRate;
+ int SustainLevel;
+ int SustainModeExp;
+ int SustainIncrease;
+ int SustainRate;
+ int ReleaseModeExp;
+ int ReleaseRate;
+ int EnvelopeVol;
+ long lVolume;
+ long lDummy1;
+ long lDummy2;
+} ADSRInfoEx;
+ 
+///////////////////////////////////////////////////////////
+
+// Tmp Flags
+
+// used for debug channel muting
+#define FLAG_MUTE 1
+
+// used for simple interpolation
+#define FLAG_IPOL0 2
+#define FLAG_IPOL1 4
+
+///////////////////////////////////////////////////////////
+
+// MAIN CHANNEL STRUCT
+typedef struct
+{
+ // no mutexes used anymore... don't need them to sync access
+ //HANDLE hMutex;
+
+ int bNew; // start flag
+
+ int iSBPos; // mixing stuff
+ int spos;
+ int sinc;
+ int SB[32+32]; // Pete added another 32 dwords in 1.6 ... prevents overflow issues with gaussian/cubic interpolation (thanx xodnizel!), and can be used for even better interpolations, eh? :)
+ int sval;
+
+ unsigned char * pStart; // start ptr into sound mem
+ unsigned char * pCurr; // current pos in sound mem
+ unsigned char * pLoop; // loop ptr in sound mem
+
+ int iStartAdr;
+ int iLoopAdr; 
+ int iNextAdr; 
+
+ int bOn; // is channel active (sample playing?)
+ int bStop; // is channel stopped (sample _can_ still be playing, ADSR Release phase)
+ int bEndPoint; // end point reached
+ int bReverbL; // can we do reverb on this channel? must have ctrl register bit, to get active
+ int bReverbR; 
+ 
+ int bVolumeL; // Volume on/off
+ int bVolumeR;
+ 
+ int iActFreq; // current psx pitch
+ int iUsedFreq; // current pc pitch
+ int iLeftVolume; // left volume
+ int iLeftVolRaw; // left psx volume value
+ int bIgnoreLoop; // ignore loop bit, if an external loop address is used
+ int iMute; // mute mode
+ int iRightVolume; // right volume
+ int iRightVolRaw; // right psx volume value
+ int iRawPitch; // raw pitch (0...3fff)
+ int iIrqDone; // debug irq done flag
+ int s_1; // last decoding infos
+ int s_2;
+ int bRVBActive; // reverb active flag
+ int bNoise; // noise active flag
+ int bFMod; // freq mod (0=off, 1=sound channel, 2=freq channel)
+ int iOldNoise; // old noise val for this channel 
+ ADSRInfo ADSR; // active ADSR settings
+ ADSRInfoEx ADSRX; // next ADSR settings (will be moved to active on sample start)
+
+} SPUCHAN;
+
+///////////////////////////////////////////////////////////
+
+typedef struct
+{
+ int StartAddr; // reverb area start addr in samples
+ int EndAddr; // reverb area end addr in samples
+ int CurrAddr; // reverb area curr addr in samples
+
+ int VolLeft;
+ int VolRight;
+ int iLastRVBLeft;
+ int iLastRVBRight;
+ int iRVBLeft;
+ int iRVBRight;
+ int iCnt;
+
+ int FB_SRC_A; // (offset)
+ int FB_SRC_B; // (offset)
+ int IIR_ALPHA; // (coef.)
+ int ACC_COEF_A; // (coef.)
+ int ACC_COEF_B; // (coef.)
+ int ACC_COEF_C; // (coef.)
+ int ACC_COEF_D; // (coef.)
+ int IIR_COEF; // (coef.)
+ int FB_ALPHA; // (coef.)
+ int FB_X; // (coef.)
+ int IIR_DEST_A0; // (offset)
+ int IIR_DEST_A1; // (offset)
+ int ACC_SRC_A0; // (offset)
+ int ACC_SRC_A1; // (offset)
+ int ACC_SRC_B0; // (offset)
+ int ACC_SRC_B1; // (offset)
+ int IIR_SRC_A0; // (offset)
+ int IIR_SRC_A1; // (offset)
+ int IIR_DEST_B0; // (offset)
+ int IIR_DEST_B1; // (offset)
+ int ACC_SRC_C0; // (offset)
+ int ACC_SRC_C1; // (offset)
+ int ACC_SRC_D0; // (offset)
+ int ACC_SRC_D1; // (offset)
+ int IIR_SRC_B1; // (offset)
+ int IIR_SRC_B0; // (offset)
+ int MIX_DEST_A0; // (offset)
+ int MIX_DEST_A1; // (offset)
+ int MIX_DEST_B0; // (offset)
+ int MIX_DEST_B1; // (offset)
+ int IN_COEF_L; // (coef.)
+ int IN_COEF_R; // (coef.)
+} REVERBInfo;
+
+#ifdef _WINDOWS
+//extern HINSTANCE hInst;
+//#define WM_MUTE (WM_USER+543)
+#endif
+
+///////////////////////////////////////////////////////////
+// SPU.C globals
+///////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////
+// CFG.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_CFG
+
+#ifndef _WINDOWS
+extern char * pConfigFile;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// DSOUND.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_DSOUND
+
+#ifdef _WINDOWS
+extern unsigned long LastWrite;
+extern unsigned long LastPlay;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// RECORD.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_RECORD
+
+#ifdef _WINDOWS
+extern int iDoRecord;
+#endif
+
+#endif
+
+///////////////////////////////////////////////////////////
+// XA.C globals
+///////////////////////////////////////////////////////////
+
+#ifndef _IN_XA
+
+extern xa_decode_t * xapGlobal;
+
+extern unsigned long * XAFeed;
+extern unsigned long * XAPlay;
+extern unsigned long * XAStart;
+extern unsigned long * XAEnd;
+
+extern unsigned long XARepeat;
+extern unsigned long XALastVal;
+
+extern int iLeftXAVol;
+extern int iRightXAVol;
+
+#endif
+
+#endif // PEOPS2_EXTERNALS

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/gauss_i.h Added

@@ -0,0 +1,162 @@
+/***************************************************************************
+                          gauss_i.h  -  description
+                           -----------------------
+    begin                : Sun Feb 08 2003
+    copyright            : (C) 2003 by Chris Moeller, eh, whatever
+    email                : chris@kode54.tk
+ ***************************************************************************/
+                       
+/***************************************************************************
+ *                                                                         *
+ *   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. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+                           
+//*************************************************************************//
+// History of changes:
+//
+// 2003/02/08 - kode54
+// - generated by interleaving table from gauss.h from the libopenspc
+//   project; a gaussian bell curve table logged from the SPC-700,
+//   though Neill says he logged the same curve from a PSX SPU. Also
+//   says that interleaving the coefficients together runs faster. Meh.
+//
+//*************************************************************************//
+
+#ifndef GAUSS_H
+#define GAUSS_H
+
+static const int gauss[]={
+	0x172, 0x519, 0x176, 0x000, 0x16E, 0x519, 0x17A, 0x000, 
+	0x16A, 0x518, 0x17D, 0x000, 0x166, 0x518, 0x181, 0x000, 
+	0x162, 0x518, 0x185, 0x000, 0x15F, 0x518, 0x189, 0x000, 
+	0x15B, 0x518, 0x18D, 0x000, 0x157, 0x517, 0x191, 0x000, 
+	0x153, 0x517, 0x195, 0x000, 0x150, 0x517, 0x19A, 0x000, 
+	0x14C, 0x516, 0x19E, 0x000, 0x148, 0x516, 0x1A2, 0x000, 
+	0x145, 0x515, 0x1A6, 0x000, 0x141, 0x514, 0x1AA, 0x000, 
+	0x13E, 0x514, 0x1AE, 0x000, 0x13A, 0x513, 0x1B2, 0x000, 
+	0x137, 0x512, 0x1B7, 0x001, 0x133, 0x511, 0x1BB, 0x001, 
+	0x130, 0x511, 0x1BF, 0x001, 0x12C, 0x510, 0x1C3, 0x001, 
+	0x129, 0x50F, 0x1C8, 0x001, 0x125, 0x50E, 0x1CC, 0x001, 
+	0x122, 0x50D, 0x1D0, 0x001, 0x11E, 0x50C, 0x1D5, 0x001, 
+	0x11B, 0x50B, 0x1D9, 0x001, 0x118, 0x50A, 0x1DD, 0x001, 
+	0x114, 0x508, 0x1E2, 0x001, 0x111, 0x507, 0x1E6, 0x002, 
+	0x10E, 0x506, 0x1EB, 0x002, 0x10B, 0x504, 0x1EF, 0x002, 
+	0x107, 0x503, 0x1F3, 0x002, 0x104, 0x502, 0x1F8, 0x002, 
+	0x101, 0x500, 0x1FC, 0x002, 0x0FE, 0x4FF, 0x201, 0x002, 
+	0x0FB, 0x4FD, 0x205, 0x003, 0x0F8, 0x4FB, 0x20A, 0x003, 
+	0x0F5, 0x4FA, 0x20F, 0x003, 0x0F2, 0x4F8, 0x213, 0x003, 
+	0x0EF, 0x4F6, 0x218, 0x003, 0x0EC, 0x4F5, 0x21C, 0x004, 
+	0x0E9, 0x4F3, 0x221, 0x004, 0x0E6, 0x4F1, 0x226, 0x004, 
+	0x0E3, 0x4EF, 0x22A, 0x004, 0x0E0, 0x4ED, 0x22F, 0x004, 
+	0x0DD, 0x4EB, 0x233, 0x005, 0x0DA, 0x4E9, 0x238, 0x005, 
+	0x0D7, 0x4E7, 0x23D, 0x005, 0x0D4, 0x4E5, 0x241, 0x005, 
+	0x0D2, 0x4E3, 0x246, 0x006, 0x0CF, 0x4E0, 0x24B, 0x006, 
+	0x0CC, 0x4DE, 0x250, 0x006, 0x0C9, 0x4DC, 0x254, 0x006, 
+	0x0C7, 0x4D9, 0x259, 0x007, 0x0C4, 0x4D7, 0x25E, 0x007, 
+	0x0C1, 0x4D5, 0x263, 0x007, 0x0BF, 0x4D2, 0x267, 0x008, 
+	0x0BC, 0x4D0, 0x26C, 0x008, 0x0BA, 0x4CD, 0x271, 0x008, 
+	0x0B7, 0x4CB, 0x276, 0x009, 0x0B4, 0x4C8, 0x27B, 0x009, 
+	0x0B2, 0x4C5, 0x280, 0x009, 0x0AF, 0x4C3, 0x284, 0x00A, 
+	0x0AD, 0x4C0, 0x289, 0x00A, 0x0AB, 0x4BD, 0x28E, 0x00A, 
+	0x0A8, 0x4BA, 0x293, 0x00B, 0x0A6, 0x4B7, 0x298, 0x00B, 
+	0x0A3, 0x4B5, 0x29D, 0x00B, 0x0A1, 0x4B2, 0x2A2, 0x00C, 
+	0x09F, 0x4AF, 0x2A6, 0x00C, 0x09C, 0x4AC, 0x2AB, 0x00D, 
+	0x09A, 0x4A9, 0x2B0, 0x00D, 0x098, 0x4A6, 0x2B5, 0x00E, 
+	0x096, 0x4A2, 0x2BA, 0x00E, 0x093, 0x49F, 0x2BF, 0x00F, 
+	0x091, 0x49C, 0x2C4, 0x00F, 0x08F, 0x499, 0x2C9, 0x00F, 
+	0x08D, 0x496, 0x2CE, 0x010, 0x08B, 0x492, 0x2D3, 0x010, 
+	0x089, 0x48F, 0x2D8, 0x011, 0x086, 0x48C, 0x2DC, 0x011, 
+	0x084, 0x488, 0x2E1, 0x012, 0x082, 0x485, 0x2E6, 0x013, 
+	0x080, 0x481, 0x2EB, 0x013, 0x07E, 0x47E, 0x2F0, 0x014, 
+	0x07C, 0x47A, 0x2F5, 0x014, 0x07A, 0x477, 0x2FA, 0x015, 
+	0x078, 0x473, 0x2FF, 0x015, 0x076, 0x470, 0x304, 0x016, 
+	0x075, 0x46C, 0x309, 0x017, 0x073, 0x468, 0x30E, 0x017, 
+	0x071, 0x465, 0x313, 0x018, 0x06F, 0x461, 0x318, 0x018, 
+	0x06D, 0x45D, 0x31D, 0x019, 0x06B, 0x459, 0x322, 0x01A, 
+	0x06A, 0x455, 0x326, 0x01B, 0x068, 0x452, 0x32B, 0x01B, 
+	0x066, 0x44E, 0x330, 0x01C, 0x064, 0x44A, 0x335, 0x01D, 
+	0x063, 0x446, 0x33A, 0x01D, 0x061, 0x442, 0x33F, 0x01E, 
+	0x05F, 0x43E, 0x344, 0x01F, 0x05E, 0x43A, 0x349, 0x020, 
+	0x05C, 0x436, 0x34E, 0x020, 0x05A, 0x432, 0x353, 0x021, 
+	0x059, 0x42E, 0x357, 0x022, 0x057, 0x42A, 0x35C, 0x023, 
+	0x056, 0x425, 0x361, 0x024, 0x054, 0x421, 0x366, 0x024, 
+	0x053, 0x41D, 0x36B, 0x025, 0x051, 0x419, 0x370, 0x026, 
+	0x050, 0x415, 0x374, 0x027, 0x04E, 0x410, 0x379, 0x028, 
+	0x04D, 0x40C, 0x37E, 0x029, 0x04C, 0x408, 0x383, 0x02A, 
+	0x04A, 0x403, 0x388, 0x02B, 0x049, 0x3FF, 0x38C, 0x02C, 
+	0x047, 0x3FB, 0x391, 0x02D, 0x046, 0x3F6, 0x396, 0x02E, 
+	0x045, 0x3F2, 0x39B, 0x02F, 0x043, 0x3ED, 0x39F, 0x030, 
+	0x042, 0x3E9, 0x3A4, 0x031, 0x041, 0x3E5, 0x3A9, 0x032, 
+	0x040, 0x3E0, 0x3AD, 0x033, 0x03E, 0x3DC, 0x3B2, 0x034, 
+	0x03D, 0x3D7, 0x3B7, 0x035, 0x03C, 0x3D2, 0x3BB, 0x036, 
+	0x03B, 0x3CE, 0x3C0, 0x037, 0x03A, 0x3C9, 0x3C5, 0x038, 
+	0x038, 0x3C5, 0x3C9, 0x03A, 0x037, 0x3C0, 0x3CE, 0x03B, 
+	0x036, 0x3BB, 0x3D2, 0x03C, 0x035, 0x3B7, 0x3D7, 0x03D, 
+	0x034, 0x3B2, 0x3DC, 0x03E, 0x033, 0x3AD, 0x3E0, 0x040, 
+	0x032, 0x3A9, 0x3E5, 0x041, 0x031, 0x3A4, 0x3E9, 0x042, 
+	0x030, 0x39F, 0x3ED, 0x043, 0x02F, 0x39B, 0x3F2, 0x045, 
+	0x02E, 0x396, 0x3F6, 0x046, 0x02D, 0x391, 0x3FB, 0x047, 
+	0x02C, 0x38C, 0x3FF, 0x049, 0x02B, 0x388, 0x403, 0x04A, 
+	0x02A, 0x383, 0x408, 0x04C, 0x029, 0x37E, 0x40C, 0x04D, 
+	0x028, 0x379, 0x410, 0x04E, 0x027, 0x374, 0x415, 0x050, 
+	0x026, 0x370, 0x419, 0x051, 0x025, 0x36B, 0x41D, 0x053, 
+	0x024, 0x366, 0x421, 0x054, 0x024, 0x361, 0x425, 0x056, 
+	0x023, 0x35C, 0x42A, 0x057, 0x022, 0x357, 0x42E, 0x059, 
+	0x021, 0x353, 0x432, 0x05A, 0x020, 0x34E, 0x436, 0x05C, 
+	0x020, 0x349, 0x43A, 0x05E, 0x01F, 0x344, 0x43E, 0x05F, 
+	0x01E, 0x33F, 0x442, 0x061, 0x01D, 0x33A, 0x446, 0x063, 
+	0x01D, 0x335, 0x44A, 0x064, 0x01C, 0x330, 0x44E, 0x066, 
+	0x01B, 0x32B, 0x452, 0x068, 0x01B, 0x326, 0x455, 0x06A, 
+	0x01A, 0x322, 0x459, 0x06B, 0x019, 0x31D, 0x45D, 0x06D, 
+	0x018, 0x318, 0x461, 0x06F, 0x018, 0x313, 0x465, 0x071, 
+	0x017, 0x30E, 0x468, 0x073, 0x017, 0x309, 0x46C, 0x075, 
+	0x016, 0x304, 0x470, 0x076, 0x015, 0x2FF, 0x473, 0x078, 
+	0x015, 0x2FA, 0x477, 0x07A, 0x014, 0x2F5, 0x47A, 0x07C, 
+	0x014, 0x2F0, 0x47E, 0x07E, 0x013, 0x2EB, 0x481, 0x080, 
+	0x013, 0x2E6, 0x485, 0x082, 0x012, 0x2E1, 0x488, 0x084, 
+	0x011, 0x2DC, 0x48C, 0x086, 0x011, 0x2D8, 0x48F, 0x089, 
+	0x010, 0x2D3, 0x492, 0x08B, 0x010, 0x2CE, 0x496, 0x08D, 
+	0x00F, 0x2C9, 0x499, 0x08F, 0x00F, 0x2C4, 0x49C, 0x091, 
+	0x00F, 0x2BF, 0x49F, 0x093, 0x00E, 0x2BA, 0x4A2, 0x096, 
+	0x00E, 0x2B5, 0x4A6, 0x098, 0x00D, 0x2B0, 0x4A9, 0x09A, 
+	0x00D, 0x2AB, 0x4AC, 0x09C, 0x00C, 0x2A6, 0x4AF, 0x09F, 
+	0x00C, 0x2A2, 0x4B2, 0x0A1, 0x00B, 0x29D, 0x4B5, 0x0A3, 
+	0x00B, 0x298, 0x4B7, 0x0A6, 0x00B, 0x293, 0x4BA, 0x0A8, 
+	0x00A, 0x28E, 0x4BD, 0x0AB, 0x00A, 0x289, 0x4C0, 0x0AD, 
+	0x00A, 0x284, 0x4C3, 0x0AF, 0x009, 0x280, 0x4C5, 0x0B2, 
+	0x009, 0x27B, 0x4C8, 0x0B4, 0x009, 0x276, 0x4CB, 0x0B7, 
+	0x008, 0x271, 0x4CD, 0x0BA, 0x008, 0x26C, 0x4D0, 0x0BC, 
+	0x008, 0x267, 0x4D2, 0x0BF, 0x007, 0x263, 0x4D5, 0x0C1, 
+	0x007, 0x25E, 0x4D7, 0x0C4, 0x007, 0x259, 0x4D9, 0x0C7, 
+	0x006, 0x254, 0x4DC, 0x0C9, 0x006, 0x250, 0x4DE, 0x0CC, 
+	0x006, 0x24B, 0x4E0, 0x0CF, 0x006, 0x246, 0x4E3, 0x0D2, 
+	0x005, 0x241, 0x4E5, 0x0D4, 0x005, 0x23D, 0x4E7, 0x0D7, 
+	0x005, 0x238, 0x4E9, 0x0DA, 0x005, 0x233, 0x4EB, 0x0DD, 
+	0x004, 0x22F, 0x4ED, 0x0E0, 0x004, 0x22A, 0x4EF, 0x0E3, 
+	0x004, 0x226, 0x4F1, 0x0E6, 0x004, 0x221, 0x4F3, 0x0E9, 
+	0x004, 0x21C, 0x4F5, 0x0EC, 0x003, 0x218, 0x4F6, 0x0EF, 
+	0x003, 0x213, 0x4F8, 0x0F2, 0x003, 0x20F, 0x4FA, 0x0F5, 
+	0x003, 0x20A, 0x4FB, 0x0F8, 0x003, 0x205, 0x4FD, 0x0FB, 
+	0x002, 0x201, 0x4FF, 0x0FE, 0x002, 0x1FC, 0x500, 0x101, 
+	0x002, 0x1F8, 0x502, 0x104, 0x002, 0x1F3, 0x503, 0x107, 
+	0x002, 0x1EF, 0x504, 0x10B, 0x002, 0x1EB, 0x506, 0x10E, 
+	0x002, 0x1E6, 0x507, 0x111, 0x001, 0x1E2, 0x508, 0x114, 
+	0x001, 0x1DD, 0x50A, 0x118, 0x001, 0x1D9, 0x50B, 0x11B, 
+	0x001, 0x1D5, 0x50C, 0x11E, 0x001, 0x1D0, 0x50D, 0x122, 
+	0x001, 0x1CC, 0x50E, 0x125, 0x001, 0x1C8, 0x50F, 0x129, 
+	0x001, 0x1C3, 0x510, 0x12C, 0x001, 0x1BF, 0x511, 0x130, 
+	0x001, 0x1BB, 0x511, 0x133, 0x001, 0x1B7, 0x512, 0x137, 
+	0x000, 0x1B2, 0x513, 0x13A, 0x000, 0x1AE, 0x514, 0x13E, 
+	0x000, 0x1AA, 0x514, 0x141, 0x000, 0x1A6, 0x515, 0x145, 
+	0x000, 0x1A2, 0x516, 0x148, 0x000, 0x19E, 0x516, 0x14C, 
+	0x000, 0x19A, 0x517, 0x150, 0x000, 0x195, 0x517, 0x153, 
+	0x000, 0x191, 0x517, 0x157, 0x000, 0x18D, 0x518, 0x15B, 
+	0x000, 0x189, 0x518, 0x15F, 0x000, 0x185, 0x518, 0x162, 
+	0x000, 0x181, 0x518, 0x166, 0x000, 0x17D, 0x518, 0x16A, 
+	0x000, 0x17A, 0x519, 0x16E, 0x000, 0x176, 0x519, 0x172};
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/psemuxa.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/registers.h Added

@@ -0,0 +1,845 @@
+/***************************************************************************
+ registers.h - description
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * 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. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - generic cleanup for the Peops release... register values by Kanodin &
+// his team
+//
+//*************************************************************************//
+
+//###########################################################################
+
+#define PS2_C0_SPUaddr_Hi (0x000 + 0x1A8)
+#define PS2_C0_SPUaddr_Lo (0x000 + 0x1AA)
+#define PS2_C1_SPUaddr_Hi (0x400 + 0x1A8)
+#define PS2_C1_SPUaddr_Lo (0x400 + 0x1AA)
+#define PS2_C0_SPUdata (0x000 + 0x1AC)
+#define PS2_C1_SPUdata (0x400 + 0x1AC)
+
+#define PS2_C0_SPUDMActrl (0x000 + 0x1AE)
+#define PS2_C1_SPUDMActrl (0x400 + 0x1AE)
+
+#define PS2_C0_SPUstat (0x000 + 0x344)
+#define PS2_C1_SPUstat (0x400 + 0x344)
+#define PS2_C0_ReverbAddr_Hi (0x000 + 0x2E0)
+#define PS2_C0_ReverbAddr_Lo (0x000 + 0x2E2)
+#define PS2_C1_ReverbAddr_Hi (0x400 + 0x2E0)
+#define PS2_C1_ReverbAddr_Lo (0x400 + 0x2E2)
+
+#define PS2_C0_ReverbAEnd_Hi (0x000 + 0x33C)
+#define PS2_C0_ReverbAEnd_Lo (0x000 + 0x33E)
+#define PS2_C1_ReverbAEnd_Hi (0x400 + 0x33C)
+#define PS2_C1_ReverbAEnd_Lo (0x400 + 0x33E)
+
+#define PS2_C0_DryL1 (0x000 + 0x188)
+#define PS2_C1_DryL1 (0x400 + 0x188)
+#define PS2_C0_DryL2 (0x000 + 0x18A)
+#define PS2_C1_DryL2 (0x400 + 0x18A)
+
+#define PS2_C0_DryR1 (0x000 + 0x190)
+#define PS2_C1_DryR1 (0x400 + 0x190)
+#define PS2_C0_DryR2 (0x000 + 0x192)
+#define PS2_C1_DryR2 (0x400 + 0x192)
+
+#define PS2_C0_ATTR (0x000 + 0x19A)
+#define PS2_C1_ATTR (0x400 + 0x19A)
+#define PS2_C0_ADMAS (0x000 + 0x1B0)
+#define PS2_C1_ADMAS (0x400 + 0x1B0)
+
+#define PS2_C0_SPUirqAddr_Hi (0x000 + 0x19C)
+#define PS2_C0_SPUirqAddr_Lo (0x000 + 0x19D)
+#define PS2_C1_SPUirqAddr_Hi (0x400 + 0x19C)
+#define PS2_C1_SPUirqAddr_Lo (0x400 + 0x19D)
+#define PS2_C0_SPUrvolL (0x000 + 0x764)
+#define PS2_C0_SPUrvolR (0x000 + 0x766)
+#define PS2_C1_SPUrvolL (0x028 + 0x764)
+#define PS2_C1_SPUrvolR (0x028 + 0x766)
+#define PS2_C0_SPUon1 (0x000 + 0x1A0)
+#define PS2_C0_SPUon2 (0x000 + 0x1A2)
+#define PS2_C1_SPUon1 (0x400 + 0x1A0)
+#define PS2_C1_SPUon2 (0x400 + 0x1A2)
+#define PS2_C0_SPUoff1 (0x000 + 0x1A4)
+#define PS2_C0_SPUoff2 (0x000 + 0x1A6)
+#define PS2_C1_SPUoff1 (0x400 + 0x1A4)
+#define PS2_C1_SPUoff2 (0x400 + 0x1A6)
+#define PS2_C0_FMod1 (0x000 + 0x180)
+#define PS2_C0_FMod2 (0x000 + 0x182)
+#define PS2_C1_FMod1 (0x400 + 0x180)
+#define PS2_C1_FMod2 (0x400 + 0x182)
+#define PS2_C0_Noise1 (0x000 + 0x184)
+#define PS2_C0_Noise2 (0x000 + 0x186)
+#define PS2_C1_Noise1 (0x400 + 0x184)
+#define PS2_C1_Noise2 (0x400 + 0x186)
+
+#define PS2_C0_RVBon1_L (0x000 + 0x18C)
+#define PS2_C0_RVBon2_L (0x000 + 0x18E)
+#define PS2_C0_RVBon1_R (0x000 + 0x194)
+#define PS2_C0_RVBon2_R (0x000 + 0x196)
+
+#define PS2_C1_RVBon1_L (0x400 + 0x18C)
+#define PS2_C1_RVBon2_L (0x400 + 0x18E)
+#define PS2_C1_RVBon1_R (0x400 + 0x194)
+#define PS2_C1_RVBon2_R (0x400 + 0x196)
+#define PS2_C0_Reverb (0x000 + 0x2E4)
+#define PS2_C1_Reverb (0x400 + 0x2E4)
+#define PS2_C0_ReverbX (0x000 + 0x774)
+#define PS2_C1_ReverbX (0x028 + 0x774)
+#define PS2_C0_SPUend1 (0x000 + 0x340)
+#define PS2_C0_SPUend2 (0x000 + 0x342)
+#define PS2_C1_SPUend1 (0x400 + 0x340)
+#define PS2_C1_SPUend2 (0x400 + 0x342)
+
+#define H_SPUReverbAddr 0x0da2
+ 
+#define H_SPUirqAddr 0x0da4
+ 
+#define H_SPUaddr 0x0da6
+ 
+#define H_SPUdata 0x0da8
+ 
+#define H_SPUctrl 0x0daa
+ 
+#define H_SPUstat 0x0dae
+ 
+#define H_SPUmvolL 0x0d80
+ 
+#define H_SPUmvolR 0x0d82
+ 
+#define H_SPUrvolL 0x0d84
+ 
+#define H_SPUrvolR 0x0d86
+ 
+#define H_SPUon1 0x0d88
+ 
+#define H_SPUon2 0x0d8a
+ 
+#define H_SPUoff1 0x0d8c
+ 
+#define H_SPUoff2 0x0d8e
+ 
+#define H_FMod1 0x0d90
+ 
+#define H_FMod2 0x0d92
+ 
+#define H_Noise1 0x0d94
+ 
+#define H_Noise2 0x0d96
+ 
+#define H_RVBon1 0x0d98
+ 
+#define H_RVBon2 0x0d9a
+#define H_SPUMute1 0x0d9c
+#define H_SPUMute2 0x0d9e
+#define H_CDLeft 0x0db0
+#define H_CDRight 0x0db2
+#define H_ExtLeft 0x0db4
+#define H_ExtRight 0x0db6
+#define H_Reverb 0x0dc0
+
+
+//###########################################################################
+
+/*
+ Included the info received in Regs.txt list by Neill Corlett - Kanodin
+
+ Voice parameters:
+ SD_VP_VOLL, SD_VP_VOLR - Volume left/right per voice. Assuming identical to PS1.
+ SD_VP_PITCH - Pitch scaler 0000-3FFF. Assuming identical to PS1.
+ SD_VP_ADSR1, SD_VP_ADSR1 - Envelope data. Bitfields are documented as identical to PS1.
+ SD_VP_ENVX - Current envelope value. Assuming identical to PS1.
+ SD_VP_VOLXL, SD_VP_VOLXR - Current voice volume left/right. Does not exist on the PS1.
+ Guessing that this is handy for the increase/decrease modes.
+
+ Voice addresses:
+
+ SD_VA_SSA - Sample start address; assuming identical to PS1
+ SD_VA_LSAX - Loop start address; assuming identical to PS1
+ SD_VA_NAX - Seems to be documented as the current playing address.
+ Does not exist on PS1.
+
+ Switches:
+
+ SD_S_PMON - Pitch mod; assuming identical to PS1
+ SD_S_NON - Noise; assuming identical to PS1
+ SD_S_VMIXL, SD_S_VMIXR - Voice mix L/R. Guessing this is just a separate L/R version 
+ of the "voice enable" bits on the PS1.
+ SD_S_VMIXEL, SD_S_VMIXER - Voice effect mix L/R. Guessing this is just a separate L/R
+ version of the "voice reverb enable" bits on the PS1.
+ SD_S_KON, SD_S_KOFF - Key on/off; assuming identical to PS1
+
+
+ Addresses:
+
+ SD_A_TSA - Transfer start address; assuming identical to PS1
+ SD_A_ESA - Effect start address - this is probably analogous to the
+ PS1's reverb work area start address
+ SD_A_EEA - Effect end address - this would've been fixed to 0x7FFFF on
+ the PS1; settable in 128K increments on the PS2.
+ SD_A_IRQA - IRQ address; assuming identical to PS1
+
+ Volume parameters:
+
+ SD_P_MVOLL, SD_P_MVOLR - Master volume L/R; assuming identical to PS1
+ SD_P_EVOLL, SD_P_EVOLR - Effect volume L/R; assuming analogous to RVOL on the PS1
+ SD_P_AVOLL, SD_P_AVOLR - External input volume L/R
+ This is probably where CORE0 connects to CORE1
+ SD_P_BVOLL, SD_P_BVOLR - Sound data input volume - perhaps this is the volume of
+ the raw PCM auto-DMA input? analogous to CD input volume?
+ SD_P_MVOLXL, SD_P_MVOLXR - Current master volume L/R; seems self-explanatory
+
+ SD_P_MMIX - Mixer / effect enable bits.
+ bit 11 = MSNDL = voice output dry L
+ 10 = MSNDR = voice output dry R
+ 9 = MSNDEL = voice output wet L
+ 8 = MSNDER = voice output wet R
+ 7 = MINL = sound data input dry L
+ 6 = MINR = sound data input dry R
+ 5 = MINEL = sound data input wet L
+ 4 = MINER = sound data input wet R
+ 3 = SINL = core external input dry L
+ 2 = SINR = core external input dry R
+ 1 = SINEL = core external input wet L
+ 0 = SINER = core external input wet R
+
+Core attributes (SD_C)
+
+ bit 4..5 - DMA related
+ bit 6 - IRQ enable
+ bit 7 - effect enable (reverb enable)
+ bit 13..8 - noise clock
+ bit 14 - mute
+
+ - if you READ the two DMA related bits, if either are set, the channel is
+ considered "busy" by sceSdVoiceTrans
+
+
+
+Reverb parameters:
+
+ Same as PS1 reverb (I used the names from my reverb doc).
+
+
+Other PS2 IOP notes
+
+ There's two DMA controllers:
+ The original one at 1F801080-1F8010FF (channels 0-6)
+ A new one at 1F801500-1F80157F (channels 7-13)
+
+ They appear to function the same way - 7 channels each.
+
+ SPU CORE0's DMA channel is 4 as per usual
+ SPU CORE1's DMA channel is 7
+
+DMA channel 10 is SIF
+ 
+ Original INTR controller at 1F801000-1F80107F
+
+ All interrupt handling seems to be done using the old INTR, but
+ with some new bits defined:
+
+
+
+ Reading from 1F801078 masks interrupts and returns 1 if they weren't
+ masked before. Writing 1 to 1F801078 re-enables interrupts.
+ Writing 0 doesn't. Maybe it was like that on the original PS1 too.
+
+Six root counters:
+
+ RTC# address sources size prescale interrupt#
+0 0x1F801100 sysclock,pixel 16 bit 1 only 4
+1 0x1F801110 sysclock,hline 16 bit 1 only 5
+2 0x1F801120 sysclock 16 bit 1,8 6
+3 0x1F801480 sysclock,hline 32 bit 1 only 14
+4 0x1F801490 sysclock 32 bit 1,8,16,256 15
+5 0x1F8014A0 sysclock 32 bit 1,8,16,256 16
+
+Count (0x0) and Compare (0x8) registers work as before, only with more bits
+in the new counters.
+
+Mode (0x4) works like this when written:
+
+ bits 0..2 gate
+ bit 3 reset on target
+ bit 4 target interrupt enable
+ bit 5 overflow interrupt enable
+ bit 6 master enable (?)
+ bit 7 ?
+ bit 8 clock select
+ bit 9 prescale (OLD)
+ bit 10..12 ?
+ bit 13..14 prescale (NEW)
+ bit 15 ? always set to 1
+
+Gate:
+ TM_NO_GATE 000
+ TM_GATE_ON_Count 001
+ TM_GATE_ON_ClearStart 011
+ TM_GATE_ON_Clear_OFF_Start 101
+ TM_GATE_ON_Start 111
+
+ V-blank ----+ +----------------------------+ +------
+ | | | |
+ | | | |
+ +----+ +----+
+ TM_NO_GATE:
+
+ 0================================>============
+
+ TM_GATE_ON_Count:
+
+ <---->0==========================><---->0=====
+
+ TM_GATE_ON_ClearStart:
+
+ 0====>0================================>0=====
+
+ TM_GATE_ON_Clear_OFF_Start:
+
+ 0====><-------------------------->0====><-----
+
+ TM_GATE_ON_Start:
+
+ <---->0==========================>============
+
+ reset on target: if set, counter resets to 0 when Compare value is reached
+
+ target interrupt enable: if set, interrupt when Compare value is reached
+ overflow interrupt enable: if set, interrupt when counter overflows
+
+ master enable: if this bit is clear, the timer should do nothing.
+
+ clock select: for counters 0, 1, and 3, setting this will select the alternate
+ counter (pixel or hline)
+
+ prescale (OLD): for counter 2 only. set this to prescale (divide) by 8.
+
+ prescale (NEW): for counters 4 and 5 only:
+
+ 00 = prescale by 1
+ 01 = prescale by 8
+ 10 = prescale by 16
+ 11 = prescale by 256
+
+Writing 0x4 also clears the counter. (I think.)
+
+When 0x4 is read, it becomes Status:
+
+ bit 0..10 ?
+ bit 11 compare value was reached
+ bit 12 count overflowed
+ bit 13..15 ?
+
+Reading probably clears these bits.
+
+
+
+ 1F8014B0 (word) - timer-related but otherwise unknown
+ 1F8014C0 (word) - timer-related but otherwise unknown
+
+
+ don't currently know how the interrupts work for DMA ch7 yet
+
+ 1F801060 (word) - address of some kind.
+
+ 1F801450 (word) -
+ if bit 3 is SET, we're in PS1 mode.
+ if bit 3 is CLEAR, we're in PS2 IOP mode.
+
+ 1F802070 (byte) - unknown. status byte of some kind? visible to EE?
+
+ 1D000000-1D00007F (?) - SIF related
+
+ 1D000020 (word) - read counter of some sort?
+ sceSifInit waits for bit 0x10000 of this to be set.
+ 1D000030 (word) - read counter of some sort?
+ 1D000040 (word) - read bits 0x20, 0x40 mean something
+ 1D000060 (word) - used to detect whether the SIF interface exists
+ read must be 0x1D000060, or the top 20 bits must be zero 
+*/
+
+/*
+
+// DirectX Audio SPU2 Driver for PCSX2
+// audio.c by J.F. and Kanodin (hooper1@cox.net)
+//
+// Copyright 2003 J.F. and Kanodin, and distributed under the
+// terms of the GNU General Public License, v2 or later.
+// http://www.gnu.org/copyleft/gpl.html.
+
+Included these just in case you need them J.F. - Kanodin
+
+// Core Start Addresses
+#define CORE0 0x1f900000
+#define CORE1 0x1f900400
+
+
+ #define IOP_INT_VBLANK (1<<0)
+ #define IOP_INT_GM (1<<1)
+ #define IOP_INT_CDROM (1<<2)
+ #define IOP_INT_DMA (1<<3)
+ #define IOP_INT_RTC0 (1<<4)
+ #define IOP_INT_RTC1 (1<<5)
+ #define IOP_INT_RTC2 (1<<6)
+ #define IOP_INT_SIO0 (1<<7)
+ #define IOP_INT_SIO1 (1<<8)
+ #define IOP_INT_SPU (1<<9)
+ #define IOP_INT_PIO (1<<10)
+ #define IOP_INT_EVBLANK (1<<11)
+ #define IOP_INT_DVD (1<<12)
+ #define IOP_INT_PCMCIA (1<<13)
+ #define IOP_INT_RTC3 (1<<14)
+ #define IOP_INT_RTC4 (1<<15)
+ #define IOP_INT_RTC5 (1<<16)
+ #define IOP_INT_SIO2 (1<<17)
+ #define IOP_INT_HTR0 (1<<18)
+ #define IOP_INT_HTR1 (1<<19)
+ #define IOP_INT_HTR2 (1<<20)
+ #define IOP_INT_HTR3 (1<<21)
+ #define IOP_INT_USB (1<<22)
+ #define IOP_INT_EXTR (1<<23)
+ #define IOP_INT_FWRE (1<<24)
+ #define IOP_INT_FDMA (1<<25) 
+
+// CORE0 => +0x000, CORE1 => +0x400
+
+// individual voice parameter regs
+
+#define VP_VOLL(cr, vc) (0x400 * cr + 0x000 + (vc << 4)) // voice volume (left)
+#define VP_VOLR(cr, vc) (0x400 * cr + 0x002 + (vc << 4)) // voice volume (right)
+#define VP_PITCH(cr, vc) (0x400 * cr + 0x004 + (vc << 4)) // voice pitch
+#define VP_ADSR1(cr, vc) (0x400 * cr + 0x006 + (vc << 4)) // voice envelope (AR, DR, SL)
+#define VP_ADSR2(cr, vc) (0x400 * cr + 0x008 + (vc << 4)) // voice envelope (SR, RR)
+#define VP_ENVX(cr, vc) (0x400 * cr + 0x00A + (vc << 4)) // voice envelope (current value)
+#define VP_VOLXL(cr, vc) (0x400 * cr + 0x00C + (vc << 4)) // voice volume (current value left)
+#define VP_VOLXR(cr, vc) (0x400 * cr + 0x00E + (vc << 4)) // voice volume (current value right)
+
+#define VA_SSA(cr, vc) (0x400 * cr + 0x1C0 + (vc * 12)) // voice waveform data start address
+#define VA_LSAX(cr, vc) (0x400 * cr + 0x1C4 + (vc * 12)) // voice waveform data loop address
+#define VA_NAX(cr, vc) (0x400 * cr + 0x1C8 + (vc * 12)) // voice waveform data next address
+
+// common settings
+
+#define S_PMON(cr) (0x400 * cr + 0x180) // pitch modulation on
+#define S_NON(cr) (0x400 * cr + 0x184) // noise generator on
+#define S_VMIXL(cr) (0x400 * cr + 0x188) // voice output mixing (dry left)
+#define S_VMIXEL(cr) (0x400 * cr + 0x18C) // voice output mixing (wet left)
+#define S_VMIXR(cr) (0x400 * cr + 0x190) // voice output mixing (dry right)
+#define S_VMIXER(cr) (0x400 * cr + 0x194) // voice output mixing (wet right)
+#define P_MMIX(cr) (0x400 * cr + 0x198) // output type after voice mixing (See paragraph below)
+#define P_ATTR(cr) (0x400 * cr + 0x19A) // core attributes (See paragraph below)
+#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address 
+#define S_KON(cr) (0x400 * cr + 0x1A0) // key on (start voice sound generation)
+#define S_KOFF(cr) (0x400 * cr + 0x1A4) // key off (end voice sound generation)
+#define A_TSA(cr) (0x400 * cr + 0x1A8) // DMA transfer start address
+#define P_DATA(cr) (0x400 * cr + 0x1AC) // DMA data register
+#define P_CTRL(cr) (0x400 * cr + 0x1AE) // DMA control register
+#define P_ADMAS(cr) (0x400 * cr + 0x1B0) // AutoDMA status
+
+#define A_ESA(cr) (0x400 * cr + 0x2E0) // effects work area start address
+
+#define FB_SRC_A(cr) (0x400 * cr + 0x2E4) 
+#define FB_SRC_B(cr) (0x400 * cr + 0x2E8) 
+#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC) 
+#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0) 
+#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4) 
+#define ACC_SRC_A1(cr) (0x400 * cr + 0x2F8)
+#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC) 
+
+#define ACC_SRC_B1(cr) (0x400 * cr + 0x300) 
+#define IIR_SRC_A0(cr) (0x400 * cr + 0x304) 
+#define IIR_SRC_A1(cr) (0x400 * cr + 0x308) 
+#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C) 
+#define IIR_DEST_B1(cr) (0x400 * cr + 0x310) 
+#define ACC_SRC_C0(cr) (0x400 * cr + 0x314) 
+#define ACC_SRC_C1(cr) (0x400 * cr + 0x318) 
+
+#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C) 
+#define ACC_SRC_D1(cr) (0x400 * cr + 0x320) 
+#define IIR_SRC_B1(cr) (0x400 * cr + 0x324) 
+#define IIR_SRC_B0(cr) (0x400 * cr + 0x328) 
+#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C) 
+#define MIX_DEST_A1(cr) (0x400 * cr + 0x330) 
+#define MIX_DEST_B0(cr) (0x400 * cr + 0x334) 
+#define MIX_DEST_B1(cr) (0x400 * cr + 0x338) 
+
+#define A_EEA(cr) (0x400 * cr + 0x33C) // effects work area end address
+
+#define P_ENDX(cr) (0x400 * cr + 0x340) // voice loop end status
+#define P_STAT(cr) (0x400 * cr + 0x344) // DMA status register
+#define P_ENDS(cr) (0x400 * cr + 0x346) // ?
+
+// CORE0 => +0x400, CORE1 => +0x428
+
+#define P_MVOLL(cr) (0x28 * cr + 0x760) // master volume (left)
+#define P_MVOLR(cr) (0x28 * cr + 0x762) // master volume (right)
+#define P_EVOLL(cr) (0x28 * cr + 0x764) // effect return volume (left)
+#define P_EVOLR(cr) (0x28 * cr + 0x766) // effect return volume (right)
+#define P_AVOLL(cr) (0x28 * cr + 0x768) // core external input volume (left)
+#define P_AVOLR(cr) (0x28 * cr + 0x76A) // core external input volume (right)
+#define P_BVOLL(cr) (0x28 * cr + 0x76C) // sound data input volume (left)
+#define P_BVOLR(cr) (0x28 * cr + 0x76E) // sound data input volume (right)
+#define P_MVOLXL(cr) (0x28 * cr + 0x770) // current master volume (left)
+#define P_MVOLXR(cr) (0x28 * cr + 0x772) // current master volume (right)
+
+#define IIR_ALPHA(cr) (0x28 * cr + 0x774) 
+#define ACC_COEF_A(cr) (0x28 * cr + 0x776) 
+#define ACC_COEF_B(cr) (0x28 * cr + 0x778) 
+#define ACC_COEF_C(cr) (0x28 * cr + 0x77A) 
+#define ACC_COEF_D(cr) (0x28 * cr + 0x77C) 
+#define IIR_COEF(cr) (0x28 * cr + 0x77E) 
+#define FB_ALPHA(cr) (0x28 * cr + 0x780) 
+#define FB_X(cr) (0x28 * cr + 0x782) 
+#define IN_COEF_L(cr) (0x28 * cr + 0x784) 
+#define IN_COEF_R(cr) (0x28 * cr + 0x786) 
+
+// CORE1 only => +0x400
+
+#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass 
+#define SPDIF_MODE 0x7C6
+#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD	
+#define SPDIF_COPY 0x7CA // SPDIF Copy Protection
+
+// PS1 SPU CORE
+
+// individual voice settings
+
+#define SPU_VP_PITCH(vc) (0xC04 + (vc << 4)) // voice pitch
+#define SPU_VA_SSA(vc) (0xC06 + (vc << 4)) // voice waveform data start address
+#define SPU_VP_ADSR(vc) (0xC08 + (vc << 4)) // voice envelope
+#define SPU_VA_SSA(vc) (0xC0E + (vc << 4)) // voice waveform data loop address
+
+// common settings
+
+#define SPU_P_MVOLL 0xD80 // master volume (left)
+#define SPU_P_MVOLR 0xD82 // master volume (right)
+#define SPU_P_RVOLL 0xD84 // effect return volume (left)
+#define SPU_P_RVOLR 0xD86 // effect return volume (right)
+#define SPU_S_KON1 0xD88 // key on
+#define SPU_S_KON2 0xD8A // 
+#define SPU_S_KOFF1 0xD8C // key off
+#define SPU_S_KOFF2 0xD8E // 
+#define SPU_S_PMON1 0xD90 // pitch modulation on
+#define SPU_S_PMON2 0xD92 // 
+#define SPU_S_NON1 0xD94 // noise generator on
+#define SPU_S_NON2 0xD96 // 
+#define SPU_S_RVBON1 0xD98 // effects on
+#define SPU_S_RVBON2 0xD9A // 
+#define SPU_S_MUTE1 0xD9C // voice mute
+#define SPU_S_MUTE2 0xD9E // 
+
+#define SPU_A_ESA 0xDA2 // effects work area start
+#define SPU_A_IRQA 0xDA4 // IRQ address
+#define SPU_A_TSA 0xDA6 // DMA transfer start address
+#define SPU_P_DATA 0xDA8 // DMA data register
+#define SPU_P_CTRL 0xDAA // DMA control register
+#define SPU_P_STAT 0xDAE // DMA status register
+
+#define SPU_P_CDL 0xDB0 // sound data input volume (left)
+#define SPU_P_CDR 0xDB2 // sound data input volume (right)
+#define SPU_P_EXTL 0xDB4 // external input volume (left)
+#define SPU_P_EXTR 0xDB6 // external input volume (right)
+
+#define SPU_P_REVERB 0xDC0 // effects control
+
+
+// Individual voice parameter regs CORE 0
+// Only
+
+
+#define VP_VOLL(cr, vc) (0x400 * cr + 0x000 + (vc << 4)) // voice volume (left)
+#define VP_VOLR(cr, vc) (0x400 * cr + 0x002 + (vc << 4)) // voice volume (right)
+#define VP_PITCH(cr, vc) (0x400 * cr + 0x004 + (vc << 4)) // voice pitch
+#define VP_ADSR1(cr, vc) (0x400 * cr + 0x006 + (vc << 4)) // voice envelope (AR, DR, SL)
+#define VP_ADSR2(cr, vc) (0x400 * cr + 0x008 + (vc << 4)) // voice envelope (SR, RR)
+#define VP_ENVX(cr, vc) (0x400 * cr + 0x00A + (vc << 4)) // voice envelope (current value)
+#define VP_VOLXL(cr, vc) (0x400 * cr + 0x00C + (vc << 4)) // voice volume (current value left)
+#define VP_VOLXR(cr, vc) (0x400 * cr + 0x00E + (vc << 4)) // voice volume (current value right)
+
+#define VA_SSA(cr, vc) (0x400 * cr + 0x1C0 + (vc * 12)) // voice waveform data start address
+#define VA_LSAX(cr, vc) (0x400 * cr + 0x1C4 + (vc * 12)) // voice waveform data loop address
+#define VA_NAX(cr, vc) (0x400 * cr + 0x1C8 + (vc * 12)) // voice waveform data next address
+
+
+// CORE 0 Common Settings
+
+
+#define S_PMON(cr) (0x400 * cr + 0x180) // pitch modulation on
+#define S_NON(cr) (0x400 * cr + 0x184) // noise generator on
+#define S_VMIXL(cr) (0x400 * cr + 0x188) // voice output mixing (dry left)
+#define S_VMIXEL(cr) (0x400 * cr + 0x18C) // voice output mixing (wet left)
+#define S_VMIXR(cr) (0x400 * cr + 0x190) // voice output mixing (dry right)
+#define S_VMIXER(cr) (0x400 * cr + 0x194) // voice output mixing (wet right)
+#define P_MMIX(cr) (0x400 * cr + 0x198) // output type after voice mixing (See paragraph below)
+#define P_ATTR(cr) (0x400 * cr + 0x19A) // core attributes (See paragraph below)
+#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address 
+#define S_KON(cr) (0x400 * cr + 0x1A0) // key on (start voice sound generation)
+#define S_KOFF(cr) (0x400 * cr + 0x1A4) // key off (end voice sound generation)
+#define A_TSA(cr) (0x400 * cr + 0x1A8) // DMA transfer start address
+#define P_DATA(cr) (0x400 * cr + 0x1AC) // DMA data register
+#define P_CTRL(cr) (0x400 * cr + 0x1AE) // DMA control register
+#define P_ADMAS(cr) (0x400 * cr + 0x1B0) // AutoDMA status
+
+#define A_ESA(cr) (0x400 * cr + 0x2E0) // effects work area start address
+
+
+// Core 0 Reverb Addresses
+
+
+#define FB_SRC_A(cr) (0x400 * cr + 0x2E4) 
+#define FB_SRC_B(cr) (0x400 * cr + 0x2E8) 
+#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC) 
+#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0) 
+#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4) 
+#define ACC_SRC_A1(cr) (0x400 * cr + 0x2F8)
+#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC) 
+
+#define ACC_SRC_B1(cr) (0x400 * cr + 0x300) 
+#define IIR_SRC_A0(cr) (0x400 * cr + 0x304) 
+#define IIR_SRC_A1(cr) (0x400 * cr + 0x308) 
+#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C) 
+#define IIR_DEST_B1(cr) (0x400 * cr + 0x310) 
+#define ACC_SRC_C0(cr) (0x400 * cr + 0x314) 
+#define ACC_SRC_C1(cr) (0x400 * cr + 0x318) 
+
+#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C) 
+#define ACC_SRC_D1(cr) (0x400 * cr + 0x320) 
+#define IIR_SRC_B1(cr) (0x400 * cr + 0x324) 
+#define IIR_SRC_B0(cr) (0x400 * cr + 0x328) 
+#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C) 
+#define MIX_DEST_A1(cr) (0x400 * cr + 0x330) 
+#define MIX_DEST_B0(cr) (0x400 * cr + 0x334) 
+#define MIX_DEST_B1(cr) (0x400 * cr + 0x338) 
+
+#define A_EEA(cr) (0x400 * cr + 0x33C) // effects work area end address
+
+#define P_ENDX(cr) (0x400 * cr + 0x340) // voice loop end status
+#define P_STAT(cr) (0x400 * cr + 0x344) // DMA status register
+#define P_ENDS(cr) (0x400 * cr + 0x346) // ?
+
+
+// CORE 0 Specific
+
+
+#define P_MVOLL(cr) (0x28 * cr + 0x760) // master volume (left)
+#define P_MVOLR(cr) (0x28 * cr + 0x762) // master volume (right)
+#define P_EVOLL(cr) (0x28 * cr + 0x764) // effect return volume (left)
+#define P_EVOLR(cr) (0x28 * cr + 0x766) // effect return volume (right)
+#define P_AVOLL(cr) (0x28 * cr + 0x768) // core external input volume (left)
+#define P_AVOLR(cr) (0x28 * cr + 0x76A) // core external input volume (right)
+#define P_BVOLL(cr) (0x28 * cr + 0x76C) // sound data input volume (left)
+#define P_BVOLR(cr) (0x28 * cr + 0x76E) // sound data input volume (right)
+#define P_MVOLXL(cr) (0x28 * cr + 0x770) // current master volume (left)
+#define P_MVOLXR(cr) (0x28 * cr + 0x772) // current master volume (right)
+
+
+// More CORE 0 Reverb
+
+
+#define IIR_ALPHA(cr) (0x28 * cr + 0x774) 
+#define ACC_COEF_A(cr) (0x28 * cr + 0x776) 
+#define ACC_COEF_B(cr) (0x28 * cr + 0x778) 
+#define ACC_COEF_C(cr) (0x28 * cr + 0x77A) 
+#define ACC_COEF_D(cr) (0x28 * cr + 0x77C) 
+#define IIR_COEF(cr) (0x28 * cr + 0x77E) 
+#define FB_ALPHA(cr) (0x28 * cr + 0x780) 
+#define FB_X(cr) (0x28 * cr + 0x782) 
+#define IN_COEF_L(cr) (0x28 * cr + 0x784) 
+#define IN_COEF_R(cr) (0x28 * cr + 0x786) 
+
+
+// CORE 1 only
+
+#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass 
+#define SPDIF_MODE 0x7C6 
+#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD	
+#define SPDIF_COPY 0x7CA // SPDIF Copy Protection
+*/
+
+/* PS1 SPU CORE
+
+*** The below really isn't needed, only if you ***
+*** want to add SPU support to the plugin ***
+*** which I see no need to add at this time. ***
+*** individual voice settings ***
+
+#define SPU_VP_PITCH(vc) (0xC04 + (vc << 4)) // voice pitch
+#define SPU_VA_SSA(vc) (0xC06 + (vc << 4)) // voice waveform data start address
+#define SPU_VP_ADSR(vc) (0xC08 + (vc << 4)) // voice envelope
+#define SPU_VA_SSA(vc) (0xC0E + (vc << 4)) // voice waveform data loop address
+
+// common settings
+
+#define SPU_P_MVOLL 0xD80 // master volume (left)
+#define SPU_P_MVOLR 0xD82 // master volume (right)
+#define SPU_P_RVOLL 0xD84 // effect return volume (left)
+#define SPU_P_RVOLR 0xD86 // effect return volume (right)
+#define SPU_S_KON1 0xD88 // key on
+#define SPU_S_KON2 0xD8A // 
+#define SPU_S_KOFF1 0xD8C // key off
+#define SPU_S_KOFF2 0xD8E // 
+#define SPU_S_PMON1 0xD90 // pitch modulation on
+#define SPU_S_PMON2 0xD92 // 
+#define SPU_S_NON1 0xD94 // noise generator on
+#define SPU_S_NON2 0xD96 // 
+#define SPU_S_RVBON1 0xD98 // effects on
+#define SPU_S_RVBON2 0xD9A // 
+#define SPU_S_MUTE1 0xD9C // voice mute
+#define SPU_S_MUTE2 0xD9E // 
+
+#define SPU_A_ESA 0xDA2 // effects work area start
+#define SPU_A_IRQA 0xDA4 // IRQ address
+#define SPU_A_TSA 0xDA6 // DMA transfer start address
+#define SPU_P_DATA 0xDA8 // DMA data register
+#define SPU_P_CTRL 0xDAA // DMA control register
+#define SPU_P_STAT 0xDAE // DMA status register
+
+#define SPU_P_CDL 0xDB0 // sound data input volume (left)
+#define SPU_P_CDR 0xDB2 // sound data input volume (right)
+#define SPU_P_EXTL 0xDB4 // external input volume (left)
+#define SPU_P_EXTR 0xDB6 // external input volume (right)
+
+#define SPU_P_REVERB 0xDC0 // effects control
+*/
+
+/*
+#define H_SPUReverbAddr 0x0da2
+#define H_SPUirqAddr 0x0da4
+#define H_SPUaddr 0x0da6
+#define H_SPUdata 0x0da8
+#define H_SPUctrl 0x0daa
+#define H_SPUstat 0x0dae
+#define H_SPUmvolL 0x0d80
+#define H_SPUmvolR 0x0d82
+#define H_SPUrvolL 0x0d84
+#define H_SPUrvolR 0x0d86
+#define H_SPUon1 0x0d88
+#define H_SPUon2 0x0d8a
+#define H_SPUoff1 0x0d8c
+#define H_SPUoff2 0x0d8e
+#define H_FMod1 0x0d90
+#define H_FMod2 0x0d92
+#define H_Noise1 0x0d94
+#define H_Noise2 0x0d96
+#define H_RVBon1 0x0d98
+#define H_RVBon2 0x0d9a
+#define H_SPUMute1 0x0d9c
+#define H_SPUMute2 0x0d9e
+#define H_CDLeft 0x0db0
+#define H_CDRight 0x0db2
+#define H_ExtLeft 0x0db4
+#define H_ExtRight 0x0db6
+#define H_Reverb 0x0dc0
+#define H_SPUPitch0 0x0c04
+#define H_SPUPitch1 0x0c14
+#define H_SPUPitch2 0x0c24
+#define H_SPUPitch3 0x0c34
+#define H_SPUPitch4 0x0c44
+#define H_SPUPitch5 0x0c54
+#define H_SPUPitch6 0x0c64
+#define H_SPUPitch7 0x0c74
+#define H_SPUPitch8 0x0c84
+#define H_SPUPitch9 0x0c94
+#define H_SPUPitch10 0x0ca4
+#define H_SPUPitch11 0x0cb4
+#define H_SPUPitch12 0x0cc4
+#define H_SPUPitch13 0x0cd4
+#define H_SPUPitch14 0x0ce4
+#define H_SPUPitch15 0x0cf4
+#define H_SPUPitch16 0x0d04
+#define H_SPUPitch17 0x0d14
+#define H_SPUPitch18 0x0d24
+#define H_SPUPitch19 0x0d34
+#define H_SPUPitch20 0x0d44
+#define H_SPUPitch21 0x0d54
+#define H_SPUPitch22 0x0d64
+#define H_SPUPitch23 0x0d74
+
+#define H_SPUStartAdr0 0x0c06
+#define H_SPUStartAdr1 0x0c16
+#define H_SPUStartAdr2 0x0c26
+#define H_SPUStartAdr3 0x0c36
+#define H_SPUStartAdr4 0x0c46
+#define H_SPUStartAdr5 0x0c56
+#define H_SPUStartAdr6 0x0c66
+#define H_SPUStartAdr7 0x0c76
+#define H_SPUStartAdr8 0x0c86
+#define H_SPUStartAdr9 0x0c96
+#define H_SPUStartAdr10 0x0ca6
+#define H_SPUStartAdr11 0x0cb6
+#define H_SPUStartAdr12 0x0cc6
+#define H_SPUStartAdr13 0x0cd6
+#define H_SPUStartAdr14 0x0ce6
+#define H_SPUStartAdr15 0x0cf6
+#define H_SPUStartAdr16 0x0d06
+#define H_SPUStartAdr17 0x0d16
+#define H_SPUStartAdr18 0x0d26
+#define H_SPUStartAdr19 0x0d36
+#define H_SPUStartAdr20 0x0d46
+#define H_SPUStartAdr21 0x0d56
+#define H_SPUStartAdr22 0x0d66
+#define H_SPUStartAdr23 0x0d76
+
+#define H_SPULoopAdr0 0x0c0e
+#define H_SPULoopAdr1 0x0c1e
+#define H_SPULoopAdr2 0x0c2e
+#define H_SPULoopAdr3 0x0c3e
+#define H_SPULoopAdr4 0x0c4e
+#define H_SPULoopAdr5 0x0c5e
+#define H_SPULoopAdr6 0x0c6e
+#define H_SPULoopAdr7 0x0c7e
+#define H_SPULoopAdr8 0x0c8e
+#define H_SPULoopAdr9 0x0c9e
+#define H_SPULoopAdr10 0x0cae
+#define H_SPULoopAdr11 0x0cbe
+#define H_SPULoopAdr12 0x0cce
+#define H_SPULoopAdr13 0x0cde
+#define H_SPULoopAdr14 0x0cee
+#define H_SPULoopAdr15 0x0cfe
+#define H_SPULoopAdr16 0x0d0e
+#define H_SPULoopAdr17 0x0d1e
+#define H_SPULoopAdr18 0x0d2e
+#define H_SPULoopAdr19 0x0d3e
+#define H_SPULoopAdr20 0x0d4e
+#define H_SPULoopAdr21 0x0d5e
+#define H_SPULoopAdr22 0x0d6e
+#define H_SPULoopAdr23 0x0d7e
+
+#define H_SPU_ADSRLevel0 0x0c08
+#define H_SPU_ADSRLevel1 0x0c18
+#define H_SPU_ADSRLevel2 0x0c28
+#define H_SPU_ADSRLevel3 0x0c38
+#define H_SPU_ADSRLevel4 0x0c48
+#define H_SPU_ADSRLevel5 0x0c58
+#define H_SPU_ADSRLevel6 0x0c68
+#define H_SPU_ADSRLevel7 0x0c78
+#define H_SPU_ADSRLevel8 0x0c88
+#define H_SPU_ADSRLevel9 0x0c98
+#define H_SPU_ADSRLevel10 0x0ca8
+#define H_SPU_ADSRLevel11 0x0cb8
+#define H_SPU_ADSRLevel12 0x0cc8
+#define H_SPU_ADSRLevel13 0x0cd8
+#define H_SPU_ADSRLevel14 0x0ce8
+#define H_SPU_ADSRLevel15 0x0cf8
+#define H_SPU_ADSRLevel16 0x0d08
+#define H_SPU_ADSRLevel17 0x0d18
+#define H_SPU_ADSRLevel18 0x0d28
+#define H_SPU_ADSRLevel19 0x0d38
+#define H_SPU_ADSRLevel20 0x0d48
+#define H_SPU_ADSRLevel21 0x0d58
+#define H_SPU_ADSRLevel22 0x0d68
+#define H_SPU_ADSRLevel23 0x0d78
+*/

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/registers2.c Added

@@ -0,0 +1,1342 @@
+/***************************************************************************
+ registers.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2003/02/09 - kode54
+// - removed &0x3fff from reverb volume registers, fixes a few games,
+// hopefully won't be breaking anything
+//
+// 2003/01/19 - Pete
+// - added Neill's reverb
+//
+// 2003/01/06 - Pete
+// - added Neill's ADSR timings
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_REGISTERS
+
+#include "../peops2/externals.h"
+#include "../peops2/registers.h"
+#include "../peops2/regs.h"
+#include "../peops2/reverb.h"
+#include "../peops2/spu.h"
+#include "../psx.h"
+
+/*
+// adsr time values (in ms) by James Higgs ... see the end of
+// the adsr.c source for details
+
+#define ATTACK_MS 514L
+#define DECAYHALF_MS 292L
+#define DECAY_MS 584L
+#define SUSTAIN_MS 450L
+#define RELEASE_MS 446L
+*/
+
+// we have a timebase of 1.020408f ms, not 1 ms... so adjust adsr defines
+#define ATTACK_MS 494L
+#define DECAYHALF_MS 286L
+#define DECAY_MS 572L
+#define SUSTAIN_MS 441L
+#define RELEASE_MS 437L
+
+////////////////////////////////////////////////////////////////////////
+// WRITE REGISTERS: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2write(mips_cpu_context *cpu, unsigned long reg, unsigned short val)
+{
+ spu2_state_t *spu = cpu->spu2;
+ long r=reg&0xffff;
+
+ spu->regArea[r>>1] = val;
+
+//	printf("SPU2: %04x to %08x\n", val, reg);
+
+ if((r>=0x0000 && r<0x0180)||(r>=0x0400 && r<0x0580)) // some channel info?
+ {
+ int ch=(r>>4)&0x1f;
+ if(r>=0x400) ch+=24;
+ 
+ switch(r&0x0f)
+ {
+ //------------------------------------------------// r volume
+ case 0: 
+ SetVolumeL(spu, (unsigned char)ch,val);
+ break;
+ //------------------------------------------------// l volume
+ case 2: 
+ SetVolumeR(spu, (unsigned char)ch,val);
+ break;
+ //------------------------------------------------// pitch
+ case 4: 
+ SetPitch(spu, ch,val);
+ break;
+ //------------------------------------------------// level with pre-calcs
+ case 6:
+ {
+ const unsigned long lval=val;unsigned long lx;
+ //---------------------------------------------//
+ spu->s_chan[ch].ADSRX.AttackModeExp=(lval&0x8000)?1:0; 
+ spu->s_chan[ch].ADSRX.AttackRate=(lval>>8) & 0x007f;
+ spu->s_chan[ch].ADSRX.DecayRate=(lval>>4) & 0x000f;
+ spu->s_chan[ch].ADSRX.SustainLevel=lval & 0x000f;
+ //---------------------------------------------//
+ if(!spu->iDebugMode) break;
+ //---------------------------------------------// stuff below is only for debug mode
+
+ spu->s_chan[ch].ADSR.AttackModeExp=(lval&0x8000)?1:0; //0x007f
+
+ lx=(((lval>>8) & 0x007f)>>2); // attack time to run from 0 to 100% volume
+ lx=min(31,lx); // no overflow on shift!
+ if(lx) 
+ { 
+ lx = (1<<lx);
+ if(lx<2147483) lx=(lx*ATTACK_MS)/10000L; // another overflow check
+ else lx=(lx/10000L)*ATTACK_MS;
+ if(!lx) lx=1;
+ }
+ spu->s_chan[ch].ADSR.AttackTime=lx; 
+
+ spu->s_chan[ch].ADSR.SustainLevel= // our adsr vol runs from 0 to 1024, so scale the sustain level
+ (1024*((lval) & 0x000f))/15;
+
+ lx=(lval>>4) & 0x000f; // decay:
+ if(lx) // our const decay value is time it takes from 100% to 0% of volume
+ {
+ lx = ((1<<(lx))*DECAY_MS)/10000L;
+ if(!lx) lx=1;
+ }
+ spu->s_chan[ch].ADSR.DecayTime = // so calc how long does it take to run from 100% to the wanted sus level
+ (lx*(1024-spu->s_chan[ch].ADSR.SustainLevel))/1024;
+ }
+ break;
+ //------------------------------------------------// adsr times with pre-calcs
+ case 8:
+ {
+ const unsigned long lval=val;unsigned long lx;
+
+ //----------------------------------------------//
+ spu->s_chan[ch].ADSRX.SustainModeExp = (lval&0x8000)?1:0;
+ spu->s_chan[ch].ADSRX.SustainIncrease= (lval&0x4000)?0:1;
+ spu->s_chan[ch].ADSRX.SustainRate = (lval>>6) & 0x007f;
+ spu->s_chan[ch].ADSRX.ReleaseModeExp = (lval&0x0020)?1:0;
+ spu->s_chan[ch].ADSRX.ReleaseRate = lval & 0x001f;
+ //----------------------------------------------//
+ if(!spu->iDebugMode) break;
+ //----------------------------------------------// stuff below is only for debug mode
+
+ spu->s_chan[ch].ADSR.SustainModeExp = (lval&0x8000)?1:0;
+ spu->s_chan[ch].ADSR.ReleaseModeExp = (lval&0x0020)?1:0;
+ 
+ lx=((((lval>>6) & 0x007f)>>2)); // sustain time... often very high
+ lx=min(31,lx); // values are used to hold the volume
+ if(lx) // until a sound stop occurs
+ { // the highest value we reach (due to 
+ lx = (1<<lx); // overflow checking) is: 
+ if(lx<2147483) lx=(lx*SUSTAIN_MS)/10000L; // 94704 seconds = 1578 minutes = 26 hours... 
+ else lx=(lx/10000L)*SUSTAIN_MS; // should be enuff... if the stop doesn't 
+ if(!lx) lx=1; // come in this time span, I don't care :)
+ }
+ spu->s_chan[ch].ADSR.SustainTime = lx;
+
+ lx=(lval & 0x001f);
+ spu->s_chan[ch].ADSR.ReleaseVal =lx;
+ if(lx) // release time from 100% to 0%
+ { // note: the release time will be
+ lx = (1<<lx); // adjusted when a stop is coming,
+ if(lx<2147483) lx=(lx*RELEASE_MS)/10000L; // so at this time the adsr vol will 
+ else lx=(lx/10000L)*RELEASE_MS; // run from (current volume) to 0%
+ if(!lx) lx=1;
+ }
+ spu->s_chan[ch].ADSR.ReleaseTime=lx;
+
+ if(lval & 0x4000) // add/dec flag
+ spu->s_chan[ch].ADSR.SustainModeDec=-1;
+ else spu->s_chan[ch].ADSR.SustainModeDec=1;
+ }
+ break;
+ //------------------------------------------------//
+ }
+
+ spu->iSpuAsyncWait=0;
+
+ return;
+ }
+
+ if((r>=0x01c0 && r<0x02E0)||(r>=0x05c0 && r<0x06E0)) // some channel info?
+ {
+ int ch=0;
+ if(r>=0x400) {ch=24;r-=0x400;}
+
+ ch+=(r-0x1c0)/12;
+ r-=(ch%24)*12;
+ switch(r)
+ {
+ //------------------------------------------------//
+ case 0x1C0:
+ spu->s_chan[ch].iStartAdr=(((unsigned long)val&0xf)<<16)|(spu->s_chan[ch].iStartAdr&0xFFFF);
+ spu->s_chan[ch].pStart=spu->spuMemC+(spu->s_chan[ch].iStartAdr<<1);
+ break;
+ case 0x1C2:
+ spu->s_chan[ch].iStartAdr=(spu->s_chan[ch].iStartAdr & 0xF0000) | (val & 0xFFFF);
+ spu->s_chan[ch].pStart=spu->spuMemC+(spu->s_chan[ch].iStartAdr<<1);
+ break;
+ //------------------------------------------------//
+ case 0x1C4:
+ spu->s_chan[ch].iLoopAdr=(((unsigned long)val&0xf)<<16)|(spu->s_chan[ch].iLoopAdr&0xFFFF);
+ spu->s_chan[ch].pLoop=spu->spuMemC+(spu->s_chan[ch].iLoopAdr<<1);
+ spu->s_chan[ch].bIgnoreLoop=1;
+ break;
+ case 0x1C6:
+ spu->s_chan[ch].iLoopAdr=(spu->s_chan[ch].iLoopAdr & 0xF0000) | (val & 0xFFFF);
+ spu->s_chan[ch].pLoop=spu->spuMemC+(spu->s_chan[ch].iLoopAdr<<1);
+ spu->s_chan[ch].bIgnoreLoop=1;
+ break;
+ //------------------------------------------------//
+ case 0x1C8:
+ // unused... check if it gets written as well
+ spu->s_chan[ch].iNextAdr=(((unsigned long)val&0xf)<<16)|(spu->s_chan[ch].iNextAdr&0xFFFF);
+ break;
+ case 0x1CA:
+ // unused... check if it gets written as well
+ spu->s_chan[ch].iNextAdr=(spu->s_chan[ch].iNextAdr & 0xF0000) | (val & 0xFFFF);
+ break;
+ //------------------------------------------------//
+ }
+
+ spu->iSpuAsyncWait=0;
+
+ return;
+ } 
+
+ switch(r)
+ {
+ //-------------------------------------------------//
+ case PS2_C0_SPUaddr_Hi:
+ spu->spuAddr2[0] = (((unsigned long)val&0xf)<<16)|(spu->spuAddr2[0]&0xFFFF);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUaddr_Lo:
+ spu->spuAddr2[0] = (spu->spuAddr2[0] & 0xF0000) | (val & 0xFFFF);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUaddr_Hi:
+ spu->spuAddr2[1] = (((unsigned long)val&0xf)<<16)|(spu->spuAddr2[1]&0xFFFF);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUaddr_Lo:
+ spu->spuAddr2[1] = (spu->spuAddr2[1] & 0xF0000) | (val & 0xFFFF);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUdata:
+ spu->spuMem[spu->spuAddr2[0]] = val;
+ spu->spuAddr2[0]++;
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUdata:
+ spu->spuMem[spu->spuAddr2[1]] = val;
+ spu->spuAddr2[1]++;
+ if(spu->spuAddr2[1]>0xfffff) spu->spuAddr2[1]=0;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_ATTR:
+ spu->spuCtrl2[0]=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_ATTR:
+ spu->spuCtrl2[1]=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUstat:
+ spu->spuStat2[0]=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUstat:
+ spu->spuStat2[1]=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_ReverbAddr_Hi:
+ spu->spuRvbAddr2[0] = (((unsigned long)val&0xf)<<16)|(spu->spuRvbAddr2[0]&0xFFFF);
+ SetReverbAddr(spu, 0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_ReverbAddr_Lo:
+ spu->spuRvbAddr2[0] = (spu->spuRvbAddr2[0] & 0xF0000) | (val & 0xFFFF);
+ SetReverbAddr(spu, 0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_ReverbAEnd_Hi:
+ spu->spuRvbAEnd2[0] = (((unsigned long)val&0xf)<<16)|(/*spu->spuRvbAEnd2[0]&*/0xFFFF);
+ spu->rvb[0].EndAddr=spu->spuRvbAEnd2[0];
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_ReverbAEnd_Hi:
+ spu->spuRvbAEnd2[1] = (((unsigned long)val&0xf)<<16)|(/*spu->spuRvbAEnd2[1]&*/0xFFFF);
+ spu->rvb[1].EndAddr=spu->spuRvbAEnd2[1];
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_ReverbAddr_Hi:
+ spu->spuRvbAddr2[1] = (((unsigned long)val&0xf)<<16)|(spu->spuRvbAddr2[1]&0xFFFF);
+ SetReverbAddr(spu, 1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_ReverbAddr_Lo:
+ spu->spuRvbAddr2[1] = (spu->spuRvbAddr2[1] & 0xF0000) | (val & 0xFFFF);
+ SetReverbAddr(spu, 1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUirqAddr_Hi:
+ spu->spuIrq2[0] = (((unsigned long)val&0xf)<<16)|(spu->spuIrq2[0]&0xFFFF);
+ spu->pSpuIrq[0]=spu->spuMemC+(spu->spuIrq2[0]<<1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUirqAddr_Lo:
+ spu->spuIrq2[0] = (spu->spuIrq2[0] & 0xF0000) | (val & 0xFFFF);
+ spu->pSpuIrq[0]=spu->spuMemC+(spu->spuIrq2[0]<<1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUirqAddr_Hi:
+ spu->spuIrq2[1] = (((unsigned long)val&0xf)<<16)|(spu->spuIrq2[1]&0xFFFF);
+ spu->pSpuIrq[1]=spu->spuMemC+(spu->spuIrq2[1]<<1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUirqAddr_Lo:
+ spu->spuIrq2[1] = (spu->spuIrq2[1] & 0xF0000) | (val & 0xFFFF);
+ spu->pSpuIrq[1]=spu->spuMemC+(spu->spuIrq2[1]<<1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUrvolL:
+ spu->rvb[0].VolLeft=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUrvolR:
+ spu->rvb[0].VolRight=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUrvolL:
+ spu->rvb[1].VolLeft=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUrvolR:
+ spu->rvb[1].VolRight=val;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUon1:
+ SoundOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUon2:
+ SoundOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUon1:
+ SoundOn(spu, 24,40,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUon2:
+ SoundOn(spu, 40,48,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUoff1:
+ SoundOff(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUoff2:
+ SoundOff(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUoff1:
+ SoundOff(spu, 24,40,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUoff2:
+ SoundOff(spu, 40,48,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_SPUend1:
+ case PS2_C0_SPUend2:
+ if(val) spu->dwEndChannel2[0]=0;
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_SPUend1:
+ case PS2_C1_SPUend2:
+ if(val) spu->dwEndChannel2[1]=0;
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_FMod1:
+ FModOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_FMod2:
+ FModOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_FMod1:
+ FModOn(spu, 24,40,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_FMod2:
+ FModOn(spu, 40,48,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_Noise1:
+ NoiseOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_Noise2:
+ NoiseOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_Noise1:
+ NoiseOn(spu, 24,40,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_Noise2:
+ NoiseOn(spu, 40,48,val);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_DryL1:
+ VolumeOn(spu, 0,16,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_DryL2:
+ VolumeOn(spu, 16,24,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_DryL1:
+ VolumeOn(spu, 24,40,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_DryL2:
+ VolumeOn(spu, 40,48,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_DryR1:
+ VolumeOn(spu, 0,16,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_DryR2:
+ VolumeOn(spu, 16,24,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_DryR1:
+ VolumeOn(spu, 24,40,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_DryR2:
+ VolumeOn(spu, 40,48,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_RVBon1_L:
+ ReverbOn(spu, 0,16,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_RVBon2_L:
+ ReverbOn(spu, 16,24,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_RVBon1_L:
+ ReverbOn(spu, 24,40,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_RVBon2_L:
+ ReverbOn(spu, 40,48,val,0);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_RVBon1_R:
+ ReverbOn(spu, 0,16,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_RVBon2_R:
+ ReverbOn(spu, 16,24,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_RVBon1_R:
+ ReverbOn(spu, 24,40,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C1_RVBon2_R:
+ ReverbOn(spu, 40,48,val,1);
+ break;
+ //-------------------------------------------------//
+ case PS2_C0_Reverb+0:
+ spu->rvb[0].FB_SRC_A=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].FB_SRC_A&0xFFFF);
+ break;
+ case PS2_C0_Reverb+2:
+ spu->rvb[0].FB_SRC_A=(spu->rvb[0].FB_SRC_A & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+4:
+ spu->rvb[0].FB_SRC_B=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].FB_SRC_B&0xFFFF);
+ break;
+ case PS2_C0_Reverb+6:
+ spu->rvb[0].FB_SRC_B=(spu->rvb[0].FB_SRC_B & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+8:
+ spu->rvb[0].IIR_DEST_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_DEST_A0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+10:
+ spu->rvb[0].IIR_DEST_A0=(spu->rvb[0].IIR_DEST_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+12:
+ spu->rvb[0].IIR_DEST_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_DEST_A1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+14:
+ spu->rvb[0].IIR_DEST_A1=(spu->rvb[0].IIR_DEST_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+16:
+ spu->rvb[0].ACC_SRC_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_A0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+18:
+ spu->rvb[0].ACC_SRC_A0=(spu->rvb[0].ACC_SRC_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+20:
+ spu->rvb[0].ACC_SRC_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_A1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+22:
+ spu->rvb[0].ACC_SRC_A1=(spu->rvb[0].ACC_SRC_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+24:
+ spu->rvb[0].ACC_SRC_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_B0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+26:
+ spu->rvb[0].ACC_SRC_B0=(spu->rvb[0].ACC_SRC_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+28:
+ spu->rvb[0].ACC_SRC_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_B1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+30:
+ spu->rvb[0].ACC_SRC_B1=(spu->rvb[0].ACC_SRC_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+32:
+ spu->rvb[0].IIR_SRC_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_SRC_A0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+34:
+ spu->rvb[0].IIR_SRC_A0=(spu->rvb[0].IIR_SRC_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+36:
+ spu->rvb[0].IIR_SRC_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_SRC_A1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+38:
+ spu->rvb[0].IIR_SRC_A1=(spu->rvb[0].IIR_SRC_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+40:
+ spu->rvb[0].IIR_DEST_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_DEST_B0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+42:
+ spu->rvb[0].IIR_DEST_B0=(spu->rvb[0].IIR_DEST_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+44:
+ spu->rvb[0].IIR_DEST_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_DEST_B1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+46:
+ spu->rvb[0].IIR_DEST_B1=(spu->rvb[0].IIR_DEST_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+48:
+ spu->rvb[0].ACC_SRC_C0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_C0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+50:
+ spu->rvb[0].ACC_SRC_C0=(spu->rvb[0].ACC_SRC_C0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+52:
+ spu->rvb[0].ACC_SRC_C1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_C1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+54:
+ spu->rvb[0].ACC_SRC_C1=(spu->rvb[0].ACC_SRC_C1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+56:
+ spu->rvb[0].ACC_SRC_D0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_D0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+58:
+ spu->rvb[0].ACC_SRC_D0=(spu->rvb[0].ACC_SRC_D0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+60:
+ spu->rvb[0].ACC_SRC_D1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].ACC_SRC_D1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+62:
+ spu->rvb[0].ACC_SRC_D1=(spu->rvb[0].ACC_SRC_D1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+64:
+ spu->rvb[0].IIR_SRC_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_SRC_B1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+66:
+ spu->rvb[0].IIR_SRC_B1=(spu->rvb[0].IIR_SRC_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+68:
+ spu->rvb[0].IIR_SRC_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].IIR_SRC_B0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+70:
+ spu->rvb[0].IIR_SRC_B0=(spu->rvb[0].IIR_SRC_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+72:
+ spu->rvb[0].MIX_DEST_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].MIX_DEST_A0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+74:
+ spu->rvb[0].MIX_DEST_A0=(spu->rvb[0].MIX_DEST_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+76:
+ spu->rvb[0].MIX_DEST_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].MIX_DEST_A1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+78:
+ spu->rvb[0].MIX_DEST_A1=(spu->rvb[0].MIX_DEST_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+80:
+ spu->rvb[0].MIX_DEST_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].MIX_DEST_B0&0xFFFF);
+ break;
+ case PS2_C0_Reverb+82:
+ spu->rvb[0].MIX_DEST_B0=(spu->rvb[0].MIX_DEST_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_Reverb+84:
+ spu->rvb[0].MIX_DEST_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[0].MIX_DEST_B1&0xFFFF);
+ break;
+ case PS2_C0_Reverb+86:
+ spu->rvb[0].MIX_DEST_B1=(spu->rvb[0].MIX_DEST_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C0_ReverbX+0: spu->rvb[0].IIR_ALPHA=(short)val; break;
+ case PS2_C0_ReverbX+2: spu->rvb[0].ACC_COEF_A=(short)val; break;
+ case PS2_C0_ReverbX+4: spu->rvb[0].ACC_COEF_B=(short)val; break;
+ case PS2_C0_ReverbX+6: spu->rvb[0].ACC_COEF_C=(short)val; break;
+ case PS2_C0_ReverbX+8: spu->rvb[0].ACC_COEF_D=(short)val; break;
+ case PS2_C0_ReverbX+10: spu->rvb[0].IIR_COEF=(short)val; break;
+ case PS2_C0_ReverbX+12: spu->rvb[0].FB_ALPHA=(short)val; break;
+ case PS2_C0_ReverbX+14: spu->rvb[0].FB_X=(short)val; break;
+ case PS2_C0_ReverbX+16: spu->rvb[0].IN_COEF_L=(short)val; break;
+ case PS2_C0_ReverbX+18: spu->rvb[0].IN_COEF_R=(short)val; break;
+ //-------------------------------------------------//
+ case PS2_C1_Reverb+0:
+ spu->rvb[1].FB_SRC_A=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].FB_SRC_A&0xFFFF);
+ break;
+ case PS2_C1_Reverb+2:
+ spu->rvb[1].FB_SRC_A=(spu->rvb[1].FB_SRC_A & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+4:
+ spu->rvb[1].FB_SRC_B=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].FB_SRC_B&0xFFFF);
+ break;
+ case PS2_C1_Reverb+6:
+ spu->rvb[1].FB_SRC_B=(spu->rvb[1].FB_SRC_B & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+8:
+ spu->rvb[1].IIR_DEST_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_DEST_A0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+10:
+ spu->rvb[1].IIR_DEST_A0=(spu->rvb[1].IIR_DEST_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+12:
+ spu->rvb[1].IIR_DEST_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_DEST_A1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+14:
+ spu->rvb[1].IIR_DEST_A1=(spu->rvb[1].IIR_DEST_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+16:
+ spu->rvb[1].ACC_SRC_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_A0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+18:
+ spu->rvb[1].ACC_SRC_A0=(spu->rvb[1].ACC_SRC_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+20:
+ spu->rvb[1].ACC_SRC_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_A1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+22:
+ spu->rvb[1].ACC_SRC_A1=(spu->rvb[1].ACC_SRC_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+24:
+ spu->rvb[1].ACC_SRC_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_B0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+26:
+ spu->rvb[1].ACC_SRC_B0=(spu->rvb[1].ACC_SRC_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+28:
+ spu->rvb[1].ACC_SRC_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_B1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+30:
+ spu->rvb[1].ACC_SRC_B1=(spu->rvb[1].ACC_SRC_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+32:
+ spu->rvb[1].IIR_SRC_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_SRC_A0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+34:
+ spu->rvb[1].IIR_SRC_A0=(spu->rvb[1].IIR_SRC_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+36:
+ spu->rvb[1].IIR_SRC_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_SRC_A1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+38:
+ spu->rvb[1].IIR_SRC_A1=(spu->rvb[1].IIR_SRC_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+40:
+ spu->rvb[1].IIR_DEST_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_DEST_B0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+42:
+ spu->rvb[1].IIR_DEST_B0=(spu->rvb[1].IIR_DEST_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+44:
+ spu->rvb[1].IIR_DEST_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_DEST_B1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+46:
+ spu->rvb[1].IIR_DEST_B1=(spu->rvb[1].IIR_DEST_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+48:
+ spu->rvb[1].ACC_SRC_C0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_C0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+50:
+ spu->rvb[1].ACC_SRC_C0=(spu->rvb[1].ACC_SRC_C0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+52:
+ spu->rvb[1].ACC_SRC_C1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_C1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+54:
+ spu->rvb[1].ACC_SRC_C1=(spu->rvb[1].ACC_SRC_C1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+56:
+ spu->rvb[1].ACC_SRC_D0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_D0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+58:
+ spu->rvb[1].ACC_SRC_D0=(spu->rvb[1].ACC_SRC_D0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+60:
+ spu->rvb[1].ACC_SRC_D1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].ACC_SRC_D1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+62:
+ spu->rvb[1].ACC_SRC_D1=(spu->rvb[1].ACC_SRC_D1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+64:
+ spu->rvb[1].IIR_SRC_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_SRC_B1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+66:
+ spu->rvb[1].IIR_SRC_B1=(spu->rvb[1].IIR_SRC_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+68:
+ spu->rvb[1].IIR_SRC_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].IIR_SRC_B0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+70:
+ spu->rvb[1].IIR_SRC_B0=(spu->rvb[1].IIR_SRC_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+72:
+ spu->rvb[1].MIX_DEST_A0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].MIX_DEST_A0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+74:
+ spu->rvb[1].MIX_DEST_A0=(spu->rvb[1].MIX_DEST_A0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+76:
+ spu->rvb[1].MIX_DEST_A1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].MIX_DEST_A1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+78:
+ spu->rvb[1].MIX_DEST_A1=(spu->rvb[1].MIX_DEST_A1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+80:
+ spu->rvb[1].MIX_DEST_B0=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].MIX_DEST_B0&0xFFFF);
+ break;
+ case PS2_C1_Reverb+82:
+ spu->rvb[1].MIX_DEST_B0=(spu->rvb[1].MIX_DEST_B0 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_Reverb+84:
+ spu->rvb[1].MIX_DEST_B1=(((unsigned long)val&0xf)<<16)|(spu->rvb[1].MIX_DEST_B1&0xFFFF);
+ break;
+ case PS2_C1_Reverb+86:
+ spu->rvb[1].MIX_DEST_B1=(spu->rvb[1].MIX_DEST_B1 & 0xF0000) | ((val) & 0xFFFF);
+ break;
+ case PS2_C1_ReverbX+0: spu->rvb[1].IIR_ALPHA=(short)val; break;
+ case PS2_C1_ReverbX+2: spu->rvb[1].ACC_COEF_A=(short)val; break;
+ case PS2_C1_ReverbX+4: spu->rvb[1].ACC_COEF_B=(short)val; break;
+ case PS2_C1_ReverbX+6: spu->rvb[1].ACC_COEF_C=(short)val; break;
+ case PS2_C1_ReverbX+8: spu->rvb[1].ACC_COEF_D=(short)val; break;
+ case PS2_C1_ReverbX+10: spu->rvb[1].IIR_COEF=(short)val; break;
+ case PS2_C1_ReverbX+12: spu->rvb[1].FB_ALPHA=(short)val; break;
+ case PS2_C1_ReverbX+14: spu->rvb[1].FB_X=(short)val; break;
+ case PS2_C1_ReverbX+16: spu->rvb[1].IN_COEF_L=(short)val; break;
+ case PS2_C1_ReverbX+18: spu->rvb[1].IN_COEF_R=(short)val; break;
+ }
+
+ spu->iSpuAsyncWait=0;
+
+}
+
+////////////////////////////////////////////////////////////////////////
+// READ REGISTER: called by main emu
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC unsigned short CALLBACK SPU2read(mips_cpu_context *cpu, unsigned long reg)
+{
+ spu2_state_t *spu = cpu->spu2;
+ long r=reg&0xffff;
+
+#ifdef _WINDOWS
+// if(iDebugMode==1) logprintf("R_REG %X\r\n",reg&0xFFFF);
+#endif
+
+ spu->iSpuAsyncWait=0;
+
+ if((r>=0x0000 && r<0x0180)||(r>=0x0400 && r<0x0580)) // some channel info?
+ {
+ switch(r&0x0f)
+ {
+ //------------------------------------------------// env value
+ case 10: 
+ {
+ int ch=(r>>4)&0x1f;
+ if(r>=0x400) ch+=24;
+ if(spu->s_chan[ch].bNew) return 1; // we are started, but not processed? return 1
+ if(spu->s_chan[ch].ADSRX.lVolume && // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+ !spu->s_chan[ch].ADSRX.EnvelopeVol) 
+ return 1;
+ return (unsigned short)(spu->s_chan[ch].ADSRX.EnvelopeVol>>16);
+ }break;
+ }
+ }
+
+ if((r>=0x01c0 && r<0x02E0)||(r>=0x05c0 && r<0x06E0)) // some channel info?
+ {
+ int ch=0;unsigned long rx=r;
+ if(rx>=0x400) {ch=24;rx-=0x400;}
+ 
+ ch+=(rx-0x1c0)/12;
+ rx-=(ch%24)*12;
+ 
+ switch(rx)
+ {
+ //------------------------------------------------//
+ case 0x1C4:
+ return (((spu->s_chan[ch].pLoop-spu->spuMemC)>>17)&0xF);
+ break;
+ case 0x1C6:
+ return (((spu->s_chan[ch].pLoop-spu->spuMemC)>>1)&0xFFFF);
+ break;
+ //------------------------------------------------//
+ case 0x1C8:
+ return (((spu->s_chan[ch].pCurr-spu->spuMemC)>>17)&0xF);
+ break;
+ case 0x1CA:
+ return (((spu->s_chan[ch].pCurr-spu->spuMemC)>>1)&0xFFFF);
+ break;
+ //------------------------------------------------//
+ }
+ }
+
+ switch(r)
+ {
+ //--------------------------------------------------//
+ case PS2_C0_SPUend1:
+ return (unsigned short)((spu->dwEndChannel2[0]&0xFFFF));
+ case PS2_C0_SPUend2:
+ return (unsigned short)((spu->dwEndChannel2[0]>>16));
+ //--------------------------------------------------//
+ case PS2_C1_SPUend1:
+ return (unsigned short)((spu->dwEndChannel2[1]&0xFFFF));
+ case PS2_C1_SPUend2:
+ return (unsigned short)((spu->dwEndChannel2[1]>>16));
+ //--------------------------------------------------//
+ case PS2_C0_ATTR:
+ return spu->spuCtrl2[0];
+ break;
+ //--------------------------------------------------//
+ case PS2_C1_ATTR:
+ return spu->spuCtrl2[1];
+ break;
+ //--------------------------------------------------//
+ case PS2_C0_SPUstat:
+ return spu->spuStat2[0];
+ break;
+ //--------------------------------------------------//
+ case PS2_C1_SPUstat:
+ return spu->spuStat2[1];
+ break;
+ //--------------------------------------------------//
+ case PS2_C0_SPUdata:
+ {
+ unsigned short s=spu->spuMem[spu->spuAddr2[0]];
+ spu->spuAddr2[0]++;
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0;
+ return s;
+ }
+ //--------------------------------------------------//
+ case PS2_C1_SPUdata:
+ {
+ unsigned short s=spu->spuMem[spu->spuAddr2[1]];
+ spu->spuAddr2[1]++;
+ if(spu->spuAddr2[1]>0xfffff) spu->spuAddr2[1]=0;
+ return s;
+ }
+ //--------------------------------------------------//
+ case PS2_C0_SPUaddr_Hi:
+ return (unsigned short)((spu->spuAddr2[0]>>16)&0xF);
+ break;
+ case PS2_C0_SPUaddr_Lo:
+ return (unsigned short)((spu->spuAddr2[0]&0xFFFF));
+ break;
+ //--------------------------------------------------//
+ case PS2_C1_SPUaddr_Hi:
+ return (unsigned short)((spu->spuAddr2[1]>>16)&0xF);
+ break;
+ case PS2_C1_SPUaddr_Lo:
+ return (unsigned short)((spu->spuAddr2[1]&0xFFFF));
+ break;
+ //--------------------------------------------------//
+ }
+
+ return spu->regArea[r>>1];
+}
+
+EXPORT_GCC void CALLBACK SPU2writePS1Port(mips_cpu_context *cpu, unsigned long reg, unsigned short val)
+{
+ spu2_state_t *spu = cpu->spu2;
+ const u32 r=reg&0xfff;
+
+ if(r>=0xc00 && r<0xd80)	// channel info
+ {
+ 	SPU2write(cpu, r-0xc00, val);
+ 	return;
+ }
+
+ switch(r)
+ {
+ //-------------------------------------------------//
+ case H_SPUaddr:
+ spu->spuAddr2[0] = (u32) val<<2;
+ break;
+ //-------------------------------------------------//
+ case H_SPUdata:
+ spu->spuMem[spu->spuAddr2[0]] = BFLIP16(val);
+ spu->spuAddr2[0]++;
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0;
+ break;
+ //-------------------------------------------------//
+ case H_SPUctrl:
+// spuCtrl=val;
+ break;
+ //-------------------------------------------------//
+ case H_SPUstat:
+ spu->spuStat2[0]=val & 0xf800;
+ break;
+ //-------------------------------------------------//
+ case H_SPUReverbAddr:
+ spu->spuRvbAddr2[0] = val;
+ SetReverbAddr(spu, 0);
+ break;
+ //-------------------------------------------------//
+ case H_SPUirqAddr:
+ spu->spuIrq2[0] = val<<2;
+ spu->pSpuIrq[0]=spu->spuMemC+((u32) val<<1);
+ break;
+ //-------------------------------------------------//
+ /* Volume settings appear to be at least 15-bit unsigned in this case. 
+ Definitely NOT 15-bit signed. Probably 16-bit signed, so s16 type cast.
+ Check out "Chrono Cross: Shadow's End Forest"
+ */
+ case H_SPUrvolL:
+ spu->rvb[0].VolLeft=(s16)val;
+ //printf("%d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUrvolR:
+ spu->rvb[0].VolRight=(s16)val;
+ //printf("%d\n",val);
+ break;
+ //-------------------------------------------------//
+
+/*
+ case H_ExtLeft:
+ //auxprintf("EL %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_ExtRight:
+ //auxprintf("ER %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolL:
+ //auxprintf("ML %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUmvolR:
+ //auxprintf("MR %d\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute1:
+ //printf("M0 %04x\n",val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUMute2:
+ // printf("M1 %04x\n",val);
+ break;
+*/
+ //-------------------------------------------------//
+ case H_SPUon1:
+ SoundOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUon2:
+ //printf("Boop: %08x: %04x\n",reg,val);
+ SoundOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff1:
+ SoundOff(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_SPUoff2:
+ SoundOff(spu, 16,24,val);
+	// printf("Boop: %08x: %04x\n",reg,val);
+ break;
+ //-------------------------------------------------//
+ case H_FMod1:
+ FModOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_FMod2:
+ FModOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise1:
+ NoiseOn(spu, 0,16,val);
+ break;
+ //-------------------------------------------------//
+ case H_Noise2:
+ NoiseOn(spu, 16,24,val);
+ break;
+ //-------------------------------------------------//
+ case H_RVBon1:
+ ReverbOn(spu, 0,16,val,0);
+ break;
+
+ //-------------------------------------------------//
+ case H_RVBon2:
+ ReverbOn(spu, 16,24,val,0);
+ break;
+
+ //-------------------------------------------------//
+ case H_Reverb+0:
+ spu->rvb[0].FB_SRC_A=val;
+ break;
+
+ case H_Reverb+2 : spu->rvb[0].FB_SRC_B=(s16)val; break;
+ case H_Reverb+4 : spu->rvb[0].IIR_ALPHA=(s16)val; break;
+ case H_Reverb+6 : spu->rvb[0].ACC_COEF_A=(s16)val; break;
+ case H_Reverb+8 : spu->rvb[0].ACC_COEF_B=(s16)val; break;
+ case H_Reverb+10 : spu->rvb[0].ACC_COEF_C=(s16)val; break;
+ case H_Reverb+12 : spu->rvb[0].ACC_COEF_D=(s16)val; break;
+ case H_Reverb+14 : spu->rvb[0].IIR_COEF=(s16)val; break;
+ case H_Reverb+16 : spu->rvb[0].FB_ALPHA=(s16)val; break;
+ case H_Reverb+18 : spu->rvb[0].FB_X=(s16)val; break;
+ case H_Reverb+20 : spu->rvb[0].IIR_DEST_A0=(s16)val; break;
+ case H_Reverb+22 : spu->rvb[0].IIR_DEST_A1=(s16)val; break;
+ case H_Reverb+24 : spu->rvb[0].ACC_SRC_A0=(s16)val; break;
+ case H_Reverb+26 : spu->rvb[0].ACC_SRC_A1=(s16)val; break;
+ case H_Reverb+28 : spu->rvb[0].ACC_SRC_B0=(s16)val; break;
+ case H_Reverb+30 : spu->rvb[0].ACC_SRC_B1=(s16)val; break;
+ case H_Reverb+32 : spu->rvb[0].IIR_SRC_A0=(s16)val; break;
+ case H_Reverb+34 : spu->rvb[0].IIR_SRC_A1=(s16)val; break;
+ case H_Reverb+36 : spu->rvb[0].IIR_DEST_B0=(s16)val; break;
+ case H_Reverb+38 : spu->rvb[0].IIR_DEST_B1=(s16)val; break;
+ case H_Reverb+40 : spu->rvb[0].ACC_SRC_C0=(s16)val; break;
+ case H_Reverb+42 : spu->rvb[0].ACC_SRC_C1=(s16)val; break;
+ case H_Reverb+44 : spu->rvb[0].ACC_SRC_D0=(s16)val; break;
+ case H_Reverb+46 : spu->rvb[0].ACC_SRC_D1=(s16)val; break;
+ case H_Reverb+48 : spu->rvb[0].IIR_SRC_B1=(s16)val; break;
+ case H_Reverb+50 : spu->rvb[0].IIR_SRC_B0=(s16)val; break;
+ case H_Reverb+52 : spu->rvb[0].MIX_DEST_A0=(s16)val; break;
+ case H_Reverb+54 : spu->rvb[0].MIX_DEST_A1=(s16)val; break;
+ case H_Reverb+56 : spu->rvb[0].MIX_DEST_B0=(s16)val; break;
+ case H_Reverb+58 : spu->rvb[0].MIX_DEST_B1=(s16)val; break;
+ case H_Reverb+60 : spu->rvb[0].IN_COEF_L=(s16)val; break;
+ case H_Reverb+62 : spu->rvb[0].IN_COEF_R=(s16)val; break;
+ }
+}
+
+EXPORT_GCC unsigned short CALLBACK SPU2readPS1Port(mips_cpu_context *cpu, unsigned long reg)
+{
+ spu2_state_t *spu = cpu->spu2;
+ const u32 r=reg&0xfff;
+
+ if(r>=0x0c00 && r<0x0d80)
+ {
+ 	return SPU2read(cpu, r-0xc00);
+ }
+
+ switch(r)
+ {
+// case H_SPUctrl:
+// return spuCtrl;
+ break;
+
+ case H_SPUstat:
+ return spu->spuStat2[0];
+ break;
+ 
+ case H_SPUaddr:
+ return (u16)(spu->spuAddr2[0]>>2);
+ break;
+
+ case H_SPUdata:
+ {
+ u16 s=BFLIP16(spu->spuMem[spu->spuAddr2[0]]);
+ spu->spuAddr2[0]++;
+ if(spu->spuAddr2[0]>0xfffff) spu->spuAddr2[0]=0;
+ return s;
+ }
+ break;
+
+ case H_SPUirqAddr:
+ return spu->spuIrq2[0]>>2;
+ break;
+ }
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SOUND ON register write
+////////////////////////////////////////////////////////////////////////
+
+void SoundOn(spu2_state_t *spu, int start,int end,unsigned short val) // SOUND ON PSX COMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if((val&1) && spu->s_chan[ch].pStart) // mmm... start has to be set before key on !?!
+ {
+ spu->s_chan[ch].bIgnoreLoop=0;
+ spu->s_chan[ch].bNew=1;
+ spu->dwNewChannel2[ch/24]|=(1<<(ch%24)); // bitfield for faster testing
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// SOUND OFF register write
+////////////////////////////////////////////////////////////////////////
+
+void SoundOff(spu2_state_t *spu, int start,int end,unsigned short val) // SOUND OFF PSX COMMAND
+{
+ int ch;
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // && spu->s_chan[i].bOn) mmm...
+ {
+ spu->s_chan[ch].bStop=1;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// FMOD register write
+////////////////////////////////////////////////////////////////////////
+
+void FModOn(spu2_state_t *spu, int start,int end,unsigned short val) // FMOD ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> fmod on/off
+ {
+ if(ch>0) 
+ {
+ spu->s_chan[ch].bFMod=1; // --> sound channel
+ spu->s_chan[ch-1].bFMod=2; // --> freq channel
+ }
+ }
+ else
+ {
+ spu->s_chan[ch].bFMod=0; // --> turn off fmod
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// NOISE register write
+////////////////////////////////////////////////////////////////////////
+
+void NoiseOn(spu2_state_t *spu, int start,int end,unsigned short val) // NOISE ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> noise on/off
+ {
+ spu->s_chan[ch].bNoise=1;
+ }
+ else 
+ {
+ spu->s_chan[ch].bNoise=0;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// LEFT VOLUME register write
+////////////////////////////////////////////////////////////////////////
+
+// please note: sweep and phase invert are wrong... but I've never seen
+// them used
+
+void SetVolumeL(spu2_state_t *spu, unsigned char ch,short vol) // LEFT VOLUME
+{
+ spu->s_chan[ch].iLeftVolRaw=vol;
+
+ if(vol&0x8000) // sweep?
+ {
+ short sInc=1; // -> sweep up?
+ if(vol&0x2000) sInc=-1; // -> or down?
+ if(vol&0x1000) vol^=0xffff; // -> mmm... phase inverted? have to investigate this
+ vol=((vol&0x7f)+1)/2; // -> sweep: 0..127 -> 0..64
+ vol+=vol/(2*sInc); // -> HACK: we don't sweep right now, so we just raise/lower the volume by the half!
+ vol*=128;
+ }
+ else // no sweep:
+ {
+ if(vol&0x4000) // -> mmm... phase inverted? have to investigate this
+ //vol^=0xffff;
+ vol=0x3fff-(vol&0x3fff);
+ }
+
+ vol&=0x3fff;
+ spu->s_chan[ch].iLeftVolume=vol; // store volume
+}
+
+////////////////////////////////////////////////////////////////////////
+// RIGHT VOLUME register write
+////////////////////////////////////////////////////////////////////////
+
+void SetVolumeR(spu2_state_t *spu, unsigned char ch,short vol) // RIGHT VOLUME
+{
+ spu->s_chan[ch].iRightVolRaw=vol;
+
+ if(vol&0x8000) // comments... see above :)
+ {
+ short sInc=1;
+ if(vol&0x2000) sInc=-1;
+ if(vol&0x1000) vol^=0xffff;
+ vol=((vol&0x7f)+1)/2; 
+ vol+=vol/(2*sInc);
+ vol*=128;
+ }
+ else 
+ {
+ if(vol&0x4000) //vol=vol^=0xffff;
+ vol=0x3fff-(vol&0x3fff);
+ }
+
+ vol&=0x3fff;
+ spu->s_chan[ch].iRightVolume=vol;
+}
+
+////////////////////////////////////////////////////////////////////////
+// PITCH register write
+////////////////////////////////////////////////////////////////////////
+
+void SetPitch(spu2_state_t *spu, int ch,unsigned short val) // SET PITCH
+{
+ int NP;
+ double intr;
+
+ if(val>0x3fff) NP=0x3fff; // get pitch val
+ else NP=val;
+
+ intr = (double)48000.0f / (double)44100.0f * (double)NP;
+ NP = (UINT32)intr;
+
+ spu->s_chan[ch].iRawPitch=NP;
+
+ NP=(44100L*NP)/4096L; // calc frequency
+
+ if(NP<1) NP=1; // some security
+ spu->s_chan[ch].iActFreq=NP; // store frequency
+}
+
+////////////////////////////////////////////////////////////////////////
+// REVERB register write
+////////////////////////////////////////////////////////////////////////
+
+void ReverbOn(spu2_state_t *spu, int start,int end,unsigned short val,int iRight) // REVERB ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> reverb on/off
+ {
+ if(iRight) spu->s_chan[ch].bReverbR=1;
+ else spu->s_chan[ch].bReverbL=1;
+ }
+ else 
+ {
+ if(iRight) spu->s_chan[ch].bReverbR=0;
+ else spu->s_chan[ch].bReverbL=0;
+ }
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// REVERB START register write
+////////////////////////////////////////////////////////////////////////
+
+void SetReverbAddr(spu2_state_t *spu, int core)
+{
+ long val=spu->spuRvbAddr2[core];
+ 
+ if(spu->rvb[core].StartAddr!=val)
+ {
+ if(val<=0x27ff)
+ {
+ spu->rvb[core].StartAddr=spu->rvb[core].CurrAddr=0;
+ }
+ else
+ {
+ spu->rvb[core].StartAddr=val;
+ spu->rvb[core].CurrAddr=spu->rvb[core].StartAddr;
+ } 
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// DRY LEFT/RIGHT per voice switches
+////////////////////////////////////////////////////////////////////////
+
+void VolumeOn(spu2_state_t *spu, int start,int end,unsigned short val,int iRight) // VOLUME ON PSX COMMAND
+{
+ int ch;
+
+ for(ch=start;ch<end;ch++,val>>=1) // loop channels
+ {
+ if(val&1) // -> reverb on/off
+ {
+ if(iRight) spu->s_chan[ch].bVolumeR=1;
+ else spu->s_chan[ch].bVolumeL=1;
+ }
+ else 
+ {
+ if(iRight) spu->s_chan[ch].bVolumeR=0;
+ else spu->s_chan[ch].bVolumeL=0;
+ }
+ }
+}
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/regs.h Added

@@ -0,0 +1,44 @@
+/***************************************************************************
+                           regs.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+struct spu2_state_s;
+
+void SoundOn(struct spu2_state_s *spu, int start,int end,unsigned short val);
+void SoundOff(struct spu2_state_s *spu, int start,int end,unsigned short val);
+void VolumeOn(struct spu2_state_s *spu, int start,int end,unsigned short val,int iRight);
+void FModOn(struct spu2_state_s *spu, int start,int end,unsigned short val);
+void NoiseOn(struct spu2_state_s *spu, int start,int end,unsigned short val);
+void SetVolumeL(struct spu2_state_s *spu, unsigned char ch,short vol);
+void SetVolumeR(struct spu2_state_s *spu, unsigned char ch,short vol);
+void SetPitch(struct spu2_state_s *spu, int ch,unsigned short val);
+void ReverbOn(struct spu2_state_s *spu, int start,int end,unsigned short val,int iRight);
+void SetReverbAddr(struct spu2_state_s *spu, int core);
+
+//EXPORT_GCC void CALLBACK SPU2write(unsigned long reg, unsigned short val);
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/reverb.h Added

@@ -0,0 +1,33 @@
+/***************************************************************************
+                          reverb.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+
+INLINE void StartREVERB(int ch);
+INLINE void StoreREVERB(int ch,int ns);
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/reverb2.c Added

@@ -0,0 +1,414 @@
+/***************************************************************************
+ reverb.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed to SPU2 functionality
+//
+// 2003/01/19 - Pete
+// - added Neill's reverb (see at the end of file)
+//
+// 2002/12/26 - Pete
+// - adjusted reverb handling
+//
+// 2002/08/14 - Pete
+// - added extra reverb
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_REVERB
+
+// will be included from spu.c
+#ifdef _IN_SPU
+
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// START REVERB
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StartREVERB(spu2_state_t *spu, int ch)
+{
+ int core=ch/24;
+ 
+ if((spu->s_chan[ch].bReverbL || spu->s_chan[ch].bReverbR) && (spu->spuCtrl2[core]&0x80)) // reverb possible?
+ {
+ if(spu->iUseReverb==1) spu->s_chan[ch].bRVBActive=1;
+ }
+ else spu->s_chan[ch].bRVBActive=0; // else -> no reverb
+}
+
+////////////////////////////////////////////////////////////////////////
+// HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
+////////////////////////////////////////////////////////////////////////
+
+INLINE void InitREVERB(spu2_state_t *spu)
+{
+ if(spu->iUseReverb==1)
+ {
+ memset(spu->sRVBStart[0],0,NSSIZE*2*4);
+ memset(spu->sRVBStart[1],0,NSSIZE*2*4);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// STORE REVERB
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
+{
+ int core=ch/24;
+ 
+ if(spu->iUseReverb==0) return;
+ else
+ if(spu->iUseReverb==1) // -------------------------------- // Neil's reverb
+ {
+ const int iRxl=(spu->s_chan[ch].sval*spu->s_chan[ch].iLeftVolume*spu->s_chan[ch].bReverbL)/0x4000;
+ const int iRxr=(spu->s_chan[ch].sval*spu->s_chan[ch].iRightVolume*spu->s_chan[ch].bReverbR)/0x4000;
+
+ ns<<=1;
+
+ *(spu->sRVBStart[core]+ns) +=iRxl; // -> we mix all active reverb channels into an extra buffer
+ *(spu->sRVBStart[core]+ns+1)+=iRxr;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // get_buffer content helper: takes care about wraps
+{
+ short * p=(short *)spu->spuMem;
+ iOff=(iOff)+spu->rvb[core].CurrAddr;
+ while(iOff>spu->rvb[core].EndAddr) iOff=spu->rvb[core].StartAddr+(iOff-(spu->rvb[core].EndAddr+1));
+ while(iOff<spu->rvb[core].StartAddr) iOff=spu->rvb[core].EndAddr-(spu->rvb[core].StartAddr-iOff);
+ return (int)*(p+iOff);
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spu->spuMem;
+ iOff=(iOff)+spu->rvb[core].CurrAddr;
+ while(iOff>spu->rvb[core].EndAddr) iOff=spu->rvb[core].StartAddr+(iOff-(spu->rvb[core].EndAddr+1));
+ while(iOff<spu->rvb[core].StartAddr) iOff=spu->rvb[core].EndAddr-(spu->rvb[core].StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+{
+ short * p=(short *)spu->spuMem;
+ iOff=(iOff)+spu->rvb[core].CurrAddr+1;
+ while(iOff>spu->rvb[core].EndAddr) iOff=spu->rvb[core].StartAddr+(iOff-(spu->rvb[core].EndAddr+1));
+ while(iOff<spu->rvb[core].StartAddr) iOff=spu->rvb[core].EndAddr-(spu->rvb[core].StartAddr-iOff);
+ if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ *(p+iOff)=(short)iVal;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core)
+{
+ if(spu->iUseReverb==1)
+ {
+ if(!spu->rvb[core].StartAddr || !spu->rvb[core].EndAddr || 
+ spu->rvb[core].StartAddr>=spu->rvb[core].EndAddr) // reverb is off
+ {
+ spu->rvb[core].iLastRVBLeft=spu->rvb[core].iLastRVBRight=spu->rvb[core].iRVBLeft=spu->rvb[core].iRVBRight=0;
+ return 0;
+ }
+
+ spu->rvb[core].iCnt++; 
+
+ if(spu->rvb[core].iCnt&1) // we work on every second left value: downsample to 22 khz
+ {
+ if((spu->spuCtrl2[core]&0x80)) // -> reverb on? oki
+ {
+ int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
+
+ const int INPUT_SAMPLE_L=*(spu->sRVBStart[core]+(ns<<1)); 
+ const int INPUT_SAMPLE_R=*(spu->sRVBStart[core]+(ns<<1)+1); 
+
+ const int IIR_INPUT_A0 = (g_buffer(spu, spu->rvb[core].IIR_SRC_A0,core) * spu->rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_L * spu->rvb[core].IN_COEF_L)/32768L;
+ const int IIR_INPUT_A1 = (g_buffer(spu, spu->rvb[core].IIR_SRC_A1,core) * spu->rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_R * spu->rvb[core].IN_COEF_R)/32768L;
+ const int IIR_INPUT_B0 = (g_buffer(spu, spu->rvb[core].IIR_SRC_B0,core) * spu->rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_L * spu->rvb[core].IN_COEF_L)/32768L;
+ const int IIR_INPUT_B1 = (g_buffer(spu, spu->rvb[core].IIR_SRC_B1,core) * spu->rvb[core].IIR_COEF)/32768L + (INPUT_SAMPLE_R * spu->rvb[core].IN_COEF_R)/32768L;
+
+ const int IIR_A0 = (IIR_INPUT_A0 * spu->rvb[core].IIR_ALPHA)/32768L + (g_buffer(spu, spu->rvb[core].IIR_DEST_A0,core) * (32768L - spu->rvb[core].IIR_ALPHA))/32768L;
+ const int IIR_A1 = (IIR_INPUT_A1 * spu->rvb[core].IIR_ALPHA)/32768L + (g_buffer(spu, spu->rvb[core].IIR_DEST_A1,core) * (32768L - spu->rvb[core].IIR_ALPHA))/32768L;
+ const int IIR_B0 = (IIR_INPUT_B0 * spu->rvb[core].IIR_ALPHA)/32768L + (g_buffer(spu, spu->rvb[core].IIR_DEST_B0,core) * (32768L - spu->rvb[core].IIR_ALPHA))/32768L;
+ const int IIR_B1 = (IIR_INPUT_B1 * spu->rvb[core].IIR_ALPHA)/32768L + (g_buffer(spu, spu->rvb[core].IIR_DEST_B1,core) * (32768L - spu->rvb[core].IIR_ALPHA))/32768L;
+
+ s_buffer1(spu, spu->rvb[core].IIR_DEST_A0, IIR_A0,core);
+ s_buffer1(spu, spu->rvb[core].IIR_DEST_A1, IIR_A1,core);
+ s_buffer1(spu, spu->rvb[core].IIR_DEST_B0, IIR_B0,core);
+ s_buffer1(spu, spu->rvb[core].IIR_DEST_B1, IIR_B1,core);
+ 
+ ACC0 = (g_buffer(spu, spu->rvb[core].ACC_SRC_A0,core) * spu->rvb[core].ACC_COEF_A)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_B0,core) * spu->rvb[core].ACC_COEF_B)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_C0,core) * spu->rvb[core].ACC_COEF_C)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_D0,core) * spu->rvb[core].ACC_COEF_D)/32768L;
+ ACC1 = (g_buffer(spu, spu->rvb[core].ACC_SRC_A1,core) * spu->rvb[core].ACC_COEF_A)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_B1,core) * spu->rvb[core].ACC_COEF_B)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_C1,core) * spu->rvb[core].ACC_COEF_C)/32768L +
+ (g_buffer(spu, spu->rvb[core].ACC_SRC_D1,core) * spu->rvb[core].ACC_COEF_D)/32768L;
+
+ FB_A0 = g_buffer(spu, spu->rvb[core].MIX_DEST_A0 - spu->rvb[core].FB_SRC_A,core);
+ FB_A1 = g_buffer(spu, spu->rvb[core].MIX_DEST_A1 - spu->rvb[core].FB_SRC_A,core);
+ FB_B0 = g_buffer(spu, spu->rvb[core].MIX_DEST_B0 - spu->rvb[core].FB_SRC_B,core);
+ FB_B1 = g_buffer(spu, spu->rvb[core].MIX_DEST_B1 - spu->rvb[core].FB_SRC_B,core);
+
+ s_buffer(spu, spu->rvb[core].MIX_DEST_A0, ACC0 - (FB_A0 * spu->rvb[core].FB_ALPHA)/32768L,core);
+ s_buffer(spu, spu->rvb[core].MIX_DEST_A1, ACC1 - (FB_A1 * spu->rvb[core].FB_ALPHA)/32768L,core);
+ 
+ s_buffer(spu, spu->rvb[core].MIX_DEST_B0, (spu->rvb[core].FB_ALPHA * ACC0)/32768L - (FB_A0 * (int)(spu->rvb[core].FB_ALPHA^0xFFFF8000))/32768L - (FB_B0 * spu->rvb[core].FB_X)/32768L,core);
+ s_buffer(spu, spu->rvb[core].MIX_DEST_B1, (spu->rvb[core].FB_ALPHA * ACC1)/32768L - (FB_A1 * (int)(spu->rvb[core].FB_ALPHA^0xFFFF8000))/32768L - (FB_B1 * spu->rvb[core].FB_X)/32768L,core);
+ 
+ spu->rvb[core].iLastRVBLeft = spu->rvb[core].iRVBLeft;
+ spu->rvb[core].iLastRVBRight = spu->rvb[core].iRVBRight;
+
+ spu->rvb[core].iRVBLeft = (g_buffer(spu, spu->rvb[core].MIX_DEST_A0,core)+g_buffer(spu, spu->rvb[core].MIX_DEST_B0,core))/3;
+ spu->rvb[core].iRVBRight = (g_buffer(spu, spu->rvb[core].MIX_DEST_A1,core)+g_buffer(spu, spu->rvb[core].MIX_DEST_B1,core))/3;
+
+ spu->rvb[core].iRVBLeft = (spu->rvb[core].iRVBLeft * spu->rvb[core].VolLeft) / 0x4000;
+ spu->rvb[core].iRVBRight = (spu->rvb[core].iRVBRight * spu->rvb[core].VolRight) / 0x4000;
+
+ spu->rvb[core].CurrAddr++;
+ if(spu->rvb[core].CurrAddr>spu->rvb[core].EndAddr) spu->rvb[core].CurrAddr=spu->rvb[core].StartAddr;
+
+ return spu->rvb[core].iLastRVBLeft+(spu->rvb[core].iRVBLeft-spu->rvb[core].iLastRVBLeft)/2;
+ }
+ else // -> reverb off
+ {
+ spu->rvb[core].iLastRVBLeft=spu->rvb[core].iLastRVBRight=spu->rvb[core].iRVBLeft=spu->rvb[core].iRVBRight=0;
+ }
+
+ spu->rvb[core].CurrAddr++;
+ if(spu->rvb[core].CurrAddr>spu->rvb[core].EndAddr) spu->rvb[core].CurrAddr=spu->rvb[core].StartAddr;
+ }
+
+ return spu->rvb[core].iLastRVBLeft;
+ }
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+INLINE int MixREVERBRight(spu2_state_t *spu, int core)
+{
+ if(spu->iUseReverb==1) // Neill's reverb:
+ {
+ int i=spu->rvb[core].iLastRVBRight+(spu->rvb[core].iRVBRight-spu->rvb[core].iLastRVBRight)/2;
+ spu->rvb[core].iLastRVBRight=spu->rvb[core].iRVBRight;
+ return i; // -> just return the last right reverb val (little bit scaled by the previous right val)
+ }
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+
+#endif
+
+/*
+-----------------------------------------------------------------------------
+PSX reverb hardware notes
+by Neill Corlett
+-----------------------------------------------------------------------------
+
+Yadda yadda disclaimer yadda probably not perfect yadda well it's okay anyway
+yadda yadda.
+
+-----------------------------------------------------------------------------
+
+Basics
+------
+
+- The reverb buffer is 22khz 16-bit mono PCM.
+- It starts at the reverb address given by 1DA2, extends to
+ the end of sound RAM, and wraps back to the 1DA2 address.
+
+Setting the address at 1DA2 resets the current reverb work address.
+
+This work address ALWAYS increments every 1/22050 sec., regardless of
+whether reverb is enabled (bit 7 of 1DAA set).
+
+And the contents of the reverb buffer ALWAYS play, scaled by the
+"reverberation depth left/right" volumes (1D84/1D86).
+(which, by the way, appear to be scaled so 3FFF=approx. 1.0, 4000=-1.0)
+
+-----------------------------------------------------------------------------
+
+Register names
+--------------
+
+These are probably not their real names.
+These are probably not even correct names.
+We will use them anyway, because we can.
+
+1DC0: FB_SRC_A (offset)
+1DC2: FB_SRC_B (offset)
+1DC4: IIR_ALPHA (coef.)
+1DC6: ACC_COEF_A (coef.)
+1DC8: ACC_COEF_B (coef.)
+1DCA: ACC_COEF_C (coef.)
+1DCC: ACC_COEF_D (coef.)
+1DCE: IIR_COEF (coef.)
+1DD0: FB_ALPHA (coef.)
+1DD2: FB_X (coef.)
+1DD4: IIR_DEST_A0 (offset)
+1DD6: IIR_DEST_A1 (offset)
+1DD8: ACC_SRC_A0 (offset)
+1DDA: ACC_SRC_A1 (offset)
+1DDC: ACC_SRC_B0 (offset)
+1DDE: ACC_SRC_B1 (offset)
+1DE0: IIR_SRC_A0 (offset)
+1DE2: IIR_SRC_A1 (offset)
+1DE4: IIR_DEST_B0 (offset)
+1DE6: IIR_DEST_B1 (offset)
+1DE8: ACC_SRC_C0 (offset)
+1DEA: ACC_SRC_C1 (offset)
+1DEC: ACC_SRC_D0 (offset)
+1DEE: ACC_SRC_D1 (offset)
+1DF0: IIR_SRC_B1 (offset)
+1DF2: IIR_SRC_B0 (offset)
+1DF4: MIX_DEST_A0 (offset)
+1DF6: MIX_DEST_A1 (offset)
+1DF8: MIX_DEST_B0 (offset)
+1DFA: MIX_DEST_B1 (offset)
+1DFC: IN_COEF_L (coef.)
+1DFE: IN_COEF_R (coef.)
+
+The coefficients are signed fractional values.
+-32768 would be -1.0
+ 32768 would be 1.0 (if it were possible... the highest is of course 32767)
+
+The offsets are (byte/8) offsets into the reverb buffer.
+i.e. you multiply them by 8, you get byte offsets.
+You can also think of them as (samples/4) offsets.
+They appear to be signed. They can be negative.
+None of the documented presets make them negative, though.
+
+Yes, 1DF0 and 1DF2 appear to be backwards. Not a typo.
+
+-----------------------------------------------------------------------------
+
+What it does
+------------
+
+We take all reverb sources:
+- regular channels that have the reverb bit on
+- cd and external sources, if their reverb bits are on
+and mix them into one stereo 44100hz signal.
+
+Lowpass/downsample that to 22050hz. The PSX uses a proper bandlimiting
+algorithm here, but I haven't figured out the hysterically exact specifics.
+I use an 8-tap filter with these coefficients, which are nice but probably
+not the real ones:
+
+0.037828187894
+0.157538631280
+0.321159685278
+0.449322115345
+0.449322115345
+0.321159685278
+0.157538631280
+0.037828187894
+
+So we have two input samples (INPUT_SAMPLE_L, INPUT_SAMPLE_R) every 22050hz.
+
+* IN MY EMULATION, I divide these by 2 to make it clip less.
+ (and of course the L/R output coefficients are adjusted to compensate)
+ The real thing appears to not do this.
+
+At every 22050hz tick:
+- If the reverb bit is enabled (bit 7 of 1DAA), execute the reverb
+ steady-state algorithm described below
+- AFTERWARDS, retrieve the "wet out" L and R samples from the reverb buffer
+ (This part may not be exactly right and I guessed at the coefs. TODO: check later.)
+ L is: 0.333 * (buffer[MIX_DEST_A0] + buffer[MIX_DEST_B0])
+ R is: 0.333 * (buffer[MIX_DEST_A1] + buffer[MIX_DEST_B1])
+- Advance the current buffer position by 1 sample
+
+The wet out L and R are then upsampled to 44100hz and played at the
+"reverberation depth left/right" (1D84/1D86) volume, independent of the main
+volume.
+
+-----------------------------------------------------------------------------
+
+Reverb steady-state
+-------------------
+
+The reverb steady-state algorithm is fairly clever, and of course by
+"clever" I mean "batshit insane".
+
+buffer[x] is relative to the current buffer position, not the beginning of
+the buffer. Note that all buffer offsets must wrap around so they're
+contained within the reverb work area.
+
+Clipping is performed at the end... maybe also sooner, but definitely at
+the end.
+
+IIR_INPUT_A0 = buffer[IIR_SRC_A0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_A1 = buffer[IIR_SRC_A1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+IIR_INPUT_B0 = buffer[IIR_SRC_B0] * IIR_COEF + INPUT_SAMPLE_L * IN_COEF_L;
+IIR_INPUT_B1 = buffer[IIR_SRC_B1] * IIR_COEF + INPUT_SAMPLE_R * IN_COEF_R;
+
+IIR_A0 = IIR_INPUT_A0 * IIR_ALPHA + buffer[IIR_DEST_A0] * (1.0 - IIR_ALPHA);
+IIR_A1 = IIR_INPUT_A1 * IIR_ALPHA + buffer[IIR_DEST_A1] * (1.0 - IIR_ALPHA);
+IIR_B0 = IIR_INPUT_B0 * IIR_ALPHA + buffer[IIR_DEST_B0] * (1.0 - IIR_ALPHA);
+IIR_B1 = IIR_INPUT_B1 * IIR_ALPHA + buffer[IIR_DEST_B1] * (1.0 - IIR_ALPHA);
+
+buffer[IIR_DEST_A0 + 1sample] = IIR_A0;
+buffer[IIR_DEST_A1 + 1sample] = IIR_A1;
+buffer[IIR_DEST_B0 + 1sample] = IIR_B0;
+buffer[IIR_DEST_B1 + 1sample] = IIR_B1;
+
+ACC0 = buffer[ACC_SRC_A0] * ACC_COEF_A +
+ buffer[ACC_SRC_B0] * ACC_COEF_B +
+ buffer[ACC_SRC_C0] * ACC_COEF_C +
+ buffer[ACC_SRC_D0] * ACC_COEF_D;
+ACC1 = buffer[ACC_SRC_A1] * ACC_COEF_A +
+ buffer[ACC_SRC_B1] * ACC_COEF_B +
+ buffer[ACC_SRC_C1] * ACC_COEF_C +
+ buffer[ACC_SRC_D1] * ACC_COEF_D;
+
+FB_A0 = buffer[MIX_DEST_A0 - FB_SRC_A];
+FB_A1 = buffer[MIX_DEST_A1 - FB_SRC_A];
+FB_B0 = buffer[MIX_DEST_B0 - FB_SRC_B];
+FB_B1 = buffer[MIX_DEST_B1 - FB_SRC_B];
+
+buffer[MIX_DEST_A0] = ACC0 - FB_A0 * FB_ALPHA;
+buffer[MIX_DEST_A1] = ACC1 - FB_A1 * FB_ALPHA;
+buffer[MIX_DEST_B0] = (FB_ALPHA * ACC0) - FB_A0 * (FB_ALPHA^0x8000) - FB_B0 * FB_X;
+buffer[MIX_DEST_B1] = (FB_ALPHA * ACC1) - FB_A1 * (FB_ALPHA^0x8000) - FB_B1 * FB_X;
+
+-----------------------------------------------------------------------------
+*/
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/spu.h Added

@@ -0,0 +1,110 @@
+/***************************************************************************
+                            spu.h  -  description
+                             -------------------
+    begin                : Wed May 15 2002
+    copyright            : (C) 2002 by Pete Bernert
+    email                : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "../psx.h"
+
+typedef struct spu2_state_s {
+    // psx buffer / addresses
+
+    unsigned short  regArea[32*1024];                        
+    unsigned short  spuMem[1*1024*1024];
+    unsigned char * spuMemC;
+    unsigned char * pSpuIrq[2];
+    unsigned char * pSpuBuffer;
+
+    // user settings          
+
+    int             iUseXA;//=0;
+    int             iVolume;//=3;
+    int             iXAPitch;//=1;
+    int             iUseTimer;//=2;
+    int             iSPUIRQWait;//=1;
+    int             iDebugMode;//=0;
+    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)
+    REVERBInfo      rvb[2];
+
+    unsigned long   dwNoiseVal;//=1;                          // global noise generator
+
+    unsigned short  spuCtrl2[2];                           // some vars to store psx reg infos
+    unsigned short  spuStat2[2];
+    unsigned long   spuIrq2[2];             
+    unsigned long   spuAddr2[2];                           // address into spu mem
+    unsigned long   spuRvbAddr2[2];
+    unsigned long   spuRvbAEnd2[2];
+    int             bEndThread;                          // thread handlers
+    int             bThreadEnded;
+    int             bSpuInit;
+    int             bSPUIsOpen;
+
+    unsigned long dwNewChannel2[2];                        // flags for faster testing, if new channel starts
+    unsigned long dwEndChannel2[2];
+
+    // UNUSED IN PS2 YET
+    void (CALLBACK *irqCallback)(void);                  // func of main emu, called on spu irq
+    void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+
+    int SSumR[NSSIZE];
+    int SSumL[NSSIZE];
+    int iCycle;
+    short * pS;
+
+    int lastch;//=-1;      // last channel processed on spu irq in timer mode
+    int lastns;       // last ns pos
+    int iSecureStart; // secure start counter
+
+    u32 sampcount;
+    u32 decaybegin;
+    u32 decayend;
+
+    // REVERB info and timing vars...
+    int *          sRVBPlay[2];
+    int *          sRVBEnd[2];
+    int *          sRVBStart[2];
+
+    int iSpuAsyncWait;
+} spu2_state_t;
+
+
+//void SetupTimer(mips_cpu_context *cpu);
+//void RemoveTimer(mips_cpu_context *cpu);
+//EXPORT_GCC void CALLBACK SPU2playADPCMchannel(mips_cpu_context *cpu, xa_decode_t *xap);
+
+EXPORT_GCC long CALLBACK SPU2init(mips_cpu_context *cpu, void (*callback)(unsigned char *, long, void *), void *data);
+EXPORT_GCC void CALLBACK SPU2free(mips_cpu_context *cpu);
+EXPORT_GCC long CALLBACK SPU2open(mips_cpu_context *cpu, void *pDsp);
+EXPORT_GCC void CALLBACK SPU2async(mips_cpu_context *cpu, unsigned long cycle);
+EXPORT_GCC void CALLBACK SPU2close(mips_cpu_context *cpu);
+void setlength2(spu2_state_t *spu, s32 stop, s32 fade);
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/spu2.c Added

@@ -0,0 +1,988 @@
+/***************************************************************************
+ spu.c - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+ 
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+ 
+//*************************************************************************//
+// History of changes:
+//
+// 2005/08/29 - Pete
+// - changed to 48Khz output
+//
+// 2004/12/25 - Pete
+// - inc'd version for pcsx2-0.7
+//
+// 2004/04/18 - Pete
+// - changed all kind of things in the plugin
+//
+// 2004/04/04 - Pete
+// - changed plugin to emulate PS2 spu
+//
+// 2003/04/07 - Eric
+// - adjusted cubic interpolation algorithm
+//
+// 2003/03/16 - Eric
+// - added cubic interpolation
+//
+// 2003/03/01 - linuzappz
+// - libraryName changes using ALSA
+//
+// 2003/02/28 - Pete
+// - added option for type of interpolation
+// - adjusted spu irqs again (Thousant Arms, Valkyrie Profile)
+// - added MONO support for MSWindows DirectSound
+//
+// 2003/02/20 - kode54
+// - amended interpolation code, goto GOON could skip initialization of gpos and cause segfault
+//
+// 2003/02/19 - kode54
+// - moved SPU IRQ handler and changed sample flag processing
+//
+// 2003/02/18 - kode54
+// - moved ADSR calculation outside of the sample decode loop, somehow I doubt that
+// ADSR timing is relative to the frequency at which a sample is played... I guess
+// this remains to be seen, and I don't know whether ADSR is applied to noise channels...
+//
+// 2003/02/09 - kode54
+// - one-shot samples now process the end block before stopping
+// - in light of removing fmod hack, now processing ADSR on frequency channel as well
+//
+// 2003/02/08 - kode54
+// - replaced easy interpolation with gaussian
+// - removed fmod averaging hack
+// - changed .sinc to be updated from .iRawPitch, no idea why it wasn't done this way already (<- Pete: because I sometimes fail to see the obvious, haharhar :)
+//
+// 2003/02/08 - linuzappz
+// - small bugfix for one usleep that was 1 instead of 1000
+// - added iDisStereo for no stereo (Linux)
+//
+// 2003/01/22 - Pete
+// - added easy interpolation & small noise adjustments
+//
+// 2003/01/19 - Pete
+// - added Neill's reverb
+//
+// 2003/01/12 - Pete
+// - added recording window handlers
+//
+// 2003/01/06 - Pete
+// - added Neill's ADSR timings
+//
+// 2002/12/28 - Pete
+// - adjusted spu irq handling, fmod handling and loop handling
+//
+// 2002/08/14 - Pete
+// - added extra reverb
+//
+// 2002/06/08 - linuzappz
+// - SPUupdate changed for SPUasync
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#include "stdafx.h"
+
+#define _IN_SPU
+
+#include "../psx.h"
+#include "../peops2/externals.h"
+#include "../peops2/regs.h"
+#include "../peops2/dma.h"
+#include "../peops2/spu.h"
+ 
+////////////////////////////////////////////////////////////////////////
+// globals
+////////////////////////////////////////////////////////////////////////
+
+
+// certain globals (were local before, but with the new timeproc I need em global)
+
+const int f[5][2] = { { 0, 0 },
+ { 60, 0 },
+ { 115, -52 },
+ { 98, -55 },
+ { 122, -60 } };
+
+////////////////////////////////////////////////////////////////////////
+// CODE AREA
+////////////////////////////////////////////////////////////////////////
+
+// dirty inline func includes
+
+#include "reverb2.c" 
+#include "adsr2.c"
+
+////////////////////////////////////////////////////////////////////////
+// helpers for simple interpolation
+
+//
+// easy interpolation on upsampling, no special filter, just "Pete's common sense" tm
+//
+// instead of having n equal sample values in a row like:
+// ____
+// |____
+//
+// we compare the current delta change with the next delta change.
+//
+// if curr_delta is positive,
+//
+// - and next delta is smaller (or changing direction):
+// \.
+// -__
+//
+// - and next delta significant (at least twice) bigger:
+// --_
+// \.
+//
+// - and next delta is nearly same:
+// \.
+// \.
+//
+//
+// if curr_delta is negative,
+//
+// - and next delta is smaller (or changing direction):
+// _--
+// /
+//
+// - and next delta significant (at least twice) bigger:
+// /
+// __- 
+// 
+// - and next delta is nearly same:
+// /
+// /
+// 
+
+
+INLINE void InterpolateUp(spu2_state_t *spu, int ch)
+{
+ if(spu->s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
+ {
+ const int id1=spu->s_chan[ch].SB[30]-spu->s_chan[ch].SB[29]; // curr delta to next val
+ const int id2=spu->s_chan[ch].SB[31]-spu->s_chan[ch].SB[30]; // and next delta to next-next val :)
+
+ spu->s_chan[ch].SB[32]=0;
+
+ if(id1>0) // curr delta positive
+ {
+ if(id2<id1)
+ {spu->s_chan[ch].SB[28]=id1;spu->s_chan[ch].SB[32]=2;}
+ else
+ if(id2<(id1<<1))
+ spu->s_chan[ch].SB[28]=(id1*spu->s_chan[ch].sinc)/0x10000L;
+ else
+ spu->s_chan[ch].SB[28]=(id1*spu->s_chan[ch].sinc)/0x20000L; 
+ }
+ else // curr delta negative
+ {
+ if(id2>id1)
+ {spu->s_chan[ch].SB[28]=id1;spu->s_chan[ch].SB[32]=2;}
+ else
+ if(id2>(id1<<1))
+ spu->s_chan[ch].SB[28]=(id1*spu->s_chan[ch].sinc)/0x10000L;
+ else
+ spu->s_chan[ch].SB[28]=(id1*spu->s_chan[ch].sinc)/0x20000L; 
+ }
+ }
+ else
+ if(spu->s_chan[ch].SB[32]==2) // flag 1: calc step and set flag... and don't change the value in this pass
+ {
+ spu->s_chan[ch].SB[32]=0;
+
+ spu->s_chan[ch].SB[28]=(spu->s_chan[ch].SB[28]*spu->s_chan[ch].sinc)/0x20000L;
+ if(spu->s_chan[ch].sinc<=0x8000)
+ spu->s_chan[ch].SB[29]=spu->s_chan[ch].SB[30]-(spu->s_chan[ch].SB[28]*((0x10000/spu->s_chan[ch].sinc)-1));
+ else spu->s_chan[ch].SB[29]+=spu->s_chan[ch].SB[28];
+ }
+ else // no flags? add bigger val (if possible), calc smaller step, set flag1
+ spu->s_chan[ch].SB[29]+=spu->s_chan[ch].SB[28];
+}
+
+//
+// even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
+//
+
+INLINE void InterpolateDown(spu2_state_t *spu, int ch)
+{
+ if(spu->s_chan[ch].sinc>=0x20000L) // we would skip at least one val?
+ {
+ spu->s_chan[ch].SB[29]+=(spu->s_chan[ch].SB[30]-spu->s_chan[ch].SB[29])/2; // add easy weight
+ if(spu->s_chan[ch].sinc>=0x30000L) // we would skip even more vals?
+ spu->s_chan[ch].SB[29]+=(spu->s_chan[ch].SB[31]-spu->s_chan[ch].SB[30])/2;// add additional next weight
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// helpers for gauss interpolation
+
+#define gval0 (((short*)(&spu->s_chan[ch].SB[29]))[gpos])
+#define gval(x) (((short*)(&spu->s_chan[ch].SB[29]))[(gpos+x)&3])
+
+#include "gauss_i.h"
+
+////////////////////////////////////////////////////////////////////////
+
+//#include "xa.c"
+
+////////////////////////////////////////////////////////////////////////
+// START SOUND... called by main thread to setup a new sound on a channel
+////////////////////////////////////////////////////////////////////////
+
+INLINE void StartSound(spu2_state_t *spu, int ch)
+{
+ spu->dwNewChannel2[ch/24]&=~(1<<(ch%24)); // clear new channel bit
+ spu->dwEndChannel2[ch/24]&=~(1<<(ch%24)); // clear end channel bit
+
+ StartADSR(spu, ch);
+ StartREVERB(spu, ch); 
+ 
+ spu->s_chan[ch].pCurr=spu->s_chan[ch].pStart; // set sample start
+ 
+ spu->s_chan[ch].s_1=0; // init mixing vars
+ spu->s_chan[ch].s_2=0;
+ spu->s_chan[ch].iSBPos=28;
+
+ spu->s_chan[ch].bNew=0; // init channel flags
+ spu->s_chan[ch].bStop=0; 
+ spu->s_chan[ch].bOn=1;
+
+ spu->s_chan[ch].SB[29]=0; // init our interpolation helpers
+ spu->s_chan[ch].SB[30]=0;
+
+ if(spu->iUseInterpolation>=2) // gauss interpolation?
+ {spu->s_chan[ch].spos=0x30000L;spu->s_chan[ch].SB[28]=0;} // -> start with more decoding
+ else {spu->s_chan[ch].spos=0x10000L;spu->s_chan[ch].SB[31]=0;} // -> no/simple interpolation starts with one 44100 decoding
+}
+
+////////////////////////////////////////////////////////////////////////
+// MAIN SPU FUNCTION
+// here is the main job handler... thread, timer or direct func call
+// basically the whole sound processing is done in this fat func!
+////////////////////////////////////////////////////////////////////////
+
+// Counting to 65536 results in full volume offage.
+void setlength2(spu2_state_t *spu, s32 stop, s32 fade)
+{
+ if(stop==~0)
+ {
+ spu->decaybegin=~0;
+ }
+ else
+ {
+ stop=(stop*441)/10;
+ fade=(fade*441)/10;
+
+ spu->decaybegin=stop;
+ spu->decayend=stop+fade;
+ }
+}
+// 5 ms waiting phase, if buffer is full and no new sound has to get started
+// .. can be made smaller (smallest val: 1 ms), but bigger waits give
+// better performance
+
+#define PAUSE_W 5
+#define PAUSE_L 5000
+
+////////////////////////////////////////////////////////////////////////
+
+static void *MAINThread(mips_cpu_context *cpu, int samp2run)
+{
+ spu2_state_t *spu = cpu->spu2;
+ int s_1,s_2,fa,voldiv=spu->iVolume;
+ unsigned char * start;unsigned int nSample;
+ int ch,predict_nr,shift_factor,flags,d,d2,s;
+ int gpos,bIRQReturn=0;
+
+// while(!bEndThread) // until we are shutting down
+ {
+ //--------------------------------------------------//
+ // ok, at the beginning we are looking if there is
+ // enuff free place in the dsound/oss buffer to
+ // fill in new data, or if there is a new channel to start.
+ // if not, we wait (thread) or return (timer/spuasync)
+ // until enuff free place is available/a new channel gets
+ // started
+
+ if(spu->dwNewChannel2[0] || spu->dwNewChannel2[1]) // new channel should start immedately?
+ { // (at least one bit 0 ... MAXCHANNEL is set?)
+ spu->iSecureStart++; // -> set iSecure
+ if(spu->iSecureStart>5) spu->iSecureStart=0; // (if it is set 5 times - that means on 5 tries a new samples has been started - in a row, we will reset it, to give the sound update a chance)
+ }
+ else spu->iSecureStart=0; // 0: no new channel should start
+
+/*	if (!iSecureStart)
+	{
+	 iSecureStart=0; // reset secure
+	 return;
+	}*/
+
+#if 0
+ while(!iSecureStart && !bEndThread) // && // no new start? no thread end?
+// (SoundGetBytesBuffered()>TESTSIZE)) // and still enuff data in sound buffer?
+ {
+ iSecureStart=0; // reset secure
+
+ if(iUseTimer) return 0; // linux no-thread mode? bye
+
+ 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? 
+
+ if(spu->lastch>=0) // will be -1 if no continue is pending
+ {
+ ch=spu->lastch; spu->lastch=-1; // -> setup all kind of vars to continue
+ goto GOON; // -> directly jump to the continue point
+ }
+
+ //--------------------------------------------------//
+ //- main channel loop -// 
+ //--------------------------------------------------//
+ {
+ for(ch=0;ch<MAXCHAN;ch++) // loop em all... we will collect 1 ms of sound of each playing channel
+ {
+ if(spu->s_chan[ch].bNew) StartSound(spu, ch); // start new sound
+ if(!spu->s_chan[ch].bOn) continue; // channel not playing? next
+
+ if(spu->s_chan[ch].iActFreq!=spu->s_chan[ch].iUsedFreq) // new psx frequency?
+ {
+ spu->s_chan[ch].iUsedFreq=spu->s_chan[ch].iActFreq; // -> take it and calc steps
+ spu->s_chan[ch].sinc=spu->s_chan[ch].iRawPitch<<4;
+ if(!spu->s_chan[ch].sinc) spu->s_chan[ch].sinc=1;
+ if(spu->iUseInterpolation==1) spu->s_chan[ch].SB[32]=1; // -> freq change in simle imterpolation mode: set flag
+ }
+// ns=0;
+// while(ns<NSSIZE) // loop until 1 ms of data is reached
+ {
+ while(spu->s_chan[ch].spos>=0x10000L)
+ {
+ if(spu->s_chan[ch].iSBPos==28) // 28 reached?
+ {
+ start=spu->s_chan[ch].pCurr; // set up the current pos
+
+ if (start == (unsigned char*)-1) // special "stop" sign
+ {
+ spu->s_chan[ch].bOn=0; // -> turn everything off
+ spu->s_chan[ch].ADSRX.lVolume=0;
+ spu->s_chan[ch].ADSRX.EnvelopeVol=0;
+ goto ENDX; // -> and done for this channel
+ }
+
+ spu->s_chan[ch].iSBPos=0;
+
+ //////////////////////////////////////////// spu irq handler here? mmm... do it later
+
+ s_1=spu->s_chan[ch].s_1;
+ s_2=spu->s_chan[ch].s_2;
+
+ predict_nr=(int)*start;start++;
+ shift_factor=predict_nr&0xf;
+ predict_nr >>= 4;
+ flags=(int)*start;start++;
+
+ // -------------------------------------- // 
+
+ for (nSample=0;nSample<28;start++) 
+ {
+ d=(int)*start;
+ s=((d&0xf)<<12);
+ if(s&0x8000) s|=0xffff0000;
+
+ 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=((d & 0xf0) << 8);
+
+ spu->s_chan[ch].SB[nSample++]=fa;
+
+ if(s&0x8000) s|=0xffff0000;
+ 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;
+
+ spu->s_chan[ch].SB[nSample++]=fa;
+ } 
+
+ //////////////////////////////////////////// irq check
+
+ if(spu->spuCtrl2[ch/24]&0x40) // some irq active?
+ {
+ if((spu->pSpuIrq[ch/24] > start-16 && // irq address reached?
+ spu->pSpuIrq[ch/24] <= start) ||
+ ((flags&1) && // special: irq on looping addr, when stop/loop flag is set 
+ (spu->pSpuIrq[ch/24] > spu->s_chan[ch].pLoop-16 &&
+ spu->pSpuIrq[ch/24] <= spu->s_chan[ch].pLoop)))
+ {
+ spu->s_chan[ch].iIrqDone=1; // -> debug flag
+
+ if(spu->irqCallback) spu->irqCallback(); // -> call main emu (not supported in SPU2 right now)
+ else
+ {
+ if(ch<24) InterruptDMA4(cpu); // -> let's see what is happening if we call our irqs instead ;)
+ else InterruptDMA7(cpu);
+ }
+ 
+ if(spu->iSPUIRQWait) // -> option: wait after irq for main emu
+ {
+ spu->iSpuAsyncWait=1;
+ bIRQReturn=1;
+ }
+ }
+ }
+ 
+ //////////////////////////////////////////// flag handler
+
+ if((flags&4) && (!spu->s_chan[ch].bIgnoreLoop))
+ spu->s_chan[ch].pLoop=start-16; // loop adress
+
+ if(flags&1) // 1: stop/loop
+ {
+ spu->dwEndChannel2[ch/24]|=(1<<(ch%24));
+ 
+ // We play this block out first...
+ //if(!(flags&2)|| spu->s_chan[ch].pLoop==NULL) 
+ // 1+2: do loop... otherwise: stop
+ if(flags!=3 || spu->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
+ start = (unsigned char*)-1;
+ }
+ else
+ {
+ start = spu->s_chan[ch].pLoop;
+ }
+ }
+
+ spu->s_chan[ch].pCurr=start; // store values for next cycle
+ spu->s_chan[ch].s_1=s_1;
+ spu->s_chan[ch].s_2=s_2; 
+
+ ////////////////////////////////////////////
+
+ if(bIRQReturn) // special return for "spu irq - wait for cpu action"
+ {
+ bIRQReturn=0;
+ {
+ spu->lastch=ch; 
+// lastns=ns;	// changemeback
+
+ return 0;
+ }
+ }
+
+ ////////////////////////////////////////////
+
+GOON: ;
+
+ }
+
+ fa=spu->s_chan[ch].SB[spu->s_chan[ch].iSBPos++]; // get sample data
+
+// if((spu->spuCtrl2[ch/24]&0x4000)==0) fa=0; // muted?
+// else // else adjust
+ {
+ if(fa>32767L) fa=32767L;
+ if(fa<-32767L) fa=-32767L; 
+ }
+
+ if(spu->iUseInterpolation>=2) // gauss/cubic interpolation
+ {
+ gpos = spu->s_chan[ch].SB[28];
+ gval0 = fa; 
+ gpos = (gpos+1) & 3;
+ spu->s_chan[ch].SB[28] = gpos;
+ }
+ else
+ if(spu->iUseInterpolation==1) // simple interpolation
+ {
+ spu->s_chan[ch].SB[28] = 0; 
+ spu->s_chan[ch].SB[29] = spu->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'
+ spu->s_chan[ch].SB[30] = spu->s_chan[ch].SB[31];
+ spu->s_chan[ch].SB[31] = fa;
+ spu->s_chan[ch].SB[32] = 1; // -> flag: calc new interolation
+ }
+ else spu->s_chan[ch].SB[29]=fa; // no interpolation
+
+ spu->s_chan[ch].spos -= 0x10000L;
+ }
+
+ ////////////////////////////////////////////////
+ // noise handler... just produces some noise data
+ // surely wrong... and no noise frequency (spuCtrl&0x3f00) will be used...
+ // and sometimes the noise will be used as fmod modulation... pfff
+
+ if(spu->s_chan[ch].bNoise)
+ {
+ if((spu->dwNoiseVal<<=1)&0x80000000L)
+ {
+ spu->dwNoiseVal^=0x0040001L;
+ fa=((spu->dwNoiseVal>>2)&0x7fff);
+ fa=-fa;
+ }
+ else fa=(spu->dwNoiseVal>>2)&0x7fff;
+
+ // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
+ fa=spu->s_chan[ch].iOldNoise+((fa-spu->s_chan[ch].iOldNoise)/((0x001f-((spu->spuCtrl2[ch/24]&0x3f00)>>9))+1));
+ if(fa>32767L) fa=32767L;
+ if(fa<-32767L) fa=-32767L; 
+ spu->s_chan[ch].iOldNoise=fa;
+
+ if(spu->iUseInterpolation<2) // no gauss/cubic interpolation?
+ spu->s_chan[ch].SB[29] = fa; // -> store noise val in "current sample" slot
+ } //----------------------------------------
+ else // NO NOISE (NORMAL SAMPLE DATA) HERE 
+ {//------------------------------------------//
+ if(spu->iUseInterpolation==3) // cubic interpolation
+ {
+ long xd; 
+ xd = ((spu->s_chan[ch].spos) >> 1)+1;
+ gpos = spu->s_chan[ch].SB[28];
+
+ fa = gval(3) - 3*gval(2) + 3*gval(1) - gval0;
+ fa *= (xd - (2<<15)) / 6;
+ fa >>= 15;
+ fa += gval(2) - gval(1) - gval(1) + gval0;
+ fa *= (xd - (1<<15)) >> 1;
+ fa >>= 15;
+ fa += gval(1) - gval0;
+ fa *= xd;
+ fa >>= 15;
+ fa = fa + gval0;
+ }
+ //------------------------------------------//
+ else
+ if(spu->iUseInterpolation==2) // gauss interpolation
+ {
+ int vl, vr;
+ vl = (spu->s_chan[ch].spos >> 6) & ~3;
+ gpos = spu->s_chan[ch].SB[28];
+ vr=(gauss[vl]*gval0)&~2047;
+ vr+=(gauss[vl+1]*gval(1))&~2047;
+ vr+=(gauss[vl+2]*gval(2))&~2047;
+ vr+=(gauss[vl+3]*gval(3))&~2047;
+ fa = vr>>11;
+/*
+ vr=(gauss[vl]*gval0)>>9;
+ vr+=(gauss[vl+1]*gval(1))>>9;
+ vr+=(gauss[vl+2]*gval(2))>>9;
+ vr+=(gauss[vl+3]*gval(3))>>9;
+ fa = vr>>2;
+*/
+ }
+ //------------------------------------------//
+ else
+ if(spu->iUseInterpolation==1) // simple interpolation
+ {
+ if(spu->s_chan[ch].sinc<0x10000L) // -> upsampling?
+ InterpolateUp(spu, ch); // --> interpolate up
+ else InterpolateDown(spu, ch); // --> else down
+ fa=spu->s_chan[ch].SB[29];
+ }
+ //------------------------------------------//
+ else fa=spu->s_chan[ch].SB[29]; // no interpolation
+ }
+
+ spu->s_chan[ch].sval = (MixADSR(spu, ch) * fa) / 1023; // add adsr
+
+ if(spu->s_chan[ch].bFMod==2) // fmod freq channel
+ {
+ int NP=spu->s_chan[ch+1].iRawPitch;
+ double intr;
+
+ NP=((32768L+spu->s_chan[ch].sval)*NP)/32768L; // mmm... I still need to adjust that to 1/48 khz... we will wait for the first game/demo using it to decide how to do it :)
+
+ if(NP>0x3fff) NP=0x3fff;
+ if(NP<0x1) NP=0x1;
+ 
+	 intr = (double)48000.0f / (double)44100.0f * (double)NP;
+ NP = (UINT32)intr;
+
+ NP=(44100L*NP)/(4096L); // calc frequency
+
+ spu->s_chan[ch+1].iActFreq=NP;
+ spu->s_chan[ch+1].iUsedFreq=NP;
+ spu->s_chan[ch+1].sinc=(((NP/10)<<16)/4410);
+ if(!spu->s_chan[ch+1].sinc) spu->s_chan[ch+1].sinc=1;
+ if(spu->iUseInterpolation==1) // freq change in sipmle interpolation mode
+ spu->s_chan[ch+1].SB[32]=1;
+
+// mmmm... set up freq decoding positions?
+// spu->s_chan[ch+1].iSBPos=28;
+// spu->s_chan[ch+1].spos=0x10000L;
+ } 
+ else 
+ { 
+ //////////////////////////////////////////////
+ // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
+
+ if(spu->s_chan[ch].iMute) 
+ spu->s_chan[ch].sval=0; // debug mute
+ else
+ {
+ if(spu->s_chan[ch].bVolumeL)
+ spu->SSumL[0]+=(spu->s_chan[ch].sval*spu->s_chan[ch].iLeftVolume)/0x4000L;
+ if(spu->s_chan[ch].bVolumeR)
+ spu->SSumR[0]+=(spu->s_chan[ch].sval*spu->s_chan[ch].iRightVolume)/0x4000L;
+ }
+ 
+ //////////////////////////////////////////////
+ // now let us store sound data for reverb 
+ 
+ if(spu->s_chan[ch].bRVBActive) StoreREVERB(spu, ch,0);
+ }
+
+ ////////////////////////////////////////////////
+ // ok, go on until 1 ms data of this channel is collected
+ 
+ spu->s_chan[ch].spos += spu->s_chan[ch].sinc; 
+ 
+ } 
+ENDX: ; 
+ }
+ } 
+ 
+ //---------------------------------------------------//
+ //- here we have another 1 ms of sound data
+ //---------------------------------------------------//
+
+ ///////////////////////////////////////////////////////
+ // mix all channels (including reverb) into one buffer
+
+ spu->SSumL[0]+=MixREVERBLeft(spu, 0,0);
+ spu->SSumL[0]+=MixREVERBLeft(spu, 0,1);
+ spu->SSumR[0]+=MixREVERBRight(spu, 0);
+ spu->SSumR[0]+=MixREVERBRight(spu, 1);
+ 
+ d=spu->SSumL[0]/voldiv;spu->SSumL[0]=0;
+ d2=spu->SSumR[0]/voldiv;spu->SSumR[0]=0;
+
+ if(d<-32767) d=-32767;if(d>32767) d=32767;
+ if(d2<-32767) d2=-32767;if(d2>32767) d2=32767;
+
+ if(spu->sampcount>=spu->decaybegin)
+ {
+	s32 dmul;
+	if(spu->decaybegin!=~0) // Is anyone REALLY going to be playing a song
+		 // for 13 hours?
+ 	{
+		if(spu->sampcount>=spu->decayend) 
+		{
+//		 	ao_song_done = 1;
+		 return(0);
+		}
+
+		dmul=256-(256*(spu->sampcount-spu->decaybegin)/(spu->decayend-spu->decaybegin));
+		d=(d*dmul)>>8;
+		d2=(d2*dmul)>>8;
+	}
+ }
+ spu->sampcount++;
+
+ *spu->pS++=d;
+ *spu->pS++=d2;
+
+ InitREVERB(spu);
+
+ ////////////////////////////////////////////////////// 
+ // feed the sound
+ // wanna have around 1/60 sec (16.666 ms) updates
+	if ((((unsigned char *)spu->pS)-((unsigned char *)spu->pSpuBuffer)) == (735*4))
+	{
+	 	cpu->spu_callback((u8*)spu->pSpuBuffer,(u8*)spu->pS-(u8*)spu->pSpuBuffer, cpu->spu_callback_data);
+	 spu->pS=(short *)spu->pSpuBuffer;					 
+	}
+ }
+
+ // end of big main loop...
+
+ spu->bThreadEnded=1;
+
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// SPU ASYNC... even newer epsxe func
+// 1 time every 'cycle' cycles... harhar
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2async(mips_cpu_context *cpu, unsigned long cycle)
+{
+ spu2_state_t *spu = cpu->spu2;
+ if(spu->iSpuAsyncWait)
+ {
+ spu->iSpuAsyncWait++;
+ if(spu->iSpuAsyncWait<=64) return;
+ spu->iSpuAsyncWait=0;
+ }
+
+ MAINThread(cpu, 0); // -> linux high-compat mode
+}
+
+////////////////////////////////////////////////////////////////////////
+// INIT/EXIT STUFF
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// SPUINIT: this func will be called first by the main emu
+////////////////////////////////////////////////////////////////////////
+
+ 
+EXPORT_GCC long CALLBACK SPU2init(mips_cpu_context *cpu, void (*callback)(unsigned char *, long, void *), void *data)
+{
+ cpu->spu2 = malloc (sizeof (spu2_state_t));
+ memset (cpu->spu2, 0, sizeof (spu2_state_t));
+ cpu->spu2->iUseXA=0;
+ cpu->spu2->iVolume=3;
+ cpu->spu2->iXAPitch=1;
+ cpu->spu2->iUseTimer=2;
+ cpu->spu2->iSPUIRQWait=1;
+ cpu->spu2->iDebugMode=0;
+ cpu->spu2->iRecordMode=0;
+ cpu->spu2->iUseReverb=1;
+ cpu->spu2->iUseInterpolation=2;
+ cpu->spu2->dwNoiseVal=1; // global noise generator
+ cpu->spu2->lastch=-1;
+
+ cpu->spu_callback = callback;
+ cpu->spu_callback_data = data;
+ cpu->spu2->spuMemC=(unsigned char *)cpu->spu2->spuMem; // just small setup
+ memset((void *)cpu->spu2->s_chan,0,MAXCHAN*sizeof(SPUCHAN));
+ memset(cpu->spu2->rvb,0,2*sizeof(REVERBInfo));
+
+ cpu->spu2->sampcount = 0;
+
+ InitADSR();
+
+ return 0;
+}
+
+EXPORT_GCC void CALLBACK SPU2free (mips_cpu_context *cpu) {
+ if (cpu->spu2) {
+ free (cpu->spu2);
+ cpu->spu2 = NULL;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// SETUPTIMER: init of certain buffers and threads/timers
+////////////////////////////////////////////////////////////////////////
+
+static void SetupTimer(mips_cpu_context *cpu)
+{
+ spu2_state_t *spu = cpu->spu2;
+ memset(spu->SSumR,0,NSSIZE*sizeof(int)); // init some mixing buffers
+ memset(spu->SSumL,0,NSSIZE*sizeof(int));
+ spu->pS=(short *)spu->pSpuBuffer; // setup soundbuffer pointer
+
+ spu->bEndThread=0; // init thread vars
+ spu->bThreadEnded=0; 
+ spu->bSpuInit=1; // flag: we are inited
+}
+
+////////////////////////////////////////////////////////////////////////
+// REMOVETIMER: kill threads/timers
+////////////////////////////////////////////////////////////////////////
+
+static void RemoveTimer(mips_cpu_context *cpu)
+{
+ spu2_state_t *spu = cpu->spu2;
+ spu->bEndThread=1; // raise flag to end thread
+ spu->bThreadEnded=0; // no more spu is running
+ spu->bSpuInit=0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SETUPSTREAMS: init most of the spu buffers
+////////////////////////////////////////////////////////////////////////
+
+static void SetupStreams(mips_cpu_context *cpu)
+{ 
+ spu2_state_t *spu = cpu->spu2;
+ int i;
+
+ spu->pSpuBuffer=(unsigned char *)malloc(32768); // alloc mixing buffer
+
+ i=NSSIZE*2;
+
+ spu->sRVBStart[0] = (int *)malloc(i*4); // alloc reverb buffer
+ memset(spu->sRVBStart[0],0,i*4);
+ spu->sRVBEnd[0] = spu->sRVBStart[0] + i;
+ spu->sRVBPlay[0] = spu->sRVBStart[0];
+ spu->sRVBStart[1] = (int *)malloc(i*4); // alloc reverb buffer
+ memset(spu->sRVBStart[1],0,i*4);
+ spu->sRVBEnd[1] = spu->sRVBStart[1] + i;
+ spu->sRVBPlay[1] = spu->sRVBStart[1];
+
+ for(i=0;i<MAXCHAN;i++) // loop sound channels
+ {
+// we don't use mutex sync... not needed, would only 
+// slow us down:
+// spu->s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
+ spu->s_chan[i].ADSRX.SustainLevel = 1024; // -> init sustain
+ spu->s_chan[i].iMute=0;
+ spu->s_chan[i].iIrqDone=0;
+ spu->s_chan[i].pLoop=spu->spuMemC;
+ spu->s_chan[i].pStart=spu->spuMemC;
+ spu->s_chan[i].pCurr=spu->spuMemC;
+ }
+}
+
+////////////////////////////////////////////////////////////////////////
+// REMOVESTREAMS: free most buffer
+////////////////////////////////////////////////////////////////////////
+
+static void RemoveStreams(mips_cpu_context *cpu)
+{ 
+ spu2_state_t *spu = cpu->spu2;
+ free(spu->pSpuBuffer); // free mixing buffer
+ spu->pSpuBuffer=NULL;
+ free(spu->sRVBStart[0]); // free reverb buffer
+ spu->sRVBStart[0]=0;
+ free(spu->sRVBStart[1]); // free reverb buffer
+ spu->sRVBStart[1]=0;
+
+/*
+ int i;
+ for(i=0;i<MAXCHAN;i++)
+ {
+ WaitForSingleObject(spu->s_chan[i].hMutex,2000);
+ ReleaseMutex(spu->s_chan[i].hMutex);
+ if(spu->s_chan[i].hMutex) 
+ {CloseHandle(spu->s_chan[i].hMutex);spu->s_chan[i].hMutex=0;}
+ }
+*/
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// SPUOPEN: called by main emu after init
+////////////////////////////////////////////////////////////////////////
+ 
+EXPORT_GCC long CALLBACK SPU2open(mips_cpu_context *cpu, void *pDsp) 
+{
+ spu2_state_t *spu = cpu->spu2;
+ if(spu->bSPUIsOpen) return 0; // security for some stupid main emus
+
+ spu->iUseXA=0; // just small setup
+ spu->iVolume=3;
+ spu->bEndThread=0;
+ spu->bThreadEnded=0;
+ spu->spuMemC=(unsigned char *)spu->spuMem; 
+ memset((void *)spu->s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN));
+ spu->pSpuIrq[0]=0;
+ spu->pSpuIrq[1]=0;
+ spu->iSPUIRQWait=1;
+ spu->dwNewChannel2[0]=0;
+ spu->dwNewChannel2[1]=0;
+ spu->dwEndChannel2[0]=0;
+ spu->dwEndChannel2[1]=0;
+ spu->spuCtrl2[0]=0; 
+ spu->spuCtrl2[1]=0; 
+ spu->spuStat2[0]=0;
+ spu->spuStat2[1]=0;
+ spu->spuIrq2[0]=0; 
+ spu->spuIrq2[1]=0; 
+ spu->spuAddr2[0]=0xffffffff; 
+ spu->spuAddr2[1]=0xffffffff; 
+ spu->spuRvbAddr2[0]=0;
+ spu->spuRvbAddr2[1]=0;
+ spu->spuRvbAEnd2[0]=0;
+ spu->spuRvbAEnd2[1]=0;
+ 
+// ReadConfig(); // read user stuff
+ 
+// SetupSound(); // setup midas (before init!)
+
+ SetupStreams(cpu); // prepare streaming
+
+ SetupTimer(cpu); // timer for feeding data
+
+ spu->bSPUIsOpen=1;
+
+ return 0; 
+}
+
+////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////
+// SPUCLOSE: called before shutdown
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2close(mips_cpu_context *cpu)
+{
+ spu2_state_t *spu = cpu->spu2;
+ if(!spu->bSPUIsOpen) return; // some security
+
+ spu->bSPUIsOpen=0; // no more open
+
+ RemoveTimer(cpu); // no more feeding
+
+// RemoveSound(cpu); // no more sound handling
+
+ RemoveStreams(cpu); // no more streaming
+}
+
+////////////////////////////////////////////////////////////////////////
+// SPUSHUTDOWN: called by main emu on final exit
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC void CALLBACK SPU2shutdown(void)
+{
+ return;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SPUTEST: we don't test, we are always fine ;)
+////////////////////////////////////////////////////////////////////////
+
+EXPORT_GCC long CALLBACK SPU2test(void)
+{
+ return 0;
+}
+
+////////////////////////////////////////////////////////////////////////
+// SETUP CALLBACKS
+// this functions will be called once, 
+// passes a callback that should be called on SPU-IRQ/cdda volume change
+////////////////////////////////////////////////////////////////////////
+
+#if 0
+// not used yet
+EXPORT_GCC void CALLBACK SPU2irqCallback(void (CALLBACK *callback)(void))
+{
+ irqCallback = callback;
+}
+
+// not used yet
+EXPORT_GCC void CALLBACK SPU2registerCallback(void (CALLBACK *callback)(void))
+{
+ irqCallback = callback;
+}
+
+// not used yet
+EXPORT_GCC void CALLBACK SPU2registerCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
+{
+ cddavCallback = CDDAVcallback;
+}
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/peops2/stdafx.h Added

@@ -0,0 +1,41 @@
+/***************************************************************************
+ StdAfx.h - description
+ -------------------
+ begin : Wed May 15 2002
+ copyright : (C) 2002 by Pete Bernert
+ email : BlackDove@addcom.de
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. See also the license.txt file for *
+ * additional informations. *
+ * *
+ ***************************************************************************/
+
+//*************************************************************************//
+// History of changes:
+//
+// 2002/05/15 - Pete
+// - generic cleanup for the Peops release
+//
+//*************************************************************************//
+
+#define EXPORT_GCC
+
+#include <stdlib.h>
+#define RRand(range) (random()%range)
+#include <string.h>
+#include <math.h>
+
+#undef CALLBACK
+#define CALLBACK
+#define DWORD unsigned long
+#define LOWORD(l) ((unsigned short)(l))
+#define HIWORD(l) ((unsigned short)(((unsigned long)(l) >> 16) & 0xFFFF))
+
+#include "psemuxa.h"
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/psx.c Added

@@ -0,0 +1,3140 @@
+/*
+ * Sony CXD8530AQ/CXD8530BQ/CXD8530CQ/CXD8661R
+ *
+ * PSX CPU emulator for the MAME project written by smf
+ * Thanks to Farfetch'd for information on the delay slot bug
+ *
+ * The PSX CPU is a custom r3000a with a built in
+ * geometry transform engine, no mmu & no data cache.
+ *
+ * There is a stall circuit for load delays, but
+ * it doesn't work if the load occurs in a branch
+ * delay slot.
+ *
+ */
+
+#include <stdio.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "psx.h"
+
+#define EXC_INT ( 0 )
+#define EXC_ADEL ( 4 )
+#define EXC_ADES ( 5 )
+#define EXC_SYS ( 8 )
+#define EXC_BP ( 9 )
+#define EXC_RI ( 10 )
+#define EXC_CPU ( 11 )
+#define EXC_OVF ( 12 )
+
+#define CP0_RANDOM ( 1 )
+#define CP0_BADVADDR ( 8 )
+#define CP0_SR ( 12 )
+#define CP0_CAUSE ( 13 )
+#define CP0_EPC ( 14 )
+#define CP0_PRID ( 15 )
+
+#define SR_IEC ( 1L << 0 )
+#define SR_KUC ( 1L << 1 )
+#define SR_ISC ( 1L << 16 )
+#define SR_SWC ( 1L << 17 )
+#define SR_TS ( 1L << 21 )
+#define SR_BEV ( 1L << 22 )
+#define SR_RE ( 1L << 25 )
+#define SR_CU0 ( 1L << 28 )
+#define SR_CU1 ( 1L << 29 )
+#define SR_CU2 ( 1L << 30 )
+#define SR_CU3 ( 1L << 31 )
+
+#define CAUSE_EXC ( 31L << 2 )
+#define CAUSE_IP ( 255L << 8 )
+#define CAUSE_IP2 ( 1L << 10 )
+#define CAUSE_IP3 ( 1L << 11 )
+#define CAUSE_IP4 ( 1L << 12 )
+#define CAUSE_IP5 ( 1L << 13 )
+#define CAUSE_IP6 ( 1L << 14 )
+#define CAUSE_IP7 ( 1L << 15 )
+#define CAUSE_CE ( 3L << 28 )
+#define CAUSE_CE0 ( 0L << 28 )
+#define CAUSE_CE1 ( 1L << 28 )
+#define CAUSE_CE2 ( 2L << 28 )
+#define CAUSE_BD ( 1L << 31 )
+
+static UINT8 mips_reg_layout[] =
+{
+	MIPS_PC, -1,
+	MIPS_DELAYV, MIPS_DELAYR, -1,
+	MIPS_HI, MIPS_LO, -1,
+	-1,
+	MIPS_R0, MIPS_R1, -1,
+	MIPS_R2, MIPS_R3, -1,
+	MIPS_R4, MIPS_R5, -1,
+	MIPS_R6, MIPS_R7, -1,
+	MIPS_R8, MIPS_R9, -1,
+	MIPS_R10, MIPS_R11, -1,
+	MIPS_R12, MIPS_R13, -1,
+	MIPS_R14, MIPS_R15, -1,
+	MIPS_R16, MIPS_R17, -1,
+	MIPS_R18, MIPS_R19, -1,
+	MIPS_R20, MIPS_R21, -1,
+	MIPS_R22, MIPS_R23, -1,
+	MIPS_R24, MIPS_R25, -1,
+	MIPS_R26, MIPS_R27, -1,
+	MIPS_R28, MIPS_R29, -1,
+	MIPS_R30, MIPS_R31, -1,
+	-1,
+	MIPS_CP0R0, MIPS_CP0R1, -1,
+	MIPS_CP0R2, MIPS_CP0R3, -1,
+	MIPS_CP0R4, MIPS_CP0R5, -1,
+	MIPS_CP0R6, MIPS_CP0R7, -1,
+	MIPS_CP0R8, MIPS_CP0R9, -1,
+	MIPS_CP0R10, MIPS_CP0R11, -1,
+	MIPS_CP0R12, MIPS_CP0R13, -1,
+	MIPS_CP0R14, MIPS_CP0R15, -1,
+	MIPS_CP0R16, MIPS_CP0R17, -1,
+	MIPS_CP0R18, MIPS_CP0R19, -1,
+	MIPS_CP0R20, MIPS_CP0R21, -1,
+	MIPS_CP0R22, MIPS_CP0R23, -1,
+	MIPS_CP0R24, MIPS_CP0R25, -1,
+	MIPS_CP0R26, MIPS_CP0R27, -1,
+	MIPS_CP0R28, MIPS_CP0R29, -1,
+	MIPS_CP0R30, MIPS_CP0R31, -1,
+	-1,
+	MIPS_CP2DR0, MIPS_CP2DR1, -1,
+	MIPS_CP2DR2, MIPS_CP2DR3, -1,
+	MIPS_CP2DR4, MIPS_CP2DR5, -1,
+	MIPS_CP2DR6, MIPS_CP2DR7, -1,
+	MIPS_CP2DR8, MIPS_CP2DR9, -1,
+	MIPS_CP2DR10, MIPS_CP2DR11, -1,
+	MIPS_CP2DR12, MIPS_CP2DR13, -1,
+	MIPS_CP2DR14, MIPS_CP2DR15, -1,
+	MIPS_CP2DR16, MIPS_CP2DR17, -1,
+	MIPS_CP2DR18, MIPS_CP2DR19, -1,
+	MIPS_CP2DR20, MIPS_CP2DR21, -1,
+	MIPS_CP2DR22, MIPS_CP2DR23, -1,
+	MIPS_CP2DR24, MIPS_CP2DR25, -1,
+	MIPS_CP2DR26, MIPS_CP2DR27, -1,
+	MIPS_CP2DR28, MIPS_CP2DR29, -1,
+	MIPS_CP2DR30, MIPS_CP2DR31, -1,
+	-1,
+	MIPS_CP2CR0, MIPS_CP2CR1, -1,
+	MIPS_CP2CR2, MIPS_CP2CR3, -1,
+	MIPS_CP2CR4, MIPS_CP2CR5, -1,
+	MIPS_CP2CR6, MIPS_CP2CR7, -1,
+	MIPS_CP2CR8, MIPS_CP2CR9, -1,
+	MIPS_CP2CR10, MIPS_CP2CR11, -1,
+	MIPS_CP2CR12, MIPS_CP2CR13, -1,
+	MIPS_CP2CR14, MIPS_CP2CR15, -1,
+	MIPS_CP2CR16, MIPS_CP2CR17, -1,
+	MIPS_CP2CR18, MIPS_CP2CR19, -1,
+	MIPS_CP2CR20, MIPS_CP2CR21, -1,
+	MIPS_CP2CR22, MIPS_CP2CR23, -1,
+	MIPS_CP2CR24, MIPS_CP2CR25, -1,
+	MIPS_CP2CR26, MIPS_CP2CR27, -1,
+	MIPS_CP2CR28, MIPS_CP2CR29, -1,
+	MIPS_CP2CR30, MIPS_CP2CR31,
+	0
+};
+
+static UINT8 mips_win_layout[] = {
+	45, 0,35,13,	/* register window (top right) */
+	 0, 0,44,13,	/* disassembler window (left, upper) */
+	 0,14,44, 8,	/* memory #1 window (left, middle) */
+	45,14,35, 8,	/* memory #2 window (lower) */
+	 0,23,80, 1 	/* command line window (bottom rows) */
+};
+
+static const char *delayn[] =
+{
+	"pc", "at", "v0", "v1", "a0", "a1", "a2", "a3",
+	"t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
+	"s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
+	"t8", "t9", "k0", "k1", "gp", "sp", "fp", "ra",
+	"pc"
+};
+
+#define REGPC ( 32 )
+
+//static mips_cpu_context mipscpu;
+
+static UINT32 mips_mtc0_writemask[]=
+{
+	0xffffffff, /* INDEX */
+	0x00000000, /* RANDOM */
+	0xffffff00, /* ENTRYLO */
+	0x00000000,
+	0xffe00000, /* CONTEXT */
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000, /* BADVADDR */
+	0x00000000,
+	0xffffffc0, /* ENTRYHI */
+	0x00000000,
+	0xf27fff3f, /* SR */
+	0x00000300, /* CAUSE */
+	0x00000000, /* EPC */
+	0x00000000, /* PRID */
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000
+};
+
+#if 0
+void GTELOG(const char *a,...)
+{
+	va_list va;
+	char s_text[ 1024 ];
+	va_start( va, a );
+	vsprintf( s_text, a, va );
+	va_end( va );
+	logerror( "%08x: GTE: %08x %s\n", cpu->pc, INS_COFUN( cpu->op ), s_text );
+}
+#else
+INLINE void GTELOG(const char *a, ...) {}
+#endif
+
+static UINT32 getcp2dr( mips_cpu_context *cpu, int n_reg );
+static void setcp2dr( mips_cpu_context *cpu, int n_reg, UINT32 n_value );
+static UINT32 getcp2cr( mips_cpu_context *cpu, int n_reg );
+static void setcp2cr( mips_cpu_context *cpu, int n_reg, UINT32 n_value );
+static void docop2( mips_cpu_context *cpu, int gteop );
+static void mips_exception(mips_cpu_context *cpu, int exception );
+
+void mips_stop( void )
+{
+#ifdef MAME_DEBUG
+	extern int debug_key_pressed;
+	debug_key_pressed = 1;
+	CALL_MAME_DEBUG;
+#endif
+}
+
+INLINE void mips_set_cp0r(mips_cpu_context *cpu, int reg, UINT32 value )
+{
+	cpu->cp0r[ reg ] = value;
+	if( reg == CP0_SR || reg == CP0_CAUSE )
+	{
+		if( ( cpu->cp0r[ CP0_SR ] & SR_IEC ) != 0 && ( cpu->cp0r[ CP0_SR ] & cpu->cp0r[ CP0_CAUSE ] & CAUSE_IP ) != 0 )
+		{
+			mips_exception(cpu, EXC_INT );
+		}
+		else if( cpu->delayr != REGPC && ( cpu->pc & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+		{
+			mips_exception( cpu, EXC_ADEL );
+			mips_set_cp0r( cpu, CP0_BADVADDR, cpu->pc );
+		}
+	}
+}
+
+INLINE void mips_commit_delayed_load(mips_cpu_context *cpu)
+{
+	if( cpu->delayr != 0 )
+	{
+		cpu->r[ cpu->delayr ] = cpu->delayv;
+		cpu->delayr = 0;
+		cpu->delayv = 0;
+	}
+}
+
+INLINE void mips_delayed_branch(mips_cpu_context *cpu, UINT32 n_adr )
+{
+	if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+	{
+		mips_exception( cpu, EXC_ADEL );
+		mips_set_cp0r( cpu, CP0_BADVADDR, n_adr );
+	}
+	else
+	{
+		mips_commit_delayed_load(cpu);
+		cpu->delayr = REGPC;
+		cpu->delayv = n_adr;
+		cpu->pc += 4;
+	}
+}
+
+INLINE void mips_set_pc(mips_cpu_context *cpu, unsigned val )
+{
+	cpu->pc = val;
+	change_pc( val );
+	cpu->delayr = 0;
+	cpu->delayv = 0;
+}
+
+INLINE void mips_advance_pc(mips_cpu_context *cpu)
+{
+	if( cpu->delayr == REGPC )
+	{
+		mips_set_pc( cpu, cpu->delayv );
+	}
+	else
+	{
+		mips_commit_delayed_load(cpu);
+		cpu->pc += 4;
+	}
+}
+
+INLINE void mips_load(mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
+{
+	mips_advance_pc(cpu);
+	if( n_r != 0 )
+	{
+		cpu->r[ n_r ] = n_v;
+	}
+}
+
+INLINE void mips_delayed_load( mips_cpu_context *cpu, UINT32 n_r, UINT32 n_v )
+{
+	if( cpu->delayr == REGPC )
+	{
+		mips_set_pc( cpu, cpu->delayv );
+		cpu->delayr = n_r;
+		cpu->delayv = n_v;
+	}
+	else
+	{
+		mips_commit_delayed_load(cpu);
+		cpu->pc += 4;
+		if( n_r != 0 )
+		{
+			cpu->r[ n_r ] = n_v;
+		}
+	}
+}
+
+static void mips_exception( mips_cpu_context *cpu, int exception )
+{
+	mips_set_cp0r( cpu, CP0_SR, ( cpu->cp0r[ CP0_SR ] & ~0x3f ) | ( ( cpu->cp0r[ CP0_SR ] << 2 ) & 0x3f ) );
+	if( cpu->delayr == REGPC )
+	{
+		mips_set_cp0r( cpu, CP0_EPC, cpu->pc - 4 );
+		mips_set_cp0r( cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_EXC ) | CAUSE_BD | ( exception << 2 ) );
+	}
+	else
+	{
+		mips_commit_delayed_load(cpu);
+		mips_set_cp0r( cpu, CP0_EPC, cpu->pc );
+		mips_set_cp0r( cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~( CAUSE_EXC | CAUSE_BD ) ) | ( exception << 2 ) );
+	}
+	if( cpu->cp0r[ CP0_SR ] & SR_BEV )
+	{
+		mips_set_pc (cpu, 0xbfc00180 );
+	}
+	else
+	{
+		mips_set_pc (cpu, 0x80000080 );
+	}
+}
+
+mips_cpu_context *mips_alloc( void ) {
+ mips_cpu_context *ctx = malloc (sizeof (mips_cpu_context));
+ memset (ctx, 0, sizeof (mips_cpu_context));
+ return ctx;
+}
+
+void mips_init(mips_cpu_context *cpu)
+{
+#if 0
+	int cpu = cpu_getactivecpu();
+
+	state_save_register_UINT32( "psxcpu", cpu, "op", &cpu->op, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "pc", &cpu->pc, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "delayv", &cpu->delayv, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "delayr", &cpu->delayr, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "hi", &cpu->hi, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "lo", &cpu->lo, 1 );
+	state_save_register_UINT32( "psxcpu", cpu, "r", &cpu->r[ 0 ], 32 );
+	state_save_register_UINT32( "psxcpu", cpu, "cp0r", &cpu->cp0r[ 0 ], 32 );
+	state_save_register_UINT32( "psxcpu", cpu, "cp2cr", &cpu->cp2cr[ 0 ].d, 32 );
+	state_save_register_UINT32( "psxcpu", cpu, "cp2dr", &cpu->cp2dr[ 0 ].d, 32 );
+#endif
+}
+
+void mips_reset( mips_cpu_context *cpu, void *param )
+{
+	mips_set_cp0r( cpu, CP0_SR, ( cpu->cp0r[ CP0_SR ] & ~( SR_TS | SR_SWC | SR_KUC | SR_IEC ) ) | SR_BEV );
+	mips_set_cp0r( cpu, CP0_RANDOM, 63 ); /* todo: */
+	mips_set_cp0r( cpu, CP0_PRID, 0x00000200 ); /* todo: */
+	mips_set_pc (cpu, 0xbfc00000 );
+	cpu->prevpc = 0xffffffff;
+}
+
+void mips_exit(mips_cpu_context *cpu) {
+ free (cpu);
+}
+
+void mips_shorten_frame(mips_cpu_context *cpu)
+{
+	cpu->mips_ICount = 0;
+}
+
+void psx_hw_runcounters(mips_cpu_context *cpu);
+
+int psxcpu_verbose = 0;
+
+int mips_execute( mips_cpu_context *cpu, int cycles )
+{
+	UINT32 n_res;
+
+	cpu->mips_ICount = cycles;
+	do
+	{
+//		CALL_MAME_DEBUG;
+
+//		psx_hw_runcounters();
+	
+		cpu->op = cpu_readop32( cpu->pc );
+
+#if 0
+		while (cpu->prevpc == cpu->pc)
+		{
+			psx_hw_runcounters();
+			cpu->mips_ICount--;
+
+			if (cpu->mips_ICount == 0) return cycles;
+		}
+
+		// if we're not in a delay slot, update
+		// if we're in a delay slot and the delay instruction is not NOP, update
+		if (( cpu->delayr == 0 ) || ((cpu->delayr != 0) && (cpu->op != 0)))
+		{
+			cpu->prevpc = cpu->pc;
+		}	
+#endif
+#if 0
+		if (1) //psxcpu_verbose)
+		{
+			printf("[%08x: %08x] [SP %08x RA %08x V0 %08x V1 %08x A0 %08x S0 %08x S1 %08x]\n", cpu->pc, cpu->op, cpu->r[29], cpu->r[31], cpu->r[2], cpu->r[3], cpu->r[4], cpu->r[ 16 ], cpu->r[ 17 ]);
+//			psxcpu_verbose--;
+		}
+#endif
+		switch( INS_OP( cpu->op ) )
+		{
+		case OP_SPECIAL:
+			switch( INS_FUNCT( cpu->op ) )
+			{
+			case FUNCT_HLECALL:
+//				printf("HLECALL, PC = %08x\n", cpu->pc);
+				psx_bios_hle(cpu, cpu->pc);
+				break;
+			case FUNCT_SLL:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] << INS_SHAMT( cpu->op ) );
+				break;
+			case FUNCT_SRL:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] >> INS_SHAMT( cpu->op ) );
+				break;
+			case FUNCT_SRA:
+				mips_load(cpu, INS_RD( cpu->op ), (INT32)cpu->r[ INS_RT( cpu->op ) ] >> INS_SHAMT( cpu->op ) );
+				break;
+			case FUNCT_SLLV:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] << ( cpu->r[ INS_RS( cpu->op ) ] & 31 ) );
+				break;
+			case FUNCT_SRLV:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] >> ( cpu->r[ INS_RS( cpu->op ) ] & 31 ) );
+				break;
+			case FUNCT_SRAV:
+				mips_load(cpu, INS_RD( cpu->op ), (INT32)cpu->r[ INS_RT( cpu->op ) ] >> ( cpu->r[ INS_RS( cpu->op ) ] & 31 ) );
+				break;
+			case FUNCT_JR:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception( cpu, EXC_RI );
+				}
+				else
+				{
+					mips_delayed_branch( cpu, cpu->r[ INS_RS( cpu->op ) ] );
+				}
+				break;
+			case FUNCT_JALR:
+				n_res = cpu->pc + 8;
+				mips_delayed_branch( cpu, cpu->r[ INS_RS( cpu->op ) ] );
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					cpu->r[ INS_RD( cpu->op ) ] = n_res;
+				}
+				break;
+			case FUNCT_SYSCALL:
+				mips_exception( cpu, EXC_SYS );
+				break;
+			case FUNCT_BREAK:
+				printf("BREAK!\n");
+				exit(-1);
+//				mips_exception( cpu, EXC_BP );
+				mips_advance_pc(cpu);
+				break;
+			case FUNCT_MFHI:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->hi );
+				break;
+			case FUNCT_MTHI:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+					cpu->hi = cpu->r[ INS_RS( cpu->op ) ];
+				}
+				break;
+			case FUNCT_MFLO:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->lo );
+				break;
+			case FUNCT_MTLO:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+					cpu->lo = cpu->r[ INS_RS( cpu->op ) ];
+				}
+				break;
+			case FUNCT_MULT:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					INT64 n_res64;
+					n_res64 = MUL_64_32_32( (INT32)cpu->r[ INS_RS( cpu->op ) ], (INT32)cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+					cpu->lo = LO32_32_64( n_res64 );
+					cpu->hi = HI32_32_64( n_res64 );
+				}
+				break;
+			case FUNCT_MULTU:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					UINT64 n_res64;
+					n_res64 = MUL_U64_U32_U32( cpu->r[ INS_RS( cpu->op ) ], cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+					cpu->lo = LO32_U32_U64( n_res64 );
+					cpu->hi = HI32_U32_U64( n_res64 );
+				}
+				break;
+			case FUNCT_DIV:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					UINT32 n_div;
+					UINT32 n_mod;
+					if( cpu->r[ INS_RT( cpu->op ) ] != 0 )
+					{
+						n_div = (INT32)cpu->r[ INS_RS( cpu->op ) ] / (INT32)cpu->r[ INS_RT( cpu->op ) ];
+						n_mod = (INT32)cpu->r[ INS_RS( cpu->op ) ] % (INT32)cpu->r[ INS_RT( cpu->op ) ];
+						mips_advance_pc(cpu);
+						cpu->lo = n_div;
+						cpu->hi = n_mod;
+					}
+					else
+					{
+						mips_advance_pc(cpu);
+					}
+				}
+				break;
+			case FUNCT_DIVU:
+				if( INS_RD( cpu->op ) != 0 )
+				{
+					mips_exception(cpu, EXC_RI );
+				}
+				else
+				{
+					UINT32 n_div;
+					UINT32 n_mod;
+					if( cpu->r[ INS_RT( cpu->op ) ] != 0 )
+					{
+						n_div = cpu->r[ INS_RS( cpu->op ) ] / cpu->r[ INS_RT( cpu->op ) ];
+						n_mod = cpu->r[ INS_RS( cpu->op ) ] % cpu->r[ INS_RT( cpu->op ) ];
+						mips_advance_pc(cpu);
+						cpu->lo = n_div;
+						cpu->hi = n_mod;
+					}
+					else
+					{
+						mips_advance_pc(cpu);
+					}
+				}
+				break;
+			case FUNCT_ADD:
+				{
+					n_res = cpu->r[ INS_RS( cpu->op ) ] + cpu->r[ INS_RT( cpu->op ) ];
+					if( (INT32)( ~( cpu->r[ INS_RS( cpu->op ) ] ^ cpu->r[ INS_RT( cpu->op ) ] ) & ( cpu->r[ INS_RS( cpu->op ) ] ^ n_res ) ) < 0 )
+					{
+						mips_exception(cpu, EXC_OVF );
+					}
+					else
+					{
+						mips_load(cpu, INS_RD( cpu->op ), n_res );
+					}
+				}
+				break;
+			case FUNCT_ADDU:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] + cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_SUB:
+				n_res = cpu->r[ INS_RS( cpu->op ) ] - cpu->r[ INS_RT( cpu->op ) ];
+				if( (INT32)( ( cpu->r[ INS_RS( cpu->op ) ] ^ cpu->r[ INS_RT( cpu->op ) ] ) & ( cpu->r[ INS_RS( cpu->op ) ] ^ n_res ) ) < 0 )
+				{
+					mips_exception(cpu, EXC_OVF );
+				}
+				else
+				{
+					mips_load(cpu, INS_RD( cpu->op ), n_res );
+				}
+				break;
+			case FUNCT_SUBU:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] - cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_AND:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] & cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_OR:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] | cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_XOR:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] ^ cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_NOR:
+				mips_load(cpu, INS_RD( cpu->op ), ~( cpu->r[ INS_RS( cpu->op ) ] | cpu->r[ INS_RT( cpu->op ) ] ) );
+				break;
+			case FUNCT_SLT:
+				mips_load(cpu, INS_RD( cpu->op ), (INT32)cpu->r[ INS_RS( cpu->op ) ] < (INT32)cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			case FUNCT_SLTU:
+				mips_load(cpu, INS_RD( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] < cpu->r[ INS_RT( cpu->op ) ] );
+				break;
+			default:
+				mips_exception(cpu, EXC_RI );
+				break;
+			}
+			break;
+		case OP_REGIMM:
+			switch( INS_RT( cpu->op ) )
+			{
+			case RT_BLTZ:
+				if( (INT32)cpu->r[ INS_RS( cpu->op ) ] < 0 )
+				{
+					mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+				}
+				break;
+			case RT_BGEZ:
+				if( (INT32)cpu->r[ INS_RS( cpu->op ) ] >= 0 )
+				{
+					mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+				}
+				break;
+			case RT_BLTZAL:
+				n_res = cpu->pc + 8;
+				if( (INT32)cpu->r[ INS_RS( cpu->op ) ] < 0 )
+				{
+					mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+				}
+				cpu->r[ 31 ] = n_res;
+				break;
+			case RT_BGEZAL:
+				n_res = cpu->pc + 8;
+				if( (INT32)cpu->r[ INS_RS( cpu->op ) ] >= 0 )
+				{
+					mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+				}
+				else
+				{
+					mips_advance_pc(cpu);
+				}
+				cpu->r[ 31 ] = n_res;
+				break;
+			}
+			break;
+		case OP_J:
+			mips_delayed_branch( cpu, ( ( cpu->pc + 4 ) & 0xf0000000 ) + ( INS_TARGET( cpu->op ) << 2 ) );
+			break;
+		case OP_JAL:
+			n_res = cpu->pc + 8;
+			mips_delayed_branch( cpu, ( ( cpu->pc + 4 ) & 0xf0000000 ) + ( INS_TARGET( cpu->op ) << 2 ) );
+			cpu->r[ 31 ] = n_res;
+			break;
+		case OP_BEQ:
+			if( cpu->r[ INS_RS( cpu->op ) ] == cpu->r[ INS_RT( cpu->op ) ] )
+			{
+				mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+			}
+			else
+			{
+				mips_advance_pc(cpu);
+			}
+			break;
+		case OP_BNE:
+			if( cpu->r[ INS_RS( cpu->op ) ] != cpu->r[ INS_RT( cpu->op ) ] )
+			{
+				mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+			}
+			else
+			{
+				mips_advance_pc(cpu);
+			}
+			break;
+		case OP_BLEZ:
+			if( INS_RT( cpu->op ) != 0 )
+			{
+				mips_exception(cpu, EXC_RI );
+			}
+			else if( (INT32)cpu->r[ INS_RS( cpu->op ) ] <= 0 )
+			{
+				mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+			}
+			else
+			{
+				mips_advance_pc(cpu);
+			}
+			break;
+		case OP_BGTZ:
+			if( INS_RT( cpu->op ) != 0 )
+			{
+				mips_exception(cpu, EXC_RI );
+			}
+			else if( (INT32)cpu->r[ INS_RS( cpu->op ) ] > 0 )
+			{
+				mips_delayed_branch( cpu, cpu->pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) << 2 ) );
+			}
+			else
+			{
+				mips_advance_pc(cpu);
+			}
+			break;
+		case OP_ADDI:
+			{
+				UINT32 n_imm;
+				n_imm = MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				n_res = cpu->r[ INS_RS( cpu->op ) ] + n_imm;
+				if( (INT32)( ~( cpu->r[ INS_RS( cpu->op ) ] ^ n_imm ) & ( cpu->r[ INS_RS( cpu->op ) ] ^ n_res ) ) < 0 )
+				{
+					mips_exception(cpu, EXC_OVF );
+				}
+				else
+				{
+					mips_load(cpu, INS_RT( cpu->op ), n_res );
+				}
+			}
+			break;
+		case OP_ADDIU:
+			if (INS_RT( cpu->op ) == 0)
+			{
+				psx_iop_call(cpu, cpu->pc, INS_IMMEDIATE(cpu->op));
+				mips_advance_pc(cpu);
+			}
+			else
+			{
+				mips_load(cpu, INS_RT( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) );
+			}
+			break;
+		case OP_SLTI:
+			mips_load(cpu, INS_RT( cpu->op ), (INT32)cpu->r[ INS_RS( cpu->op ) ] < MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) );
+			break;
+		case OP_SLTIU:
+			mips_load(cpu, INS_RT( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] < (UINT32)MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) ) );
+			break;
+		case OP_ANDI:
+			mips_load(cpu, INS_RT( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] & INS_IMMEDIATE( cpu->op ) );
+			break;
+		case OP_ORI:
+			mips_load(cpu, INS_RT( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] | INS_IMMEDIATE( cpu->op ) );
+			break;
+		case OP_XORI:
+			mips_load(cpu, INS_RT( cpu->op ), cpu->r[ INS_RS( cpu->op ) ] ^ INS_IMMEDIATE( cpu->op ) );
+			break;
+		case OP_LUI:
+			mips_load(cpu, INS_RT( cpu->op ), INS_IMMEDIATE( cpu->op ) << 16 );
+			break;
+		case OP_COP0:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) != 0 && ( cpu->cp0r[ CP0_SR ] & SR_CU0 ) == 0 )
+			{
+				mips_exception(cpu, EXC_CPU );
+				mips_set_cp0r( cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_CE ) | CAUSE_CE0 );
+			}
+			else
+			{
+				switch( INS_RS( cpu->op ) )
+				{
+				case RS_MFC:
+					mips_delayed_load( cpu, INS_RT( cpu->op ), cpu->cp0r[ INS_RD( cpu->op ) ] );
+					break;
+				case RS_CFC:
+					/* todo: */
+					logerror( "%08x: COP0 CFC not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_MTC:
+					n_res = ( cpu->cp0r[ INS_RD( cpu->op ) ] & ~mips_mtc0_writemask[ INS_RD( cpu->op ) ] ) |
+						( cpu->r[ INS_RT( cpu->op ) ] & mips_mtc0_writemask[ INS_RD( cpu->op ) ] );
+					mips_advance_pc(cpu);
+					mips_set_cp0r(cpu, INS_RD( cpu->op ), n_res );
+					break;
+				case RS_CTC:
+					/* todo: */
+					logerror( "%08x: COP0 CTC not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_BC:
+					switch( INS_RT( cpu->op ) )
+					{
+					case RT_BCF:
+						/* todo: */
+						logerror( "%08x: COP0 BCF not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					case RT_BCT:
+						/* todo: */
+						logerror( "%08x: COP0 BCT not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP0 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				default:
+					switch( INS_CO( cpu->op ) )
+					{
+					case 1:
+						switch( INS_CF( cpu->op ) )
+						{
+						case CF_RFE:
+							mips_advance_pc(cpu);
+							mips_set_cp0r(cpu, CP0_SR, ( cpu->cp0r[ CP0_SR ] & ~0xf ) | ( ( cpu->cp0r[ CP0_SR ] >> 2 ) & 0xf ) );
+							break;
+						default:
+							/* todo: */
+							logerror( "%08x: COP0 unknown command %08x\n", cpu->pc, cpu->op );
+							mips_stop();
+							mips_advance_pc(cpu);
+							break;
+						}
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP0 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				}
+			}
+			break;
+		case OP_COP1:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_CU1 ) == 0 )
+			{
+				mips_exception(cpu, EXC_CPU );
+				mips_set_cp0r(cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_CE ) | CAUSE_CE1 );
+			}
+			else
+			{
+				switch( INS_RS( cpu->op ) )
+				{
+				case RS_MFC:
+					/* todo: */
+					logerror( "%08x: COP1 BCT not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_CFC:
+					/* todo: */
+					logerror( "%08x: COP1 CFC not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_MTC:
+					/* todo: */
+					logerror( "%08x: COP1 MTC not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_CTC:
+					/* todo: */
+					logerror( "%08x: COP1 CTC not supported\n", cpu->pc );
+					mips_stop();
+					mips_advance_pc(cpu);
+					break;
+				case RS_BC:
+					switch( INS_RT( cpu->op ) )
+					{
+					case RT_BCF:
+						/* todo: */
+						logerror( "%08x: COP1 BCF not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					case RT_BCT:
+						/* todo: */
+						logerror( "%08x: COP1 BCT not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP1 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				default:
+					switch( INS_CO( cpu->op ) )
+					{
+					case 1:
+						/* todo: */
+						logerror( "%08x: COP1 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP1 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				}
+			}
+			break;
+		case OP_COP2:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_CU2 ) == 0 )
+			{
+				mips_exception(cpu, EXC_CPU );
+				mips_set_cp0r(cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_CE ) | CAUSE_CE2 );
+			}
+			else
+			{
+				switch( INS_RS( cpu->op ) )
+				{
+				case RS_MFC:
+					mips_delayed_load(cpu, INS_RT( cpu->op ), getcp2dr(cpu, INS_RD( cpu->op ) ) );
+					break;
+				case RS_CFC:
+					mips_delayed_load(cpu, INS_RT( cpu->op ), getcp2cr(cpu, INS_RD( cpu->op ) ) );
+					break;
+				case RS_MTC:
+					setcp2dr(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+					break;
+				case RS_CTC:
+					setcp2cr(cpu, INS_RD( cpu->op ), cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+					break;
+				case RS_BC:
+					switch( INS_RT( cpu->op ) )
+					{
+					case RT_BCF:
+						/* todo: */
+						logerror( "%08x: COP2 BCF not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					case RT_BCT:
+						/* todo: */
+						logerror( "%08x: COP2 BCT not supported\n", cpu->pc );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP2 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				default:
+					switch( INS_CO( cpu->op ) )
+					{
+					case 1:
+						docop2(cpu, INS_COFUN( cpu->op ) );
+						mips_advance_pc(cpu);
+						break;
+					default:
+						/* todo: */
+						logerror( "%08x: COP2 unknown command %08x\n", cpu->pc, cpu->op );
+						mips_stop();
+						mips_advance_pc(cpu);
+						break;
+					}
+					break;
+				}
+			}
+			break;
+		case OP_LB:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LB SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), MIPS_BYTE_EXTEND( program_read_byte_32le( cpu, n_adr ^ 3 ) ) );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), MIPS_BYTE_EXTEND( program_read_byte_32le( cpu, n_adr ) ) );
+				}
+			}
+			break;
+		case OP_LH:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LH SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), MIPS_WORD_EXTEND( program_read_word_32le( cpu, n_adr ^ 2 ) ) );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), MIPS_WORD_EXTEND( program_read_word_32le( cpu, n_adr ) ) );
+				}
+			}
+			break;
+		case OP_LWL:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LWL SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x00ffffff ) | ( (UINT32)program_read_byte_32le( cpu, n_adr + 3 ) << 24 );
+						break;
+					case 1:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x0000ffff ) | ( (UINT32)program_read_word_32le( cpu, n_adr + 1 ) << 16 );
+						break;
+					case 2:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x000000ff ) | ( (UINT32)program_read_byte_32le( cpu, n_adr - 1 ) << 8 ) | ( (UINT32)program_read_word_32le( cpu, n_adr ) << 16 );
+						break;
+					default:
+						n_res = program_read_dword_32le( cpu, n_adr - 3 );
+						break;
+					}
+					mips_delayed_load(cpu, INS_RT( cpu->op ), n_res );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x00ffffff ) | ( (UINT32)program_read_byte_32le( cpu, n_adr ) << 24 );
+						break;
+					case 1:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x0000ffff ) | ( (UINT32)program_read_word_32le( cpu, n_adr - 1 ) << 16 );
+						break;
+					case 2:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0x000000ff ) | ( (UINT32)program_read_word_32le( cpu, n_adr - 2 ) << 8 ) | ( (UINT32)program_read_byte_32le( cpu, n_adr ) << 24 );
+						break;
+					default:
+						n_res = program_read_dword_32le( cpu, n_adr - 3 );
+						break;
+					}
+					mips_delayed_load(cpu, INS_RT( cpu->op ), n_res );
+				}
+			}
+			break;
+		case OP_LW:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LW SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+#if 0
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+				{
+					printf("ADEL\n");
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+#endif
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), program_read_dword_32le( cpu, n_adr ) );
+				}
+			}
+			break;
+		case OP_LBU:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LBU SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), program_read_byte_32le( cpu, n_adr ^ 3 ) );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), program_read_byte_32le( cpu, n_adr ) );
+				}
+			}
+			break;
+		case OP_LHU:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LHU SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), program_read_word_32le( cpu, n_adr ^ 2 ) );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					mips_delayed_load(cpu, INS_RT( cpu->op ), program_read_word_32le( cpu, n_adr ) );
+				}
+			}
+			break;
+		case OP_LWR:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LWR SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 3:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xffffff00 ) | program_read_byte_32le( cpu, n_adr - 3 );
+						break;
+					case 2:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xffff0000 ) | program_read_word_32le( cpu, n_adr - 2 );
+						break;
+					case 1:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xff000000 ) | program_read_word_32le( cpu, n_adr - 1 ) | ( (UINT32)program_read_byte_32le( cpu, n_adr + 1 ) << 16 );
+						break;
+					default:
+						n_res = program_read_dword_32le( cpu, n_adr );
+						break;
+					}
+					mips_delayed_load(cpu, INS_RT( cpu->op ), n_res );
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 3:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xffffff00 ) | program_read_byte_32le( cpu, n_adr );
+						break;
+					case 2:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xffff0000 ) | program_read_word_32le( cpu, n_adr );
+						break;
+					case 1:
+						n_res = ( cpu->r[ INS_RT( cpu->op ) ] & 0xff000000 ) | program_read_byte_32le( cpu, n_adr ) | ( (UINT32)program_read_word_32le( cpu, n_adr + 1 ) << 8 );
+						break;
+					default:
+						n_res = program_read_dword_32le( cpu, n_adr );
+						break;
+					}
+					mips_delayed_load(cpu, INS_RT( cpu->op ), n_res );
+				}
+			}
+			break;
+		case OP_SB:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: SB SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_byte_32le( cpu, n_adr ^ 3, cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_byte_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_SH:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: SH SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_word_32le( cpu, n_adr ^ 2, cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_word_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_SWL:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				printf("SR_ISC not supported\n");
+				logerror( "%08x: SWL SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					printf("permission violation?\n");
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						program_write_byte_32le( cpu, n_adr + 3, cpu->r[ INS_RT( cpu->op ) ] >> 24 );
+						break;
+					case 1:
+						program_write_word_32le( cpu, n_adr + 1, cpu->r[ INS_RT( cpu->op ) ] >> 16 );
+						break;
+					case 2:
+						program_write_byte_32le( cpu, n_adr - 1, cpu->r[ INS_RT( cpu->op ) ] >> 8 );
+						program_write_word_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] >> 16 );
+						break;
+					case 3:
+						program_write_dword_32le( cpu, n_adr - 3, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					}
+					mips_advance_pc(cpu);
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					printf("permission violation 2\n");
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						program_write_byte_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] >> 24 );
+						break;
+					case 1:
+						program_write_word_32le( cpu, n_adr - 1, cpu->r[ INS_RT( cpu->op ) ] >> 16 );
+						break;
+					case 2:
+						program_write_word_32le( cpu, n_adr - 2, cpu->r[ INS_RT( cpu->op ) ] >> 8 );
+						program_write_byte_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] >> 24 );
+						break;
+					case 3:
+						program_write_dword_32le( cpu, n_adr - 3, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					}
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_SW:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+/* used by bootstrap
+				logerror( "%08x: SW SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+*/
+				mips_advance_pc(cpu);
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if(0) // ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_dword_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_SWR:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: SWR SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						program_write_dword_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					case 1:
+						program_write_word_32le( cpu, n_adr - 1, cpu->r[ INS_RT( cpu->op ) ] );
+						program_write_byte_32le( cpu, n_adr + 1, cpu->r[ INS_RT( cpu->op ) ] >> 16 );
+						break;
+					case 2:
+						program_write_word_32le( cpu, n_adr - 2, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					case 3:
+						program_write_byte_32le( cpu, n_adr - 3, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					}
+					mips_advance_pc(cpu);
+				}
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					switch( n_adr & 3 )
+					{
+					case 0:
+						program_write_dword_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					case 1:
+						program_write_byte_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+						program_write_word_32le( cpu, n_adr + 1, cpu->r[ INS_RT( cpu->op ) ] >> 8 );
+						break;
+					case 2:
+						program_write_word_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					case 3:
+						program_write_byte_32le( cpu, n_adr, cpu->r[ INS_RT( cpu->op ) ] );
+						break;
+					}
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_LWC1:
+			/* todo: */
+			logerror( "%08x: COP1 LWC not supported\n", cpu->pc );
+			mips_stop();
+			mips_advance_pc(cpu);
+			break;
+		case OP_LWC2:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_CU2 ) == 0 )
+			{
+				mips_exception(cpu, EXC_CPU );
+				mips_set_cp0r(cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_CE ) | CAUSE_CE2 );
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: LWC2 SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADEL );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					/* todo: delay? */
+					setcp2dr(cpu, INS_RT( cpu->op ), program_read_dword_32le( cpu, n_adr ) );
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		case OP_SWC1:
+			/* todo: */
+			logerror( "%08x: COP1 SWC not supported\n", cpu->pc );
+			mips_stop();
+			mips_advance_pc(cpu);
+			break;
+		case OP_SWC2:
+			if( ( cpu->cp0r[ CP0_SR ] & SR_CU2 ) == 0 )
+			{
+				mips_exception(cpu, EXC_CPU );
+				mips_set_cp0r(cpu, CP0_CAUSE, ( cpu->cp0r[ CP0_CAUSE ] & ~CAUSE_CE ) | CAUSE_CE2 );
+			}
+			else if( ( cpu->cp0r[ CP0_SR ] & SR_ISC ) != 0 )
+			{
+				/* todo: */
+				logerror( "%08x: SWC2 SR_ISC not supported\n", cpu->pc );
+				mips_stop();
+				mips_advance_pc(cpu);
+			}
+			else
+			{
+				UINT32 n_adr;
+				n_adr = cpu->r[ INS_RS( cpu->op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( cpu->op ) );
+				if( ( n_adr & ( ( ( cpu->cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
+				{
+					mips_exception(cpu, EXC_ADES );
+					mips_set_cp0r(cpu, CP0_BADVADDR, n_adr );
+				}
+				else
+				{
+					program_write_dword_32le( cpu, n_adr, getcp2dr(cpu, INS_RT( cpu->op ) ) );
+					mips_advance_pc(cpu);
+				}
+			}
+			break;
+		default:
+//			printf( "%08x: unknown opcode %08x (prev %08x, RA %08x)\n", cpu->pc, cpu->op, cpu->prevpc, cpu->r[31] );
+//			mips_stop();
+//			mips_exception(cpu, EXC_RI );
+ 			break;
+		}
+//skipinterp: // unused label
+		cpu->mips_ICount--;
+	} while( cpu->mips_ICount > 0 );
+
+	return cycles - cpu->mips_ICount;
+}
+
+#if 0
+static void mips_get_context( void *dst )
+{
+	if( dst )
+	{
+		*(mips_cpu_context *)dst = mipscpu;
+	}
+}
+
+static void mips_set_context( void *src )
+{
+	if( src )
+	{
+		mipscpu = *(mips_cpu_context *)src;
+		change_pc( cpu->pc );
+	}
+}
+#endif
+
+static void set_irq_line( mips_cpu_context *cpu, int irqline, int state )
+{
+	UINT32 ip;
+
+	switch( irqline )
+	{
+	case MIPS_IRQ0:
+		ip = CAUSE_IP2;
+		break;
+	case MIPS_IRQ1:
+		ip = CAUSE_IP3;
+		break;
+	case MIPS_IRQ2:
+		ip = CAUSE_IP4;
+		break;
+	case MIPS_IRQ3:
+		ip = CAUSE_IP5;
+		break;
+	case MIPS_IRQ4:
+		ip = CAUSE_IP6;
+		break;
+	case MIPS_IRQ5:
+		ip = CAUSE_IP7;
+		break;
+	default:
+		return;
+	}
+
+	switch( state )
+	{
+	case CLEAR_LINE:
+		mips_set_cp0r(cpu, CP0_CAUSE, cpu->cp0r[ CP0_CAUSE ] & ~ip );
+		break;
+	case ASSERT_LINE:
+		mips_set_cp0r(cpu, CP0_CAUSE, cpu->cp0r[ CP0_CAUSE ] |= ip );
+		if( cpu->irq_callback )
+		{
+			/* HOLD_LINE interrupts are not supported by the architecture.
+			By acknowledging the interupt here they are treated like PULSE_LINE
+			interrupts, so if the interrupt isn't enabled it will be ignored.
+			There is also a problem with PULSE_LINE interrupts as the interrupt
+			pending bits aren't latched the emulated code won't know what caused
+			the interrupt. */
+			(*cpu->irq_callback)( cpu, irqline );
+		}
+		break;
+	}
+}
+
+/****************************************************************************
+ * Return a formatted string for a register
+ ****************************************************************************/
+
+offs_t mips_dasm( mips_cpu_context *cpu, char *buffer, offs_t pc )
+{
+	offs_t ret;
+	change_pc( pc );
+#ifdef MAME_DEBUG
+	ret = DasmMIPS( buffer, pc );
+#else
+	sprintf( buffer, "$%08x", cpu_readop32( pc ) );
+	ret = 4;
+#endif
+	change_pc( cpu->pc );
+	return ret;
+}
+
+/* preliminary gte code */
+
+#define VXY0 ( cpu->cp2dr[ 0 ].d )
+#define VX0 ( cpu->cp2dr[ 0 ].w.l )
+#define VY0 ( cpu->cp2dr[ 0 ].w.h )
+#define VZ0 ( cpu->cp2dr[ 1 ].w.l )
+#define VXY1 ( cpu->cp2dr[ 2 ].d )
+#define VX1 ( cpu->cp2dr[ 2 ].w.l )
+#define VY1 ( cpu->cp2dr[ 2 ].w.h )
+#define VZ1 ( cpu->cp2dr[ 3 ].w.l )
+#define VXY2 ( cpu->cp2dr[ 4 ].d )
+#define VX2 ( cpu->cp2dr[ 4 ].w.l )
+#define VY2 ( cpu->cp2dr[ 4 ].w.h )
+#define VZ2 ( cpu->cp2dr[ 5 ].w.l )
+#define RGB ( cpu->cp2dr[ 6 ].d )
+#define R ( cpu->cp2dr[ 6 ].b.l )
+#define G ( cpu->cp2dr[ 6 ].b.h )
+#define B ( cpu->cp2dr[ 6 ].b.h2 )
+#define CODE ( cpu->cp2dr[ 6 ].b.h3 )
+#define OTZ ( cpu->cp2dr[ 7 ].w.l )
+#define IR0 ( cpu->cp2dr[ 8 ].d )
+#define IR1 ( cpu->cp2dr[ 9 ].d )
+#define IR2 ( cpu->cp2dr[ 10 ].d )
+#define IR3 ( cpu->cp2dr[ 11 ].d )
+#define SXY0 ( cpu->cp2dr[ 12 ].d )
+#define SX0 ( cpu->cp2dr[ 12 ].w.l )
+#define SY0 ( cpu->cp2dr[ 12 ].w.h )
+#define SXY1 ( cpu->cp2dr[ 13 ].d )
+#define SX1 ( cpu->cp2dr[ 13 ].w.l )
+#define SY1 ( cpu->cp2dr[ 13 ].w.h )
+#define SXY2 ( cpu->cp2dr[ 14 ].d )
+#define SX2 ( cpu->cp2dr[ 14 ].w.l )
+#define SY2 ( cpu->cp2dr[ 14 ].w.h )
+#define SXYP ( cpu->cp2dr[ 15 ].d )
+#define SXP ( cpu->cp2dr[ 15 ].w.l )
+#define SYP ( cpu->cp2dr[ 15 ].w.h )
+#define SZ0 ( cpu->cp2dr[ 16 ].w.l )
+#define SZ1 ( cpu->cp2dr[ 17 ].w.l )
+#define SZ2 ( cpu->cp2dr[ 18 ].w.l )
+#define SZ3 ( cpu->cp2dr[ 19 ].w.l )
+#define RGB0 ( cpu->cp2dr[ 20 ].d )
+#define R0 ( cpu->cp2dr[ 20 ].b.l )
+#define G0 ( cpu->cp2dr[ 20 ].b.h )
+#define B0 ( cpu->cp2dr[ 20 ].b.h2 )
+#define CD0 ( cpu->cp2dr[ 20 ].b.h3 )
+#define RGB1 ( cpu->cp2dr[ 21 ].d )
+#define R1 ( cpu->cp2dr[ 21 ].b.l )
+#define G1 ( cpu->cp2dr[ 21 ].b.h )
+#define B1 ( cpu->cp2dr[ 21 ].b.h2 )
+#define CD1 ( cpu->cp2dr[ 21 ].b.h3 )
+#define RGB2 ( cpu->cp2dr[ 22 ].d )
+#define R2 ( cpu->cp2dr[ 22 ].b.l )
+#define G2 ( cpu->cp2dr[ 22 ].b.h )
+#define B2 ( cpu->cp2dr[ 22 ].b.h2 )
+#define CD2 ( cpu->cp2dr[ 22 ].b.h3 )
+#define RES1 ( cpu->cp2dr[ 23 ].d )
+#define MAC0 ( cpu->cp2dr[ 24 ].d )
+#define MAC1 ( cpu->cp2dr[ 25 ].d )
+#define MAC2 ( cpu->cp2dr[ 26 ].d )
+#define MAC3 ( cpu->cp2dr[ 27 ].d )
+#define IRGB ( cpu->cp2dr[ 28 ].d )
+#define ORGB ( cpu->cp2dr[ 29 ].d )
+#define LZCS ( cpu->cp2dr[ 30 ].d )
+#define LZCR ( cpu->cp2dr[ 31 ].d )
+
+#define D1 ( cpu->cp2cr[ 0 ].d )
+#define R11 ( cpu->cp2cr[ 0 ].w.l )
+#define R12 ( cpu->cp2cr[ 0 ].w.h )
+#define R13 ( cpu->cp2cr[ 1 ].w.l )
+#define R21 ( cpu->cp2cr[ 1 ].w.h )
+#define D2 ( cpu->cp2cr[ 2 ].d )
+#define R22 ( cpu->cp2cr[ 2 ].w.l )
+#define R23 ( cpu->cp2cr[ 2 ].w.h )
+#define R31 ( cpu->cp2cr[ 3 ].w.l )
+#define R32 ( cpu->cp2cr[ 3 ].w.h )
+#define D3 ( cpu->cp2cr[ 4 ].d )
+#define R33 ( cpu->cp2cr[ 4 ].w.l )
+#define TRX ( cpu->cp2cr[ 5 ].d )
+#define TRY ( cpu->cp2cr[ 6 ].d )
+#define TRZ ( cpu->cp2cr[ 7 ].d )
+#define L11 ( cpu->cp2cr[ 8 ].w.l )
+#define L12 ( cpu->cp2cr[ 8 ].w.h )
+#define L13 ( cpu->cp2cr[ 9 ].w.l )
+#define L21 ( cpu->cp2cr[ 9 ].w.h )
+#define L22 ( cpu->cp2cr[ 10 ].w.l )
+#define L23 ( cpu->cp2cr[ 10 ].w.h )
+#define L31 ( cpu->cp2cr[ 11 ].w.l )
+#define L32 ( cpu->cp2cr[ 11 ].w.h )
+#define L33 ( cpu->cp2cr[ 12 ].w.l )
+#define RBK ( cpu->cp2cr[ 13 ].d )
+#define GBK ( cpu->cp2cr[ 14 ].d )
+#define BBK ( cpu->cp2cr[ 15 ].d )
+#define LR1 ( cpu->cp2cr[ 16 ].w.l )
+#define LR2 ( cpu->cp2cr[ 16 ].w.h )
+#define LR3 ( cpu->cp2cr[ 17 ].w.l )
+#define LG1 ( cpu->cp2cr[ 17 ].w.h )
+#define LG2 ( cpu->cp2cr[ 18 ].w.l )
+#define LG3 ( cpu->cp2cr[ 18 ].w.h )
+#define LB1 ( cpu->cp2cr[ 19 ].w.l )
+#define LB2 ( cpu->cp2cr[ 19 ].w.h )
+#define LB3 ( cpu->cp2cr[ 20 ].w.l )
+#define RFC ( cpu->cp2cr[ 21 ].d )
+#define GFC ( cpu->cp2cr[ 22 ].d )
+#define BFC ( cpu->cp2cr[ 23 ].d )
+#define OFX ( cpu->cp2cr[ 24 ].d )
+#define OFY ( cpu->cp2cr[ 25 ].d )
+#define H ( cpu->cp2cr[ 26 ].w.l )
+#define DQA ( cpu->cp2cr[ 27 ].w.l )
+#define DQB ( cpu->cp2cr[ 28 ].d )
+#define ZSF3 ( cpu->cp2cr[ 29 ].w.l )
+#define ZSF4 ( cpu->cp2cr[ 30 ].w.l )
+#define FLAG ( cpu->cp2cr[ 31 ].d )
+
+static UINT32 getcp2dr(mips_cpu_context *cpu, int n_reg )
+{
+	if( n_reg == 1 || n_reg == 3 || n_reg == 5 || n_reg == 8 || n_reg == 9 || n_reg == 10 || n_reg == 11 )
+	{
+		cpu->cp2dr[ n_reg ].d = (INT32)(INT16)cpu->cp2dr[ n_reg ].d;
+	}
+	else if( n_reg == 17 || n_reg == 18 || n_reg == 19 )
+	{
+		cpu->cp2dr[ n_reg ].d = (UINT32)(UINT16)cpu->cp2dr[ n_reg ].d;
+	}
+	else if( n_reg == 29 )
+	{
+		ORGB = ( ( IR1 >> 7 ) & 0x1f ) | ( ( IR2 >> 2 ) & 0x3e0 ) | ( ( IR3 << 3 ) & 0x7c00 );
+	}
+	GTELOG( "get CP2DR%u=%08x", n_reg, cpu->cp2dr[ n_reg ].d );
+	return cpu->cp2dr[ n_reg ].d;
+}
+
+static void setcp2dr(mips_cpu_context *cpu, int n_reg, UINT32 n_value )
+{
+	GTELOG( "set CP2DR%u=%08x", n_reg, n_value );
+	cpu->cp2dr[ n_reg ].d = n_value;
+
+	if( n_reg == 15 )
+	{
+		SXY0 = SXY1;
+		SXY1 = SXY2;
+		SXY2 = SXYP;
+	}
+	else if( n_reg == 28 )
+	{
+		IR1 = ( IRGB & 0x1f ) << 4;
+		IR2 = ( IRGB & 0x3e0 ) >> 1;
+		IR3 = ( IRGB & 0x7c00 ) >> 6;
+	}
+	else if( n_reg == 30 )
+	{
+		UINT32 n_lzcs = LZCS;
+		UINT32 n_lzcr = 0;
+
+		if( ( n_lzcs & 0x80000000 ) == 0 )
+		{
+			n_lzcs = ~n_lzcs;
+		}
+		while( ( n_lzcs & 0x80000000 ) != 0 )
+		{
+			n_lzcr++;
+			n_lzcs <<= 1;
+		}
+		LZCR = n_lzcr;
+	}
+}
+
+static UINT32 getcp2cr(mips_cpu_context *cpu, int n_reg )
+{
+	GTELOG( "get CP2CR%u=%08x", n_reg, cpu->cp2cr[ n_reg ].d );
+	return cpu->cp2cr[ n_reg ].d;
+}
+
+static void setcp2cr(mips_cpu_context *cpu, int n_reg, UINT32 n_value )
+{
+	GTELOG( "set CP2CR%u=%08x", n_reg, n_value );
+	cpu->cp2cr[ n_reg ].d = n_value;
+}
+
+INLINE INT32 LIM( mips_cpu_context *cpu, INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
+{
+	if( n_value > n_max )
+	{
+		FLAG |= n_flag;
+		return n_max;
+	}
+	else if( n_value < n_min )
+	{
+		FLAG |= n_flag;
+		return n_min;
+	}
+	return n_value;
+}
+
+INLINE INT64 BOUNDS( mips_cpu_context *cpu, INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
+{
+	if( n_value > n_max )
+	{
+		FLAG |= n_maxflag;
+	}
+	else if( n_value < n_min )
+	{
+		FLAG |= n_minflag;
+	}
+	return n_value;
+}
+
+#define A1( a ) BOUNDS( cpu, ( a ), 0x7fffffff, 30, -(INT64)0x80000000, ( 1 << 27 ) )
+#define A2( a ) BOUNDS( cpu, ( a ), 0x7fffffff, 29, -(INT64)0x80000000, ( 1 << 26 ) )
+#define A3( a ) BOUNDS( cpu, ( a ), 0x7fffffff, 28, -(INT64)0x80000000, ( 1 << 25 ) )
+#define Lm_B1( a, l ) LIM( cpu, ( a ), 0x7fff, -0x8000 * !l, ( 1 << 31 ) | ( 1 << 24 ) )
+#define Lm_B2( a, l ) LIM( cpu, ( a ), 0x7fff, -0x8000 * !l, ( 1 << 31 ) | ( 1 << 23 ) )
+#define Lm_B3( a, l ) LIM( cpu, ( a ), 0x7fff, -0x8000 * !l, ( 1 << 22 ) )
+#define Lm_C1( a ) LIM( cpu, ( a ), 0x00ff, 0x0000, ( 1 << 21 ) )
+#define Lm_C2( a ) LIM( cpu, ( a ), 0x00ff, 0x0000, ( 1 << 20 ) )
+#define Lm_C3( a ) LIM( cpu, ( a ), 0x00ff, 0x0000, ( 1 << 19 ) )
+#define Lm_D( a ) LIM( cpu, ( a ), 0xffff, 0x0000, ( 1 << 31 ) | ( 1 << 18 ) )
+
+INLINE UINT32 Lm_E( mips_cpu_context *cpu, UINT32 n_z )
+{
+	if( n_z <= H / 2 )
+	{
+		n_z = H / 2;
+		FLAG |= ( 1 << 31 ) | ( 1 << 17 );
+	}
+	if( n_z == 0 )
+	{
+		n_z = 1;
+	}
+	return n_z;
+}
+
+#define F( a ) BOUNDS( cpu, ( a ), 0x7fffffff, ( 1 << 31 ) | ( 1 << 16 ), -(INT64)0x80000000, ( 1 << 31 ) | ( 1 << 15 ) )
+#define Lm_G1( a ) LIM( cpu, ( a ), 0x3ff, -0x400, ( 1 << 31 ) | ( 1 << 14 ) )
+#define Lm_G2( a ) LIM( cpu, ( a ), 0x3ff, -0x400, ( 1 << 31 ) | ( 1 << 13 ) )
+#define Lm_H( a ) LIM( cpu, ( a ), 0xfff, 0x000, ( 1 << 12 ) )
+
+static void docop2(mips_cpu_context *cpu, int gteop )
+{
+	int n_sf;
+	int n_v;
+	int n_lm;
+	int n_pass;
+	UINT16 n_v1;
+	UINT16 n_v2;
+	UINT16 n_v3;
+	UINT16 **p_n_mx;
+	UINT32 **p_n_cv;
+	UINT16 n_zm = 0;
+	UINT32 n_zc = 0;
+	UINT16 *p_n_vx[] = { &VX0, &VX1, &VX2 };
+	UINT16 *p_n_vy[] = { &VY0, &VY1, &VY2 };
+	UINT16 *p_n_vz[] = { &VZ0, &VZ1, &VZ2 };
+	UINT16 *p_n_rm[] = { &R11, &R12, &R13, &R21, &R22, &R23, &R31, &R32, &R33 };
+	UINT16 *p_n_lm[] = { &L11, &L12, &L13, &L21, &L22, &L23, &L31, &L32, &L33 };
+	UINT16 *p_n_cm[] = { &LR1, &LR2, &LR3, &LG1, &LG2, &LG3, &LB1, &LB2, &LB3 };
+	UINT16 *p_n_zm[] = { &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm };
+	UINT16 **p_p_n_mx[] = { p_n_rm, p_n_lm, p_n_cm, p_n_zm };
+	UINT32 *p_n_tr[] = { &TRX, &TRY, &TRZ };
+	UINT32 *p_n_bk[] = { &RBK, &GBK, &BBK };
+	UINT32 *p_n_fc[] = { &RFC, &GFC, &BFC };
+	UINT32 *p_n_zc[] = { &n_zc, &n_zc, &n_zc };
+	UINT32 **p_p_n_cv[] = { p_n_tr, p_n_bk, p_n_fc, p_n_zc };
+
+	switch( GTE_FUNCT( gteop ) )
+	{
+	case 0x01:
+		if( gteop == 0x0180001 )
+		{
+			GTELOG( "RTPS" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT32)TRX << 12 ) + ( (INT16)R11 * (INT16)VX0 ) + ( (INT16)R12 * (INT16)VY0 ) + ( (INT16)R13 * (INT16)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)(INT32)TRY << 12 ) + ( (INT16)R21 * (INT16)VX0 ) + ( (INT16)R22 * (INT16)VY0 ) + ( (INT16)R23 * (INT16)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)(INT32)TRZ << 12 ) + ( (INT16)R31 * (INT16)VX0 ) + ( (INT16)R32 * (INT16)VY0 ) + ( (INT16)R33 * (INT16)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			SZ0 = SZ1;
+			SZ1 = SZ2;
+			SZ2 = SZ3;
+			SZ3 = Lm_D( (INT32)MAC3 );
+			SXY0 = SXY1;
+			SXY1 = SXY2;
+			SX2 = Lm_G1( F( (INT64)(INT32)OFX + ( (INT64)(INT16)IR1 * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) ) >> 16 );
+			SY2 = Lm_G2( F( (INT64)(INT32)OFY + ( (INT64)(INT16)IR2 * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) ) >> 16 );
+			MAC0 = F( (INT64)(INT32)DQB + ( (INT64)(INT16)DQA * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) );
+			IR0 = Lm_H( (INT32)MAC0 >> 12 );
+			return;
+		}
+		break;
+	case 0x06:
+		if( gteop == 0x0400006 ||
+			gteop == 0x1400006 ||
+			gteop == 0x0155cc6 )
+		{
+			GTELOG( "NCLIP" );
+			FLAG = 0;
+
+			MAC0 = F( ( (INT64)(INT16)SX0 * (INT16)SY1 ) + ( (INT16)SX1 * (INT16)SY2 ) + ( (INT16)SX2 * (INT16)SY0 ) - ( (INT16)SX0 * (INT16)SY2 ) - ( (INT16)SX1 * (INT16)SY0 ) - ( (INT16)SX2 * (INT16)SY1 ) );
+			return;
+		}
+		break;
+	case 0x0c:
+		if( GTE_OP( gteop ) == 0x17 )
+		{
+			GTELOG( "OP" );
+			n_sf = 12 * GTE_SF( gteop );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT32)D2 * (INT16)IR3 ) - ( (INT64)(INT32)D3 * (INT16)IR2 ) ) >> n_sf );
+			MAC2 = A2( ( ( (INT64)(INT32)D3 * (INT16)IR1 ) - ( (INT64)(INT32)D1 * (INT16)IR3 ) ) >> n_sf );
+			MAC3 = A3( ( ( (INT64)(INT32)D1 * (INT16)IR2 ) - ( (INT64)(INT32)D2 * (INT16)IR1 ) ) >> n_sf );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			return;
+		}
+		break;
+	case 0x10:
+		if( gteop == 0x0780010 )
+		{
+			GTELOG( "DPCS" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)R << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - ( R << 4 ), 0 ) ) ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)G << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - ( G << 4 ), 0 ) ) ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)B << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - ( B << 4 ), 0 ) ) ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x11:
+		if( gteop == 0x0980011 )
+		{
+			GTELOG( "INTPL" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT16)IR1 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - (INT16)IR1, 0 ) ) ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)(INT16)IR2 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - (INT16)IR2, 0 ) ) ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)(INT16)IR3 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - (INT16)IR3, 0 ) ) ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 );
+			return;
+		}
+		break;
+	case 0x12:
+		if( GTE_OP( gteop ) == 0x04 )
+		{
+			GTELOG( "MVMVA" );
+			n_sf = 12 * GTE_SF( gteop );
+			p_n_mx = p_p_n_mx[ GTE_MX( gteop ) ];
+			n_v = GTE_V( gteop );
+			if( n_v < 3 )
+			{
+				n_v1 = *p_n_vx[ n_v ];
+				n_v2 = *p_n_vy[ n_v ];
+				n_v3 = *p_n_vz[ n_v ];
+			}
+			else
+			{
+				n_v1 = IR1;
+				n_v2 = IR2;
+				n_v3 = IR3;
+			}
+			p_n_cv = p_p_n_cv[ GTE_CV( gteop ) ];
+			n_lm = GTE_LM( gteop );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT32)*p_n_cv[ 0 ] << 12 ) + ( (INT16)*p_n_mx[ 0 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 1 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 2 ] * (INT16)n_v3 ) ) >> n_sf );
+			MAC2 = A2( ( ( (INT64)(INT32)*p_n_cv[ 1 ] << 12 ) + ( (INT16)*p_n_mx[ 3 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 4 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 5 ] * (INT16)n_v3 ) ) >> n_sf );
+			MAC3 = A3( ( ( (INT64)(INT32)*p_n_cv[ 2 ] << 12 ) + ( (INT16)*p_n_mx[ 6 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 7 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 8 ] * (INT16)n_v3 ) ) >> n_sf );
+
+			IR1 = Lm_B1( (INT32)MAC1, n_lm );
+			IR2 = Lm_B2( (INT32)MAC2, n_lm );
+			IR3 = Lm_B3( (INT32)MAC3, n_lm );
+			return;
+		}
+		break;
+	case 0x13:
+		if( gteop == 0x0e80413 )
+		{
+			GTELOG( "NCDS" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x14:
+		if( gteop == 0x1280414 )
+		{
+			GTELOG( "CDP" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( MAC1, 1 );
+			IR2 = Lm_B2( MAC2, 1 );
+			IR3 = Lm_B3( MAC3, 1 );
+			MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+			IR1 = Lm_B1( MAC1, 1 );
+			IR2 = Lm_B2( MAC2, 1 );
+			IR3 = Lm_B3( MAC3, 1 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x16:
+		if( gteop == 0x0f80416 )
+		{
+			GTELOG( "NCDT" );
+			FLAG = 0;
+
+			for( n_v = 0; n_v < 3; n_v++ )
+			{
+				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+				MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+				MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				CD0 = CD1;
+				CD1 = CD2;
+				CD2 = CODE;
+				R0 = R1;
+				R1 = R2;
+				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				G0 = G1;
+				G1 = G2;
+				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				B0 = B1;
+				B1 = B2;
+				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			}
+			return;
+		}
+		break;
+	case 0x1b:
+		if( gteop == 0x108041b )
+		{
+			GTELOG( "NCCS" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
+			MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
+			MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x1c:
+		if( gteop == 0x138041c )
+		{
+			GTELOG( "CC" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( MAC1, 1 );
+			IR2 = Lm_B2( MAC2, 1 );
+			IR3 = Lm_B3( MAC3, 1 );
+			MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
+			MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
+			MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
+			IR1 = Lm_B1( MAC1, 1 );
+			IR2 = Lm_B2( MAC2, 1 );
+			IR3 = Lm_B3( MAC3, 1 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x1e:
+		if( gteop == 0x0c8041e )
+		{
+			GTELOG( "NCS" );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (INT32)MAC1, 1 );
+			IR2 = Lm_B2( (INT32)MAC2, 1 );
+			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x20:
+		if( gteop == 0x0d80420 )
+		{
+			GTELOG( "NCT" );
+			FLAG = 0;
+
+			for( n_v = 0; n_v < 3; n_v++ )
+			{
+				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				CD0 = CD1;
+				CD1 = CD2;
+				CD2 = CODE;
+				R0 = R1;
+				R1 = R2;
+				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				G0 = G1;
+				G1 = G2;
+				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				B0 = B1;
+				B1 = B2;
+				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			}
+			return;
+		}
+		break;
+	case 0x28:
+		if( GTE_OP( gteop ) == 0x0a && GTE_LM( gteop ) == 1 )
+		{
+			GTELOG( "SQR" );
+			n_sf = 12 * GTE_SF( gteop );
+			FLAG = 0;
+
+			MAC1 = A1( ( (INT64)(INT16)IR1 * (INT16)IR1 ) >> n_sf );
+			MAC2 = A2( ( (INT64)(INT16)IR2 * (INT16)IR2 ) >> n_sf );
+			MAC3 = A3( ( (INT64)(INT16)IR3 * (INT16)IR3 ) >> n_sf );
+			IR1 = Lm_B1( MAC1, 1 );
+			IR2 = Lm_B2( MAC2, 1 );
+			IR3 = Lm_B3( MAC3, 1 );
+			return;
+		}
+		break;
+	// DCPL 0x29
+	case 0x2a:
+		if( gteop == 0x0f8002a )
+		{
+			GTELOG( "DPCT" );
+			FLAG = 0;
+
+			for( n_pass = 0; n_pass < 3; n_pass++ )
+			{
+				MAC1 = A1( ( ( (INT64)R0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - ( R0 << 4 ), 0 ) ) ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)G0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - ( G0 << 4 ), 0 ) ) ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)B0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - ( B0 << 4 ), 0 ) ) ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 0 );
+				IR2 = Lm_B2( (INT32)MAC2, 0 );
+				IR3 = Lm_B3( (INT32)MAC3, 0 );
+				CD0 = CD1;
+				CD1 = CD2;
+				CD2 = CODE;
+				R0 = R1;
+				R1 = R2;
+				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				G0 = G1;
+				G1 = G2;
+				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				B0 = B1;
+				B1 = B2;
+				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			}
+			return;
+		}
+		break;
+	case 0x2d:
+		if( gteop == 0x158002d )
+		{
+			GTELOG( "AVSZ3" );
+			FLAG = 0;
+
+			MAC0 = F( ( (INT64)(INT16)ZSF3 * SZ1 ) + ( (INT16)ZSF3 * SZ2 ) + ( (INT16)ZSF3 * SZ3 ) );
+			OTZ = Lm_D( (INT32)MAC0 >> 12 );
+			return;
+		}
+		break;
+	case 0x2e:
+		if( gteop == 0x168002e )
+		{
+			GTELOG( "AVSZ4" );
+			FLAG = 0;
+
+			MAC0 = F( ( (INT64)(INT16)ZSF4 * SZ0 ) + ( (INT16)ZSF4 * SZ1 ) + ( (INT16)ZSF4 * SZ2 ) + ( (INT16)ZSF4 * SZ3 ) );
+			OTZ = Lm_D( (INT32)MAC0 >> 12 );
+			return;
+		}
+		break;
+	case 0x30:
+		if( gteop == 0x0280030 )
+		{
+			GTELOG( "RTPT" );
+			FLAG = 0;
+
+			for( n_v = 0; n_v < 3; n_v++ )
+			{
+				MAC1 = A1( ( ( (INT64)(INT32)TRX << 12 ) + ( (INT16)R11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)(INT32)TRY << 12 ) + ( (INT16)R21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)(INT32)TRZ << 12 ) + ( (INT16)R31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 0 );
+				IR2 = Lm_B2( (INT32)MAC2, 0 );
+				IR3 = Lm_B3( (INT32)MAC3, 0 );
+				SZ0 = SZ1;
+				SZ1 = SZ2;
+				SZ2 = SZ3;
+				SZ3 = Lm_D( (INT32)MAC3 );
+				SXY0 = SXY1;
+				SXY1 = SXY2;
+				SX2 = Lm_G1( F( ( (INT64)(INT32)OFX + ( (INT64)(INT16)IR1 * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) ) >> 16 ) );
+				SY2 = Lm_G2( F( ( (INT64)(INT32)OFY + ( (INT64)(INT16)IR2 * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) ) >> 16 ) );
+				MAC0 = F( (INT64)(INT32)DQB + ( (INT64)(INT16)DQA * ( ( (UINT32)H << 16 ) / Lm_E( cpu, SZ3 ) ) ) );
+				IR0 = Lm_H( (INT32)MAC0 >> 12 );
+			}
+			return;
+		}
+		break;
+	case 0x3d:
+		if( GTE_OP( gteop ) == 0x09 ||
+			GTE_OP( gteop ) == 0x19 )
+		{
+			GTELOG( "GPF" );
+			n_sf = 12 * GTE_SF( gteop );
+			FLAG = 0;
+
+			MAC1 = A1( ( (INT64)(INT16)IR0 * (INT16)IR1 ) >> n_sf );
+			MAC2 = A2( ( (INT64)(INT16)IR0 * (INT16)IR2 ) >> n_sf );
+			MAC3 = A3( ( (INT64)(INT16)IR0 * (INT16)IR3 ) >> n_sf );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x3e:
+		if( GTE_OP( gteop ) == 0x1a )
+		{
+			GTELOG( "GPL" );
+			n_sf = 12 * GTE_SF( gteop );
+			FLAG = 0;
+
+			MAC1 = A1( ( ( (INT64)(INT32)MAC1 << n_sf ) + ( (INT16)IR0 * (INT16)IR1 ) ) >> n_sf );
+			MAC2 = A2( ( ( (INT64)(INT32)MAC2 << n_sf ) + ( (INT16)IR0 * (INT16)IR2 ) ) >> n_sf );
+			MAC3 = A3( ( ( (INT64)(INT32)MAC3 << n_sf ) + ( (INT16)IR0 * (INT16)IR3 ) ) >> n_sf );
+			IR1 = Lm_B1( (INT32)MAC1, 0 );
+			IR2 = Lm_B2( (INT32)MAC2, 0 );
+			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			CD0 = CD1;
+			CD1 = CD2;
+			CD2 = CODE;
+			R0 = R1;
+			R1 = R2;
+			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			G0 = G1;
+			G1 = G2;
+			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			B0 = B1;
+			B1 = B2;
+			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			return;
+		}
+		break;
+	case 0x3f:
+		if( gteop == 0x108043f ||
+			gteop == 0x118043f )
+		{
+			GTELOG( "NCCT" );
+			FLAG = 0;
+
+			for( n_v = 0; n_v < 3; n_v++ )
+			{
+				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
+				MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
+				MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
+				IR1 = Lm_B1( (INT32)MAC1, 1 );
+				IR2 = Lm_B2( (INT32)MAC2, 1 );
+				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				CD0 = CD1;
+				CD1 = CD2;
+				CD2 = CODE;
+				R0 = R1;
+				R1 = R2;
+				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				G0 = G1;
+				G1 = G2;
+				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				B0 = B1;
+				B1 = B2;
+				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			}
+			return;
+		}
+		break;
+	}
+//	usrintf_showmessage_secs( 1, "unknown GTE op %08x", gteop );
+	logerror( "%08x: unknown GTE op %08x\n", cpu->pc, gteop );
+	mips_stop();
+}
+
+/**************************************************************************
+ * Generic set_info
+ **************************************************************************/
+
+void mips_set_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info)
+{
+	switch (state)
+	{
+		/* --- the following bits of info are set as 64-bit signed integers --- */
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ0:		set_irq_line(cpu, MIPS_IRQ0, info->i);		break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ1:		set_irq_line(cpu, MIPS_IRQ1, info->i);		break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ2:		set_irq_line(cpu, MIPS_IRQ2, info->i);		break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ3:		set_irq_line(cpu, MIPS_IRQ3, info->i);		break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ4:		set_irq_line(cpu, MIPS_IRQ4, info->i);		break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ5:		set_irq_line(cpu, MIPS_IRQ5, info->i);		break;
+
+		case CPUINFO_INT_PC:							mips_set_pc (cpu, info->i );					break;
+		case CPUINFO_INT_REGISTER + MIPS_PC:			mips_set_pc (cpu, info->i );					break;
+		case CPUINFO_INT_SP:							/* no stack */							break;
+		case CPUINFO_INT_REGISTER + MIPS_DELAYV:		cpu->delayv = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_DELAYR:		if( info->i <= REGPC ) cpu->delayr = info->i; break;
+		case CPUINFO_INT_REGISTER + MIPS_HI:			cpu->hi = info->i;					break;
+		case CPUINFO_INT_REGISTER + MIPS_LO:			cpu->lo = info->i;					break;
+		case CPUINFO_INT_REGISTER + MIPS_R0:			cpu->r[ 0 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R1:			cpu->r[ 1 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R2:			cpu->r[ 2 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R3:			cpu->r[ 3 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R4:			cpu->r[ 4 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R5:			cpu->r[ 5 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R6:			cpu->r[ 6 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R7:			cpu->r[ 7 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R8:			cpu->r[ 8 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R9:			cpu->r[ 9 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R10:			cpu->r[ 10 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R11:			cpu->r[ 11 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R12:			cpu->r[ 12 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R13:			cpu->r[ 13 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R14:			cpu->r[ 14 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R15:			cpu->r[ 15 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R16:			cpu->r[ 16 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R17:			cpu->r[ 17 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R18:			cpu->r[ 18 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R19:			cpu->r[ 19 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R20:			cpu->r[ 20 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R21:			cpu->r[ 21 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R22:			cpu->r[ 22 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R23:			cpu->r[ 23 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R24:			cpu->r[ 24 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R25:			cpu->r[ 25 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R26:			cpu->r[ 26 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R27:			cpu->r[ 27 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R28:			cpu->r[ 28 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R29:			cpu->r[ 29 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R30:			cpu->r[ 30 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_R31:			cpu->r[ 31 ] = info->i;				break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R0:			mips_set_cp0r(cpu, 0, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R1:			mips_set_cp0r(cpu, 1, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R2:			mips_set_cp0r(cpu, 2, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R3:			mips_set_cp0r(cpu, 3, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R4:			mips_set_cp0r(cpu, 4, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R5:			mips_set_cp0r(cpu, 5, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R6:			mips_set_cp0r(cpu, 6, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R7:			mips_set_cp0r(cpu, 7, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R8:			mips_set_cp0r(cpu, 8, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R9:			mips_set_cp0r(cpu, 9, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R10:		mips_set_cp0r(cpu, 10, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R11:		mips_set_cp0r(cpu, 11, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R12:		mips_set_cp0r(cpu, 12, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R13:		mips_set_cp0r(cpu, 13, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R14:		mips_set_cp0r(cpu, 14, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R15:		mips_set_cp0r(cpu, 15, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R16:		mips_set_cp0r(cpu, 16, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R17:		mips_set_cp0r(cpu, 17, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R18:		mips_set_cp0r(cpu, 18, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R19:		mips_set_cp0r(cpu, 19, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R20:		mips_set_cp0r(cpu, 20, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R21:		mips_set_cp0r(cpu, 21, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R22:		mips_set_cp0r(cpu, 22, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R23:		mips_set_cp0r(cpu, 23, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R24:		mips_set_cp0r(cpu, 24, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R25:		mips_set_cp0r(cpu, 25, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R26:		mips_set_cp0r(cpu, 26, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R27:		mips_set_cp0r(cpu, 27, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R28:		mips_set_cp0r(cpu, 28, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R29:		mips_set_cp0r(cpu, 29, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R30:		mips_set_cp0r(cpu, 30, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R31:		mips_set_cp0r(cpu, 31, info->i );			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR0:		cpu->cp2dr[ 0 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR1:		cpu->cp2dr[ 1 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR2:		cpu->cp2dr[ 2 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR3:		cpu->cp2dr[ 3 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR4:		cpu->cp2dr[ 4 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR5:		cpu->cp2dr[ 5 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR6:		cpu->cp2dr[ 6 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR7:		cpu->cp2dr[ 7 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR8:		cpu->cp2dr[ 8 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR9:		cpu->cp2dr[ 9 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR10:		cpu->cp2dr[ 10 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR11:		cpu->cp2dr[ 11 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR12:		cpu->cp2dr[ 12 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR13:		cpu->cp2dr[ 13 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR14:		cpu->cp2dr[ 14 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR15:		cpu->cp2dr[ 15 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR16:		cpu->cp2dr[ 16 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR17:		cpu->cp2dr[ 17 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR18:		cpu->cp2dr[ 18 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR19:		cpu->cp2dr[ 19 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR20:		cpu->cp2dr[ 20 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR21:		cpu->cp2dr[ 21 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR22:		cpu->cp2dr[ 22 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR23:		cpu->cp2dr[ 23 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR24:		cpu->cp2dr[ 24 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR25:		cpu->cp2dr[ 25 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR26:		cpu->cp2dr[ 26 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR27:		cpu->cp2dr[ 27 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR28:		cpu->cp2dr[ 28 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR29:		cpu->cp2dr[ 29 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR30:		cpu->cp2dr[ 30 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR31:		cpu->cp2dr[ 31 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR0:		cpu->cp2cr[ 0 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR1:		cpu->cp2cr[ 1 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR2:		cpu->cp2cr[ 2 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR3:		cpu->cp2cr[ 3 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR4:		cpu->cp2cr[ 4 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR5:		cpu->cp2cr[ 5 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR6:		cpu->cp2cr[ 6 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR7:		cpu->cp2cr[ 7 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR8:		cpu->cp2cr[ 8 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR9:		cpu->cp2cr[ 9 ].d = info->i;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR10:		cpu->cp2cr[ 10 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR11:		cpu->cp2cr[ 11 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR12:		cpu->cp2cr[ 12 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR13:		cpu->cp2cr[ 13 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR14:		cpu->cp2cr[ 14 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR15:		cpu->cp2cr[ 15 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR16:		cpu->cp2cr[ 16 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR17:		cpu->cp2cr[ 17 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR18:		cpu->cp2cr[ 18 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR19:		cpu->cp2cr[ 19 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR20:		cpu->cp2cr[ 20 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR21:		cpu->cp2cr[ 21 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR22:		cpu->cp2cr[ 22 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR23:		cpu->cp2cr[ 23 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR24:		cpu->cp2cr[ 24 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR25:		cpu->cp2cr[ 25 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR26:		cpu->cp2cr[ 26 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR27:		cpu->cp2cr[ 27 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR28:		cpu->cp2cr[ 28 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR29:		cpu->cp2cr[ 29 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR30:		cpu->cp2cr[ 30 ].d = info->i;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR31:		cpu->cp2cr[ 31 ].d = info->i;		break;
+		
+		/* --- the following bits of info are set as pointers to data or functions --- */
+		case CPUINFO_PTR_IRQ_CALLBACK:					cpu->irq_callback = info->irqcallback;			break;
+	}
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+void mips_get_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info)
+{
+	switch (state)
+	{
+		/* --- the following bits of info are returned as 64-bit signed integers --- */
+		case CPUINFO_INT_CONTEXT_SIZE:					info->i = sizeof(mips_cpu_context);				break;
+		case CPUINFO_INT_INPUT_LINES:					info->i = 6;							break;
+		case CPUINFO_INT_DEFAULT_IRQ_VECTOR:			info->i = 0;							break;
+		case CPUINFO_INT_ENDIANNESS:					info->i = CPU_IS_LE;					break;
+		case CPUINFO_INT_CLOCK_DIVIDER:					info->i = 1;							break;
+		case CPUINFO_INT_MIN_INSTRUCTION_BYTES:			info->i = 4;							break;
+		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;
+		case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA:	info->i = 0;					break;
+		case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: 	info->i = 0;					break;
+		case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: 	info->i = 0;					break;
+		case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO:		info->i = 0;					break;
+		case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: 		info->i = 0;					break;
+		case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: 		info->i = 0;					break;
+
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ0:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x400) ? ASSERT_LINE : CLEAR_LINE; break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ1:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x800) ? ASSERT_LINE : CLEAR_LINE; break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ2:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x1000) ? ASSERT_LINE : CLEAR_LINE; break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ3:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x2000) ? ASSERT_LINE : CLEAR_LINE; break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ4:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x4000) ? ASSERT_LINE : CLEAR_LINE; break;
+		case CPUINFO_INT_INPUT_STATE + MIPS_IRQ5:		info->i = (cpu->cp0r[ CP0_CAUSE ] & 0x8000) ? ASSERT_LINE : CLEAR_LINE; break;
+
+		case CPUINFO_INT_PREVIOUSPC:					/* not implemented */					break;
+
+		case CPUINFO_INT_PC:							info->i = cpu->pc;					break;
+		case CPUINFO_INT_REGISTER + MIPS_PC:			info->i = cpu->pc;					break;
+		case CPUINFO_INT_SP:
+			/* because there is no hardware stack and the pipeline causes the cpu to execute the
+			instruction after a subroutine call before the subroutine is executed there is little
+			chance of cmd_step_over() in mamedbg.c working. */
+								info->i = 0;													break;
+		case CPUINFO_INT_REGISTER + MIPS_DELAYV:		info->i = cpu->delayv;				break;
+		case CPUINFO_INT_REGISTER + MIPS_DELAYR:		info->i = cpu->delayr;				break;
+		case CPUINFO_INT_REGISTER + MIPS_HI:			info->i = cpu->hi;					break;
+		case CPUINFO_INT_REGISTER + MIPS_LO:			info->i = cpu->lo;					break;
+		case CPUINFO_INT_REGISTER + MIPS_R0:			info->i = cpu->r[ 0 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R1:			info->i = cpu->r[ 1 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R2:			info->i = cpu->r[ 2 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R3:			info->i = cpu->r[ 3 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R4:			info->i = cpu->r[ 4 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R5:			info->i = cpu->r[ 5 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R6:			info->i = cpu->r[ 6 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R7:			info->i = cpu->r[ 7 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R8:			info->i = cpu->r[ 8 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R9:			info->i = cpu->r[ 9 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R10:			info->i = cpu->r[ 10 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R11:			info->i = cpu->r[ 11 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R12:			info->i = cpu->r[ 12 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R13:			info->i = cpu->r[ 13 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R14:			info->i = cpu->r[ 14 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R15:			info->i = cpu->r[ 15 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R16:			info->i = cpu->r[ 16 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R17:			info->i = cpu->r[ 17 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R18:			info->i = cpu->r[ 18 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R19:			info->i = cpu->r[ 19 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R20:			info->i = cpu->r[ 20 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R21:			info->i = cpu->r[ 21 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R22:			info->i = cpu->r[ 22 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R23:			info->i = cpu->r[ 23 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R24:			info->i = cpu->r[ 24 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R25:			info->i = cpu->r[ 25 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R26:			info->i = cpu->r[ 26 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R27:			info->i = cpu->r[ 27 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R28:			info->i = cpu->r[ 28 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R29:			info->i = cpu->r[ 29 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R30:			info->i = cpu->r[ 30 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_R31:			info->i = cpu->r[ 31 ];				break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R0:			info->i = cpu->cp0r[ 0 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R1:			info->i = cpu->cp0r[ 1 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R2:			info->i = cpu->cp0r[ 2 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R3:			info->i = cpu->cp0r[ 3 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R4:			info->i = cpu->cp0r[ 4 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R5:			info->i = cpu->cp0r[ 5 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R6:			info->i = cpu->cp0r[ 6 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R7:			info->i = cpu->cp0r[ 7 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R8:			info->i = cpu->cp0r[ 8 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R9:			info->i = cpu->cp0r[ 9 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R10:		info->i = cpu->cp0r[ 10 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R11:		info->i = cpu->cp0r[ 11 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R12:		info->i = cpu->cp0r[ 12 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R13:		info->i = cpu->cp0r[ 13 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R14:		info->i = cpu->cp0r[ 14 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R15:		info->i = cpu->cp0r[ 15 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R16:		info->i = cpu->cp0r[ 16 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R17:		info->i = cpu->cp0r[ 17 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R18:		info->i = cpu->cp0r[ 18 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R19:		info->i = cpu->cp0r[ 19 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R20:		info->i = cpu->cp0r[ 20 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R21:		info->i = cpu->cp0r[ 21 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R22:		info->i = cpu->cp0r[ 22 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R23:		info->i = cpu->cp0r[ 23 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R24:		info->i = cpu->cp0r[ 24 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R25:		info->i = cpu->cp0r[ 25 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R26:		info->i = cpu->cp0r[ 26 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R27:		info->i = cpu->cp0r[ 27 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R28:		info->i = cpu->cp0r[ 28 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R29:		info->i = cpu->cp0r[ 29 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R30:		info->i = cpu->cp0r[ 30 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP0R31:		info->i = cpu->cp0r[ 31 ];			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR0:		info->i = cpu->cp2dr[ 0 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR1:		info->i = cpu->cp2dr[ 1 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR2:		info->i = cpu->cp2dr[ 2 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR3:		info->i = cpu->cp2dr[ 3 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR4:		info->i = cpu->cp2dr[ 4 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR5:		info->i = cpu->cp2dr[ 5 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR6:		info->i = cpu->cp2dr[ 6 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR7:		info->i = cpu->cp2dr[ 7 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR8:		info->i = cpu->cp2dr[ 8 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR9:		info->i = cpu->cp2dr[ 9 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR10:		info->i = cpu->cp2dr[ 10 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR11:		info->i = cpu->cp2dr[ 11 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR12:		info->i = cpu->cp2dr[ 12 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR13:		info->i = cpu->cp2dr[ 13 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR14:		info->i = cpu->cp2dr[ 14 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR15:		info->i = cpu->cp2dr[ 15 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR16:		info->i = cpu->cp2dr[ 16 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR17:		info->i = cpu->cp2dr[ 17 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR18:		info->i = cpu->cp2dr[ 18 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR19:		info->i = cpu->cp2dr[ 19 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR20:		info->i = cpu->cp2dr[ 20 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR21:		info->i = cpu->cp2dr[ 21 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR22:		info->i = cpu->cp2dr[ 22 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR23:		info->i = cpu->cp2dr[ 23 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR24:		info->i = cpu->cp2dr[ 24 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR25:		info->i = cpu->cp2dr[ 25 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR26:		info->i = cpu->cp2dr[ 26 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR27:		info->i = cpu->cp2dr[ 27 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR28:		info->i = cpu->cp2dr[ 28 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR29:		info->i = cpu->cp2dr[ 29 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR30:		info->i = cpu->cp2dr[ 30 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2DR31:		info->i = cpu->cp2dr[ 31 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR0:		info->i = cpu->cp2cr[ 0 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR1:		info->i = cpu->cp2cr[ 1 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR2:		info->i = cpu->cp2cr[ 2 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR3:		info->i = cpu->cp2cr[ 3 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR4:		info->i = cpu->cp2cr[ 4 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR5:		info->i = cpu->cp2cr[ 5 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR6:		info->i = cpu->cp2cr[ 6 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR7:		info->i = cpu->cp2cr[ 7 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR8:		info->i = cpu->cp2cr[ 8 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR9:		info->i = cpu->cp2cr[ 9 ].d;			break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR10:		info->i = cpu->cp2cr[ 10 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR11:		info->i = cpu->cp2cr[ 11 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR12:		info->i = cpu->cp2cr[ 12 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR13:		info->i = cpu->cp2cr[ 13 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR14:		info->i = cpu->cp2cr[ 14 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR15:		info->i = cpu->cp2cr[ 15 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR16:		info->i = cpu->cp2cr[ 16 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR17:		info->i = cpu->cp2cr[ 17 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR18:		info->i = cpu->cp2cr[ 18 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR19:		info->i = cpu->cp2cr[ 19 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR20:		info->i = cpu->cp2cr[ 20 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR21:		info->i = cpu->cp2cr[ 21 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR22:		info->i = cpu->cp2cr[ 22 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR23:		info->i = cpu->cp2cr[ 23 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR24:		info->i = cpu->cp2cr[ 24 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR25:		info->i = cpu->cp2cr[ 25 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR26:		info->i = cpu->cp2cr[ 26 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR27:		info->i = cpu->cp2cr[ 27 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR28:		info->i = cpu->cp2cr[ 28 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR29:		info->i = cpu->cp2cr[ 29 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR30:		info->i = cpu->cp2cr[ 30 ].d;		break;
+		case CPUINFO_INT_REGISTER + MIPS_CP2CR31:		info->i = cpu->cp2cr[ 31 ].d;		break;
+
+		/* --- the following bits of info are returned as pointers to data or functions --- */
+		case CPUINFO_PTR_SET_INFO:						info->setinfo = mips_set_info;			break;
+//		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = mips_get_context;	break;
+//		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = mips_set_context;	break;
+		case CPUINFO_PTR_INIT:							info->init = mips_init;					break;
+		case CPUINFO_PTR_RESET:							info->reset = mips_reset;				break;
+		case CPUINFO_PTR_EXIT:							info->exit = mips_exit;					break;
+		case CPUINFO_PTR_EXECUTE:						info->execute = mips_execute;			break;
+		case CPUINFO_PTR_BURN:							info->burn = NULL;						break;
+		case CPUINFO_PTR_DISASSEMBLE:					info->disassemble = mips_dasm;			break;
+		case CPUINFO_PTR_IRQ_CALLBACK:					info->irqcallback = cpu->irq_callback; break;
+		case CPUINFO_PTR_INSTRUCTION_COUNTER:			info->icount = &cpu->mips_ICount;			break;
+		case CPUINFO_PTR_REGISTER_LAYOUT:				info->p = mips_reg_layout;				break;
+		case CPUINFO_PTR_WINDOW_LAYOUT:					info->p = mips_win_layout;				break;
+
+		/* --- the following bits of info are returned as NULL-terminated strings --- */
+#if 0
+		case CPUINFO_STR_NAME:							strcpy(info->s = cpuintrf_temp_str(), "PSX CPU"); break;
+		case CPUINFO_STR_CORE_FAMILY:					strcpy(info->s = cpuintrf_temp_str(), "mipscpu"); break;
+		case CPUINFO_STR_CORE_VERSION:					strcpy(info->s = cpuintrf_temp_str(), "1.4"); break;
+		case CPUINFO_STR_CORE_FILE:						strcpy(info->s = cpuintrf_temp_str(), __FILE__); break;
+		case CPUINFO_STR_CORE_CREDITS:					strcpy(info->s = cpuintrf_temp_str(), "Copyright 2003 smf"); break;
+
+		case CPUINFO_STR_FLAGS:							strcpy(info->s = cpuintrf_temp_str(), " "); break;
+
+		case CPUINFO_STR_REGISTER + MIPS_PC:			sprintf( info->s = cpuintrf_temp_str(), "pc :%08x", cpu->pc ); break;
+		case CPUINFO_STR_REGISTER + MIPS_DELAYV:		sprintf( info->s = cpuintrf_temp_str(), "delay :%08x", cpu->delayv ); break;
+		case CPUINFO_STR_REGISTER + MIPS_DELAYR:		sprintf( info->s = cpuintrf_temp_str(), "delay %s:%02x", delayn[ cpu->delayr ], cpu->delayr ); break;
+		case CPUINFO_STR_REGISTER + MIPS_HI:			sprintf( info->s = cpuintrf_temp_str(), "hi :%08x", cpu->hi ); break;
+		case CPUINFO_STR_REGISTER + MIPS_LO:			sprintf( info->s = cpuintrf_temp_str(), "lo :%08x", cpu->lo ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R0:			sprintf( info->s = cpuintrf_temp_str(), "zero :%08x", cpu->r[ 0 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R1:			sprintf( info->s = cpuintrf_temp_str(), "at :%08x", cpu->r[ 1 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R2:			sprintf( info->s = cpuintrf_temp_str(), "v0 :%08x", cpu->r[ 2 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R3:			sprintf( info->s = cpuintrf_temp_str(), "v1 :%08x", cpu->r[ 3 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R4:			sprintf( info->s = cpuintrf_temp_str(), "a0 :%08x", cpu->r[ 4 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R5:			sprintf( info->s = cpuintrf_temp_str(), "a1 :%08x", cpu->r[ 5 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R6:			sprintf( info->s = cpuintrf_temp_str(), "a2 :%08x", cpu->r[ 6 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R7:			sprintf( info->s = cpuintrf_temp_str(), "a3 :%08x", cpu->r[ 7 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R8:			sprintf( info->s = cpuintrf_temp_str(), "t0 :%08x", cpu->r[ 8 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R9:			sprintf( info->s = cpuintrf_temp_str(), "t1 :%08x", cpu->r[ 9 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R10:			sprintf( info->s = cpuintrf_temp_str(), "t2 :%08x", cpu->r[ 10 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R11:			sprintf( info->s = cpuintrf_temp_str(), "t3 :%08x", cpu->r[ 11 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R12:			sprintf( info->s = cpuintrf_temp_str(), "t4 :%08x", cpu->r[ 12 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R13:			sprintf( info->s = cpuintrf_temp_str(), "t5 :%08x", cpu->r[ 13 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R14:			sprintf( info->s = cpuintrf_temp_str(), "t6 :%08x", cpu->r[ 14 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R15:			sprintf( info->s = cpuintrf_temp_str(), "t7 :%08x", cpu->r[ 15 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R16:			sprintf( info->s = cpuintrf_temp_str(), "s0 :%08x", cpu->r[ 16 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R17:			sprintf( info->s = cpuintrf_temp_str(), "s1 :%08x", cpu->r[ 17 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R18:			sprintf( info->s = cpuintrf_temp_str(), "s2 :%08x", cpu->r[ 18 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R19:			sprintf( info->s = cpuintrf_temp_str(), "s3 :%08x", cpu->r[ 19 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R20:			sprintf( info->s = cpuintrf_temp_str(), "s4 :%08x", cpu->r[ 20 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R21:			sprintf( info->s = cpuintrf_temp_str(), "s5 :%08x", cpu->r[ 21 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R22:			sprintf( info->s = cpuintrf_temp_str(), "s6 :%08x", cpu->r[ 22 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R23:			sprintf( info->s = cpuintrf_temp_str(), "s7 :%08x", cpu->r[ 23 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R24:			sprintf( info->s = cpuintrf_temp_str(), "t8 :%08x", cpu->r[ 24 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R25:			sprintf( info->s = cpuintrf_temp_str(), "t9 :%08x", cpu->r[ 25 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R26:			sprintf( info->s = cpuintrf_temp_str(), "k0 :%08x", cpu->r[ 26 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R27:			sprintf( info->s = cpuintrf_temp_str(), "k1 :%08x", cpu->r[ 27 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R28:			sprintf( info->s = cpuintrf_temp_str(), "gp :%08x", cpu->r[ 28 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R29:			sprintf( info->s = cpuintrf_temp_str(), "sp :%08x", cpu->r[ 29 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R30:			sprintf( info->s = cpuintrf_temp_str(), "fp :%08x", cpu->r[ 30 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_R31:			sprintf( info->s = cpuintrf_temp_str(), "ra :%08x", cpu->r[ 31 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R0:			sprintf( info->s = cpuintrf_temp_str(), "Index :%08x", cpu->cp0r[ 0 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R1:			sprintf( info->s = cpuintrf_temp_str(), "Random :%08x", cpu->cp0r[ 1 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R2:			sprintf( info->s = cpuintrf_temp_str(), "EntryLo :%08x", cpu->cp0r[ 2 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R3:			sprintf( info->s = cpuintrf_temp_str(), "cp0r3 :%08x", cpu->cp0r[ 3 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R4:			sprintf( info->s = cpuintrf_temp_str(), "Context :%08x", cpu->cp0r[ 4 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R5:			sprintf( info->s = cpuintrf_temp_str(), "cp0r5 :%08x", cpu->cp0r[ 5 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R6:			sprintf( info->s = cpuintrf_temp_str(), "cp0r6 :%08x", cpu->cp0r[ 6 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R7:			sprintf( info->s = cpuintrf_temp_str(), "cp0r7 :%08x", cpu->cp0r[ 7 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R8:			sprintf( info->s = cpuintrf_temp_str(), "BadVAddr:%08x", cpu->cp0r[ 8 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R9:			sprintf( info->s = cpuintrf_temp_str(), "cp0r9 :%08x", cpu->cp0r[ 9 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R10:		sprintf( info->s = cpuintrf_temp_str(), "EntryHi :%08x", cpu->cp0r[ 10 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R11:		sprintf( info->s = cpuintrf_temp_str(), "cp0r11 :%08x", cpu->cp0r[ 11 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R12:		sprintf( info->s = cpuintrf_temp_str(), "SR :%08x", cpu->cp0r[ 12 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R13:		sprintf( info->s = cpuintrf_temp_str(), "Cause :%08x", cpu->cp0r[ 13 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R14:		sprintf( info->s = cpuintrf_temp_str(), "EPC :%08x", cpu->cp0r[ 14 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R15:		sprintf( info->s = cpuintrf_temp_str(), "PRId :%08x", cpu->cp0r[ 15 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R16:		sprintf( info->s = cpuintrf_temp_str(), "cp0r16 :%08x", cpu->cp0r[ 16 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R17:		sprintf( info->s = cpuintrf_temp_str(), "cp0r17 :%08x", cpu->cp0r[ 17 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R18:		sprintf( info->s = cpuintrf_temp_str(), "cp0r18 :%08x", cpu->cp0r[ 18 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R19:		sprintf( info->s = cpuintrf_temp_str(), "cp0r19 :%08x", cpu->cp0r[ 19 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R20:		sprintf( info->s = cpuintrf_temp_str(), "cp0r20 :%08x", cpu->cp0r[ 20 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R21:		sprintf( info->s = cpuintrf_temp_str(), "cp0r21 :%08x", cpu->cp0r[ 21 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R22:		sprintf( info->s = cpuintrf_temp_str(), "cp0r22 :%08x", cpu->cp0r[ 22 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R23:		sprintf( info->s = cpuintrf_temp_str(), "cp0r23 :%08x", cpu->cp0r[ 23 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R24:		sprintf( info->s = cpuintrf_temp_str(), "cp0r24 :%08x", cpu->cp0r[ 24 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R25:		sprintf( info->s = cpuintrf_temp_str(), "cp0r25 :%08x", cpu->cp0r[ 25 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R26:		sprintf( info->s = cpuintrf_temp_str(), "cp0r26 :%08x", cpu->cp0r[ 26 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R27:		sprintf( info->s = cpuintrf_temp_str(), "cp0r27 :%08x", cpu->cp0r[ 27 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R28:		sprintf( info->s = cpuintrf_temp_str(), "cp0r28 :%08x", cpu->cp0r[ 28 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R29:		sprintf( info->s = cpuintrf_temp_str(), "cp0r29 :%08x", cpu->cp0r[ 29 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R30:		sprintf( info->s = cpuintrf_temp_str(), "cp0r30 :%08x", cpu->cp0r[ 30 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP0R31:		sprintf( info->s = cpuintrf_temp_str(), "cp0r31 :%08x", cpu->cp0r[ 31 ] ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR0:		sprintf( info->s = cpuintrf_temp_str(), "vxy0 :%08x", cpu->cp2dr[ 0 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR1:		sprintf( info->s = cpuintrf_temp_str(), "vz0 :%08x", cpu->cp2dr[ 1 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR2:		sprintf( info->s = cpuintrf_temp_str(), "vxy1 :%08x", cpu->cp2dr[ 2 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR3:		sprintf( info->s = cpuintrf_temp_str(), "vz1 :%08x", cpu->cp2dr[ 3 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR4:		sprintf( info->s = cpuintrf_temp_str(), "vxy2 :%08x", cpu->cp2dr[ 4 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR5:		sprintf( info->s = cpuintrf_temp_str(), "vz2 :%08x", cpu->cp2dr[ 5 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR6:		sprintf( info->s = cpuintrf_temp_str(), "rgb :%08x", cpu->cp2dr[ 6 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR7:		sprintf( info->s = cpuintrf_temp_str(), "otz :%08x", cpu->cp2dr[ 7 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR8:		sprintf( info->s = cpuintrf_temp_str(), "ir0 :%08x", cpu->cp2dr[ 8 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR9:		sprintf( info->s = cpuintrf_temp_str(), "ir1 :%08x", cpu->cp2dr[ 9 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR10:		sprintf( info->s = cpuintrf_temp_str(), "ir2 :%08x", cpu->cp2dr[ 10 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR11:		sprintf( info->s = cpuintrf_temp_str(), "ir3 :%08x", cpu->cp2dr[ 11 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR12:		sprintf( info->s = cpuintrf_temp_str(), "sxy0 :%08x", cpu->cp2dr[ 12 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR13:		sprintf( info->s = cpuintrf_temp_str(), "sxy1 :%08x", cpu->cp2dr[ 13 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR14:		sprintf( info->s = cpuintrf_temp_str(), "sxy2 :%08x", cpu->cp2dr[ 14 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR15:		sprintf( info->s = cpuintrf_temp_str(), "sxyp :%08x", cpu->cp2dr[ 15 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR16:		sprintf( info->s = cpuintrf_temp_str(), "sz0 :%08x", cpu->cp2dr[ 16 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR17:		sprintf( info->s = cpuintrf_temp_str(), "sz1 :%08x", cpu->cp2dr[ 17 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR18:		sprintf( info->s = cpuintrf_temp_str(), "sz2 :%08x", cpu->cp2dr[ 18 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR19:		sprintf( info->s = cpuintrf_temp_str(), "sz3 :%08x", cpu->cp2dr[ 19 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR20:		sprintf( info->s = cpuintrf_temp_str(), "rgb0 :%08x", cpu->cp2dr[ 20 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR21:		sprintf( info->s = cpuintrf_temp_str(), "rgb1 :%08x", cpu->cp2dr[ 21 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR22:		sprintf( info->s = cpuintrf_temp_str(), "rgb2 :%08x", cpu->cp2dr[ 22 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR23:		sprintf( info->s = cpuintrf_temp_str(), "res1 :%08x", cpu->cp2dr[ 23 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR24:		sprintf( info->s = cpuintrf_temp_str(), "mac0 :%08x", cpu->cp2dr[ 24 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR25:		sprintf( info->s = cpuintrf_temp_str(), "mac1 :%08x", cpu->cp2dr[ 25 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR26:		sprintf( info->s = cpuintrf_temp_str(), "mac2 :%08x", cpu->cp2dr[ 26 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR27:		sprintf( info->s = cpuintrf_temp_str(), "mac3 :%08x", cpu->cp2dr[ 27 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR28:		sprintf( info->s = cpuintrf_temp_str(), "irgb :%08x", cpu->cp2dr[ 28 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR29:		sprintf( info->s = cpuintrf_temp_str(), "orgb :%08x", cpu->cp2dr[ 29 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR30:		sprintf( info->s = cpuintrf_temp_str(), "lzcs :%08x", cpu->cp2dr[ 30 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2DR31:		sprintf( info->s = cpuintrf_temp_str(), "lzcr :%08x", cpu->cp2dr[ 31 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR0:		sprintf( info->s = cpuintrf_temp_str(), "r11r12 :%08x", cpu->cp2cr[ 0 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR1:		sprintf( info->s = cpuintrf_temp_str(), "r13r21 :%08x", cpu->cp2cr[ 1 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR2:		sprintf( info->s = cpuintrf_temp_str(), "r22r23 :%08x", cpu->cp2cr[ 2 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR3:		sprintf( info->s = cpuintrf_temp_str(), "r31r32 :%08x", cpu->cp2cr[ 3 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR4:		sprintf( info->s = cpuintrf_temp_str(), "r33 :%08x", cpu->cp2cr[ 4 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR5:		sprintf( info->s = cpuintrf_temp_str(), "trx :%08x", cpu->cp2cr[ 5 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR6:		sprintf( info->s = cpuintrf_temp_str(), "try :%08x", cpu->cp2cr[ 6 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR7:		sprintf( info->s = cpuintrf_temp_str(), "trz :%08x", cpu->cp2cr[ 7 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR8:		sprintf( info->s = cpuintrf_temp_str(), "l11l12 :%08x", cpu->cp2cr[ 8 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR9:		sprintf( info->s = cpuintrf_temp_str(), "l13l21 :%08x", cpu->cp2cr[ 9 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR10:		sprintf( info->s = cpuintrf_temp_str(), "l22l23 :%08x", cpu->cp2cr[ 10 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR11:		sprintf( info->s = cpuintrf_temp_str(), "l31l32 :%08x", cpu->cp2cr[ 11 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR12:		sprintf( info->s = cpuintrf_temp_str(), "l33 :%08x", cpu->cp2cr[ 12 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR13:		sprintf( info->s = cpuintrf_temp_str(), "rbk :%08x", cpu->cp2cr[ 13 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR14:		sprintf( info->s = cpuintrf_temp_str(), "gbk :%08x", cpu->cp2cr[ 14 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR15:		sprintf( info->s = cpuintrf_temp_str(), "bbk :%08x", cpu->cp2cr[ 15 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR16:		sprintf( info->s = cpuintrf_temp_str(), "lr1lr2 :%08x", cpu->cp2cr[ 16 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR17:		sprintf( info->s = cpuintrf_temp_str(), "lr31g1 :%08x", cpu->cp2cr[ 17 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR18:		sprintf( info->s = cpuintrf_temp_str(), "lg2lg3 :%08x", cpu->cp2cr[ 18 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR19:		sprintf( info->s = cpuintrf_temp_str(), "lb1lb2 :%08x", cpu->cp2cr[ 19 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR20:		sprintf( info->s = cpuintrf_temp_str(), "lb3 :%08x", cpu->cp2cr[ 20 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR21:		sprintf( info->s = cpuintrf_temp_str(), "rfc :%08x", cpu->cp2cr[ 21 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR22:		sprintf( info->s = cpuintrf_temp_str(), "gfc :%08x", cpu->cp2cr[ 22 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR23:		sprintf( info->s = cpuintrf_temp_str(), "bfc :%08x", cpu->cp2cr[ 23 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR24:		sprintf( info->s = cpuintrf_temp_str(), "ofx :%08x", cpu->cp2cr[ 24 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR25:		sprintf( info->s = cpuintrf_temp_str(), "ofy :%08x", cpu->cp2cr[ 25 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR26:		sprintf( info->s = cpuintrf_temp_str(), "h :%08x", cpu->cp2cr[ 26 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR27:		sprintf( info->s = cpuintrf_temp_str(), "dqa :%08x", cpu->cp2cr[ 27 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR28:		sprintf( info->s = cpuintrf_temp_str(), "dqb :%08x", cpu->cp2cr[ 28 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR29:		sprintf( info->s = cpuintrf_temp_str(), "zsf3 :%08x", cpu->cp2cr[ 29 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR30:		sprintf( info->s = cpuintrf_temp_str(), "zsf4 :%08x", cpu->cp2cr[ 30 ].d ); break;
+		case CPUINFO_STR_REGISTER + MIPS_CP2CR31:		sprintf( info->s = cpuintrf_temp_str(), "flag :%08x", cpu->cp2cr[ 31 ].d ); break;
+#endif
+	}
+}
+
+uint32 mips_get_cause(mips_cpu_context *cpu)
+{
+	return cpu->cp0r[ CP0_CAUSE ];
+}
+
+uint32 mips_get_status(mips_cpu_context *cpu)
+{
+	return cpu->cp0r[ CP0_SR ];
+}
+
+void mips_set_status(mips_cpu_context *cpu, uint32 status)
+{
+	cpu->cp0r[ CP0_SR ] = status;
+}
+
+uint32 mips_get_ePC(mips_cpu_context *cpu)
+{
+	return cpu->cp0r[ CP0_EPC ];
+}
+
+int mips_get_icount(mips_cpu_context *cpu)
+{
+	return cpu->mips_ICount;
+}
+
+void mips_set_icount(mips_cpu_context *cpu, int count)
+{
+	cpu->mips_ICount = count;
+}
+
+
+#if (HAS_PSXCPU)
+/**************************************************************************
+ * CPU-specific set_info
+ **************************************************************************/
+
+void psxcpu_get_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info)
+{
+	switch (state)
+	{
+		/* --- the following bits of info are returned as NULL-terminated strings --- */
+//		case CPUINFO_STR_NAME:							strcpy(info->s = cpuintrf_temp_str(), "PSX CPU"); break;
+
+		default:
+			mips_get_info(cpu, state, info);
+			break;
+	}
+}
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/psx.h Added

@@ -0,0 +1,486 @@
+#ifndef _MIPS_H
+#define _MIPS_H
+
+#include "ao.h"
+#include "osd_cpu.h"
+//#include "driver.h"
+
+typedef void genf(void);
+typedef int offs_t;
+
+#define cpu_readop32(pc) program_read_dword_32le(cpu, pc)
+#define change_pc(pc)																	\
+
+
+#ifdef __GNUC__
+#if (__GNUC__ < 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
+#define UNUSEDARG
+#else
+#define UNUSEDARG __attribute__((__unused__))
+#endif
+#else
+#define UNUSEDARG
+#endif
+
+typedef int8		(*read8_handler) (UNUSEDARG offs_t offset);
+typedef void		(*write8_handler) (UNUSEDARG offs_t offset, UNUSEDARG int8 data);
+typedef int16		(*read16_handler) (UNUSEDARG offs_t offset, UNUSEDARG int16 mem_mask);
+typedef void		(*write16_handler)(UNUSEDARG offs_t offset, UNUSEDARG int16 data, UNUSEDARG int16 mem_mask);
+typedef int32		(*read32_handler) (UNUSEDARG offs_t offset, UNUSEDARG int32 mem_mask);
+typedef void		(*write32_handler)(UNUSEDARG offs_t offset, UNUSEDARG int32 data, UNUSEDARG int32 mem_mask);
+typedef int64		(*read64_handler) (UNUSEDARG offs_t offset, UNUSEDARG int64 mem_mask);
+typedef void		(*write64_handler)(UNUSEDARG offs_t offset, UNUSEDARG int64 data, UNUSEDARG int64 mem_mask);
+
+union read_handlers_t
+{
+	genf *				handler;
+	read8_handler		handler8;
+	read16_handler		handler16;
+	read32_handler		handler32;
+	read64_handler		handler64;
+};
+
+union write_handlers_t
+{
+	genf *				handler;
+	write8_handler		handler8;
+	write16_handler		handler16;
+	write32_handler		handler32;
+	write64_handler		handler64;
+};
+
+struct address_map_t
+{
+	uint32				flags;				/* flags and additional info about this entry */
+	offs_t				start, end;			/* start/end (or mask/match) values */
+	offs_t				mirror;				/* mirror bits */
+	offs_t				mask;				/* mask bits */
+	union read_handlers_t read;				/* read handler callback */
+	union write_handlers_t write;			/* write handler callback */
+	void *				memory;				/* pointer to memory backing this entry */
+	uint32				share;				/* index of a shared memory block */
+	void **				base;				/* receives pointer to memory (optional) */
+	size_t *			size;				/* receives size of area in bytes (optional) */
+};
+typedef struct address_map_t *(*construct_map_t)(struct address_map_t *map);
+
+#define MAX_FILE_SLOTS	(32)
+
+typedef struct
+{
+	char name[10];
+	uint32 dispatch;
+} ExternLibEntries;
+
+typedef struct
+{
+	int32 iState;		// state of thread
+
+	uint32 flags;		// flags
+	uint32 routine;		// start of code for the thread
+	uint32 stackloc;	// stack location in IOP RAM
+	uint32 stacksize;	// stack size
+	uint32 refCon;		// user value passed in at CreateThread time
+
+	uint32 waitparm;	// what we're waiting on if in one the TS_WAIT* states
+	
+	uint32 save_regs[37];	// CPU registers belonging to this thread
+} Thread;
+
+typedef struct
+{
+	uint32 attr;
+	uint32 option;
+	int32 init;
+	int32 current;
+	int32 max;
+	int32 threadsWaiting;
+	int32 inuse;
+} Semaphore;
+
+#define SEMA_MAX	(64)
+
+typedef struct
+{
+	uint32 type;
+	uint32 value;
+	uint32 param;
+	int inUse;
+} EventFlag;
+
+typedef struct
+{
+	uint32 count;
+	uint32 mode;
+	uint32 target;
+	uint32 sysclock;
+} Counter;
+
+
+typedef struct
+{
+	uint32 desc;
+	int32 status;
+	int32 mode;
+	uint32 fhandler;
+} EvtCtrlBlk[32];
+
+typedef struct
+{
+	int32 iActive;
+	uint32 count;
+	uint32 target;
+	uint32 source;
+	uint32 prescale;
+	uint32 handler;
+	uint32 hparam;
+	uint32 mode;
+} IOPTimer;
+
+typedef struct mips_cpu_context_s
+{
+ int psf_refresh;
+	UINT32 op;
+	UINT32 pc;
+	UINT32 prevpc;
+	UINT32 delayv;
+	UINT32 delayr;
+	UINT32 hi;
+	UINT32 lo;
+	UINT32 r[ 32 ];
+	UINT32 cp0r[ 32 ];
+	PAIR cp2cr[ 32 ];
+	PAIR cp2dr[ 32 ];
+	int (*irq_callback)(struct mips_cpu_context_s *cpu, int irqline);
+ int mips_ICount;
+ // PSX main RAM
+ uint32 psx_ram[(2*1024*1024)/4];
+ uint32 psx_scratch[0x400];
+ // backup image to restart songs
+ uint32 initial_ram[(2*1024*1024)/4];
+ uint32 initial_scratch[0x400];
+
+ // spu
+ struct spu_state_s *spu;
+ struct spu2_state_s *spu2;
+ void (*spu_callback)(unsigned char *, long, void *);
+ void *spu_callback_data;
+
+ // state
+ Counter root_cnts[3];	// 3 of the bastards
+
+ EvtCtrlBlk *Event;
+ EvtCtrlBlk *CounterEvent;
+
+ uint32 spu_delay, dma_icr, irq_data, irq_mask, dma_timer, WAI;
+ uint32 dma4_madr, dma4_bcr, dma4_chcr, dma4_delay;
+ uint32 dma7_madr, dma7_bcr, dma7_chcr, dma7_delay;
+ uint32 dma4_cb, dma7_cb, dma4_fval, dma4_flag, dma7_fval, dma7_flag;
+ uint32 irq9_cb, irq9_fval, irq9_flag;
+
+ volatile int softcall_target;
+ int filestat[MAX_FILE_SLOTS];
+ uint8 *filedata[MAX_FILE_SLOTS];
+ uint32 filesize[MAX_FILE_SLOTS], filepos[MAX_FILE_SLOTS];
+ int intr_susp;
+
+ uint64 sys_time;
+ int timerexp;
+
+ int32 iNumLibs;
+ ExternLibEntries	reglibs[32];
+
+ int32 iNumFlags;
+ EventFlag evflags[32];
+
+ int32 iNumSema;
+ Semaphore semaphores[SEMA_MAX];
+
+ int32 iNumThreads, iCurThread;
+ Thread threads[32];
+ IOPTimer iop_timers[8];
+ int32 iNumTimers;
+ int fcnt;
+ uint32 heap_addr, entry_int;
+ uint32 irq_regs[37];
+ int irq_mutex;
+
+} mips_cpu_context;
+
+union cpuinfo
+{
+	int64	i;											/* generic integers */
+	void *	p;											/* generic pointers */
+	genf * f;											/* generic function pointers */
+	char *	s;											/* generic strings */
+	mips_cpu_context *cpu;
+
+	void	(*setinfo)(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info);/* CPUINFO_PTR_SET_INFO */
+//	void	(*getcontext)(void *context);				/* CPUINFO_PTR_GET_CONTEXT */
+//	void	(*setcontext)(void *context);				/* CPUINFO_PTR_SET_CONTEXT */
+	void	(*init)(mips_cpu_context *cpu);								/* CPUINFO_PTR_INIT */
+	void	(*reset)(mips_cpu_context *cpu, void *param);						/* CPUINFO_PTR_RESET */
+	void	(*exit)(mips_cpu_context *cpu);								/* CPUINFO_PTR_EXIT */
+	int		(*execute)(mips_cpu_context *cpu, int cycles);						/* CPUINFO_PTR_EXECUTE */
+	void	(*burn)(mips_cpu_context *cpu, int cycles);						/* CPUINFO_PTR_BURN */
+	offs_t	(*disassemble)(mips_cpu_context *cpu, char *buffer, offs_t pc);	/* CPUINFO_PTR_DISASSEMBLE */
+	int		(*irqcallback)(mips_cpu_context *cpu, int state);					/* CPUINFO_PTR_IRQCALLBACK */
+	int *	icount;										/* CPUINFO_PTR_INSTRUCTION_COUNTER */
+	construct_map_t internal_map;						/* CPUINFO_PTR_INTERNAL_MEMORY_MAP */
+};
+
+enum
+{
+	MIPS_PC = 1,
+	MIPS_DELAYV, MIPS_DELAYR,
+	MIPS_HI, MIPS_LO,
+	MIPS_R0, MIPS_R1,
+	MIPS_R2, MIPS_R3,
+	MIPS_R4, MIPS_R5,
+	MIPS_R6, MIPS_R7,
+	MIPS_R8, MIPS_R9,
+	MIPS_R10, MIPS_R11,
+	MIPS_R12, MIPS_R13,
+	MIPS_R14, MIPS_R15,
+	MIPS_R16, MIPS_R17,
+	MIPS_R18, MIPS_R19,
+	MIPS_R20, MIPS_R21,
+	MIPS_R22, MIPS_R23,
+	MIPS_R24, MIPS_R25,
+	MIPS_R26, MIPS_R27,
+	MIPS_R28, MIPS_R29,
+	MIPS_R30, MIPS_R31,
+	MIPS_CP0R0, MIPS_CP0R1,
+	MIPS_CP0R2, MIPS_CP0R3,
+	MIPS_CP0R4, MIPS_CP0R5,
+	MIPS_CP0R6, MIPS_CP0R7,
+	MIPS_CP0R8, MIPS_CP0R9,
+	MIPS_CP0R10, MIPS_CP0R11,
+	MIPS_CP0R12, MIPS_CP0R13,
+	MIPS_CP0R14, MIPS_CP0R15,
+	MIPS_CP0R16, MIPS_CP0R17,
+	MIPS_CP0R18, MIPS_CP0R19,
+	MIPS_CP0R20, MIPS_CP0R21,
+	MIPS_CP0R22, MIPS_CP0R23,
+	MIPS_CP0R24, MIPS_CP0R25,
+	MIPS_CP0R26, MIPS_CP0R27,
+	MIPS_CP0R28, MIPS_CP0R29,
+	MIPS_CP0R30, MIPS_CP0R31,
+	MIPS_CP2DR0, MIPS_CP2DR1,
+	MIPS_CP2DR2, MIPS_CP2DR3,
+	MIPS_CP2DR4, MIPS_CP2DR5,
+	MIPS_CP2DR6, MIPS_CP2DR7,
+	MIPS_CP2DR8, MIPS_CP2DR9,
+	MIPS_CP2DR10, MIPS_CP2DR11,
+	MIPS_CP2DR12, MIPS_CP2DR13,
+	MIPS_CP2DR14, MIPS_CP2DR15,
+	MIPS_CP2DR16, MIPS_CP2DR17,
+	MIPS_CP2DR18, MIPS_CP2DR19,
+	MIPS_CP2DR20, MIPS_CP2DR21,
+	MIPS_CP2DR22, MIPS_CP2DR23,
+	MIPS_CP2DR24, MIPS_CP2DR25,
+	MIPS_CP2DR26, MIPS_CP2DR27,
+	MIPS_CP2DR28, MIPS_CP2DR29,
+	MIPS_CP2DR30, MIPS_CP2DR31,
+	MIPS_CP2CR0, MIPS_CP2CR1,
+	MIPS_CP2CR2, MIPS_CP2CR3,
+	MIPS_CP2CR4, MIPS_CP2CR5,
+	MIPS_CP2CR6, MIPS_CP2CR7,
+	MIPS_CP2CR8, MIPS_CP2CR9,
+	MIPS_CP2CR10, MIPS_CP2CR11,
+	MIPS_CP2CR12, MIPS_CP2CR13,
+	MIPS_CP2CR14, MIPS_CP2CR15,
+	MIPS_CP2CR16, MIPS_CP2CR17,
+	MIPS_CP2CR18, MIPS_CP2CR19,
+	MIPS_CP2CR20, MIPS_CP2CR21,
+	MIPS_CP2CR22, MIPS_CP2CR23,
+	MIPS_CP2CR24, MIPS_CP2CR25,
+	MIPS_CP2CR26, MIPS_CP2CR27,
+	MIPS_CP2CR28, MIPS_CP2CR29,
+	MIPS_CP2CR30, MIPS_CP2CR31
+};
+
+#define MIPS_INT_NONE	( -1 )
+
+#define MIPS_IRQ0	( 0 )
+#define MIPS_IRQ1	( 1 )
+#define MIPS_IRQ2	( 2 )
+#define MIPS_IRQ3	( 3 )
+#define MIPS_IRQ4	( 4 )
+#define MIPS_IRQ5	( 5 )
+
+#define MIPS_BYTE_EXTEND( a ) ( (INT32)(INT8)a )
+#define MIPS_WORD_EXTEND( a ) ( (INT32)(INT16)a )
+
+#define INS_OP( op ) ( ( op >> 26 ) & 63 )
+#define INS_RS( op ) ( ( op >> 21 ) & 31 )
+#define INS_RT( op ) ( ( op >> 16 ) & 31 )
+#define INS_IMMEDIATE( op ) ( op & 0xffff )
+#define INS_TARGET( op ) ( op & 0x3ffffff )
+#define INS_RD( op ) ( ( op >> 11 ) & 31 )
+#define INS_SHAMT( op ) ( ( op >> 6 ) & 31 )
+#define INS_FUNCT( op ) ( op & 63 )
+#define INS_CODE( op ) ( ( op >> 6 ) & 0xfffff )
+#define INS_CO( op ) ( ( op >> 25 ) & 1 )
+#define INS_COFUN( op ) ( op & 0x1ffffff )
+#define INS_CF( op ) ( op & 63 )
+
+#define GTE_OP( op ) ( ( op >> 20 ) & 31 )
+#define GTE_SF( op ) ( ( op >> 19 ) & 1 )
+#define GTE_MX( op ) ( ( op >> 17 ) & 3 )
+#define GTE_V( op ) ( ( op >> 15 ) & 3 )
+#define GTE_CV( op ) ( ( op >> 13 ) & 3 )
+#define GTE_CD( op ) ( ( op >> 11 ) & 3 ) /* not used */
+#define GTE_LM( op ) ( ( op >> 10 ) & 1 )
+#define GTE_CT( op ) ( ( op >> 6 ) & 15 ) /* not used */
+#define GTE_FUNCT( op ) ( op & 63 )
+
+#define OP_SPECIAL ( 0 )
+#define OP_REGIMM ( 1 )
+#define OP_J ( 2 )
+#define OP_JAL ( 3 )
+#define OP_BEQ ( 4 )
+#define OP_BNE ( 5 )
+#define OP_BLEZ ( 6 )
+#define OP_BGTZ ( 7 )
+#define OP_ADDI ( 8 )
+#define OP_ADDIU ( 9 )
+#define OP_SLTI ( 10 )
+#define OP_SLTIU ( 11 )
+#define OP_ANDI ( 12 )
+#define OP_ORI ( 13 )
+#define OP_XORI ( 14 )
+#define OP_LUI ( 15 )
+#define OP_COP0 ( 16 )
+#define OP_COP1 ( 17 )
+#define OP_COP2 ( 18 )
+#define OP_LB ( 32 )
+#define OP_LH ( 33 )
+#define OP_LWL ( 34 )
+#define OP_LW ( 35 )
+#define OP_LBU ( 36 )
+#define OP_LHU ( 37 )
+#define OP_LWR ( 38 )
+#define OP_SB ( 40 )
+#define OP_SH ( 41 )
+#define OP_SWL ( 42 )
+#define OP_SW ( 43 )
+#define OP_SWR ( 46 )
+#define OP_LWC1 ( 49 )
+#define OP_LWC2 ( 50 )
+#define OP_SWC1 ( 57 )
+#define OP_SWC2 ( 58 )
+
+/* OP_SPECIAL */
+#define FUNCT_SLL ( 0 )
+#define FUNCT_SRL ( 2 )
+#define FUNCT_SRA ( 3 )
+#define FUNCT_SLLV ( 4 )
+#define FUNCT_SRLV ( 6 )
+#define FUNCT_SRAV ( 7 )
+#define FUNCT_JR ( 8 )
+#define FUNCT_JALR ( 9 )	 
+#define FUNCT_HLECALL ( 11 )
+#define FUNCT_SYSCALL ( 12 )
+#define FUNCT_BREAK ( 13 )
+#define FUNCT_MFHI ( 16 )
+#define FUNCT_MTHI ( 17 )
+#define FUNCT_MFLO ( 18 )
+#define FUNCT_MTLO ( 19 )
+#define FUNCT_MULT ( 24 )
+#define FUNCT_MULTU ( 25 )
+#define FUNCT_DIV ( 26 )
+#define FUNCT_DIVU ( 27 )
+#define FUNCT_ADD ( 32 )
+#define FUNCT_ADDU ( 33 )
+#define FUNCT_SUB ( 34 )
+#define FUNCT_SUBU ( 35 )
+#define FUNCT_AND ( 36 )
+#define FUNCT_OR ( 37 )
+#define FUNCT_XOR ( 38 )
+#define FUNCT_NOR ( 39 )
+#define FUNCT_SLT ( 42 )
+#define FUNCT_SLTU ( 43 )
+
+/* OP_REGIMM */
+#define RT_BLTZ ( 0 )
+#define RT_BGEZ ( 1 )
+#define RT_BLTZAL ( 16 )
+#define RT_BGEZAL ( 17 )
+
+/* OP_COP0/OP_COP1/OP_COP2 */
+#define RS_MFC ( 0 )
+#define RS_CFC ( 2 )
+#define RS_MTC ( 4 )
+#define RS_CTC ( 6 )
+#define RS_BC ( 8 )
+
+/* RS_BC */
+#define RT_BCF ( 0 )
+#define RT_BCT ( 1 )
+
+/* OP_COP0 */
+#define CF_RFE ( 16 )
+
+#ifdef MAME_DEBUG
+unsigned DasmMIPS(char *buff, unsigned _pc);
+#endif
+
+#if (HAS_PSXCPU)
+void psxcpu_get_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info);
+#endif
+
+mips_cpu_context *mips_alloc(void);
+void mips_free (mips_cpu_context *cpu);
+
+void mips_init(mips_cpu_context *cpu);
+void mips_exit(mips_cpu_context *cpu);
+void mips_reset(mips_cpu_context *cpu, void *param );
+int mips_execute(mips_cpu_context *cpu, int cycles );
+void mips_set_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info);
+void mips_get_info(mips_cpu_context *cpu, UINT32 state, union cpuinfo *info);
+int mips_execute( mips_cpu_context *cpu, int cycles );
+int mips_get_icount(mips_cpu_context *cpu);
+void mips_set_icount(mips_cpu_context *cpu, int count);
+
+uint32 mips_get_cause(mips_cpu_context *cpu);
+uint32 mips_get_status(mips_cpu_context *cpu);
+void mips_set_status(mips_cpu_context *cpu, uint32 status);
+uint32 mips_get_ePC(mips_cpu_context *cpu);
+
+
+void psx_hw_init(mips_cpu_context *cpu);
+void psx_hw_slice(mips_cpu_context *cpu);
+void psx_hw_frame(mips_cpu_context *cpu);
+void ps2_hw_slice(mips_cpu_context *cpu);
+void ps2_hw_frame(mips_cpu_context *cpu);
+
+void mips_shorten_frame(mips_cpu_context *cpu);
+uint32 psf2_load_file(mips_cpu_context *cpu, char *file, uint8 *buf, uint32 buflen);
+uint32 psf2_load_elf(mips_cpu_context *cpu, uint8 *start, uint32 len);
+void psx_hw_runcounters(mips_cpu_context *cpu);
+
+
+void psx_bios_hle(mips_cpu_context *cpu, uint32 pc);
+void psx_iop_call(mips_cpu_context *cpu, uint32 pc, uint32 callnum);
+uint8 program_read_byte_32le(mips_cpu_context *cpu, offs_t address);
+uint16 program_read_word_32le(mips_cpu_context *cpu, offs_t address);
+uint32 program_read_dword_32le(mips_cpu_context *cpu, offs_t address);
+void program_write_byte_32le(mips_cpu_context *cpu, offs_t address, uint8 data);
+void program_write_word_32le(mips_cpu_context *cpu, offs_t address, uint16 data);
+void program_write_dword_32le(mips_cpu_context *cpu, offs_t address, uint32 data);
+
+// SPU1
+void setlength(struct spu_state_s *spu, s32 stop, s32 fade);
+
+// SPU2
+void SPU2write(mips_cpu_context *cpu, unsigned long reg, unsigned short val);
+unsigned short SPU2read(mips_cpu_context *cpu, unsigned long reg);
+void SPU2readDMA4Mem(mips_cpu_context *cpu, uint32 usPSXMem,int iSize);
+void SPU2writeDMA4Mem(mips_cpu_context *cpu, uint32 usPSXMem,int iSize);
+void SPU2readDMA7Mem(mips_cpu_context *cpu, uint32 usPSXMem,int iSize);
+void SPU2writeDMA7Mem(mips_cpu_context *cpu, uint32 usPSXMem,int iSize);
+void SPU2interruptDMA4(mips_cpu_context *cpu);
+void SPU2interruptDMA7(mips_cpu_context *cpu);
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_psf/psx_hw.c Added

@@ -0,0 +1,3393 @@
+/*
+	Audio Overload SDK - PSX and IOP hardware emulation
+
+	Copyright (c) 2007 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+/*
+ psx_hw.c - Minimal PSX/IOP hardware glue/emulation/whatever
+
+ supported: main RAM (2 MB, mirrored to fill an 8 MB space like on real HW)
+ DMA channel 4 (SPURAM) in both directions (including completion IRQ)
+	 VBL IRQ
+	 Root counters 2 and 3 including completion events and IRQs
+	 Some BIOS services including exception handling (via HLE)
+	 HLE emulation of IOP operating system, including multithreading
+	 SPU(2), SPU(2)RAM (via PEOpS)
+
+
+
+ Special notes:
+ PSF1
+ 	- Chocobo's Dungeon 2 contains an illegal code sequence (patched)
+
+ PSF2
+	- Shadow Hearts assumes that the wave buffer alloc will go to 0x80060000 and the sequence buffer to 0x80170000.
+	 Our memory management doesn't work out that way, so we have to (wait for it) cheese it.
+*/
+
+#include <stdio.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "psx.h"
+#include "peops/spu.h"
+#include "peops/regs.h"
+	
+#define DEBUG_HLE_BIOS	(0)		// debug PS1 HLE BIOS
+#define DEBUG_HLE_IOP	(0)		// debug PS2 IOP OS calls
+#define DEBUG_UNK_RW	(0)		// debug unknown reads/writes
+#define DEBUG_THREADING (0)		// debug PS2 IOP threading
+
+extern int psxcpu_verbose;
+
+uint32 psf2_get_loadaddr(void);
+void psf2_set_loadaddr(uint32 new);
+static void call_irq_routine(mips_cpu_context *cpu, uint32 routine, uint32 parameter);
+
+// thread states
+enum
+{
+	TS_RUNNING = 0,		// now running
+	TS_READY,		// ready to run
+	TS_WAITEVFLAG,		// waiting on an event flag
+	TS_WAITSEMA,		// waiting on a semaphore
+	TS_WAITDELAY,		// waiting on a time delay
+	TS_SLEEPING,		// sleeping
+	TS_CREATED,		// newly created, hasn't run yet
+
+	TS_MAXSTATE
+};
+
+#if DEBUG_THREADING
+static char *_cpu->threadstateNames[TS_MAXSTATE] = { "RUNNING", "READY", "WAITEVFLAG", "WAITSEMA", "WAITDELAY", "SLEEPING", "CREATED" };
+#endif
+
+#if DEBUG_HLE_IOP
+static char *seek_types[3] = { "SEEK_SET", "SEEK_CUR", "SEEK_END" };
+#endif
+
+#define CLOCK_DIV	(8)	// 33 MHz / this = what we run the R3000 at to keep the CPU usage not insane
+
+// counter modes
+#define RC_EN		(0x0001)	// halt
+#define RC_RESET	(0x0008)	// automatically wrap
+#define RC_IQ1		(0x0010)	// IRQ when target reached
+#define RC_IQ2		(0x0040)	// IRQ when target reached (pSX treats same as IQ1?)
+#define RC_CLC		(0x0100)	// counter uses direct system clock
+#define RC_DIV8		(0x0200)	// (counter 2 only) system clock/8
+
+// Sony event states
+#define EvStUNUSED	0x0000
+#define EvStWAIT	0x1000
+#define EvStACTIVE	0x2000
+#define EvStALREADY 	0x4000
+
+// Sony event modes
+#define EvMdINTR	0x1000
+#define EvMdNOINTR	0x2000
+
+// take a snapshot of the CPU state for a thread
+static void FreezeThread(mips_cpu_context *cpu, int32 iThread, int flag)
+{
+	int i;
+	union cpuinfo mipsinfo;
+
+	#if DEBUG_THREADING
+//	printf("IOP: FreezeThread(%d)\n", iThread);
+	#endif
+
+	for (i = 0; i < 32; i++)
+	{
+		mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+		cpu->threads[iThread].save_regs[i] = mipsinfo.i;
+	}
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	cpu->threads[iThread].save_regs[32] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	cpu->threads[iThread].save_regs[33] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	cpu->threads[iThread].save_regs[35] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+	cpu->threads[iThread].save_regs[36] = mipsinfo.i;
+
+
+	// if a thread is freezing itself due to a IOP syscall, we must save the RA as the PC
+	// to come back to or else the syscall will recurse	
+	if (flag)
+	{
+		mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+	}
+	else
+	{
+		mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	}
+	cpu->threads[iThread].save_regs[34] = mipsinfo.i;
+
+	#if DEBUG_THREADING
+	{
+		char buffer[256];
+
+		DasmMIPS(buffer, mipsinfo.i, &psx_ram[(mipsinfo.i & 0x7fffffff)/4]);
+
+		printf("IOP: FreezeThread(%d) => %08x [%s]\n", iThread, cpu->threads[iThread].save_regs[34], buffer);
+	}
+	#endif
+
+	// if thread was running, now it's ready
+	if (cpu->threads[iThread].iState == TS_RUNNING)
+	{
+		cpu->threads[iThread].iState = TS_READY;
+	}
+}
+
+// restore the CPU state from a thread's snapshot
+static void ThawThread(mips_cpu_context *cpu, int32 iThread)
+{
+	int i;
+	union cpuinfo mipsinfo;
+
+	// the first time a thread is put on the CPU,
+	// some special setup is required
+	if (cpu->threads[iThread].iState == TS_CREATED)
+	{
+		// PC = starting routine
+		cpu->threads[iThread].save_regs[34] = cpu->threads[iThread].routine-4;	// compensate for weird delay slot effects
+		// SP = thread's stack area
+		cpu->threads[iThread].save_regs[29] = (cpu->threads[iThread].stackloc + cpu->threads[iThread].stacksize) - 16;
+		cpu->threads[iThread].save_regs[29] |= 0x80000000;
+
+		cpu->threads[iThread].save_regs[35] = cpu->threads[iThread].save_regs[36] = 0;
+
+		#if DEBUG_THREADING
+//		printf("IOP: Initial setup for thread %d => PC %x SP %x\n", iThread, cpu->threads[iThread].save_regs[34]+4, cpu->threads[iThread].save_regs[29]);
+		#endif
+	}
+											 
+	#if DEBUG_THREADING
+	{
+		char buffer[256];
+
+		mips_get_info(CPUINFO_INT_PC, &mipsinfo);
+		DasmMIPS(buffer, mipsinfo.i, &psx_ram[(mipsinfo.i & 0x7fffffff)/4]);
+
+		printf("IOP: ThawThread(%d) => %08x [%s] (wake %d)\n", iThread, cpu->threads[iThread].save_regs[34], buffer, wakecount);
+	}
+	#endif
+
+	for (i = 0; i < 32; i++)
+	{
+		mipsinfo.i = cpu->threads[iThread].save_regs[i];
+		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+	}
+
+	mipsinfo.i = cpu->threads[iThread].save_regs[32];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	mipsinfo.i = cpu->threads[iThread].save_regs[33];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	mipsinfo.i = cpu->threads[iThread].save_regs[34];
+	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	mipsinfo.i = cpu->threads[iThread].save_regs[35];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	mipsinfo.i = cpu->threads[iThread].save_regs[36];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+
+	cpu->threads[iThread].iState = TS_RUNNING;
+}
+
+// find a new thread to run
+static void ps2_reschedule(mips_cpu_context *cpu)
+{
+	int i, starti, iNextThread;
+
+	iNextThread = -1;
+
+	// see if any thread other than the current one is ready to run
+	i = cpu->iCurThread+1;
+	if (i >= cpu->iNumThreads)
+	{
+		i = 0;
+	}
+
+	starti = i;
+
+	// starting with the next thread after this one,
+	// see who wants to run
+	while (i < cpu->iNumThreads)
+	{
+		if (i != cpu->iCurThread)
+		{
+			if (cpu->threads[i].iState == TS_READY)
+			{
+			 	iNextThread = i;
+				break;
+			}
+		}
+
+		i++;
+	}
+
+	// if we started above thread 0 and didn't pick one,
+	// go around and try from zero
+	if ((starti > 0) && (iNextThread == -1))
+	{
+		for (i = 0; i < cpu->iNumThreads; i++)
+		{
+			if (i != cpu->iCurThread)
+			{
+				if (cpu->threads[i].iState == TS_READY)
+				{
+				 	iNextThread = i;
+					break;
+				}
+			}
+		}
+	}
+
+	if (iNextThread != -1)
+	{
+		#if DEBUG_THREADING
+		for (i = 0; i < cpu->iNumThreads; i++)
+		{
+			printf("Thread %02d: %s\n", i, _cpu->threadstateNames[cpu->threads[i].iState]);
+		}
+		#endif
+
+		if (cpu->iCurThread != -1)
+		{
+			FreezeThread(cpu, cpu->iCurThread, 0);
+		}
+		ThawThread(cpu, iNextThread);
+		cpu->iCurThread = iNextThread;
+		cpu->threads[cpu->iCurThread].iState = TS_RUNNING;
+	}
+	else
+	{
+		// no thread to switch to, is the current one still running?
+		if (cpu->iCurThread != -1)
+		{
+			if (cpu->threads[cpu->iCurThread].iState != TS_RUNNING)
+			{
+				#if DEBUG_THREADING
+				printf("IOP: no cpu->threads to run\n");
+
+				for (i = 0; i < cpu->iNumThreads; i++)
+				{
+					printf("Thread %02d: %s\n", i, _cpu->threadstateNames[cpu->threads[i].iState]);
+				}
+				#endif
+
+				mips_shorten_frame(cpu);	// kill the CPU
+				cpu->iCurThread = -1;	// no cpu->threads are active
+			}
+		}
+		else
+		{
+			mips_shorten_frame(cpu);	// kill the CPU
+			cpu->iCurThread = -1;	// no cpu->threads are active
+		}
+	}
+}
+
+static void psx_irq_update(mips_cpu_context *cpu)
+{
+	union cpuinfo mipsinfo;
+
+	if ((cpu->irq_data & cpu->irq_mask) != 0)
+	{	// assert the line
+		cpu->WAI = 0;
+		mipsinfo.i = ASSERT_LINE;
+		mips_set_info( cpu, CPUINFO_INT_INPUT_STATE + MIPS_IRQ0, &mipsinfo );
+	}
+	else
+	{
+		// clear the line
+		mipsinfo.i = CLEAR_LINE;
+		mips_set_info( cpu, CPUINFO_INT_INPUT_STATE + MIPS_IRQ0, &mipsinfo );
+	}
+}
+
+void psx_irq_set(mips_cpu_context *cpu, uint32 irq)
+{
+	cpu->irq_data |= irq;
+
+	psx_irq_update(cpu);
+}
+
+static uint32 gpu_stat = 0;
+
+uint32 psx_hw_read(mips_cpu_context *cpu, offs_t offset, uint32 mem_mask)
+{
+	if (offset >= 0x00000000 && offset <= 0x007fffff)
+	{
+		offset &= 0x1fffff;
+		return LE32(cpu->psx_ram[offset>>2]);
+	}
+
+	if (offset >= 0x80000000 && offset <= 0x807fffff)
+	{
+		offset &= 0x1fffff;
+		return LE32(cpu->psx_ram[offset>>2]);
+	}
+
+	if (offset == 0xbfc00180 || offset == 0xbfc00184)	// exception vector
+	{
+		return FUNCT_HLECALL;
+	}	
+
+	if (offset == 0x1f801014)
+	{
+		return cpu->spu_delay;
+	}
+
+	if (offset == 0xbf801014)
+	{
+		return cpu->spu_delay;
+	}
+
+	if (offset == 0x1f801814)
+	{
+		gpu_stat ^= 0xffffffff;
+		return gpu_stat;
+	}
+
+	if (offset >= 0x1f801c00 && offset <= 0x1f801dff)
+	{
+		if ((mem_mask == 0xffff0000) || (mem_mask == 0xffffff00))
+		{
+			return SPUreadRegister(cpu, offset) & ~mem_mask;
+		}
+		else if (mem_mask == 0x0000ffff)
+		{
+			return SPUreadRegister(cpu, offset)<<16;
+		}
+		else printf("SPU: read unknown mask %08x\n", mem_mask);
+	}
+
+	if (offset >= 0xbf900000 && offset <= 0xbf9007ff)
+	{
+		if ((mem_mask == 0xffff0000) || (mem_mask == 0xffffff00))
+		{
+			return SPU2read(cpu, offset) & ~mem_mask;
+		}
+		else if (mem_mask == 0x0000ffff)
+		{
+			return SPU2read(cpu, offset)<<16;
+		}
+		else if (mem_mask == 0)
+		{
+			return SPU2read(cpu, offset) | SPU2read(cpu, offset+2)<<16;
+		}
+		else printf("SPU2: read unknown mask %08x\n", mem_mask);
+	}
+
+	if (offset >= 0x1f801100 && offset <= 0x1f801128)
+	{
+		int cnt = (offset>>4) & 0xf;
+		
+		switch (offset & 0xf)
+		{
+			case 0:
+//				printf("RC: read counter %d count = %x\n", cnt, cpu->root_cnts[cnt].count);
+				return cpu->root_cnts[cnt].count;
+				break;
+			case 4:
+//				printf("RC: read counter %d mode\n", cnt);
+				return cpu->root_cnts[cnt].mode;
+				break;
+			case 8:
+//				printf("RC: read counter %d target\n", cnt);
+				return cpu->root_cnts[cnt].target;
+				break;
+		}
+
+		return 0;
+	}
+
+	if (offset == 0x1f8010f4)
+	{
+		return cpu->dma_icr;
+	}
+	else if (offset == 0x1f801070)
+	{
+//		printf("Read cpu->irq_data %x (mask %08x)\n", cpu->irq_data, mem_mask);
+		return cpu->irq_data;
+	}
+	else if (offset == 0x1f801074)
+	{
+		return cpu->irq_mask;
+	}
+
+/*	if (offset == 0xbf801508)
+	{
+		return cpu->dma7_bcr;
+	}*/
+
+	if (offset == 0xbf920344)
+	{
+		return 0x80808080;
+	}
+
+	#if DEBUG_UNK_RW
+	{
+		union cpuinfo mipsinfo;
+
+		mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+		printf("Unknown read: %08x, mask %08x (PC=%x)\n", offset&~3, mem_mask, mipsinfo.i);
+	}
+	#endif
+	return 0;
+}
+
+static void psx_dma4(mips_cpu_context *cpu, uint32 madr, uint32 bcr, uint32 chcr)
+{
+	if (chcr == 0x01000201)	// cpu to SPU
+	{
+//		printf("DMA4: RAM %08x to SPU\n", madr);
+		bcr = (bcr>>16) * (bcr & 0xffff) * 2;
+		SPUwriteDMAMem(cpu, madr&0x1fffff, bcr);
+	}
+	else
+	{
+//		printf("DMA4: SPU to RAM %08x\n", madr);
+		bcr = (bcr>>16) * (bcr & 0xffff) * 2;
+		SPUreadDMAMem(cpu, madr&0x1fffff, bcr);
+	}
+}
+
+static void ps2_dma4(mips_cpu_context *cpu, uint32 madr, uint32 bcr, uint32 chcr)
+{
+	if (chcr == 0x01000201)	// cpu to SPU2
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA4: RAM %08x to SPU2\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 4;
+		SPU2writeDMA4Mem(cpu, madr&0x1fffff, bcr);
+	}
+	else
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA4: SPU2 to RAM %08x\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 4;
+		SPU2readDMA4Mem(cpu, madr&0x1fffff, bcr);
+	}
+
+	cpu->dma4_delay = 80;
+}
+
+static void ps2_dma7(mips_cpu_context *cpu, uint32 madr, uint32 bcr, uint32 chcr)
+{
+	if ((chcr == 0x01000201) || (chcr == 0x00100010) || (chcr == 0x000f0010) || (chcr == 0x00010010))	// cpu to SPU2
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA7: RAM %08x to SPU2\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 4;
+		SPU2writeDMA7Mem(cpu, madr&0x1fffff, bcr);
+	}
+	else
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA7: SPU2 to RAM %08x\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 4;
+//		SPU2readDMA7Mem(madr&0x1fffff, bcr);
+	}
+
+	cpu->dma7_delay = 80;
+}
+
+void psx_hw_write(mips_cpu_context *cpu, offs_t offset, uint32 data, uint32 mem_mask)
+{
+	union cpuinfo mipsinfo;
+
+	if (offset >= 0x00000000 && offset <= 0x007fffff)
+	{
+		offset &= 0x1fffff;
+//		if (offset < 0x10000) printf("Write %x to kernel @ %x\n", data, offset);
+
+		mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+
+		cpu->psx_ram[offset>>2] &= LE32(mem_mask);
+		cpu->psx_ram[offset>>2] |= LE32(data);
+		return;
+	}
+
+	if (offset >= 0x80000000 && offset <= 0x807fffff)
+	{
+		offset &= 0x1fffff;
+//		if (offset < 0x10000) printf("Write %x to kernel @ %x\n", data, offset);
+		mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+		cpu->psx_ram[offset>>2] &= LE32(mem_mask);
+		cpu->psx_ram[offset>>2] |= LE32(data);
+		return;
+	}
+
+	if (offset == 0x1f801014 || offset == 0xbf801014)
+	{
+		cpu->spu_delay &= mem_mask;
+		cpu->spu_delay |= data;
+		return;
+	}
+
+	if (offset >= 0x1f801c00 && offset <= 0x1f801dff)
+	{
+	 //		printf("SPU2 wrote %x to SPU1 address %x!\n", data, offset);
+		if (mem_mask == 0xffff0000)
+		{
+			SPUwriteRegister(cpu, offset, data);
+			return;
+		}
+		else if (mem_mask == 0x0000ffff)
+		{
+			SPUwriteRegister(cpu, offset, data>>16);
+			return;
+		}
+		else printf("SPU: write unknown mask %08x\n", mem_mask);
+	}
+
+	if (offset >= 0xbf900000 && offset <= 0xbf9007ff)
+	{
+		if (mem_mask == 0xffff0000)
+		{
+			SPU2write(cpu, offset, data);
+			return;
+		}
+		else if (mem_mask == 0x0000ffff)
+		{
+			SPU2write(cpu, offset, data>>16);
+			return;
+		}
+		else if (mem_mask == 0)
+		{
+			SPU2write(cpu, offset, data & 0xffff);
+			SPU2write(cpu, offset+2, data>>16);
+			return;
+		}
+		else printf("SPU2: write unknown mask %08x\n", mem_mask);
+	}
+
+	if (offset >= 0x1f801100 && offset <= 0x1f801128)
+	{
+		int cnt = (offset>>4) & 0xf;
+		
+		switch (offset & 0xf)
+		{
+			case 0:
+				cpu->root_cnts[cnt].count = data;
+//				printf("RC: counter %d count = %x\n", cnt, data);
+				break;
+			case 4:
+				cpu->root_cnts[cnt].mode = data;
+//				printf("RC: counter %d mode = %x\n", cnt, data);
+				break;
+			case 8:
+				cpu->root_cnts[cnt].target = data;
+//				printf("RC: counter %d target = %x\n", cnt, data);
+				break;
+		}
+
+		return;
+	}
+
+	// DMA4
+	if (offset == 0x1f8010c0)
+	{
+		cpu->dma4_madr = data;
+		return;
+	}
+	else if (offset == 0x1f8010c4)
+	{
+		cpu->dma4_bcr = data;
+		return;
+	}
+	else if (offset == 0x1f8010c8)
+	{
+		cpu->dma4_chcr = data;
+		psx_dma4(cpu, cpu->dma4_madr, cpu->dma4_bcr, cpu->dma4_chcr);
+
+		if (cpu->dma_icr & (1 << (16+4)))
+		{
+			cpu->dma_timer = 3;
+		}
+		return;
+	}
+	else if (offset == 0x1f8010f4)
+	{
+		cpu->dma_icr = ( cpu->dma_icr & mem_mask ) |
+			 ( ~mem_mask & 0x80000000 & cpu->dma_icr) |
+			 ( ~data & ~mem_mask & 0x7f000000 & cpu->dma_icr) |
+			 ( data & ~mem_mask & 0x00ffffff);
+
+		if ((cpu->dma_icr & 0x7f000000) != 0)
+		{
+			cpu->dma_icr &= ~0x80000000;
+		}
+
+		return;
+	}
+	else if (offset == 0x1f801070)
+	{
+		cpu->irq_data = (cpu->irq_data & mem_mask) | (cpu->irq_data & cpu->irq_mask & data);
+		psx_irq_update(cpu);
+		return;
+	}
+	else if (offset == 0x1f801074)
+	{
+		cpu->irq_mask &= mem_mask;
+		cpu->irq_mask |= data;
+		psx_irq_update(cpu);
+		return;
+	}
+
+	// PS2 DMA4
+	if (offset == 0xbf8010c0)
+	{
+		cpu->dma4_madr = data;
+		return;
+	}
+	else if (offset == 0xbf8010c8)
+	{
+		cpu->dma4_chcr = data;
+		ps2_dma4(cpu, cpu->dma4_madr, cpu->dma4_bcr, cpu->dma4_chcr);
+
+		if (cpu->dma_icr & (1 << (16+4)))
+		{
+			cpu->dma_timer = 3;
+		}
+		return;
+	}
+							 
+	if (offset == 0xbf8010c4 || offset == 0xbf8010c6)
+	{
+		cpu->dma4_bcr &= mem_mask;
+		cpu->dma4_bcr |= data;
+		return;
+	}
+
+	// PS2 DMA7
+	if (offset == 0xbf801500)
+	{
+		cpu->dma7_madr = data;
+		return;
+	}
+	else if (offset == 0xbf801504)
+	{
+		cpu->dma7_chcr = data;
+		ps2_dma7(cpu, cpu->dma7_madr, cpu->dma7_bcr, cpu->dma7_chcr);
+		return;
+	}
+							 
+	if (offset == 0xbf801508 || offset == 0xbf80150a)
+	{
+		cpu->dma7_bcr &= mem_mask;
+		cpu->dma7_bcr |= data;
+		return;
+	}
+
+	#if DEBUG_UNK_RW
+	{
+		union cpuinfo mipsinfo;
+
+		mips_get_info(CPUINFO_INT_PC, &mipsinfo);
+		printf("Unknown write: %08x to %08x, mask %08x (PC=%x)\n", data, offset&~3, mem_mask, mipsinfo.i);
+	}
+	#endif
+}
+
+// called per sample, 1/44100th of a second (768 clock cycles)
+void psx_hw_slice(mips_cpu_context *cpu)
+{
+	psx_hw_runcounters(cpu);
+
+	if (!cpu->WAI)
+		mips_execute(cpu, 768/CLOCK_DIV);
+
+	if (cpu->dma_timer)
+	{
+		cpu->dma_timer--;
+		if (cpu->dma_timer == 0)
+		{
+			cpu->dma_icr |= (1 << (24+4));
+			psx_irq_set(cpu, 0x0008);
+		}
+	}
+}
+
+void ps2_hw_slice(mips_cpu_context *cpu)
+{
+	int i = 0;
+
+	cpu->timerexp = 0;
+	psx_hw_runcounters(cpu);
+
+	if (cpu->iCurThread != -1)
+	{
+		mips_execute(cpu, 836/CLOCK_DIV);
+	}
+	else	// no thread, don't run CPU, just update counters
+	{
+		if (cpu->timerexp)
+		{
+			ps2_reschedule(cpu);
+
+			if (cpu->iCurThread != -1)
+			{
+				mips_execute(cpu, (836/CLOCK_DIV)-i);
+				i = (836/CLOCK_DIV);
+			}
+		}
+	}
+}
+
+void psx_hw_frame(mips_cpu_context *cpu)
+{
+	if (cpu->psf_refresh == 50)
+	{
+		cpu->fcnt++;;
+
+		if (cpu->fcnt < 6)
+		{
+			psx_irq_set(cpu, 1);
+		}
+		else
+		{
+			cpu->fcnt = 0;
+		}
+	}
+	else	// NTSC
+	{
+		psx_irq_set(cpu, 1);
+	}
+}
+
+void ps2_hw_frame(mips_cpu_context *cpu)
+{
+	ps2_reschedule(cpu);
+}
+
+// BIOS HLE
+
+// heap block struct offsets
+enum
+{
+	BLK_STAT = 0,
+	BLK_SIZE = 4,
+	BLK_FD = 8,
+	BLK_BK = 12
+};
+
+static void call_irq_routine(mips_cpu_context *cpu, uint32 routine, uint32 parameter)
+{
+	int j, oldICount;
+	union cpuinfo mipsinfo;
+
+	if (!cpu->irq_mutex)
+	{
+		cpu->irq_mutex = 1;
+	}
+	else
+	{
+		printf("IOP: ERROR! IRQ reentry!\n");
+		return;
+	}
+
+	// save regs for IRQ
+	for (j = 0; j < 32; j++)
+	{
+		mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + j, &mipsinfo);
+		cpu->irq_regs[j] = mipsinfo.i;
+	}
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	cpu->irq_regs[32] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	cpu->irq_regs[33] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	cpu->irq_regs[34] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	cpu->irq_regs[35] = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+	cpu->irq_regs[36] = mipsinfo.i;
+
+	// PC = timer handler routine
+	mipsinfo.i = routine; 
+	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+
+	// parameter in a0
+	mipsinfo.i = parameter;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+
+	// RA = a trap address we can set
+	mipsinfo.i = 0x80001000;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+
+	// make sure we're set
+	cpu->psx_ram[0x1000/4] = LE32(FUNCT_HLECALL);
+
+	cpu->softcall_target = 0;
+	oldICount = mips_get_icount(cpu);
+	while (!cpu->softcall_target)
+	{
+		mips_execute(cpu, 10);
+	}
+	mips_set_icount(cpu,oldICount);
+
+	// restore IRQ regs
+	for (j = 0; j < 32; j++)
+	{
+		mipsinfo.i = cpu->irq_regs[j];
+		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + j, &mipsinfo);
+	}
+
+	mipsinfo.i = cpu->irq_regs[32];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs[33];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs[34];
+	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs[35];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs[36];
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+
+	cpu->irq_mutex = 0;
+}
+
+void psx_bios_exception(mips_cpu_context *cpu, uint32 pc)
+{
+	uint32 a0, status;
+	union cpuinfo mipsinfo;
+	int i, oldICount;
+
+//	printf("bios_exception: cause %x\n", mips_get_cause() & 0x3c);
+
+	// get a0
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+	a0 = mipsinfo.i;
+
+	switch (mips_get_cause(cpu) & 0x3c)
+	{
+		case 0:	// IRQ
+//			printf("IRQ: %x, mask %x\n", cpu->irq_data, cpu->irq_mask);
+			// save all regs
+			for (i = 0; i < 32; i++)
+			{
+				mips_get_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+				cpu->irq_regs[i] = mipsinfo.i;
+			}
+			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+			cpu->irq_regs[32] = mipsinfo.i;
+			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+			cpu->irq_regs[33] = mipsinfo.i;
+
+			// check BIOS-driven interrupts
+			if (cpu->irq_data & 1)	// VSync
+			{
+				if (cpu->CounterEvent[3][1].status == LE32(EvStACTIVE))
+				{
+					// run the handler
+					mipsinfo.i = LE32(cpu->CounterEvent[3][1].fhandler);
+//	 				printf("Cause = %x, ePC = %x\n", mips_get_cause(), mips_get_ePC());
+//	 				printf("VBL running handler @ %x\n", mipsinfo.i);
+					mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+					mipsinfo.i = 0x80001000;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				
+					// make sure we're set
+					cpu->psx_ram[0x1000/4] = LE32(FUNCT_HLECALL);
+		
+					cpu->softcall_target = 0;
+					oldICount = mips_get_icount(cpu);
+					while (!cpu->softcall_target)
+					{
+						mips_execute(cpu, 10);
+					}
+					mips_set_icount(cpu, oldICount);
+
+//	 				printf("Exiting softcall handler\n");
+
+					cpu->irq_data &= ~1;		// clear the VBL IRQ if we handled it
+				}
+			}
+			else if (cpu->irq_data & 0x70)	// root counters
+			{
+				for (i = 0; i < 3; i++)
+				{
+					if (cpu->irq_data & (1 << (i+4)))
+					{
+						if (cpu->CounterEvent[i][1].status == LE32(EvStACTIVE))
+						{
+							// run the handler
+							mipsinfo.i = LE32(cpu->CounterEvent[i][1].fhandler);
+//							printf("Cause = %x, ePC = %x\n", mips_get_cause(), mips_get_ePC());
+//							printf("Counter %d running handler @ %x\n", i, mipsinfo.i);
+							mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+							mipsinfo.i = 0x80001000;
+							mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+							
+							// make sure we're set
+							cpu->psx_ram[0x1000/4] = LE32(FUNCT_HLECALL);
+					
+							cpu->softcall_target = 0;
+							oldICount = mips_get_icount(cpu);
+							while (!cpu->softcall_target)
+							{
+								mips_execute(cpu, 10);
+							}
+							mips_set_icount(cpu,oldICount);
+
+//							printf("Exiting softcall handler\n");
+							cpu->irq_data &= ~(1 << (i+4));
+						}
+						else
+						{
+//							printf("CEvt %d not active\n", i);
+						}
+					}
+				}
+			}
+		 	
+			if (cpu->entry_int)
+			{
+				psx_hw_write(cpu, 0x1f801070, 0xffffffff, 0);
+
+				a0 = cpu->entry_int;
+
+//				printf("taking cpu->entry_int\n");
+
+				// RA (and PC)
+				mipsinfo.i = LE32(cpu->psx_ram[((a0&0x1fffff)+0)/4]);
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+				// SP
+				mipsinfo.i = LE32(cpu->psx_ram[((a0&0x1fffff)+4)/4]);
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+				// FP
+				mipsinfo.i = LE32(cpu->psx_ram[((a0&0x1fffff)+8)/4]);
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+
+				// S0-S7 are next
+				for (i = 0; i < 8; i++)
+				{
+					mipsinfo.i = LE32(cpu->psx_ram[((a0&0x1fffff)+12+(i*4))/4]);
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R16 + i, &mipsinfo);
+				}
+
+				// GP
+				mipsinfo.i = LE32(cpu->psx_ram[((a0&0x1fffff)+44)/4]);
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R28, &mipsinfo);
+
+				// v0 = 1
+				mipsinfo.i = 1;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+			}
+			else
+			{
+				psx_hw_write(cpu, 0x1f801070, 0, 0xffff0000);
+
+				// note: the cpu->entry_int won't be bailing us out here, so do it ourselves
+				for (i = 0; i < 32; i++)
+				{
+					mipsinfo.i = cpu->irq_regs[i];
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+				}
+
+				mipsinfo.i = cpu->irq_regs[32];
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+				mipsinfo.i = cpu->irq_regs[33];
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+				mipsinfo.i = mips_get_ePC(cpu);
+				mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+
+				status = mips_get_status(cpu);
+				status = (status & 0xfffffff0) | ((status & 0x3c)>>2);
+				mips_set_status(cpu, status);
+			}
+			break;
+
+		case 0x20:	// syscall
+			// syscall always farks with the status, so get it now
+			status = mips_get_status(cpu);
+
+			switch (a0)
+			{
+				case 1: // EnterCritical
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: EnterCritical\n");
+					#endif
+					status &= ~0x0404;
+					break;
+
+				case 2:	// ExitCritical
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: ExitCritical\n");
+					#endif
+					status |= 0x0404;
+					break;
+
+				default:
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: Unknown syscall %x\n", a0);
+					#endif
+					break;
+			}
+
+			// PC = ePC + 4
+			mipsinfo.i = mips_get_ePC(cpu) + 4;
+			mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+
+			// and update the status accordingly
+			status = (status & 0xfffffff0) | ((status & 0x3c)>>2);
+			mips_set_status(cpu, status);
+			break;
+
+		default:
+			#if DEBUG_HLE_BIOS
+			printf("HLEBIOS: Unknown exception %x\n", mips_get_cause());
+			#endif
+			break;
+	}
+}
+
+static uint32 calc_ev(uint32 a0)
+{
+	uint32 ev;
+
+	ev = (a0 >> 24) & 0xf;
+	if (ev == 0xf) 
+	{
+		ev = 0x5;
+	}
+	ev *= 32;
+	ev += (a0 & 0x1f);
+
+	return ev;
+}
+
+static uint32 calc_spec(uint32 a1)
+{
+	uint32 spec = 0;
+	int i;
+
+	if (a1 == 0x301)
+	{
+		spec = 16;
+	}
+	else if (a1 == 0x302)
+	{
+		spec = 17;
+	}
+	else
+	{
+		for (i = 0; i < 16; i++)
+		{
+			if (a1 & (1<<i))
+			{
+				spec = i;
+				break;
+			}
+		}
+	}
+
+	return spec;
+}
+
+void psx_hw_init(mips_cpu_context *cpu)
+{
+	cpu->timerexp = 0;
+
+	memset(cpu->filestat, 0, sizeof(cpu->filestat));
+	memset(cpu->filedata, 0, sizeof(cpu->filedata));
+
+	cpu->dma4_cb = cpu->dma7_cb = 0;
+
+	cpu->sys_time = 0;
+
+	// clear registered libraries table
+	memset(cpu->reglibs, 0, sizeof(cpu->reglibs));
+	cpu->iNumLibs = 0;
+
+	memset(cpu->evflags, 0, sizeof(cpu->evflags));
+	cpu->iNumFlags = 0;
+
+	memset(cpu->threads, 0, sizeof(cpu->threads));
+	cpu->iNumThreads = 1;	// we always have at least one thread
+
+	memset(cpu->semaphores, 0, sizeof(cpu->semaphores));
+	cpu->iNumSema = 0;
+
+	// set the initial thread to "RUNNING"
+	cpu->threads[0].iState = TS_RUNNING;
+	cpu->iCurThread = 0;
+
+	memset(cpu->iop_timers, 0, sizeof(cpu->iop_timers));
+	cpu->iNumTimers = 0;
+
+	// set PS1 BIOS HLE breakpoints
+	cpu->psx_ram[0xa0/4] = LE32(FUNCT_HLECALL);
+	cpu->psx_ram[0xb0/4] = LE32(FUNCT_HLECALL);
+	cpu->psx_ram[0xc0/4] = LE32(FUNCT_HLECALL);
+
+	cpu->Event = (EvtCtrlBlk *)&cpu->psx_ram[0x1000/4];
+	cpu->CounterEvent = (cpu->Event + (32*2));
+
+	cpu->dma_icr = 0;
+	cpu->spu_delay = 0;
+	cpu->irq_data = 0;
+	cpu->irq_mask = 0;
+	cpu->softcall_target = 0;
+	gpu_stat = 0;
+	cpu->dma4_madr = cpu->dma4_bcr = cpu->dma4_chcr = 0;
+	cpu->heap_addr = 0;
+	cpu->entry_int = 0;
+
+	cpu->WAI = 0;
+
+	cpu->root_cnts[0].mode = RC_EN;
+	cpu->root_cnts[1].mode = RC_EN;
+	cpu->root_cnts[2].mode = RC_EN;
+	cpu->root_cnts[0].sysclock = 0;
+	cpu->root_cnts[1].sysclock = 0;
+	cpu->root_cnts[2].sysclock = 0;
+}
+
+void psx_bios_hle(mips_cpu_context *cpu, uint32 pc)
+{
+	uint32 subcall, status;
+	union cpuinfo mipsinfo;
+	uint32 a0, a1, a2, a3;
+	int i;
+
+	if ((pc == 0) || (pc == 0x80000000)) 	 	// IOP "null" state
+	{
+		#if DEBUG_HLE_IOP
+		printf("IOP 'null' state\n");
+		#endif
+//		ao_song_done = 1;
+		return;
+	}
+
+	if (pc == 0xbfc00180 || pc == 0xbfc00184)	// exception, not BIOS call
+	{
+		psx_bios_exception(cpu, pc);
+		return;
+	}
+
+	if (pc == 0x80001000)
+	{
+//		printf("hit softcall target\n");
+		cpu->softcall_target = 1;
+		return;
+	}
+
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R9, &mipsinfo);
+
+	subcall = mipsinfo.i & 0xff;
+
+	// most calls have a0/a1 as parameters, so prefetch them
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+	a0 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
+	a1 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R6, &mipsinfo);
+	a2 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R7, &mipsinfo);
+	a3 = mipsinfo.i;
+
+//	mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+//	printf("HLEBIOS: return is %08x\n", mipsinfo.i);
+	
+	switch (pc)
+	{
+		case 0xa0:	// a0 syscalls
+			switch (subcall)
+			{
+				case 0x13:	// setjmp
+					// RA
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					cpu->psx_ram[((a0&0x1fffff)+0)/4] = LE32(mipsinfo.i);
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: setjmp(%08x) => PC %08x\n", a0, mipsinfo.i);
+					#endif
+					// SP
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R29, &mipsinfo);
+					cpu->psx_ram[((a0&0x1fffff)+4)/4] = LE32(mipsinfo.i);
+					// FP
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R30, &mipsinfo);
+					cpu->psx_ram[((a0&0x1fffff)+8)/4] = LE32(mipsinfo.i);
+
+					// S0-S7 are next
+					for (i = 0; i < 8; i++)
+					{
+						mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R16 + i, &mipsinfo);
+						cpu->psx_ram[((a0&0x1fffff)+12+(i*4))/4] = LE32(mipsinfo.i);
+					}
+
+					// GP
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R28, &mipsinfo);
+					cpu->psx_ram[((a0&0x1fffff)+44)/4] = LE32(mipsinfo.i);
+
+					// v0 = 0
+					mipsinfo.i = 0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					break;
+
+				case 0x18:	// strncmp
+					{
+						uint8 *dst, *src;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: strncmp(%08x, %08x, %d)\n", a0, a1, a2);
+						#endif
+
+						dst = (uint8 *)cpu->psx_ram;
+						src = (uint8 *)cpu->psx_ram;
+						dst += (a0 & 0x1fffff);
+						src += (a1 & 0x1fffff);
+
+						// v0 = result
+						mipsinfo.i = strncmp((char *)dst, (char *)src, a2);
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x19:	// strcpy
+					{
+						uint8 *dst, *src;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: strcpy(%08x, %08x)\n", a0, a1);
+						#endif
+
+						dst = (uint8 *)cpu->psx_ram;
+						src = (uint8 *)cpu->psx_ram;
+						dst += (a0 & 0x1fffff);
+						src += (a1 & 0x1fffff);
+
+						while (*src)
+						{
+							*dst = *src;
+							dst++;
+							src++;
+						}
+
+						// v0 = a0
+						mipsinfo.i = a0;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x28:	// bzero
+					{
+						uint8 *dst;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: bzero(%08x, %08x)\n", a0, a1);
+						#endif
+
+						dst = (uint8 *)cpu->psx_ram;
+						dst += (a0 & 0x1fffff);
+						memset(dst, 0, a1);
+					}
+					break;
+
+				case 0x2a:	// memcpy
+					{
+						uint8 *dst, *src;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: memcpy(%08x, %08x, %08x)\n", a0, a1, a2);
+						#endif
+
+						dst = (uint8 *)cpu->psx_ram;
+						src = (uint8 *)cpu->psx_ram;
+						dst += (a0 & 0x1fffff);
+						src += (a1 & 0x1fffff);
+
+						while (a2)
+						{
+							*dst = *src;
+							dst++;
+							src++;
+							a2--;
+						}
+
+						// v0 = a0
+						mipsinfo.i = a0;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+				
+				case 0x2b:	// memset
+					{
+						uint8 *dst;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: memset(%08x, %08x, %08x)\n", a0, a1, a2);
+						#endif
+
+						dst = (uint8 *)cpu->psx_ram;
+						dst += (a0 & 0x1fffff);
+
+						while (a2)
+						{
+							*dst = a1;
+							dst++;
+							a2--;
+						}
+
+						// v0 = a0
+						mipsinfo.i = a0;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x2f:	// rand
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: rand\n");
+					#endif
+
+					// v0 = result
+					mipsinfo.i = 1 + (int)(32767.0*rand()/(RAND_MAX+1.0));
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					break;
+
+				case 0x30:	// srand
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: srand(%x)\n", a0);
+					#endif
+					srand(a0);
+					break;
+
+				case 0x33:	// malloc
+					{
+						uint32 chunk, fd;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: malloc(%x)\n", a0);
+						#endif
+
+						chunk = cpu->heap_addr;
+
+						// find a free block that's big enough
+						while ((a0 > LE32(cpu->psx_ram[(chunk+BLK_SIZE)/4])) ||
+						 (LE32(cpu->psx_ram[(chunk+BLK_STAT)/4]) == 1))
+						{
+							chunk = LE32(cpu->psx_ram[(chunk+BLK_FD)]);
+						}
+
+						// split free block
+						fd = chunk + 16 + a0;	// free block starts after block record and allocation size
+						cpu->psx_ram[(fd+BLK_STAT)/4] = cpu->psx_ram[(chunk+BLK_STAT)/4];
+						cpu->psx_ram[(fd+BLK_SIZE)/4] = LE32(LE32(cpu->psx_ram[(chunk+BLK_SIZE)/4]) - a0);
+						cpu->psx_ram[(fd+BLK_FD)/4] = cpu->psx_ram[(chunk+BLK_FD)/4]; 
+						cpu->psx_ram[(fd+BLK_BK)/4] = chunk;
+
+						cpu->psx_ram[(chunk+BLK_STAT)/4] = LE32(1);
+						cpu->psx_ram[(chunk+BLK_SIZE)/4] = LE32(a0);
+						cpu->psx_ram[(chunk+BLK_FD)/4] = LE32(fd);
+
+						mipsinfo.i = chunk + 16;
+						mipsinfo.i |= 0x80000000;
+						#if DEBUG_HLE_BIOS
+						printf("== %08x\n", mipsinfo.i);
+						#endif
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+				
+				case 0x39:	// InitHeap
+					// heap address in A0, length in A1
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: InitHeap(%08x, %08x)\n", a0, a1);
+					#endif
+
+					cpu->heap_addr = a0 & 0x3fffffff;
+
+					cpu->psx_ram[(cpu->heap_addr+BLK_STAT)/4] = LE32(0);
+					cpu->psx_ram[(cpu->heap_addr+BLK_FD)/4] = LE32(0);
+					cpu->psx_ram[(cpu->heap_addr+BLK_BK)/4] = LE32(0);
+
+					// if heap size out of range, clamp it
+					if (((a0 & 0x1fffff) + a1) >= 2*1024*1024)
+					{
+						cpu->psx_ram[(cpu->heap_addr+BLK_SIZE)/4] = LE32(0x1ffffc - (a0 & 0x1fffff));
+					}
+					else
+					{
+						cpu->psx_ram[(cpu->heap_addr+BLK_SIZE)/4] = LE32(a1);
+					}
+					break;
+
+				case 0x3f:	// printf
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: printf(%08x) = %s\n", a0, &cpu->psx_ram[(a0&0x1fffff)/4]);
+					#endif
+					break;
+
+				case 0x72:	//__96_remove
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: __96_remove\n");
+					#endif
+					break;
+
+				default:
+					#if DEBUG_HLE_BIOS
+					printf("Unknown BIOS A0 call = %x\n", subcall);
+					#endif
+					break;
+			}
+			break;
+
+		case 0xb0:	// b0 syscalls
+			switch (subcall)
+			{		 
+				case 0x07:	// DeliverEvent
+					{
+						int ev, spec;
+
+
+						ev = calc_ev(a0);
+						spec = calc_spec(a1);
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: DeliverEvent(ev %d, spec %d)\n", ev, spec);
+						#endif
+
+						if (cpu->Event[ev][spec].status != LE32(EvStACTIVE))
+						{
+							#if DEBUG_HLE_BIOS
+							printf("event not active\n");
+							#endif
+							return;
+						}
+
+						// if interrupt mode, do the call
+						if (cpu->Event[ev][spec].mode == LE32(EvMdINTR))
+						{
+							#if DEBUG_HLE_BIOS
+							printf("INTR type, need to call handler %x\n", LE32(Event[ev][spec].fhandler));
+							#endif
+						}
+						else
+						{
+							cpu->Event[ev][spec].status = LE32(EvStALREADY);
+						}
+					}
+					break;
+			 
+				case 0x08:	// OpenEvent
+					{
+						int ev, spec;
+						
+						ev = calc_ev(a0);
+						spec = calc_spec(a1);
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: OpenEvent(%08x, %08x, %08x, %08x) = ev %d spec %d\n", a0, a1, a2, a3, ev, spec);
+						if (ev >= 64 && ev <= 67)
+						{
+							printf("HLEBIOS: event %d maps to root counter %d\n", ev, ev-64);
+						}
+						#endif
+
+						cpu->Event[ev][spec].status = LE32(EvStWAIT);
+						cpu->Event[ev][spec].mode = LE32(a2);
+						cpu->Event[ev][spec].fhandler = LE32(a3);
+
+						// v0 = ev | spec<<8;
+						mipsinfo.i = ev | (spec<<8);
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x0a:	// WaitEvent
+					{
+						int ev, spec;
+						
+						ev = a0 & 0xff;
+						spec = (a0 >> 8) & 0xff;
+
+						mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: WaitEvent(ev %d spec %d) PC=%x\n", ev, spec, mipsinfo.i);
+						#endif
+
+						cpu->Event[ev][spec].status = LE32(EvStACTIVE);
+
+						// v0 = 1
+						mipsinfo.i = 1;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+
+						cpu->WAI = 1;
+						mips_shorten_frame(cpu);
+					}
+					break;
+
+				case 0x0b:	// TestEvent
+					{
+						int ev, spec;
+
+						ev = a0 & 0xff;
+						spec = (a0 >> 8) & 0xff;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: TestEvent(ev %d spec %d)\n", ev, spec);
+						#endif
+
+						// v0 = (is event ready?)
+						if (cpu->Event[ev][spec].status == LE32(EvStALREADY))
+						{
+							cpu->Event[ev][spec].status = LE32(EvStACTIVE);
+							mipsinfo.i = 1;
+						}
+						else
+						{
+							mipsinfo.i = 0;
+						}
+
+						cpu->WAI = 1;
+
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+
+						// it looks like this sets v1 to something non-zero too
+						// (code in Crash 2 & 3 actually relies on that behavior)
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R3, &mipsinfo);
+					}
+					break;
+
+				case 0x0c:	// EnableEvent
+					{
+						int ev, spec;
+						
+						ev = a0 & 0xff;
+						spec = (a0 >> 8) & 0xff;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: EnableEvent(ev %d spec %d)\n", ev, spec);
+						#endif
+
+						cpu->Event[ev][spec].status = LE32(EvStACTIVE);
+
+						// v0 = 1
+						mipsinfo.i = 1;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x0d:	// DisableEvent
+					{
+						int ev, spec;
+						
+						ev = a0 & 0xff;
+						spec = (a0 >> 8) & 0xff;
+
+						#if DEBUG_HLE_BIOS
+						printf("HLEBIOS: DisableEvent(ev %d spec %d)\n", ev, spec);
+						#endif
+
+						cpu->Event[ev][spec].status = LE32(EvStWAIT);
+
+						// v0 = 1
+						mipsinfo.i = 1;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+					}
+					break;
+
+				case 0x17:	// ReturnFromException
+					for (i = 0; i < 32; i++)
+					{
+						mipsinfo.i = cpu->irq_regs[i];
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+					}
+
+					mipsinfo.i = cpu->irq_regs[32];
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+					mipsinfo.i = cpu->irq_regs[33];
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+					mipsinfo.i = mips_get_ePC(cpu);
+//					printf("ReturnFromException: IRQ state %x\n", cpu->irq_data & cpu->irq_mask);
+//					printf("HLEBIOS: ReturnFromException, cause = %08x, PC = %08x\n", mips_get_cause(), mipsinfo.i);
+					mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+
+					status = mips_get_status(cpu);
+					status = (status & 0xfffffff0) | ((status & 0x3c)>>2);
+					mips_set_status(cpu, status);
+					return;	// force return to avoid PC=RA below
+					break;
+
+				case 0x19:	// HookEntryInt
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: HookEntryInt(%08x)\n", a0);
+					#endif
+					cpu->entry_int = a0;
+					break;
+
+				case 0x3f:	// puts
+//					printf("HLEBIOS: puts\n");
+					break;
+
+				case 0x5b:	// ChangeClearPAD
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: ChangeClearPAD\n");
+					#endif
+					break;
+
+				default:
+					#if DEBUG_HLE_BIOS
+					printf("Unknown BIOS B0 call = %x\n", subcall);
+					#endif
+					break;
+			}
+			break;
+
+		case 0xc0:	// c0 syscalls
+			switch (subcall)
+			{		
+				case 0xa:	// ChangeClearRCnt
+					#if DEBUG_HLE_BIOS
+					printf("HLEBIOS: ChangeClearRCnt(%08x, %08x)\n", a0, a1);
+					#endif
+
+					// v0 = (a0*4)+0x8600
+					mipsinfo.i = LE32(cpu->psx_ram[((a0<<2) + 0x8600)/4]);
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+
+					// (a0*4)+0x8600 = a1;
+					cpu->psx_ram[((a0<<2) + 0x8600)/4] = LE32(a1);
+					break;
+			 
+				default:
+					#if DEBUG_HLE_BIOS
+					printf("Unknown BIOS C0 call = %x\n", subcall);
+					#endif
+					break;
+			}
+			break;
+	}
+
+	// PC = RA
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+	mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+}
+
+// root counters
+
+void psx_hw_runcounters(mips_cpu_context *cpu)
+{
+	int i;
+//	int j;
+//	union cpuinfo mipsinfo;
+
+	// don't process any IRQ sources when interrupts are suspended
+	if (!cpu->intr_susp)
+	{
+		if (cpu->dma4_delay)
+		{
+			cpu->dma4_delay--;
+
+			if (cpu->dma4_delay == 0)
+			{
+				SPU2interruptDMA4(cpu);
+
+				if (cpu->dma4_cb)
+				{
+					call_irq_routine(cpu, cpu->dma4_cb, cpu->dma4_flag);
+				}
+			}
+		}
+
+		if (cpu->dma7_delay)
+		{
+			cpu->dma7_delay--;
+
+			if (cpu->dma7_delay == 0)
+			{
+				SPU2interruptDMA7(cpu);
+
+				if (cpu->dma7_cb)
+				{
+					call_irq_routine(cpu, cpu->dma7_cb, cpu->dma7_flag);
+				}
+			}
+		}
+
+		for (i = 0; i < cpu->iNumThreads; i++)
+		{
+			if (cpu->threads[i].iState == TS_WAITDELAY)
+			{
+				if (cpu->threads[i].waitparm > CLOCK_DIV)
+				{
+					cpu->threads[i].waitparm -= CLOCK_DIV;
+				}
+				else	// time's up
+				{
+					cpu->threads[i].waitparm = 0;
+					cpu->threads[i].iState = TS_READY;
+
+					cpu->timerexp = 1;
+
+					ps2_reschedule(cpu);
+				}
+			}
+		}
+
+		cpu->sys_time += 836;
+
+		if (cpu->iNumTimers > 0)
+		{
+			for (i = 0; i < cpu->iNumTimers; i++)
+			{
+				if (cpu->iop_timers[i].iActive > 0)
+				{
+					cpu->iop_timers[i].count += 836;
+					if (cpu->iop_timers[i].count >= cpu->iop_timers[i].target)
+					{
+						cpu->iop_timers[i].count -= cpu->iop_timers[i].target;
+
+	//					printf("Timer %d: handler = %08x, param = %08x\n", i, cpu->iop_timers[i].handler, cpu->iop_timers[i].hparam);
+						call_irq_routine(cpu, cpu->iop_timers[i].handler, cpu->iop_timers[i].hparam);
+
+						cpu->timerexp = 1;
+					} 
+				}
+			}
+		}
+	}
+
+// PS1 root counters
+	for (i = 0; i < 3; i++)
+	{
+		if ((!(cpu->root_cnts[i].mode & RC_EN)) && (cpu->root_cnts[i].mode != 0))
+		{
+			if (cpu->root_cnts[i].mode & RC_DIV8)
+			{
+				cpu->root_cnts[i].count += 768/8;
+			}
+			else
+			{
+				cpu->root_cnts[i].count += 768;
+			}
+
+			if (cpu->root_cnts[i].count >= cpu->root_cnts[i].target)
+			{
+				if (!(cpu->root_cnts[i].mode & RC_RESET))
+				{
+					cpu->root_cnts[i].mode |= RC_EN;
+				}
+				else
+				{
+					cpu->root_cnts[i].count %= cpu->root_cnts[i].target;
+				}
+				
+				psx_irq_set(cpu, 1<<(4+i));
+			}
+		}
+	}
+}
+
+// PEOpS callbacks
+
+void SPUirq(void) 
+{
+//	psx_irq_set(0x200);
+}
+
+// PSXCPU callbacks
+
+uint8 program_read_byte_32le(mips_cpu_context *cpu, offs_t address)
+{
+	switch (address & 0x3)
+	{
+		case 0:
+			return psx_hw_read(cpu, address, 0xffffff00);
+			break;
+		case 1:
+			return psx_hw_read(cpu, address, 0xffff00ff)>>8;
+			break;
+		case 2:
+			return psx_hw_read(cpu, address, 0xff00ffff)>>16;
+			break;
+		case 3:
+			return psx_hw_read(cpu, address, 0x00ffffff)>>24;
+			break;
+	}
+	return 0;
+}
+
+uint16 program_read_word_32le(mips_cpu_context *cpu, offs_t address)
+{
+	if (address & 2)
+		return psx_hw_read(cpu, address, 0x0000ffff)>>16;
+
+	return psx_hw_read(cpu, address, 0xffff0000);
+}
+
+uint32 program_read_dword_32le(mips_cpu_context *cpu, offs_t address)
+{
+	return psx_hw_read(cpu, address, 0);
+}
+
+void program_write_byte_32le(mips_cpu_context *cpu, offs_t address, uint8 data)
+{
+	switch (address & 0x3)
+	{
+		case 0:
+			psx_hw_write(cpu, address, data, 0xffffff00);
+			break;
+		case 1:
+			psx_hw_write(cpu, address, data<<8, 0xffff00ff);
+			break;
+		case 2:
+			psx_hw_write(cpu, address, data<<16, 0xff00ffff);
+			break;
+		case 3:
+			psx_hw_write(cpu, address, data<<24, 0x00ffffff);
+			break;
+	}
+}
+
+void program_write_word_32le(mips_cpu_context *cpu, offs_t address, uint16 data)
+{
+	if (address & 2)
+	{
+		psx_hw_write(cpu, address, data<<16, 0x0000ffff);
+		return;
+	}
+
+	psx_hw_write(cpu, address, data, 0xffff0000);
+}
+
+void program_write_dword_32le(mips_cpu_context *cpu, offs_t address, uint32 data)
+{
+	psx_hw_write(cpu, address, data, 0);
+}
+
+// sprintf replacement
+static void iop_sprintf(mips_cpu_context *cpu, char *out, char *fmt, uint32 pstart)
+{
+	char temp[64], tfmt[64];
+	char *cf, *pstr;
+	union cpuinfo mipsinfo;
+	int curparm, fp, isnum;
+
+	curparm = pstart;
+	cf = fmt;
+
+	while (*cf != '\0')
+	{
+		if (*cf != '%')
+		{
+			if (*cf == 27)
+			{
+				*out++ = '[';
+				*out++ = 'E';
+				*out++ = 'S';
+				*out++ = 'C';
+				*out = ']';
+			}
+			else
+			{
+				*out = *cf;
+			}
+			out++;
+			cf++;
+		}
+		else	// got format
+		{
+			cf++;
+
+			tfmt[0] = '%';
+			fp = 1;
+			while (((*cf >= '0') && (*cf <= '9')) || (*cf == '.'))
+			{
+				tfmt[fp] = *cf;
+				fp++;
+				cf++;
+			}
+
+			tfmt[fp] = *cf;
+			tfmt[fp+1] = '\0';
+
+			isnum = 0;			
+			switch (*cf)
+			{
+				case 'x':
+				case 'X':
+				case 'd':
+				case 'D':
+				case 'c':
+				case 'C':
+				case 'u':
+				case 'U':
+					isnum = 1;
+					break;
+			}
+
+//			printf("]]] temp format: [%s] [%d]\n", tfmt, isnum);
+
+			if (isnum)
+			{
+				mips_get_info(cpu, curparm, &mipsinfo);
+//				printf("parameter %d = %x\n", curparm-pstart, mipsinfo.i);
+				curparm++;
+				sprintf(temp, tfmt, (int32)mipsinfo.i);
+			}
+			else
+			{
+				mips_get_info(cpu, curparm, &mipsinfo);
+				curparm++;
+
+				pstr = (char *)cpu->psx_ram;
+				pstr += (mipsinfo.i & 0x1fffff);
+
+				sprintf(temp, tfmt, pstr);
+			}
+
+			pstr = &temp[0];
+			while (*pstr != '\0')
+			{
+				*out = *pstr;
+				out++;
+				pstr++;
+			}
+
+			cf++;
+		}
+	}
+
+	*out = '\0';
+}
+
+// PS2 IOP callbacks
+void psx_iop_call(mips_cpu_context *cpu, uint32 pc, uint32 callnum)
+{
+	uint32 scan;
+	char *mname, *str1;
+//	char *str2, *str3;
+	char name[9], out[512];
+	uint32 a0, a1, a2, a3;
+	union cpuinfo mipsinfo;
+	int i;
+
+//	printf("IOP call @ %08x\n", pc);
+
+	// prefetch parameters
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+	a0 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
+	a1 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R6, &mipsinfo);
+	a2 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R7, &mipsinfo);
+	a3 = mipsinfo.i;
+
+	scan = (pc&0x0fffffff)/4;
+	while ((cpu->psx_ram[scan] != LE32(0x41e00000)) && (scan >= (0x10000/4)))
+	{
+		scan--;
+	}
+
+	if (cpu->psx_ram[scan] != LE32(0x41e00000))
+	{
+		printf("FATAL ERROR: couldn't find IOP link signature\n");
+		return;
+	}
+
+	scan += 3;	// skip zero and version
+	memcpy(name, &cpu->psx_ram[scan], 8);
+	name[8] = '\0';
+
+//	printf("IOP: call module [%s] service %d (PC=%08x)\n", name, callnum, pc);
+
+	if (!strcmp(name, "stdio"))
+	{
+		switch (callnum)
+		{
+			case 4:	// printf
+				mname = (char *)cpu->psx_ram;
+				mname += a0 & 0x1fffff;
+				mname += (a0 & 3);
+
+				iop_sprintf(cpu, out, mname, CPUINFO_INT_REGISTER + MIPS_R5);	// a1 is first parm
+				
+			/*	if (out[strlen(out)-1] != '\n')
+				{
+					strcat(out, "\n");
+				}*/
+
+				#if DEBUG_HLE_IOP
+				printf("%s", out);
+				#endif
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "sifman"))
+	{
+		switch (callnum)
+		{
+			case 5:	// sceSifInit
+				#if DEBUG_HLE_IOP
+				printf("IOP: sceSifInit()\n");
+				#endif
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 7: // sceSifSetDma
+				#if DEBUG_HLE_IOP
+				printf("IOP: sceSifSetDma(%08x %08x)\n", a0, a1);
+				#endif
+
+				mipsinfo.i = 1;	// nonzero = success
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 8:	// sceSifDmaStat
+				#if DEBUG_HLE_IOP
+				printf("IOP: sceSifDmaStat(%08x)\n", a0);
+				#endif
+
+				mipsinfo.i = -1;	// dma completed
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 29: // sceSifCheckInit
+				#if DEBUG_HLE_IOP
+				printf("IOP: sceSifCheckInit()\n");
+				#endif
+
+				mipsinfo.i = 1;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "thbase"))
+	{
+		uint32 newAlloc;
+
+		switch (callnum)
+		{
+			case 4:	// CreateThread
+				#if DEBUG_THREADING
+				printf("IOP: CreateThread(%08x)\n", a0);
+				#endif
+				a0 &= 0x1fffff;
+				a0 /= 4;
+				#if DEBUG_THREADING
+				printf(" : flags %x routine %08x pri %x stacksize %d refCon %08x\n",
+					cpu->psx_ram[a0], cpu->psx_ram[a0+1], cpu->psx_ram[a0+2], cpu->psx_ram[a0+3], cpu->psx_ram[a0+4]);
+				#endif
+
+				newAlloc = psf2_get_loadaddr();
+				// force 16-byte alignment
+				if (newAlloc & 0xf)
+				{
+					newAlloc &= ~0xf;
+					newAlloc += 16;
+				}
+				psf2_set_loadaddr(newAlloc + LE32(cpu->psx_ram[a0+3]));
+				
+				cpu->threads[cpu->iNumThreads].iState = TS_CREATED;
+				cpu->threads[cpu->iNumThreads].stackloc = newAlloc;
+				cpu->threads[cpu->iNumThreads].flags = LE32(cpu->psx_ram[a0]);
+				cpu->threads[cpu->iNumThreads].routine = LE32(cpu->psx_ram[a0+2]);
+				cpu->threads[cpu->iNumThreads].stacksize = LE32(cpu->psx_ram[a0+3]);
+				cpu->threads[cpu->iNumThreads].refCon = LE32(cpu->psx_ram[a0+4]);
+
+				mipsinfo.i = cpu->iNumThreads;
+				cpu->iNumThreads++;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 6:	// StartThread
+				#if DEBUG_THREADING
+				printf("IOP: StartThread(%d %d)\n", a0, a1);
+				#endif
+
+				FreezeThread(cpu, cpu->iCurThread, 1);
+				ThawThread(cpu, a0);
+				cpu->iCurThread = a0;
+				break;
+
+			case 20:// GetThreadID
+				#if DEBUG_THREADING
+				printf("IOP: GetThreadId()\n");
+				#endif
+
+				mipsinfo.i = cpu->iCurThread;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 24:// SleepThread
+				#if DEBUG_THREADING
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: SleepThread() [curThread %d, PC=%x]\n", cpu->iCurThread, mipsinfo.i);
+				#endif
+
+				FreezeThread(cpu, cpu->iCurThread, 1);
+				cpu->threads[cpu->iCurThread].iState = TS_SLEEPING;
+				cpu->iCurThread = -1;
+
+				ps2_reschedule(cpu);
+				break;
+
+			case 25:// WakeupThread
+				#if DEBUG_THREADING
+				printf("IOP: WakeupThread(%d)\n", a0);
+				#endif
+
+				// set thread to "ready to go"
+				cpu->threads[a0].iState = TS_READY;	
+				break;
+
+			case 26:// iWakeupThread
+				#if DEBUG_THREADING
+				printf("IOP: iWakeupThread(%d)\n", a0);
+				#endif
+
+				// set thread to "ready to go" if it's not running
+				if (cpu->threads[a0].iState != TS_RUNNING)
+				{
+					cpu->threads[a0].iState = TS_READY;	
+				}
+				break;
+
+			case 33:// DelayThread
+				{
+					double dTicks;
+//					int i;
+
+					#if DEBUG_THREADING
+					mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					printf("IOP: DelayThread(%d) (PC=%x) [curthread = %d]\n", a0, mipsinfo.i, cpu->iCurThread);
+					#endif
+
+					if (a0 < 100)
+					{
+						a0 = 100;
+					}
+					dTicks = (double)a0;
+
+					FreezeThread(cpu, cpu->iCurThread, 1);
+					cpu->threads[cpu->iCurThread].iState = TS_WAITDELAY;
+					dTicks /= (double)1000000.0;
+					dTicks *= (double)36864000.0;	// 768*48000 = IOP native-mode clock rate
+					cpu->threads[cpu->iCurThread].waitparm = (uint32)dTicks;
+					cpu->iCurThread = -1;
+
+					ps2_reschedule(cpu);
+				}
+				break;
+
+			case 34://GetSystemTime
+				#if DEBUG_HLE_IOP
+				printf("IOP: GetSystemTime(%x)\n", a0);
+				#endif
+
+				a0 &= 0x1fffff;
+				a0 /= 4;
+
+				cpu->psx_ram[a0] = LE32(cpu->sys_time & 0xffffffff); 	// low
+				cpu->psx_ram[a0+1] = LE32(cpu->sys_time >> 32);	// high
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 39:// USec2SysClock
+				{
+					uint64 dTicks = (uint64)a0;
+					uint32 hi, lo;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: USec2SysClock(%d %08x)\n", a0, a1);
+					#endif
+
+					dTicks *= (uint64)36864000;
+					dTicks /= (uint64)1000000;
+			
+					hi = dTicks>>32;
+					lo = dTicks & 0xffffffff;
+
+					cpu->psx_ram[((a1 & 0x1fffff)/4)] = LE32(lo);
+					cpu->psx_ram[((a1 & 0x1fffff)/4)+1] = LE32(hi);
+
+					mipsinfo.i = 0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			case 40://SysClock2USec
+				{
+					uint64 temp;
+					uint32 seconds, usec;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: SysClock2USec(%08x %08x %08x)\n", a0, a1, a2);
+					#endif
+
+					a0 &= 0x1fffff;
+					a1 &= 0x1fffff;
+					a2 &= 0x1fffff;
+					a0 /= 4;
+					a1 /= 4;
+					a2 /= 4;
+
+					temp = LE32(cpu->psx_ram[a0]);
+					temp |= (uint64)LE32(cpu->psx_ram[a0+1])<<32;
+
+					temp *= (uint64)1000000;
+					temp /= (uint64)36864000;
+
+					// temp now is USec
+					seconds = (temp / 1000000) & 0xffffffff;
+					usec = (temp % 1000000) & 0xffffffff;
+
+					cpu->psx_ram[a1] = LE32(seconds);
+					cpu->psx_ram[a2] = LE32(usec);
+				}
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "thevent"))
+	{
+		switch (callnum)
+		{
+			case 4:	// CreateEventFlag
+				mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				#if DEBUG_HLE_IOP
+				printf("IOP: CreateEventFlag(%08x) (PC=%x)\n", a0, mipsinfo.i);
+				#endif
+
+				a0 &= 0x1fffff;
+				a0 /= 4;
+ 
+				cpu->evflags[cpu->iNumFlags].type = LE32(cpu->psx_ram[a0]);
+				cpu->evflags[cpu->iNumFlags].value = LE32(cpu->psx_ram[a0+1]);
+				cpu->evflags[cpu->iNumFlags].param = LE32(cpu->psx_ram[a0+2]);
+				cpu->evflags[cpu->iNumFlags].inUse = 1;
+
+				#if DEBUG_HLE_IOP
+				printf(" Flag %02d: type %d init %08x param %08x\n", cpu->iNumFlags, cpu->evflags[cpu->iNumFlags].type, cpu->evflags[cpu->iNumFlags].value, cpu->evflags[cpu->iNumFlags].param);
+				#endif
+
+				mipsinfo.i = cpu->iNumFlags+1;
+				cpu->iNumFlags++;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 6: // SetEventFlag
+				a0--;
+				#if DEBUG_HLE_IOP
+				printf("IOP: SetEventFlag(%d %08x)\n", a0, a1);
+				#endif
+
+				cpu->evflags[a0].value |= a1;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 7: // iSetEventFlag
+				a0--;
+				#if DEBUG_HLE_IOP
+				printf("IOP: iSetEventFlag(%08x %08x)\n", a0, a1);
+				#endif
+
+				cpu->evflags[a0].value |= a1;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+
+				for (i=0; i < cpu->iNumThreads; i++)
+				{
+					if ((cpu->threads[i].iState == TS_WAITEVFLAG) && (cpu->threads[i].waitparm == a0))
+					{
+						cpu->threads[i].iState = TS_READY;	
+					}
+				}
+				break;
+
+			case 8:	// ClearEventFlag
+				a0--;
+				mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				#if DEBUG_HLE_IOP
+				printf("IOP: ClearEventFlag(%d %08x) (PC=%x)\n", a0, a1, mipsinfo.i);
+				#endif
+
+				cpu->evflags[a0].value &= a1;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 9: // iClearEventFlag
+				a0--;
+				#if DEBUG_HLE_IOP
+				printf("IOP: iClearEventFlag(%d %08x)\n", a0, a1);
+				#endif
+
+				cpu->evflags[a0].value &= a1;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 10:// WaitEventFlag
+				a0--;
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: WaitEventFlag(%d %08x %d %08x PC=%x)\n", a0, a1, a2, a3, mipsinfo.i);
+				#endif
+
+				// if we're not set, freeze this thread
+				if (!(cpu->evflags[a0].value & a1))
+				{
+					FreezeThread(cpu, cpu->iCurThread, 1);
+					cpu->threads[cpu->iCurThread].iState = TS_WAITEVFLAG;
+					cpu->threads[cpu->iCurThread].waitparm = a0;
+					cpu->iCurThread = -1;
+
+					ps2_reschedule(cpu);
+				}
+				else
+				{
+					mipsinfo.i = 0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "thsemap"))
+	{
+		int foundthread;
+
+		switch (callnum)
+		{
+			case 4:	// CreateSema
+				#if DEBUG_HLE_IOP
+				printf("IOP: CreateSema(%08x)\n", a0);
+				#endif
+
+				mipsinfo.i = -1;
+				for (i = 0; i < SEMA_MAX; i++)
+				{
+					if (!cpu->semaphores[i].inuse)
+					{
+						mipsinfo.i = i;
+						break;
+					}
+				}
+
+				if (mipsinfo.i == -1)
+				{
+					printf("IOP: out of cpu->semaphores!\n");
+				}
+
+				a0 &= 0x7fffffff;
+				a0 /= 4;
+
+//				printf("Sema %d Parms: %08x %08x %08x %08x\n", mipsinfo.i, cpu->psx_ram[a0], cpu->psx_ram[a0+1], cpu->psx_ram[a0+2], cpu->psx_ram[a0+3]);
+	
+				if (mipsinfo.i != -1)
+				{
+					cpu->semaphores[mipsinfo.i].attr = LE32(cpu->psx_ram[a0]);
+					cpu->semaphores[mipsinfo.i].option = LE32(cpu->psx_ram[a0+1]);
+					cpu->semaphores[mipsinfo.i].init = LE32(cpu->psx_ram[a0+2]);
+					cpu->semaphores[mipsinfo.i].max = LE32(cpu->psx_ram[a0+3]);
+
+					cpu->semaphores[mipsinfo.i].current = cpu->semaphores[mipsinfo.i].init;
+
+					cpu->semaphores[mipsinfo.i].inuse = 1;
+				}
+
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 6: // SignalSema
+				#if DEBUG_HLE_IOP
+				printf("IOP: SignalSema(%d) (current %d)\n", a0, cpu->semaphores[a0].current);
+				#endif
+
+				foundthread = 0;
+				for (i=0; i < cpu->iNumThreads; i++)
+				{
+					if ((cpu->threads[i].iState == TS_WAITSEMA) && (cpu->threads[i].waitparm == a0))
+					{
+						cpu->threads[i].iState = TS_READY;	
+						cpu->semaphores[a0].threadsWaiting--;
+						foundthread = 1;
+						break;
+					}
+				}
+
+				mipsinfo.i = 0;
+
+				if (!foundthread)
+				{
+					if (cpu->semaphores[a0].current < cpu->semaphores[a0].max)
+					{
+						cpu->semaphores[a0].current++;
+					}
+					else
+					{
+						mipsinfo.i = -420;	// semaphore overflow
+					}
+				}
+
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 7: // iSignalSema
+				#if DEBUG_HLE_IOP
+				printf("IOP: iSignalSema(%d)\n", a0);
+				#endif
+
+				foundthread = 0;
+				for (i=0; i < cpu->iNumThreads; i++)
+				{
+					if ((cpu->threads[i].iState == TS_WAITSEMA) && (cpu->threads[i].waitparm == a0))
+					{
+						cpu->threads[i].iState = TS_READY;	
+						cpu->semaphores[a0].threadsWaiting--;
+						foundthread = 1;
+						break;
+					}
+				}
+
+				mipsinfo.i = 0;
+
+				if (!foundthread)
+				{
+					if (cpu->semaphores[a0].current < cpu->semaphores[a0].max)
+					{
+						cpu->semaphores[a0].current++;
+					}
+					else
+					{
+						mipsinfo.i = -420;	// semaphore overflow
+					}
+				}
+
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 8: // WaitSema
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: WaitSema(%d) (cnt %d) (th %d) (PC=%x)\n", a0, cpu->iCurThread, cpu->semaphores[a0].current, mipsinfo.i);
+				#endif
+		
+				if (cpu->semaphores[a0].current > 0)
+				{
+					cpu->semaphores[a0].current--;
+				}
+				else
+				{
+					FreezeThread(cpu,cpu->iCurThread, 1);
+					cpu->threads[cpu->iCurThread].iState = TS_WAITSEMA;
+					cpu->threads[cpu->iCurThread].waitparm = a0;
+					ps2_reschedule(cpu);
+				}
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "timrman"))
+	{
+		switch (callnum)
+		{
+			case 4:	// AllocHardTimer
+				#if DEBUG_HLE_IOP
+				printf("IOP: AllocHardTimer(%d %d %d)\n", a0, a1, a2);
+				#endif
+				// source, size, prescale
+								 
+				if (a1 != 32)
+				{
+					printf("IOP: AllocHardTimer doesn't support 16-bit timers!\n");
+				}
+
+				cpu->iop_timers[cpu->iNumTimers].source = a0;
+				cpu->iop_timers[cpu->iNumTimers].prescale = a2;
+
+				mipsinfo.i = cpu->iNumTimers+1;
+				cpu->iNumTimers++;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 6: // FreeHardTimer
+				#if DEBUG_HLE_IOP
+				printf("IOP: FreeHardTimer(%d)\n", a0);
+				#endif
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 10:// GetTimerCounter
+				mipsinfo.i = cpu->iop_timers[a0-1].count;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 20: // SetTimerHandler
+				#if DEBUG_HLE_IOP
+				printf("IOP: SetTimerHandler(%d %d %08x %08x)\n", a0, a1, a2, a3);
+				#endif
+				// id, compare, handler, common (last is param for handler)
+
+				cpu->iop_timers[a0-1].target = a1;
+				cpu->iop_timers[a0-1].handler = a2;
+				cpu->iop_timers[a0-1].hparam = a3;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 22: // SetupHardTimer
+				#if DEBUG_HLE_IOP
+				printf("IOP: SetupHardTimer(%d %d %d %d)\n", a0, a1, a2, a3);
+				#endif
+				// id, source, mode, prescale
+
+				cpu->iop_timers[a0-1].source = a1;
+				cpu->iop_timers[a0-1].mode = a2;
+				cpu->iop_timers[a0-1].prescale = a3;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 23: // StartHardTimer
+				#if DEBUG_HLE_IOP
+				printf("IOP: StartHardTimer(%d)\n", a0);
+				#endif
+
+				cpu->iop_timers[a0-1].iActive = 1;
+				cpu->iop_timers[a0-1].count = 0;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 24: // StopHardTimer
+				#if DEBUG_HLE_IOP
+				printf("IOP: StopHardTimer(%d)\n", a0);
+				#endif
+
+				cpu->iop_timers[a0-1].iActive = 0;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "sysclib"))
+	{
+		switch (callnum)
+		{
+			case 12:	// memcpy
+				{
+					uint8 *dst, *src;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: memcpy(%08x, %08x, %d)\n", a0, a1, a2);
+					#endif
+
+					dst = (uint8 *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					src = (uint8 *)&cpu->psx_ram[(a1&0x1fffff)/4];
+					// get exact byte alignment
+					dst += a0 % 4;
+					src += a1 % 4;
+
+					while (a2)
+					{
+						*dst = *src;
+						dst++;
+						src++;
+						a2--;
+					}
+
+					// v0 = a0
+					mipsinfo.i = a0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			case 13:	// memmove
+				{
+					uint8 *dst, *src;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: memmove(%08x, %08x, %d)\n", a0, a1, a2);
+					#endif
+
+					dst = (uint8 *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					src = (uint8 *)&cpu->psx_ram[(a1&0x1fffff)/4];
+					// get exact byte alignment
+					dst += a0 % 4;
+					src += a1 % 4;
+
+					dst += a2 - 1;
+					src += a2 - 1;
+
+					while (a2)
+					{
+						*dst = *src;
+						dst--;
+						src--;
+						a2--;
+					}
+
+					// v0 = a0
+					mipsinfo.i = a0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			case 14:	// memset
+				{
+					uint8 *dst;
+
+					#if DEBUG_HLE_IOP
+					mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					printf("IOP: memset(%08x, %02x, %d) [PC=%x]\n", a0, a1, a2, mipsinfo.i);
+					#endif
+
+					dst = (uint8 *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					dst += (a0 & 3);
+
+					memset(dst, a1, a2);
+				}
+				break;
+
+			case 17:	// bzero
+				{
+					uint8 *dst;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: bzero(%08x, %08x)\n", a0, a1);
+					#endif
+
+					dst = (uint8 *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					dst += (a0 & 3);
+					memset(dst, 0, a1);
+				}
+				break;
+
+			case 19:	// sprintf
+				mname = (char *)cpu->psx_ram;
+				str1 = (char *)cpu->psx_ram;
+				mname += a0 & 0x1fffff;
+				str1 += a1 & 0x1fffff;
+
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: sprintf(%08x, %s, ...) [PC=%08x]\n", a0, str1, (uint32)mipsinfo.i);
+				printf("%x %x %x %x\n", a0, a1, a2, a3);
+				#endif
+
+				iop_sprintf(cpu, mname, str1, CPUINFO_INT_REGISTER + MIPS_R6);	// a2 is first parameter
+
+				#if DEBUG_HLE_IOP
+				printf(" = [%s]\n", mname);
+				#endif
+				break;
+
+			case 23:	// strcpy
+				{
+					uint8 *dst, *src;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: strcpy(%08x, %08x)\n", a0, a1);
+					#endif
+
+					dst = (uint8 *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					src = (uint8 *)&cpu->psx_ram[(a1&0x1fffff)/4];
+					// get exact byte alignment
+					dst += a0 % 4;
+					src += a1 % 4;
+
+					while (*src != '\0')
+					{
+						*dst = *src;
+						dst++;
+						src++;
+					}
+					*dst = '\0';
+
+					// v0 = a0
+					mipsinfo.i = a0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			case 27:	// strlen
+				{
+					char *dst;
+
+					#if DEBUG_HLE_IOP
+					mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					printf("IOP: strlen(%08x) [PC=%x]\n", a0, mipsinfo.i);
+					#endif
+
+					dst = (char *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					dst += (a0 & 3);
+					mipsinfo.i = strlen(dst);
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+			case 30:	// strncpy
+				{
+					char *dst, *src;
+
+					#if DEBUG_HLE_IOP
+					printf("IOP: strncpy(%08x, %08x, %d)\n", a0, a1, a2);
+					#endif
+
+					dst = (char *)&cpu->psx_ram[(a0&0x1fffff)/4];
+					src = (char *)&cpu->psx_ram[(a1&0x1fffff)/4];
+					// get exact byte alignment
+					dst += a0 % 4;
+					src += a1 % 4;
+
+					while ((*src != '\0') && (a2 > 0))
+					{
+						*dst = *src;
+						dst++;
+						src++;
+						a2--;
+					}
+					*dst = '\0';
+
+					// v0 = a0
+					mipsinfo.i = a0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				}
+				break;
+
+
+			case 36:	// strtol
+				mname = (char *)&cpu->psx_ram[(a0 & 0x1fffff)/4];
+				mname += (a0 & 3);
+
+				if (a1)
+				{
+					printf("IOP: Unhandled strtol with non-NULL second parm\n");
+				}
+
+				mipsinfo.i = strtol(mname, NULL, a2);
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "intrman"))
+	{
+		switch (callnum)
+		{
+			case 4:	// RegisterIntrHandler
+				#if DEBUG_HLE_IOP
+				printf("IOP: RegisterIntrHandler(%d %08x %08x %08x)\n", a0, a1, a2, a3);
+				#endif
+
+				if (a0 == 9)
+				{
+					cpu->irq9_fval = a1;
+					cpu->irq9_cb = a2;
+					cpu->irq9_flag = a3;
+				}
+
+				// DMA4?
+				if (a0 == 36)
+				{
+					cpu->dma4_fval = a1;
+					cpu->dma4_cb = a2;
+					cpu->dma4_flag = a3;
+				}
+
+				// DMA7?
+				if (a0 == 40)
+				{
+					cpu->dma7_fval = a1;
+					cpu->dma7_cb = a2;
+					cpu->dma7_flag = a3;
+				}
+				break;
+
+			case 5:	// ReleaseIntrHandler
+				#if DEBUG_HLE_IOP
+				printf("IOP: ReleaseIntrHandler(%d)\n", a0);
+				#endif
+				break;
+
+			case 6:	// EnableIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: EnableIntr(%d)\n", a0);
+				#endif
+				break;
+
+			case 7:	// DisableIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: DisableIntr(%d)\n", a0);
+				#endif
+				break;
+
+			case 8: // CpuDisableIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: CpuDisableIntr(%d)\n", a0);
+				#endif
+				break;
+
+			case 9: // CpuEnableIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: CpuEnableIntr(%d)\n", a0);
+				#endif
+				break;
+
+			case 17:	// CpuSuspendIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: CpuSuspendIntr\n");
+				#endif
+
+				// if already suspended, return an error code
+				if (cpu->intr_susp)
+				{
+					mipsinfo.i = -102;
+				}
+				else
+				{
+					mipsinfo.i = 0;
+				}
+				cpu->intr_susp = 1;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 18:	// CpuResumeIntr
+				#if DEBUG_HLE_IOP
+				printf("IOP: CpuResumeIntr\n");
+				#endif
+				cpu->intr_susp = 0;
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 23:	// QueryIntrContext
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: QueryIntrContext(PC=%x)\n", mipsinfo.i);
+				#endif
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "loadcore"))
+	{
+		switch (callnum)
+		{
+			case 5: // FlushDcache
+				#if DEBUG_HLE_IOP
+				printf("IOP: FlushDcache()\n");
+				#endif
+				break;
+
+			case 6:	// RegisterLibraryEntries
+				a0 &= 0x1fffff;
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: RegisterLibraryEntries(%08x) (PC=%x)\n", a0, mipsinfo.i);
+				#endif
+				
+				if (cpu->psx_ram[a0/4] == LE32(0x41c00000))
+				{
+					a0 += 3*4;
+					memcpy(&cpu->reglibs[cpu->iNumLibs].name, &cpu->psx_ram[a0/4], 8);
+					cpu->reglibs[cpu->iNumLibs].name[8] = '\0';
+					#if DEBUG_HLE_IOP
+					printf("Lib name [%s]\n", &cpu->reglibs[cpu->iNumLibs].name);
+					#endif
+					a0 += 2*4;
+					cpu->reglibs[cpu->iNumLibs].dispatch = a0;
+					cpu->iNumLibs++;
+				}
+				else
+				{
+					printf("ERROR: Entry table signature missing\n");
+
+				}
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "sysmem"))
+	{
+		uint32 newAlloc;
+
+		switch (callnum)
+		{
+			case 4:	// AllocMemory
+				newAlloc = psf2_get_loadaddr();
+				// make sure we're 16-byte aligned
+				if (newAlloc & 15)
+				{
+					newAlloc &= ~15;
+					newAlloc += 16;
+				}
+
+				if (a1 & 15)
+				{
+					a1 &= ~15;
+					a1 += 16;
+				}
+
+				if (a1 == 1114112)	// HACK for crappy code in Shadow Hearts rip that assumes the buffer address
+				{
+					printf("SH Hack: was %x now %x\n", newAlloc, 0x60000);
+					newAlloc = 0x60000;
+				}
+
+				psf2_set_loadaddr(newAlloc + a1);
+
+				#if DEBUG_HLE_IOP
+				printf("IOP: AllocMemory(%d, %d, %x) = %08x\n", a0, a1, a2, newAlloc|0x80000000);
+				#endif
+
+				mipsinfo.i = newAlloc; // | 0x80000000;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 5:	// FreeMemory
+				#if DEBUG_HLE_IOP
+				printf("IOP: FreeMemory(%x)\n", a0);
+				#endif
+				break;
+
+			case 7:	// QueryMaxFreeMemSize
+				#if DEBUG_HLE_IOP
+				printf("IOP: QueryMaxFreeMemSize\n");
+				#endif
+
+				mipsinfo.i = (2*1024*1024) - psf2_get_loadaddr();
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 8:	// QueryTotalFreeMemSize
+				#if DEBUG_HLE_IOP
+				printf("IOP: QueryTotalFreeMemSize\n");
+				#endif
+
+				mipsinfo.i = (2*1024*1024) - psf2_get_loadaddr();
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 14: // Kprintf
+				mname = (char *)cpu->psx_ram;
+				mname += a0 & 0x1fffff;
+				mname += (a0 & 3);
+
+				iop_sprintf(cpu, out, mname, CPUINFO_INT_REGISTER + MIPS_R5);	// a1 is first parm
+				
+				if (out[strlen(out)-1] != '\n')
+				{
+					strcat(out, "\n");
+				}
+
+				// filter out ESC characters
+				{
+					int ch;
+
+					for (ch = 0; ch < strlen(out); ch++)
+					{
+						if (out[ch] == 27)
+						{
+							out[ch] = ']';
+						}
+					}
+				}
+
+				#if DEBUG_HLE_IOP
+				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("KTTY: %s [PC=%x]\n", out, mipsinfo.i);
+				#endif
+
+				#if 0
+				{
+					FILE *f;
+					f = fopen("psxram.bin", "wb");
+					fwrite(cpu->psx_ram, 2*1024*1024, 1, f);
+					fclose(f);
+				}
+				#endif
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+	}
+	else if (!strcmp(name, "modload"))
+	{
+		uint8 *tempmem;
+		uint32 newAlloc;
+
+		switch (callnum)
+		{
+			case 7:	// LoadStartModule
+				mname = (char *)&cpu->psx_ram[(a0 & 0x1fffff)/4];
+				mname += 8;
+				str1 = (char *)&cpu->psx_ram[(a2 & 0x1fffff)/4];
+				#if DEBUG_HLE_IOP
+				printf("LoadStartModule: %s\n", mname);
+				#endif
+
+				// get 2k for our parameters
+				newAlloc = psf2_get_loadaddr();
+				// force 16-byte alignment
+				if (newAlloc & 0xf)
+				{
+					newAlloc &= ~0xf;
+					newAlloc += 16;
+				}
+				psf2_set_loadaddr(newAlloc + 2048);
+
+				tempmem = (uint8 *)malloc(2*1024*1024);
+				if (psf2_load_file(cpu, mname, tempmem, 2*1024*1024) != 0xffffffff)
+				{
+					uint32 start;
+					int i;
+
+					start = psf2_load_elf(cpu, tempmem, 2*1024*1024);
+
+					if (start != 0xffffffff)
+					{
+						uint32 args[20], numargs = 1, argofs;
+						uint8 *argwalk = (uint8 *)cpu->psx_ram, *argbase;
+						
+						argwalk += (a2 & 0x1fffff);
+						argbase = argwalk;
+
+						args[0] = a0;	// program name is argc[0]
+
+						argofs = 0;
+
+						if (a1 > 0)
+						{
+							args[numargs] = a2;
+							numargs++;
+
+							while (a1)
+							{
+								if ((*argwalk == 0) && (a1 > 1))
+								{
+									args[numargs] = a2 + argofs + 1;
+									numargs++;
+								}
+								argwalk++;
+								argofs++;
+								a1--;
+							}
+						}
+
+						for (i = 0; i < numargs; i++) 
+						{
+							#if DEBUG_HLE_IOP
+//							printf("Arg %d: %08x [%s]\n", i, args[i], &argbase[args[i]-a2]); 
+							#endif
+							cpu->psx_ram[(newAlloc/4)+i] = LE32(args[i]);
+						}
+
+						// set argv and argc
+						mipsinfo.i = numargs;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R4, &mipsinfo);
+						mipsinfo.i = 0x80000000 | newAlloc;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
+
+						// leave RA alone, PC = module start
+						// (NOTE: we get called in the delay slot!)
+						mipsinfo.i = start - 4;
+						mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+					}
+				}
+				free(tempmem);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+				break;
+		}
+
+	}
+	else if (!strcmp(name, "ioman"))
+	{
+		switch (callnum)
+		{
+			case 4:	// open
+				{
+					int i, slot2use;
+
+					slot2use = -1;
+					for (i = 0; i < MAX_FILE_SLOTS; i++)
+					{
+						if (cpu->filestat[i] == 0)
+						{
+							slot2use = i;
+							break;
+						}
+					}
+
+					if (slot2use == -1)
+					{
+						printf("IOP: out of file slots!\n");
+						mipsinfo.i = 0xffffffff;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+						return;
+					}
+
+					mname = (char *)cpu->psx_ram;
+					mname += (a0 & 0x1fffff);
+
+					if (!strncmp(mname, "aofile:", 7))
+					{
+						mname += 8;
+					}
+					else if (!strncmp(mname, "hefile:", 7))
+					{
+						mname += 8;
+					}
+					else if (!strncmp(mname, "host0:", 6)) 
+					{
+						mname += 7;
+					}
+
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					#if DEBUG_HLE_IOP
+					printf("IOP: open(\"%s\") (PC=%08x)\n", mname, mipsinfo.i);
+					#endif
+
+					cpu->filedata[slot2use] = malloc(6*1024*1024);
+					cpu->filesize[slot2use] = psf2_load_file(cpu, mname, cpu->filedata[slot2use], 6*1024*1024);
+					cpu->filepos[slot2use] = 0;
+					cpu->filestat[slot2use] = 1;
+
+					if (cpu->filesize[slot2use] == 0xffffffff)
+					{
+						mipsinfo.i = cpu->filesize[slot2use];
+					}
+					else
+					{
+						mipsinfo.i = slot2use;
+					}
+				}
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 5:	// close
+				#if DEBUG_HLE_IOP
+				mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: close(%d) (PC=%08x)\n", a0, mipsinfo.i);
+				#endif
+				free(cpu->filedata[a0]);
+				cpu->filedata[a0] = (uint8 *)NULL;
+				cpu->filepos[a0] = 0;
+				cpu->filesize[a0] = 0;
+				cpu->filestat[a0] = 0;
+				break;
+
+			case 6:	// read
+				#if DEBUG_HLE_IOP
+				printf("IOP: read(%x %x %d) [pos %d size %d]\n", a0, a1, a2, cpu->filepos[a0], cpu->filesize[a0]);
+				#endif
+
+				if (cpu->filepos[a0] >= cpu->filesize[a0])
+				{
+					mipsinfo.i = 0;
+				}
+				else
+				{
+					uint8 *rp;
+
+					if ((cpu->filepos[a0] + a2) > cpu->filesize[a0])
+					{
+						a2 = cpu->filesize[a0] - cpu->filepos[a0];
+					}
+
+					rp = (uint8 *)cpu->psx_ram;
+					rp += (a1 & 0x1fffff);
+					memcpy(rp, &cpu->filedata[a0][cpu->filepos[a0]], a2);
+
+					cpu->filepos[a0] += a2;
+					mipsinfo.i = a2;
+				}
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 8:	// lseek
+				#if DEBUG_HLE_IOP
+				mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+				printf("IOP: lseek(%d, %d, %s) (PC=%08x)\n", a0, a1, seek_types[a2], mipsinfo.i);
+				#endif
+
+				switch (a2)
+				{
+					case 0:	// SEEK_SET
+						if (a1 <= cpu->filesize[a0])
+						{
+							cpu->filepos[a0] = a1;
+						}
+						break;
+					case 1:	// SEEK_CUR
+						if ((a1 + cpu->filepos[a0]) < cpu->filesize[a0])
+						{
+							cpu->filepos[a0] += a1;
+						}
+						break;
+					case 2:	// SEEK_END
+						cpu->filepos[a0] = cpu->filesize[a0] - a1;
+						break;
+				}
+
+				mipsinfo.i = cpu->filepos[a0];
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 20:	// AddDrv
+				#if DEBUG_HLE_IOP
+				printf("IOP: AddDrv(%x)\n", a0);
+				#endif
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			case 21:	// DelDrv
+				#if DEBUG_HLE_IOP
+				printf("IOP: DelDrv(%x)\n", a0);
+				#endif
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+				break;
+
+			default:
+				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+		}		 
+	}		
+	else
+	{
+		int lib;
+
+		if (cpu->iNumLibs > 0)
+		{
+			for (lib = 0; lib < cpu->iNumLibs; lib++)
+			{
+				if (!strcmp(name, cpu->reglibs[lib].name))
+				{
+					#if DEBUG_HLE_IOP
+					uint32 PC;
+
+					mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
+					PC = mipsinfo.i;
+					#endif
+
+					// zap the delay slot handling
+					mipsinfo.i = 0;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+
+					mipsinfo.i = LE32(cpu->psx_ram[(cpu->reglibs[lib].dispatch/4) + callnum]);
+
+					// (NOTE: we get called in the delay slot!)
+					#if DEBUG_HLE_IOP
+					printf("IOP: Calling %s (%d) service %d => %08x (parms %08x %08x %08x %08x) (PC=%x)\n",
+							 cpu->reglibs[lib].name, 
+							 lib,
+							 callnum, 
+							 (uint32)mipsinfo.i, 
+							 a0, a1, a2, a3, PC);
+					#endif
+
+					#if 0
+					if (!strcmp(cpu->reglibs[lib].name, "ssd"))
+					{
+						if (callnum == 37)
+						{
+							psxcpu_verbose = 4096;
+						}
+					}
+					#endif
+
+					mipsinfo.i -= 4;
+					mips_set_info(cpu,CPUINFO_INT_PC, &mipsinfo);
+
+					return;
+				}
+			}
+		}
+
+		printf("IOP: Unhandled service %d for module %s\n", callnum, name);
+	}
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/eng_qsf.c Added

@@ -0,0 +1,520 @@
+/*
+	Audio Overload SDK - QSF file engine
+
+	Copyright (c) 2007, R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+//
+// eng_qsf.c
+// by R. Belmont
+//
+
+/*
+The program section of a QSF file, once decompressed, contains a series of
+data blocks of the form:
+
+3 bytes - ASCII section name tag
+4 bytes - Starting offset (LSB-first)
+4 bytes - Length (N) (LSB-first)
+N bytes - Data
+
+The data is then loaded to the given starting offset in the section described
+by the ASCII tag.
+
+The following sections are defined:
+
+"KEY" - Kabuki decryption key. This section should be 11 bytes and contain
+ the following:
+ 4 bytes - swap_key1 (MSB-first)
+ 4 bytes - swap_key2 (MSB-first)
+ 2 bytes - addr_key (MSB-first)
+ 1 bytes - xor_key
+"Z80" - Z80 program ROM.
+"SMP" - QSound sample ROM.
+
+If the KEY section isn't given or both swap_keys are zero, then it is assumed
+that no encryption is used.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "qsound.h"
+#include "z80.h"
+
+#include "corlett.h"
+
+#define DEBUG_LOADER	(0)
+
+// timer rate is 285 Hz
+static const int32 samples_per_tick = 44100/285;
+
+typedef struct {
+ corlett_t *c;
+ char qsfby[256];
+ uint32 skey1, skey2;
+ uint16 akey;
+ uint8 xkey;
+ int32 uses_kabuki;
+ char *Z80ROM, *QSamples;
+ char RAM[0x1000], RAM2[0x1000];
+ char initRAM[0x1000], initRAM2[0x1000];
+ int32 cur_bank;
+ z80_state_t *z80;
+ qsound_state_t *qs;
+ int32 samples_to_next_tick;
+} qsf_synth_t;
+
+static struct QSound_interface qsintf = 
+{
+	QSOUND_CLOCK,
+	NULL
+};
+
+uint8 qsf_memory_read(qsf_synth_t *s, uint16 addr);
+uint8 qsf_memory_readport(qsf_synth_t *s, uint16 addr);
+void qsf_memory_write(qsf_synth_t *s, uint16 addr, uint8 byte);
+void qsf_memory_writeport(qsf_synth_t *s, uint16 addr, uint8 byte);
+
+/* redirect stubs to interface the Z80 core to the QSF engine */
+uint8 memory_read(void *userdata, uint16 addr)
+{
+	return qsf_memory_read(userdata, addr);
+}
+
+uint8 memory_readop(void *userdata, uint16 addr)
+{
+	return memory_read(userdata, addr);
+}
+
+uint8 memory_readport(void *userdata, uint16 addr)
+{
+	return qsf_memory_readport(userdata, addr);
+}
+
+void memory_write(void *userdata, uint16 addr, uint8 byte)
+{
+	qsf_memory_write(userdata, addr, byte);
+}
+
+void memory_writeport(void *userdata, uint16 addr, uint8 byte)
+{
+	qsf_memory_writeport(userdata, addr, byte);
+}
+
+int32 qsf_stop(void *handle);
+
+static void qsf_walktags(qsf_synth_t *s, uint8 *buffer, uint8 *end)
+{
+	uint8 *cbuf = buffer;
+	uint32 offset, length;
+
+	while (cbuf < end)
+	{
+		#if DEBUG_LOADER				
+		printf("cbuf: %08x end: %08x\n", (uint32)cbuf, (uint32)end);
+		#endif
+		offset = cbuf[3] | cbuf[4]<<8 | cbuf[5]<<16 | cbuf[6]<<24;
+		length = cbuf[7] | cbuf[8]<<8 | cbuf[9]<<16 | cbuf[10]<<24;
+
+		#if DEBUG_LOADER				
+		printf("Tag: %c%c%c @ %08x, length %08x\n", cbuf[0], cbuf[1], cbuf[2], offset, length);
+		#endif
+
+		switch (cbuf[0])
+		{
+			case 'Z':
+				memcpy(&s->Z80ROM[offset], &cbuf[11], length);
+				break;
+
+			case 'S':
+				memcpy(&s->QSamples[offset], &cbuf[11], length);
+				break;
+
+			case 'K':
+				s->skey1 = cbuf[11]<<24 | cbuf[12]<<16 | cbuf[13]<<8 | cbuf[14];
+				s->skey2 = cbuf[15]<<24 | cbuf[16]<<16 | cbuf[17]<<8 | cbuf[18];
+				s->akey = cbuf[19]<<8 | cbuf[20];
+				s->xkey = cbuf[20];
+				break;
+
+			default:
+				printf("ERROR: Unknown QSF tag!\n");
+				break;
+		}
+
+		cbuf += 11;
+		cbuf += length;
+	}
+}
+
+static int32 qsf_irq_cb(int param)
+{
+	return 0x000000ff;	// RST_38
+}
+
+void *qsf_start(const char *path, uint8 *buffer, uint32 length)
+{
+ qsf_synth_t *s = malloc (sizeof (qsf_synth_t));
+ memset (s, 0, sizeof (qsf_synth_t));
+
+	uint8 *file = NULL, *lib_decoded = NULL, *lib_raw_file = NULL;
+	uint64 file_len, lib_len, lib_raw_length;
+	corlett_t *lib;
+
+	s->z80 = z80_init();
+	s->z80->userdata = s;
+
+	s->Z80ROM = malloc(512*1024);
+	s->QSamples = malloc(8*1024*1024);
+
+	s->skey1 = s->skey2 = 0;
+	s->akey = 0;
+	s->xkey = 0;
+	s->cur_bank = 0;
+
+	// Decode the current QSF
+	if (corlett_decode(buffer, length, &file, &file_len, &s->c) != AO_SUCCESS)
+	{
+		return AO_FAIL;
+	}
+
+	// Get the library file
+	if (s->c->lib[0] != 0)
+	{
+		uint64 tmp_length;
+	
+ char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->lib, libpath, sizeof (libpath));
+
+#if DEBUG_LOADER	
+ printf("Loading library: %s\n", libpath);
+#endif
+ if (ao_get_lib(libpath, &lib_raw_file, &tmp_length) != AO_SUCCESS)
+ {
+ free (file);
+ qsf_stop (s);
+ return NULL;
+		}
+		lib_raw_length = tmp_length;
+		
+		if (corlett_decode(lib_raw_file, lib_raw_length, &lib_decoded, &lib_len, &lib) != AO_SUCCESS)
+		{
+			free(lib_raw_file);
+ free (file);
+ qsf_stop (s);
+ return NULL;
+		}
+				
+		// Free up raw file
+		free(lib_raw_file);
+
+		// use the contents
+		qsf_walktags(s, lib_decoded, lib_decoded+lib_len);
+		
+		// Dispose the corlett structure for the lib - we don't use it
+		free(lib);
+		if (lib_decoded) {
+ free (lib_decoded);
+ lib_decoded = NULL;
+ }
+	}
+
+	// now patch the file into RAM OVER the libraries
+	qsf_walktags(s, file, file+file_len);
+
+	free(file);
+
+	if ((s->skey1 != 0) && (s->skey2 != 0))
+	{
+		#if DEBUG_LOADER
+		printf("Decoding Kabuki: skey1 %08x skey2 %08x akey %04x xkey %02x\n", skey1, skey2, akey, xkey);
+		#endif
+
+		s->uses_kabuki = 1;
+		cps1_decode((unsigned char *)s->Z80ROM, s->skey1, s->skey2, s->akey, s->xkey);
+	}
+
+	// set qsfby tag
+	strcpy(s->qsfby, "n/a");
+	if (s->c)
+	{
+		int i;
+		for (i = 0; i < MAX_UNKNOWN_TAGS; i++)
+		{
+			if (!strcasecmp(s->c->tag_name[i], "qsfby"))
+			{
+				strcpy(s->qsfby, s->c->tag_data[i]);
+			}
+		}
+	}
+
+	memcpy (s->initRAM, s->RAM, 0x1000);
+	memcpy (s->initRAM2, s->RAM2, 0x1000);
+
+ if (s->z80) {
+ z80_reset(s->z80, NULL);
+ z80_set_irq_callback(s->z80, qsf_irq_cb);
+ }
+	qsintf.sample_rom = s->QSamples;
+	s->qs = qsound_sh_start(&qsintf);
+	s->samples_to_next_tick = samples_per_tick;
+
+	return s;
+}
+
+static void timer_tick(qsf_synth_t *s)
+{
+	z80_set_irq_line(s->z80, 0, ASSERT_LINE);
+	z80_set_irq_line(s->z80, 0, CLEAR_LINE);
+}
+
+int32 qsf_gen(qsf_synth_t *s, int16 *buffer, uint32 samples)
+{	
+	int16 output[44100/30], output2[44100/30];
+	int16 *stereo[2];
+	int16 *outp = buffer;
+	int32 i, opos, tickinc, loops;
+
+	// our largest possible step is samples_per_tick or samples, whichever is smaller
+	if (s->samples_to_next_tick > samples)
+	{
+		tickinc = samples;
+	}
+	else
+	{
+		tickinc = s->samples_to_next_tick;
+	}
+
+	loops = samples / tickinc;
+	opos = 0;
+
+	for (i = 0; i < loops; i++)
+	{
+		z80_execute(s->z80, (8000000/44100)*tickinc);
+		stereo[0] = &output[opos];
+		stereo[1] = &output2[opos];
+		qsound_update(s->qs, 0, stereo, tickinc);
+
+		opos += tickinc;
+		s->samples_to_next_tick -= tickinc;
+
+		if (s->samples_to_next_tick <= 0)
+		{
+			timer_tick(s);
+			s->samples_to_next_tick = samples_per_tick;
+		}
+	}
+
+	// are there "leftovers"?
+	if (opos < samples)
+	{
+		z80_execute(s->z80, (8000000/44100)*(samples-opos));
+		stereo[0] = &output[opos];
+		stereo[1] = &output2[opos];
+		qsound_update(s->qs, 0, stereo, (samples-opos));
+
+		s->samples_to_next_tick -= (samples-opos);
+
+		if (s->samples_to_next_tick <= 0)
+		{
+			timer_tick(s);
+			s->samples_to_next_tick = samples_per_tick;
+		}
+	}
+
+	for (i = 0; i < samples; i++)
+	{
+		*outp++ = output[i];
+		*outp++ = output2[i];
+	}
+
+	return AO_SUCCESS;
+}
+
+int32 qsf_stop(void *handle)
+{
+ qsf_synth_t *s = (qsf_synth_t *)handle;
+	free(s->Z80ROM);
+	free(s->QSamples);
+	if (s->z80) {
+ z80_free (s->z80);
+ }
+ if (s->qs) {
+ qsound_sh_stop (s->qs);
+ }
+ if (s->c) {
+ free (s->c);
+ }
+	free(s);
+
+	return AO_SUCCESS;
+}
+
+int32 qsf_command(void *handle, int32 command, int32 parameter)
+{
+ qsf_synth_t *s = handle;
+	switch (command)
+	{
+		case COMMAND_RESTART:
+ memcpy (s->RAM, s->initRAM, 0x1000);
+ memcpy (s->RAM2, s->initRAM2, 0x1000);
+
+ if (s->z80) {
+ z80_reset(s->z80, NULL);
+ z80_set_irq_callback(s->z80, qsf_irq_cb);
+ }
+ qsound_sh_stop (s->qs);
+ s->qs = qsound_sh_start(&qsintf);
+ s->samples_to_next_tick = samples_per_tick;
+			return AO_SUCCESS;
+		
+	}
+	return AO_FAIL;
+}
+
+int32 qsf_fill_info(void *handle, ao_display_info *info)
+{
+ qsf_synth_t *s = handle;
+	if (s->c == NULL)
+		return AO_FAIL;
+		
+	strcpy(info->title[1], "Name: ");
+	sprintf(info->info[1], "%s", s->c->inf_title);
+
+	strcpy(info->title[2], "Game: ");
+	sprintf(info->info[2], "%s", s->c->inf_game);
+	
+	strcpy(info->title[3], "Artist: ");
+	sprintf(info->info[3], "%s", s->c->inf_artist);
+
+	strcpy(info->title[4], "Copyright: ");
+	sprintf(info->info[4], "%s", s->c->inf_copy);
+
+	strcpy(info->title[5], "Year: ");
+	sprintf(info->info[5], "%s", s->c->inf_year);
+
+	strcpy(info->title[6], "Length: ");
+	sprintf(info->info[6], "%s", s->c->inf_length);
+
+	strcpy(info->title[7], "Fade: ");
+	sprintf(info->info[7], "%s", s->c->inf_fade);
+
+	strcpy(info->title[8], "Ripper: ");
+	sprintf(info->info[8], "%s", s->qsfby);
+
+	return AO_SUCCESS;
+}
+
+uint8 qsf_memory_read(qsf_synth_t *s, uint16 addr)
+{
+	if (addr < 0x8000)
+	{
+		return s->Z80ROM[addr];
+	}
+	else if (addr < 0xc000)
+	{
+		return s->Z80ROM[(addr - 0x8000) + s->cur_bank];
+	}
+	else if (addr <= 0xcfff)
+	{
+		return s->RAM[addr - 0xc000];
+	}
+	else if (addr == 0xd007)
+	{
+		return qsound_status_r(s->qs);
+	}
+	else if (addr >= 0xf000)
+	{
+		return s->RAM2[addr-0xf000];
+	}
+	return 0;
+}
+
+uint8 qsf_memory_readop(qsf_synth_t *s, uint16 addr)
+{
+	if (!s->uses_kabuki)
+	{
+		return qsf_memory_read(s, addr);
+	}
+
+	if (addr < 0x8000)
+	{
+		return s->Z80ROM[addr + (256*1024)];
+	}
+
+	return qsf_memory_read(s, addr);
+}
+
+uint8 qsf_memory_readport(qsf_synth_t *s, uint16 addr)
+{
+	return s->Z80ROM[0x11];
+}
+
+void qsf_memory_write(qsf_synth_t *s, uint16 addr, uint8 byte)
+{
+	if (addr >= 0xc000 && addr <= 0xcfff)
+	{
+		
+		s->RAM[addr-0xc000] = byte;
+		return;
+	}
+	else if (addr == 0xd000)
+	{
+		qsound_data_h_w(s->qs, byte);
+		return;
+	}
+	else if (addr == 0xd001)
+	{
+		qsound_data_l_w(s->qs, byte);
+		return;
+	}
+	else if (addr == 0xd002)
+	{
+		qsound_cmd_w(s->qs, byte);
+		return;
+	}
+	else if (addr == 0xd003)
+	{
+		s->cur_bank = (0x8000 + (byte & 0xf) * 0x4000);
+		if (s->cur_bank > (256*1024))
+		{
+			s->cur_bank = 0;
+		}
+//		printf("Z80 bank to %x (%x)\n", cur_bank, byte);
+		return;
+	}
+	else if (addr >= 0xf000)
+	{
+		s->RAM2[addr-0xf000] = byte;
+		return;
+	}
+}
+
+void qsf_memory_writeport(qsf_synth_t *s, uint16 addr, uint8 byte)
+{
+	printf("Unk port %x @ %x\n", byte, addr);
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/kabuki.c Added

@@ -0,0 +1,156 @@
+/***************************************************************************
+
+"Kabuki" Z80 encryption
+
+
+The "Kabuki" is a custom Z80 module which runs encrypted code. The encryption
+key is stored in some battery-backed RAM, therefore the chip has the annoying
+habit of stopping working every few years, when the battery dies.
+Check at the bottom of this text to see a list of all the known games which
+use this chip.
+
+
+How it works:
+The base operation is a bit swap which affects couples of adjacent bits.
+Each of the 4 couples may or may not be swapped, depending on the address of
+the byte and on whether it is an opcode or data.
+The decryption consists of these steps:
+- bitswap
+- ROL
+- bitswap
+- XOR with a key
+- ROL
+- bitswap
+- ROL
+- bitswap
+
+To know how to apply the bit swap, take the address of the byte to decode and:
+- if the byte is an opcode, add addr_key to the address
+- if the byte is data, XOR the address with 1FC0, add 1, and then add addr_key
+You'll get a 16-bit word. The first two bitswaps depend on bits 0-7 of that
+word, while the second two on bits 8-15. When a bit in the word is 1, swap the
+two bits, oherwise don't. The exact couple of bits affected depends on the
+game and is identified in this file with two keys: swap_key1 and swap_key2
+(which are just permutations of the numbers 0-7, not full 32-bit integers).
+
+
+Key space size:
+- swap_key1 8! = 40320
+- swap_key2 8! = 40320
+- addr_key 2^16 = 65536
+- xor_key 2^8 = 256
+- total 2.7274 * 10^16
+
+
+Weaknesses:
+- 0x00 and 0xff, having all the bits set to the same value, are not affected
+ by bit permutations after the XOR. Therefore, their encryption is the same
+ regardless of the high 8 bits of the address, and of the value of
+ swap_key2. If there is a long stream of 0x00 or 0xff in the original data,
+ this can be used to find by brute force all the candidates for swap_key1,
+ xor_key, and for the low 8 bits of addr_key. This is a serious weakness
+ which dramatically reduces the security of the encryption.
+- A 0x00 is always encrypted as a byte with as many 1s as xor_key; a 0xff is
+ always encrypted as a byte with as many 0s as xor_key has 1s. So you just
+ need to know one 0x00 or 0xff in the unencrypted data to know how many 1s
+ there are in xor_key.
+- Once you have restricted the range for swap_key1 and you know the number of
+ 1s in the xor_key, you can easily use known plaintext attacks and brute
+ force to find the remaining keys. Long strings like THIS GAME IS FOR USE IN
+ and ABCDEFGHIJKLMNOPQRSTUVWXYZ can be found by comparing the number of 1s
+ in the clear and encrypted data, taking xor_key into account. When you have
+ found where the string is, use brute force to reduce the key space.
+
+
+Known games:
+ swap_key1 swap_key2 addr_key xor_key
+Mahjong Gakuen 2 Gakuen-chou no Fukushuu 76543210 01234567 aa55 a5
+Poker Ladies " " " " "" ""
+Dokaben " " " " "" ""
+Dokaben 2 unknown
+Pang / Buster Bros / Pomping World 01234567 76543210 6548 24
+Capcom Baseball " " " " "" ""
+Capcom World 04152637 40516273 5751 43
+Adventure Quiz 2 Hatena ? no Dai-Bouken 45670123 45670123 5751 43
+Super Pang 45670123 45670123 5852 43
+Super Buster Bros 45670123 45670123 2130 12
+Super Marukin-Ban 54321076 54321076 4854 4f
+Quiz Tonosama no Yabou 12345670 12345670 1111 11
+Ashita Tenki ni Naare unknown
+Quiz Sangokushi 23456701 23456701 1828 18
+Block Block 02461357 64207531 0002 01
+
+Warriors of Fate 01234567 54163072 5151 51
+Cadillacs and Dinosaurs 76543210 24601357 4343 43
+Punisher 67452103 75316024 2222 22
+Slam Masters 54321076 65432107 3131 19
+
+***************************************************************************/
+
+#include "cpuintrf.h"
+
+static int bitswap1(int src,int key,int sel)
+{
+	if (sel & (1 << ((key >> 0) & 7)))
+		src = (src & 0xfc) | ((src & 0x01) << 1) | ((src & 0x02) >> 1);
+	if (sel & (1 << ((key >> 4) & 7)))
+		src = (src & 0xf3) | ((src & 0x04) << 1) | ((src & 0x08) >> 1);
+	if (sel & (1 << ((key >> 8) & 7)))
+		src = (src & 0xcf) | ((src & 0x10) << 1) | ((src & 0x20) >> 1);
+	if (sel & (1 << ((key >>12) & 7)))
+		src = (src & 0x3f) | ((src & 0x40) << 1) | ((src & 0x80) >> 1);
+
+	return src;
+}
+
+static int bitswap2(int src,int key,int sel)
+{
+	if (sel & (1 << ((key >>12) & 7)))
+		src = (src & 0xfc) | ((src & 0x01) << 1) | ((src & 0x02) >> 1);
+	if (sel & (1 << ((key >> 8) & 7)))
+		src = (src & 0xf3) | ((src & 0x04) << 1) | ((src & 0x08) >> 1);
+	if (sel & (1 << ((key >> 4) & 7)))
+		src = (src & 0xcf) | ((src & 0x10) << 1) | ((src & 0x20) >> 1);
+	if (sel & (1 << ((key >> 0) & 7)))
+		src = (src & 0x3f) | ((src & 0x40) << 1) | ((src & 0x80) >> 1);
+
+	return src;
+}
+
+static int bytedecode(int src,int swap_key1,int swap_key2,int xor_key,int sel)
+{
+	src = bitswap1(src,swap_key1 & 0xffff,sel & 0xff);
+	src = ((src & 0x7f) << 1) | ((src & 0x80) >> 7);
+	src = bitswap2(src,swap_key1 >> 16,sel & 0xff);
+	src ^= xor_key;
+	src = ((src & 0x7f) << 1) | ((src & 0x80) >> 7);
+	src = bitswap2(src,swap_key2 & 0xffff,sel >> 8);
+	src = ((src & 0x7f) << 1) | ((src & 0x80) >> 7);
+	src = bitswap1(src,swap_key2 >> 16,sel >> 8);
+	return src;
+}
+
+static void kabuki_decode(unsigned char *src,unsigned char *dest_op,unsigned char *dest_data,
+		int base_addr,int length,int swap_key1,int swap_key2,int addr_key,int xor_key)
+{
+	int A;
+	int sel;
+
+	for (A = 0; A < length; A++)
+	{
+		/* decode opcodes */
+		sel = (A + base_addr) + addr_key;
+		dest_op[A] = bytedecode(src[A],swap_key1,swap_key2,xor_key,sel);
+
+		/* decode data */
+		sel = ((A + base_addr) ^ 0x1fc0) + addr_key + 1;
+		dest_data[A] = bytedecode(src[A],swap_key1,swap_key2,xor_key,sel);
+	}
+}
+
+void cps1_decode(unsigned char *rom, int swap_key1,int swap_key2,int addr_key,int xor_key)
+{
+	int diff = (512*1024)/2;
+
+	kabuki_decode(rom, rom+diff, rom, 0x0000, 0x8000, swap_key1, swap_key2, addr_key, xor_key);
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/qsound.c Added

@@ -0,0 +1,442 @@
+/***************************************************************************
+
+ Capcom System QSound(tm)
+ ========================
+
+ Driver by Paul Leaman (paul@vortexcomputing.demon.co.uk)
+		and Miguel Angel Horna (mahorna@teleline.es)
+
+ A 16 channel stereo sample player.
+
+ QSpace position is simulated by panning the sound in the stereo space.
+
+ Register
+ 0	 xxbb	xx = unknown bb = start high address
+ 1	 ssss	ssss = sample start address
+ 2	 pitch
+ 3	 unknown (always 0x8000)
+ 4	 loop offset from end address
+ 5	 end
+ 6	 master channel volume
+ 7	 not used
+ 8	 Balance (left=0x0110 centre=0x0120 right=0x0130)
+ 9	 unknown (most fixed samples use 0 for this register)
+
+ Many thanks to CAB (the author of Amuse), without whom this probably would
+ never have been finished.
+
+ If anybody has some information about this hardware, please send it to me
+ to mahorna@teleline.es or 432937@cepsz.unizar.es.
+ http://teleline.terra.es/personal/mahorna
+
+***************************************************************************/
+
+#include <math.h>
+#include "cpuintrf.h"
+#include "qsound.h"
+
+#if 0
+#if QSOUND_DRIVER2
+void setchannel(int channel,signed short *buffer,int length,int vol,int pan);
+void setchloop(int channel,int loops,int loope);
+void stopchan(int channel);
+void calcula_mix(int channel);
+#endif
+#endif
+
+qsound_state_t *qsound_sh_start( struct QSound_interface *qsintf )
+{
+ qsound_state_t *qs = malloc (sizeof (qsound_state_t));
+ memset (qs, 0, sizeof (qsound_state_t));
+ memcpy (&qs->intf, qsintf, sizeof (struct QSound_interface));
+
+	int i;
+
+	qs->qsound_sample_rom = (QSOUND_SRC_SAMPLE *)qs->intf.sample_rom;
+
+	memset(qs->qsound_channel, 0, sizeof(qs->qsound_channel));
+
+#if QSOUND_DRIVER1
+	qs->qsound_frq_ratio = ((float)qs->intf.clock / (float)QSOUND_CLOCKDIV) /
+						(float) 44100;
+	qs->qsound_frq_ratio *= 16.0;
+
+	/* Create pan table */
+	for (i=0; i<33; i++)
+	{
+		qs->qsound_pan_table[i]=(int)((256/sqrt(32)) * sqrt(i));
+	}
+#else
+	i=0;
+#endif
+
+#if LOG_QSOUND
+	logerror("Pan table\n");
+	for (i=0; i<33; i++)
+		logerror("%02x ", qs->qsound_pan_table[i]);
+#endif
+#if 0
+	{
+		/* Allocate stream */
+#define CHANNELS ( 2 )
+		char buf[CHANNELS][40];
+		const char *name[CHANNELS];
+		int vol[2];
+		name[0] = buf[0];
+		name[1] = buf[1];
+		sprintf( buf[0], "%s L", sound_name(msound) );
+		sprintf( buf[1], "%s R", sound_name(msound) );
+		vol[0]=MIXER(intf->mixing_level[0], MIXER_PAN_LEFT);
+		vol[1]=MIXER(intf->mixing_level[1], MIXER_PAN_RIGHT);
+		qsound_stream = stream_init_multi(
+			CHANNELS,
+			name,
+			vol,
+			Machine->sample_rate,
+			0,
+			qsound_update );
+	}
+#endif
+#if LOG_WAVE
+	qs->fpRawDataR=fopen("qsoundr.raw", "w+b");
+	qs->fpRawDataL=fopen("qsoundl.raw", "w+b");
+	if (!qs->fpRawDataR || !qs->fpRawDataL)
+	{
+		return NULL;
+	}
+#endif
+
+	return qs;
+}
+
+void qsound_sh_stop (qsound_state_t *qs)
+{
+ if (qs) {
+#if LOG_WAVE
+ if (qs->fpRawDataR)
+ {
+ fclose(qs->fpRawDataR);
+ }
+ if (qs->fpRawDataL)
+ {
+ fclose(qs->fpRawDataL);
+ }
+#endif
+ free (qs);
+ }
+}
+
+void qsound_data_h_w(qsound_state_t *qs, int data)
+{
+	qs->qsound_data=(qs->qsound_data&0xff)|(data<<8);
+}
+
+void qsound_data_l_w(qsound_state_t *qs, int data)
+{
+	qs->qsound_data=(qs->qsound_data&0xff00)|data;
+}
+
+void qsound_cmd_w(qsound_state_t *qs, int data)
+{
+//	printf("QS: cmd %x, data %x\n", data, qs->qsound_data);
+	qsound_set_command(qs, data, qs->qsound_data);
+}
+
+int qsound_status_r(qsound_state_t *qs)
+{
+	/* Port ready bit (0x80 if ready) */
+	return 0x80;
+}
+
+void qsound_set_command(qsound_state_t *qs, int data, int value)
+{
+	int ch=0,reg=0;
+	if (data < 0x80)
+	{
+		ch=data>>3;
+		reg=data & 0x07;
+	}
+	else
+	{
+		if (data < 0x90)
+		{
+			ch=data-0x80;
+			reg=8;
+		}
+		else
+		{
+			if (data >= 0xba && data < 0xca)
+			{
+				ch=data-0xba;
+				reg=9;
+			}
+			else
+			{
+				/* Unknown registers */
+				ch=99;
+				reg=99;
+			}
+		}
+	}
+
+	switch (reg)
+	{
+		case 0: /* Bank */
+			ch=(ch+1)&0x0f;	/* strange ... */
+			qs->qsound_channel[ch].bank=(value&0x7f)<<16;
+			qs->qsound_channel[ch].bank /= LENGTH_DIV;
+#ifdef MAME_DEBUG
+			if (!value & 0x8000)
+			{
+				char baf[40];
+				sprintf(baf,"Register3=%04x",value);
+				usrintf_showmessage(baf);
+			}
+#endif
+
+			break;
+		case 1: /* start */
+//			printf("QS: key on ch %02d\n", ch);
+			qs->qsound_channel[ch].address=value;
+			qs->qsound_channel[ch].address/=LENGTH_DIV;
+			break;
+		case 2: /* pitch */
+#if QSOUND_DRIVER1
+			qs->qsound_channel[ch].pitch=(long)
+					((float)value * qs->qsound_frq_ratio );
+			qs->qsound_channel[ch].pitch/=LENGTH_DIV;
+#else
+			qs->qsound_channel[ch].factor=((float) (value*(6/LENGTH_DIV)) /
+									 (float) Machine->sample_rate)*256.0;
+
+#endif
+			if (!value)
+			{
+				/* Key off */
+//				printf("QS: key off ch %02d\n", ch);
+				qs->qsound_channel[ch].key=0;
+			}
+			break;
+		case 3: /* unknown */
+			qs->qsound_channel[ch].reg3=value;
+#ifdef MAME_DEBUG
+			if (value != 0x8000)
+			{
+				char baf[40];
+				sprintf(baf,"Register3=%04x",value);
+				usrintf_showmessage(baf);
+			}
+#endif
+			break;
+		case 4: /* loop offset */
+			qs->qsound_channel[ch].loop=value/LENGTH_DIV;
+			break;
+		case 5: /* end */
+			qs->qsound_channel[ch].end=value/LENGTH_DIV;
+			break;
+		case 6: /* master volume */
+			if (value==0)
+			{
+				/* Key off */
+				qs->qsound_channel[ch].key=0;
+			}
+			else if (qs->qsound_channel[ch].key==0)
+			{
+				/* Key on */
+				qs->qsound_channel[ch].key=1;
+#if QSOUND_DRIVER1
+				qs->qsound_channel[ch].offset=0;
+				qs->qsound_channel[ch].lastdt=0;
+#else
+				qs->qsound_channel[ch].cursor=qs->qsound_channel[ch].address <<8 ;
+				qs->qsound_channel[ch].buffer=qsound_sample_rom+
+										 qs->qsound_channel[ch].bank;
+#endif
+			}
+			qs->qsound_channel[ch].vol=value;
+#if QSOUND_DRIVER2
+			calcula_mix(ch);
+#endif
+			break;
+
+		case 7: /* unused */
+#ifdef MAME_DEBUG
+			{
+				char baf[40];
+				sprintf(baf,"UNUSED QSOUND REG 7=%04x",value);
+				usrintf_showmessage(baf);
+			}
+#endif
+
+			break;
+		case 8:
+			{
+#if QSOUND_DRIVER1
+			 int pandata=(value-0x10)&0x3f;
+			 if (pandata > 32)
+			 {
+					pandata=32;
+			 }
+			 qs->qsound_channel[ch].rvol=qs->qsound_pan_table[pandata];
+			 qs->qsound_channel[ch].lvol=qs->qsound_pan_table[32-pandata];
+#endif
+			 qs->qsound_channel[ch].pan = value;
+#if QSOUND_DRIVER2
+			 calcula_mix(ch);
+#endif
+			}
+			break;
+		 case 9:
+			qs->qsound_channel[ch].reg9=value;
+/*
+#ifdef MAME_DEBUG
+			{
+				char baf[40];
+				sprintf(baf,"QSOUND REG 9=%04x",value);
+				usrintf_showmessage(baf);
+			}
+#endif
+*/
+			break;
+	}
+#if LOG_QSOUND
+	logerror("QSOUND WRITE %02x CH%02d-R%02d =%04x\n", data, ch, reg, value);
+#endif
+}
+
+#if QSOUND_DRIVER1
+
+/* Driver 1 - based on the Amuse source */
+
+void qsound_update(qsound_state_t *qs, int num, INT16 **buffer, int length )
+{
+	int i,j;
+	int rvol, lvol, count;
+	struct QSOUND_CHANNEL *pC=&qs->qsound_channel[0];
+	QSOUND_SRC_SAMPLE * pST;
+	QSOUND_SAMPLE *datap[2];
+
+	datap[0] = buffer[0];
+	datap[1] = buffer[1];
+	memset( datap[0], 0x00, length * sizeof(QSOUND_SAMPLE) );
+	memset( datap[1], 0x00, length * sizeof(QSOUND_SAMPLE) );
+
+
+	for (i=0; i<QSOUND_CHANNELS; i++)
+	{
+		if (pC->key)
+		{
+			QSOUND_SAMPLE *pOutL=datap[0];
+			QSOUND_SAMPLE *pOutR=datap[1];
+			pST=qs->qsound_sample_rom+pC->bank;
+
+			rvol=(pC->rvol*pC->vol)>>(8*LENGTH_DIV);
+			lvol=(pC->lvol*pC->vol)>>(8*LENGTH_DIV);
+
+			for (j=length-1; j>=0; j--)
+			{
+				count=(pC->offset)>>16;
+				pC->offset &= 0xffff;
+				if (count)
+				{
+					pC->address += count;
+					if (pC->address >= pC->end)
+					{
+						if (!pC->loop)
+						{
+							/* Reached the end of a non-looped sample */
+							pC->key=0;
+							break;
+						}
+						/* Reached the end, restart the loop */
+						pC->address = (pC->end - pC->loop) & 0xffff;
+					}
+					pC->lastdt = pST[pC->address];
+				}
+
+				(*pOutL) += ((pC->lastdt * lvol) >> 6);
+				(*pOutR) += ((pC->lastdt * rvol) >> 6);
+				pOutL++;
+				pOutR++;
+				pC->offset += pC->pitch;
+			}
+		}
+		pC++;
+	}
+
+#if LOG_WAVE
+	fwrite(datap[0], length*sizeof(QSOUND_SAMPLE), 1, fpRawDataL);
+	fwrite(datap[1], length*sizeof(QSOUND_SAMPLE), 1, fpRawDataR);
+#endif
+}
+
+#else
+
+/* ----------------------------------------------------------------
+		QSound Sample Mixer (Slow)
+		Miguel Angel Horna mahorna@teleline.es
+
+ ------------------------------------------------------------------ */
+
+
+void calcula_mix(int channel)
+{
+	int factl,factr;
+	struct qs->qsound_channel *pC=&qs->qsound_channel[channel];
+	int vol=pC->vol>>5;
+	int pan=((pC->pan&0xFF)-0x10)<<3;
+	pC->mixl=vol;
+	pC->mixr=vol;
+	factr=pan;
+	factl=255-factr;
+	pC->mixl=(pC->mixl * factl)>>8;
+	pC->mixr=(pC->mixr * factr)>>8;
+#if QSOUND_8BIT_SAMPLES
+	pC->mixl<<=8;
+	pC->mixr<<=8;
+#endif
+}
+
+void qsound_update(int num,void **buffer,int length)
+{
+	int i,j;
+	QSOUND_SAMPLE *bufL,*bufR, sample;
+	struct qs->qsound_channel *pC=qs->qsound_channel;
+
+	memset( buffer[0], 0x00, length * sizeof(QSOUND_SAMPLE) );
+	memset( buffer[1], 0x00, length * sizeof(QSOUND_SAMPLE) );
+
+	for(j=0;j<qs->qsound_channelS;++j)
+	{
+		 bufL=(QSOUND_SAMPLE *) buffer[0];
+		 bufR=(QSOUND_SAMPLE *) buffer[1];
+		 if(pC->key)
+		 {
+				for(i=0;i<length;++i)
+				{
+						 int pos=pC->cursor>>8;
+						 if(pos!=pC->lpos)	/*next sample*/
+						 {
+								sample=pC->buffer[pos];
+								pC->lastsaml=(sample*pC->mixl)>>8;
+								pC->lastsamr=(sample*pC->mixr)>>8;
+								pC->lpos=pos;
+						 }
+						 (*bufL++)+=pC->lastsaml;
+						 (*bufR++)+=pC->lastsamr;
+						 pC->cursor+=pC->factor;
+						 if(pC->loop && (pC->cursor>>8) > pC->end)
+						 {
+								 pC->cursor=(pC->end-pC->loop)<<8;
+						 }
+						 else if((pC->cursor>>8) > pC->end)
+								 pC->key=0;
+				 }
+		 }
+		 pC++;
+	 }
+}
+#endif
+
+
+/**************** end of file ****************/

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/qsound.h Added

@@ -0,0 +1,117 @@
+/*********************************************************
+
+    Capcom Q-Sound system
+
+*********************************************************/
+
+#ifndef __QSOUND_H__
+#define __QSOUND_H__
+
+#define QSOUND_CLOCK    4000000   /* default 4MHz clock */
+
+struct QSound_interface 
+{
+	int clock;			/* clock */
+	char *sample_rom;		/* sample data */
+};
+
+
+/*
+Two Q sound drivers:
+DRIVER1 Based on the Amuse source
+DRIVER2 Miguel Angel Horna (mahorna@teleline.es)
+*/
+#define QSOUND_DRIVER1	  1
+/*
+I don't know whether this system uses 8 bit or 16 bit samples.
+If it uses 16 bit samples then the sample ROM loading macros need
+to be modified to work with non-intel machines.
+*/
+#define QSOUND_8BIT_SAMPLES 1
+
+/*
+Debug defines
+*/
+#define LOG_WAVE	0
+#define LOG_QSOUND  0
+
+/* Typedefs & defines */
+
+#define QSOUND_DRIVER2 !QSOUND_DRIVER1
+
+#if QSOUND_8BIT_SAMPLES
+/* 8 bit source ROM samples */
+typedef signed char QSOUND_SRC_SAMPLE;
+#define LENGTH_DIV 1
+#else
+/* 8 bit source ROM samples */
+typedef signed short QSOUND_SRC_SAMPLE;
+#define LENGTH_DIV 2
+#endif
+
+#define QSOUND_CLOCKDIV 166			 /* Clock divider */
+#define QSOUND_CHANNELS 16
+typedef INT16 QSOUND_SAMPLE;
+
+struct QSOUND_CHANNEL
+{
+	int bank;	   /* bank (x16)	*/
+	int address;	/* start address */
+	int pitch;	  /* pitch */
+	int reg3;	   /* unknown (always 0x8000) */
+	int loop;	   /* loop address */
+	int end;		/* end address */
+	int vol;		/* master volume */
+	int pan;		/* Pan value */
+	int reg9;	   /* unknown */
+
+	/* Work variables */
+	int key;		/* Key on / key off */
+
+#if QSOUND_DRIVER1
+	int lvol;	   /* left volume */
+	int rvol;	   /* right volume */
+	int lastdt;	 /* last sample value */
+	int offset;	 /* current offset counter */
+#else
+	QSOUND_SRC_SAMPLE *buffer;
+	int factor;		   /*step factor (fixed point 8-bit)*/
+	int mixl,mixr;		/*mixing factor (fixed point)*/
+	int cursor;		   /*current sample position (fixed point)*/
+	int lpos;			 /*last cursor pos*/
+	int lastsaml;		 /*last left sample (to avoid any calculation)*/
+	int lastsamr;		 /*last right sample*/
+#endif
+};
+
+
+typedef struct {
+    /* Private variables */
+    struct QSound_interface intf;	/* Interface  */
+    int qsound_stream;				/* Audio stream */
+    struct QSOUND_CHANNEL qsound_channel[QSOUND_CHANNELS];
+    int qsound_data;				  /* register latch data */
+    QSOUND_SRC_SAMPLE *qsound_sample_rom;	/* Q sound sample ROM */
+
+#if QSOUND_DRIVER1
+    int qsound_pan_table[33];		 /* Pan volume table */
+    float qsound_frq_ratio;		   /* Frequency ratio */
+#endif
+
+#if LOG_WAVE
+    FILE *fpRawDataL;
+    FILE *fpRawDataR;
+#endif
+} qsound_state_t;
+
+qsound_state_t *qsound_sh_start(struct QSound_interface *qsintf);
+void qsound_sh_stop(qsound_state_t *qs);
+
+void qsound_data_h_w(qsound_state_t *qs, int data);
+void qsound_data_l_w(qsound_state_t *qs, int data);
+void qsound_cmd_w(qsound_state_t *qs, int data);
+int qsound_status_r(qsound_state_t *qs);
+void qsound_update(qsound_state_t *qs, int num, INT16 **buffer, int length);
+void qsound_set_command(qsound_state_t *qs, int data, int value);
+
+#endif /* __QSOUND_H__ */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/z80.c Added

@@ -0,0 +1,4425 @@
+/*****************************************************************************
+ *
+ *	 z80.c
+ *	 Portable Z80 emulator V3.5
+ *
+ *	 Copyright (C) 1998,1999,2000 Juergen Buchmueller, all rights reserved.
+ *
+ *	 - This source code is released as freeware for non-commercial purposes.
+ *	 - You are free to use and redistribute this code in modified or
+ *	 unmodified form, provided you list me in the credits.
+ *	 - If you modify this source code, you must add a notice to each modified
+ *	 source file that it has been changed. If you're a nice person, you
+ *	 will clearly mark each change too. :)
+ *	 - If you wish to use this for commercial purposes, please contact me at
+ *	 pullmoll@t-online.de
+ *	 - The author of this copywritten work reserves the right to change the
+ *	 terms of its usage and license at any time, including retroactively
+ *	 - This entire notice must remain in the source code.
+ *
+ *	 Changes in 3.5
+ *	 - Implemented OTIR, INIR, etc. without look-up table for PF flag.
+ *	 [Ramsoft, Sean Young]
+ *	 Changes in 3.4
+ *	 - Removed Z80-MSX specific code as it's not needed any more.
+ *	 - Implemented DAA without look-up table [Ramsoft, Sean Young]
+ *	 Changes in 3.3
+ *	 - Fixed undocumented flags XF & YF in the non-asm versions of CP,
+ *	 and all the 16 bit arithmetic instructions. [Sean Young]
+ *	 Changes in 3.2
+ *	 - Fixed undocumented flags XF & YF of RRCA, and CF and HF of
+ *	 INI/IND/OUTI/OUTD/INIR/INDR/OTIR/OTDR [Sean Young]
+ *	 Changes in 3.1
+ *	 - removed the REPEAT_AT_ONCE execution of LDIR/CPIR etc. opcodes
+ *	 for readabilities sake and because the implementation was buggy
+ *	 (and I was not able to find the difference)
+ *	 Changes in 3.0
+ *	 - 'finished' switch to dynamically overrideable cycle count tables
+ *	 Changes in 2.9:
+ *	 - added methods to access and override the cycle count tables
+ *	 - fixed handling and timing of multiple DD/FD prefixed opcodes
+ *	 Changes in 2.8:
+ *	 - OUTI/OUTD/OTIR/OTDR also pre-decrement the B register now.
+ *	 This was wrong because of a bug fix on the wrong side
+ *	 (astrocade sound driver).
+ *	 Changes in 2.7:
+ *	 - removed z80_vm specific code, it's not needed (and never was).
+ *	 Changes in 2.6:
+ *	 - BUSY_LOOP_HACKS needed to call change_pc16() earlier, before
+ *		checking the opcodes at the new address, because otherwise they
+ *		might access the old (wrong or even NULL) banked memory region.
+ *		Thanks to Sean Young for finding this nasty bug.
+ *	 Changes in 2.5:
+ *	 - Burning cycles always adjusts the ICount by a multiple of 4.
+ *	 - In REPEAT_AT_ONCE cases the R register wasn't incremented twice
+ *		per repetition as it should have been. Those repeated opcodes
+ *		could also underflow the ICount.
+ *	 - Simplified TIME_LOOP_HACKS for BC and added two more for DE + HL
+ *		timing loops. I think those hacks weren't endian safe before too.
+ *	 Changes in 2.4:
+ *	 - z80_reset zaps the entire context, sets IX and IY to 0xffff(!) and
+ *		sets the Z flag. With these changes the Tehkan World Cup driver
+ *		_seems_ to work again.
+ *	 Changes in 2.3:
+ *	 - External termination of the execution loop calls z80_burn() and
+ *		z80_vm_burn() to burn an amount of cycles (R adjustment)
+ *	 - Shortcuts which burn CPU cycles (BUSY_LOOP_HACKS and TIME_LOOP_HACKS)
+ *		now also adjust the R register depending on the skipped opcodes.
+ *	 Changes in 2.2:
+ *	 - Fixed bugs in CPL, SCF and CCF instructions flag handling.
+ *	 - Changed variable EA and ARG16() function to UINT32; this
+ *		produces slightly more efficient code.
+ *	 - The DD/FD XY CB opcodes where XY is 40-7F and Y is not 6/E
+ *		are changed to calls to the X6/XE opcodes to reduce object size.
+ *		They're hardly ever used so this should not yield a speed penalty.
+ *	 New in 2.0:
+ *	 - Optional more exact Z80 emulation (#define Z80_EXACT 1) according
+ *		to a detailed description by Sean Young which can be found at:
+ *		http://www.msxnet.org/tech/z80-documented.pdf
+ *****************************************************************************/
+
+#include "ao.h"
+
+#include "cpuintrf.h"
+#include "z80.h"
+
+#include "mem.h"
+
+static UINT8 z80_reg_layout[] = {
+	Z80_PC, Z80_SP, Z80_AF, Z80_BC, Z80_DE, Z80_HL, -1,
+	Z80_IX, Z80_IY, Z80_AF2,Z80_BC2,Z80_DE2,Z80_HL2,-1,
+	Z80_R,	Z80_I,	Z80_IM, Z80_IFF1,Z80_IFF2, -1,
+	Z80_NMI_STATE,Z80_IRQ_STATE,Z80_DC0,Z80_DC1,Z80_DC2,Z80_DC3, 0
+};
+
+static UINT8 z80_win_layout[] = {
+	27, 0,53, 4,	/* register window (top rows) */
+	 0, 0,26,22,	/* disassembler window (left colums) */
+	27, 5,53, 8,	/* memory #1 window (right, upper middle) */
+	27,14,53, 8,	/* memory #2 window (right, lower middle) */
+	 0,23,80, 1,	/* command line window (bottom rows) */
+};
+
+#define CF	0x01
+#define NF	0x02
+#define PF	0x04
+#define VF	PF
+#define XF	0x08
+#define HF	0x10
+#define YF	0x20
+#define ZF	0x40
+#define SF	0x80
+
+#define INT_IRQ 0x01
+#define NMI_IRQ 0x02
+
+#define _PPC	z80->Z80.PREPC.d		/* previous program counter */
+
+#define _PCD	z80->Z80.PC.d
+#define _PC		z80->Z80.PC.w.l
+
+#define _SPD	z80->Z80.SP.d
+#define _SP		z80->Z80.SP.w.l
+
+#define _AFD	z80->Z80.AF.d
+#define _AF		z80->Z80.AF.w.l
+#define _Z80_A		z80->Z80.AF.b.h
+#define _F		z80->Z80.AF.b.l
+
+#define _BCD	z80->Z80.BC.d
+#define _BC		z80->Z80.BC.w.l
+#define _Z80_B		z80->Z80.BC.b.h
+#define _Z80_C		z80->Z80.BC.b.l
+
+#define _DED	z80->Z80.DE.d
+#define _DE		z80->Z80.DE.w.l
+#define _Z80_D		z80->Z80.DE.b.h
+#define _Z80_E		z80->Z80.DE.b.l
+
+#define _HLD	z80->Z80.HL.d
+#define _HL		z80->Z80.HL.w.l
+#define _Z80_H		z80->Z80.HL.b.h
+#define _Z80_L		z80->Z80.HL.b.l
+
+#define _IXD	z80->Z80.IX.d
+#define _IX		z80->Z80.IX.w.l
+#define _HX		z80->Z80.IX.b.h
+#define _LX		z80->Z80.IX.b.l
+
+#define _IYD	z80->Z80.IY.d
+#define _IY		z80->Z80.IY.w.l
+#define _HY		z80->Z80.IY.b.h
+#define _LY		z80->Z80.IY.b.l
+
+#define _Z80_I		z80->Z80.I
+#define _Z80_R		z80->Z80.R
+#define _R2		z80->Z80.R2
+#define _IM		z80->Z80.IM
+#define _IFF1	z80->Z80.IFF1
+#define _IFF2	z80->Z80.IFF2
+#define _HALT	z80->Z80.HALT
+
+static const UINT8 cc_op[0x100] = {
+ 4,10, 7, 6, 4, 4, 7, 4, 4,11, 7, 6, 4, 4, 7, 4,
+ 8,10, 7, 6, 4, 4, 7, 4,12,11, 7, 6, 4, 4, 7, 4,
+ 7,10,16, 6, 4, 4, 7, 4, 7,11,16, 6, 4, 4, 7, 4,
+ 7,10,13, 6,11,11,10, 4, 7,11,13, 6, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 7, 7, 7, 7, 7, 7, 4, 7, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4,
+ 5,10,10,10,10,11, 7,11, 5,10,10, 0,10,17, 7,11,
+ 5,10,10,11,10,11, 7,11, 5, 4,10,11,10, 0, 7,11,
+ 5,10,10,19,10,11, 7,11, 5, 4,10, 4,10, 0, 7,11,
+ 5,10,10, 4,10,11, 7,11, 5, 6,10, 4,10, 0, 7,11};
+
+static const UINT8 cc_cb[0x100] = {
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,12, 8, 8, 8, 8, 8, 8, 8,12, 8,
+ 8, 8, 8, 8, 8, 8,12, 8, 8, 8, 8, 8, 8, 8,12, 8,
+ 8, 8, 8, 8, 8, 8,12, 8, 8, 8, 8, 8, 8, 8,12, 8,
+ 8, 8, 8, 8, 8, 8,12, 8, 8, 8, 8, 8, 8, 8,12, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8,
+ 8, 8, 8, 8, 8, 8,15, 8, 8, 8, 8, 8, 8, 8,15, 8};
+
+static const UINT8 cc_ed[0x100] = {
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+12,12,15,20, 8, 8, 8, 9,12,12,15,20, 8, 8, 8, 9,
+12,12,15,20, 8, 8, 8, 9,12,12,15,20, 8, 8, 8, 9,
+12,12,15,20, 8, 8, 8,18,12,12,15,20, 8, 8, 8,18,
+12,12,15,20, 8, 8, 8, 8,12,12,15,20, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+16,16,16,16, 8, 8, 8, 8,16,16,16,16, 8, 8, 8, 8,
+16,16,16,16, 8, 8, 8, 8,16,16,16,16, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8};
+
+static const UINT8 cc_xy[0x100] = {
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,15, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,15, 4, 4, 4, 4, 4, 4,
+ 4,14,20,10, 9, 9, 9, 4, 4,15,20,10, 9, 9, 9, 4,
+ 4, 4, 4, 4,23,23,19, 4, 4,15, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 9, 9, 9, 9, 9, 9,19, 9, 9, 9, 9, 9, 9, 9,19, 9,
+19,19,19,19,19,19, 4,19, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 9, 9,19, 4, 4, 4, 4, 4, 9, 9,19, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4,14, 4,23, 4,15, 4, 4, 4, 8, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4,10, 4, 4, 4, 4, 4, 4};
+
+static const UINT8 cc_xycb[0x100] = {
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
+20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
+20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
+20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,
+23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23};
+
+/* extra cycles if jr/jp/call taken and 'interrupt latency' on rst 0-7 */
+static const UINT8 cc_ex[0x100] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,	/* DJNZ */
+ 5, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,	/* JR NZ/JR Z */
+ 5, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,	/* JR NC/JR C */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0,	/* LDIR/CPIR/INIR/OTIR LDDR/CPDR/INDR/OTDR */
+ 6, 0, 0, 0, 7, 0, 0, 2, 6, 0, 0, 0, 7, 0, 0, 2,
+ 6, 0, 0, 0, 7, 0, 0, 2, 6, 0, 0, 0, 7, 0, 0, 2,
+ 6, 0, 0, 0, 7, 0, 0, 2, 6, 0, 0, 0, 7, 0, 0, 2,
+ 6, 0, 0, 0, 7, 0, 0, 2, 6, 0, 0, 0, 7, 0, 0, 2};
+
+static const UINT8 *cc[6] = { cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex };
+#define Z80_TABLE_dd	Z80_TABLE_xy
+#define Z80_TABLE_fd	Z80_TABLE_xy
+
+static void take_interrupt(z80_state_t *z80);
+
+typedef void (*funcptr)(z80_state_t *z80);
+
+#define PROTOTYPES(tablename,prefix) \
+	INLINE void prefix##_00(z80_state_t *z80); INLINE void prefix##_01(z80_state_t *z80); INLINE void prefix##_02(z80_state_t *z80); INLINE void prefix##_03(z80_state_t *z80); \
+	INLINE void prefix##_04(z80_state_t *z80); INLINE void prefix##_05(z80_state_t *z80); INLINE void prefix##_06(z80_state_t *z80); INLINE void prefix##_07(z80_state_t *z80); \
+	INLINE void prefix##_08(z80_state_t *z80); INLINE void prefix##_09(z80_state_t *z80); INLINE void prefix##_0a(z80_state_t *z80); INLINE void prefix##_0b(z80_state_t *z80); \
+	INLINE void prefix##_0c(z80_state_t *z80); INLINE void prefix##_0d(z80_state_t *z80); INLINE void prefix##_0e(z80_state_t *z80); INLINE void prefix##_0f(z80_state_t *z80); \
+	INLINE void prefix##_10(z80_state_t *z80); INLINE void prefix##_11(z80_state_t *z80); INLINE void prefix##_12(z80_state_t *z80); INLINE void prefix##_13(z80_state_t *z80); \
+	INLINE void prefix##_14(z80_state_t *z80); INLINE void prefix##_15(z80_state_t *z80); INLINE void prefix##_16(z80_state_t *z80); INLINE void prefix##_17(z80_state_t *z80); \
+	INLINE void prefix##_18(z80_state_t *z80); INLINE void prefix##_19(z80_state_t *z80); INLINE void prefix##_1a(z80_state_t *z80); INLINE void prefix##_1b(z80_state_t *z80); \
+	INLINE void prefix##_1c(z80_state_t *z80); INLINE void prefix##_1d(z80_state_t *z80); INLINE void prefix##_1e(z80_state_t *z80); INLINE void prefix##_1f(z80_state_t *z80); \
+	INLINE void prefix##_20(z80_state_t *z80); INLINE void prefix##_21(z80_state_t *z80); INLINE void prefix##_22(z80_state_t *z80); INLINE void prefix##_23(z80_state_t *z80); \
+	INLINE void prefix##_24(z80_state_t *z80); INLINE void prefix##_25(z80_state_t *z80); INLINE void prefix##_26(z80_state_t *z80); INLINE void prefix##_27(z80_state_t *z80); \
+	INLINE void prefix##_28(z80_state_t *z80); INLINE void prefix##_29(z80_state_t *z80); INLINE void prefix##_2a(z80_state_t *z80); INLINE void prefix##_2b(z80_state_t *z80); \
+	INLINE void prefix##_2c(z80_state_t *z80); INLINE void prefix##_2d(z80_state_t *z80); INLINE void prefix##_2e(z80_state_t *z80); INLINE void prefix##_2f(z80_state_t *z80); \
+	INLINE void prefix##_30(z80_state_t *z80); INLINE void prefix##_31(z80_state_t *z80); INLINE void prefix##_32(z80_state_t *z80); INLINE void prefix##_33(z80_state_t *z80); \
+	INLINE void prefix##_34(z80_state_t *z80); INLINE void prefix##_35(z80_state_t *z80); INLINE void prefix##_36(z80_state_t *z80); INLINE void prefix##_37(z80_state_t *z80); \
+	INLINE void prefix##_38(z80_state_t *z80); INLINE void prefix##_39(z80_state_t *z80); INLINE void prefix##_3a(z80_state_t *z80); INLINE void prefix##_3b(z80_state_t *z80); \
+	INLINE void prefix##_3c(z80_state_t *z80); INLINE void prefix##_3d(z80_state_t *z80); INLINE void prefix##_3e(z80_state_t *z80); INLINE void prefix##_3f(z80_state_t *z80); \
+	INLINE void prefix##_40(z80_state_t *z80); INLINE void prefix##_41(z80_state_t *z80); INLINE void prefix##_42(z80_state_t *z80); INLINE void prefix##_43(z80_state_t *z80); \
+	INLINE void prefix##_44(z80_state_t *z80); INLINE void prefix##_45(z80_state_t *z80); INLINE void prefix##_46(z80_state_t *z80); INLINE void prefix##_47(z80_state_t *z80); \
+	INLINE void prefix##_48(z80_state_t *z80); INLINE void prefix##_49(z80_state_t *z80); INLINE void prefix##_4a(z80_state_t *z80); INLINE void prefix##_4b(z80_state_t *z80); \
+	INLINE void prefix##_4c(z80_state_t *z80); INLINE void prefix##_4d(z80_state_t *z80); INLINE void prefix##_4e(z80_state_t *z80); INLINE void prefix##_4f(z80_state_t *z80); \
+	INLINE void prefix##_50(z80_state_t *z80); INLINE void prefix##_51(z80_state_t *z80); INLINE void prefix##_52(z80_state_t *z80); INLINE void prefix##_53(z80_state_t *z80); \
+	INLINE void prefix##_54(z80_state_t *z80); INLINE void prefix##_55(z80_state_t *z80); INLINE void prefix##_56(z80_state_t *z80); INLINE void prefix##_57(z80_state_t *z80); \
+	INLINE void prefix##_58(z80_state_t *z80); INLINE void prefix##_59(z80_state_t *z80); INLINE void prefix##_5a(z80_state_t *z80); INLINE void prefix##_5b(z80_state_t *z80); \
+	INLINE void prefix##_5c(z80_state_t *z80); INLINE void prefix##_5d(z80_state_t *z80); INLINE void prefix##_5e(z80_state_t *z80); INLINE void prefix##_5f(z80_state_t *z80); \
+	INLINE void prefix##_60(z80_state_t *z80); INLINE void prefix##_61(z80_state_t *z80); INLINE void prefix##_62(z80_state_t *z80); INLINE void prefix##_63(z80_state_t *z80); \
+	INLINE void prefix##_64(z80_state_t *z80); INLINE void prefix##_65(z80_state_t *z80); INLINE void prefix##_66(z80_state_t *z80); INLINE void prefix##_67(z80_state_t *z80); \
+	INLINE void prefix##_68(z80_state_t *z80); INLINE void prefix##_69(z80_state_t *z80); INLINE void prefix##_6a(z80_state_t *z80); INLINE void prefix##_6b(z80_state_t *z80); \
+	INLINE void prefix##_6c(z80_state_t *z80); INLINE void prefix##_6d(z80_state_t *z80); INLINE void prefix##_6e(z80_state_t *z80); INLINE void prefix##_6f(z80_state_t *z80); \
+	INLINE void prefix##_70(z80_state_t *z80); INLINE void prefix##_71(z80_state_t *z80); INLINE void prefix##_72(z80_state_t *z80); INLINE void prefix##_73(z80_state_t *z80); \
+	INLINE void prefix##_74(z80_state_t *z80); INLINE void prefix##_75(z80_state_t *z80); INLINE void prefix##_76(z80_state_t *z80); INLINE void prefix##_77(z80_state_t *z80); \
+	INLINE void prefix##_78(z80_state_t *z80); INLINE void prefix##_79(z80_state_t *z80); INLINE void prefix##_7a(z80_state_t *z80); INLINE void prefix##_7b(z80_state_t *z80); \
+	INLINE void prefix##_7c(z80_state_t *z80); INLINE void prefix##_7d(z80_state_t *z80); INLINE void prefix##_7e(z80_state_t *z80); INLINE void prefix##_7f(z80_state_t *z80); \
+	INLINE void prefix##_80(z80_state_t *z80); INLINE void prefix##_81(z80_state_t *z80); INLINE void prefix##_82(z80_state_t *z80); INLINE void prefix##_83(z80_state_t *z80); \
+	INLINE void prefix##_84(z80_state_t *z80); INLINE void prefix##_85(z80_state_t *z80); INLINE void prefix##_86(z80_state_t *z80); INLINE void prefix##_87(z80_state_t *z80); \
+	INLINE void prefix##_88(z80_state_t *z80); INLINE void prefix##_89(z80_state_t *z80); INLINE void prefix##_8a(z80_state_t *z80); INLINE void prefix##_8b(z80_state_t *z80); \
+	INLINE void prefix##_8c(z80_state_t *z80); INLINE void prefix##_8d(z80_state_t *z80); INLINE void prefix##_8e(z80_state_t *z80); INLINE void prefix##_8f(z80_state_t *z80); \
+	INLINE void prefix##_90(z80_state_t *z80); INLINE void prefix##_91(z80_state_t *z80); INLINE void prefix##_92(z80_state_t *z80); INLINE void prefix##_93(z80_state_t *z80); \
+	INLINE void prefix##_94(z80_state_t *z80); INLINE void prefix##_95(z80_state_t *z80); INLINE void prefix##_96(z80_state_t *z80); INLINE void prefix##_97(z80_state_t *z80); \
+	INLINE void prefix##_98(z80_state_t *z80); INLINE void prefix##_99(z80_state_t *z80); INLINE void prefix##_9a(z80_state_t *z80); INLINE void prefix##_9b(z80_state_t *z80); \
+	INLINE void prefix##_9c(z80_state_t *z80); INLINE void prefix##_9d(z80_state_t *z80); INLINE void prefix##_9e(z80_state_t *z80); INLINE void prefix##_9f(z80_state_t *z80); \
+	INLINE void prefix##_a0(z80_state_t *z80); INLINE void prefix##_a1(z80_state_t *z80); INLINE void prefix##_a2(z80_state_t *z80); INLINE void prefix##_a3(z80_state_t *z80); \
+	INLINE void prefix##_a4(z80_state_t *z80); INLINE void prefix##_a5(z80_state_t *z80); INLINE void prefix##_a6(z80_state_t *z80); INLINE void prefix##_a7(z80_state_t *z80); \
+	INLINE void prefix##_a8(z80_state_t *z80); INLINE void prefix##_a9(z80_state_t *z80); INLINE void prefix##_aa(z80_state_t *z80); INLINE void prefix##_ab(z80_state_t *z80); \
+	INLINE void prefix##_ac(z80_state_t *z80); INLINE void prefix##_ad(z80_state_t *z80); INLINE void prefix##_ae(z80_state_t *z80); INLINE void prefix##_af(z80_state_t *z80); \
+	INLINE void prefix##_b0(z80_state_t *z80); INLINE void prefix##_b1(z80_state_t *z80); INLINE void prefix##_b2(z80_state_t *z80); INLINE void prefix##_b3(z80_state_t *z80); \
+	INLINE void prefix##_b4(z80_state_t *z80); INLINE void prefix##_b5(z80_state_t *z80); INLINE void prefix##_b6(z80_state_t *z80); INLINE void prefix##_b7(z80_state_t *z80); \
+	INLINE void prefix##_b8(z80_state_t *z80); INLINE void prefix##_b9(z80_state_t *z80); INLINE void prefix##_ba(z80_state_t *z80); INLINE void prefix##_bb(z80_state_t *z80); \
+	INLINE void prefix##_bc(z80_state_t *z80); INLINE void prefix##_bd(z80_state_t *z80); INLINE void prefix##_be(z80_state_t *z80); INLINE void prefix##_bf(z80_state_t *z80); \
+	INLINE void prefix##_c0(z80_state_t *z80); INLINE void prefix##_c1(z80_state_t *z80); INLINE void prefix##_c2(z80_state_t *z80); INLINE void prefix##_c3(z80_state_t *z80); \
+	INLINE void prefix##_c4(z80_state_t *z80); INLINE void prefix##_c5(z80_state_t *z80); INLINE void prefix##_c6(z80_state_t *z80); INLINE void prefix##_c7(z80_state_t *z80); \
+	INLINE void prefix##_c8(z80_state_t *z80); INLINE void prefix##_c9(z80_state_t *z80); INLINE void prefix##_ca(z80_state_t *z80); INLINE void prefix##_cb(z80_state_t *z80); \
+	INLINE void prefix##_cc(z80_state_t *z80); INLINE void prefix##_cd(z80_state_t *z80); INLINE void prefix##_ce(z80_state_t *z80); INLINE void prefix##_cf(z80_state_t *z80); \
+	INLINE void prefix##_d0(z80_state_t *z80); INLINE void prefix##_d1(z80_state_t *z80); INLINE void prefix##_d2(z80_state_t *z80); INLINE void prefix##_d3(z80_state_t *z80); \
+	INLINE void prefix##_d4(z80_state_t *z80); INLINE void prefix##_d5(z80_state_t *z80); INLINE void prefix##_d6(z80_state_t *z80); INLINE void prefix##_d7(z80_state_t *z80); \
+	INLINE void prefix##_d8(z80_state_t *z80); INLINE void prefix##_d9(z80_state_t *z80); INLINE void prefix##_da(z80_state_t *z80); INLINE void prefix##_db(z80_state_t *z80); \
+	INLINE void prefix##_dc(z80_state_t *z80); INLINE void prefix##_dd(z80_state_t *z80); INLINE void prefix##_de(z80_state_t *z80); INLINE void prefix##_df(z80_state_t *z80); \
+	INLINE void prefix##_e0(z80_state_t *z80); INLINE void prefix##_e1(z80_state_t *z80); INLINE void prefix##_e2(z80_state_t *z80); INLINE void prefix##_e3(z80_state_t *z80); \
+	INLINE void prefix##_e4(z80_state_t *z80); INLINE void prefix##_e5(z80_state_t *z80); INLINE void prefix##_e6(z80_state_t *z80); INLINE void prefix##_e7(z80_state_t *z80); \
+	INLINE void prefix##_e8(z80_state_t *z80); INLINE void prefix##_e9(z80_state_t *z80); INLINE void prefix##_ea(z80_state_t *z80); INLINE void prefix##_eb(z80_state_t *z80); \
+	INLINE void prefix##_ec(z80_state_t *z80); INLINE void prefix##_ed(z80_state_t *z80); INLINE void prefix##_ee(z80_state_t *z80); INLINE void prefix##_ef(z80_state_t *z80); \
+	INLINE void prefix##_f0(z80_state_t *z80); INLINE void prefix##_f1(z80_state_t *z80); INLINE void prefix##_f2(z80_state_t *z80); INLINE void prefix##_f3(z80_state_t *z80); \
+	INLINE void prefix##_f4(z80_state_t *z80); INLINE void prefix##_f5(z80_state_t *z80); INLINE void prefix##_f6(z80_state_t *z80); INLINE void prefix##_f7(z80_state_t *z80); \
+	INLINE void prefix##_f8(z80_state_t *z80); INLINE void prefix##_f9(z80_state_t *z80); INLINE void prefix##_fa(z80_state_t *z80); INLINE void prefix##_fb(z80_state_t *z80); \
+	INLINE void prefix##_fc(z80_state_t *z80); INLINE void prefix##_fd(z80_state_t *z80); INLINE void prefix##_fe(z80_state_t *z80); INLINE void prefix##_ff(z80_state_t *z80); \
+static const funcptr tablename[0x100] = {	\
+	prefix##_00,prefix##_01,prefix##_02,prefix##_03,prefix##_04,prefix##_05,prefix##_06,prefix##_07, \
+	prefix##_08,prefix##_09,prefix##_0a,prefix##_0b,prefix##_0c,prefix##_0d,prefix##_0e,prefix##_0f, \
+	prefix##_10,prefix##_11,prefix##_12,prefix##_13,prefix##_14,prefix##_15,prefix##_16,prefix##_17, \
+	prefix##_18,prefix##_19,prefix##_1a,prefix##_1b,prefix##_1c,prefix##_1d,prefix##_1e,prefix##_1f, \
+	prefix##_20,prefix##_21,prefix##_22,prefix##_23,prefix##_24,prefix##_25,prefix##_26,prefix##_27, \
+	prefix##_28,prefix##_29,prefix##_2a,prefix##_2b,prefix##_2c,prefix##_2d,prefix##_2e,prefix##_2f, \
+	prefix##_30,prefix##_31,prefix##_32,prefix##_33,prefix##_34,prefix##_35,prefix##_36,prefix##_37, \
+	prefix##_38,prefix##_39,prefix##_3a,prefix##_3b,prefix##_3c,prefix##_3d,prefix##_3e,prefix##_3f, \
+	prefix##_40,prefix##_41,prefix##_42,prefix##_43,prefix##_44,prefix##_45,prefix##_46,prefix##_47, \
+	prefix##_48,prefix##_49,prefix##_4a,prefix##_4b,prefix##_4c,prefix##_4d,prefix##_4e,prefix##_4f, \
+	prefix##_50,prefix##_51,prefix##_52,prefix##_53,prefix##_54,prefix##_55,prefix##_56,prefix##_57, \
+	prefix##_58,prefix##_59,prefix##_5a,prefix##_5b,prefix##_5c,prefix##_5d,prefix##_5e,prefix##_5f, \
+	prefix##_60,prefix##_61,prefix##_62,prefix##_63,prefix##_64,prefix##_65,prefix##_66,prefix##_67, \
+	prefix##_68,prefix##_69,prefix##_6a,prefix##_6b,prefix##_6c,prefix##_6d,prefix##_6e,prefix##_6f, \
+	prefix##_70,prefix##_71,prefix##_72,prefix##_73,prefix##_74,prefix##_75,prefix##_76,prefix##_77, \
+	prefix##_78,prefix##_79,prefix##_7a,prefix##_7b,prefix##_7c,prefix##_7d,prefix##_7e,prefix##_7f, \
+	prefix##_80,prefix##_81,prefix##_82,prefix##_83,prefix##_84,prefix##_85,prefix##_86,prefix##_87, \
+	prefix##_88,prefix##_89,prefix##_8a,prefix##_8b,prefix##_8c,prefix##_8d,prefix##_8e,prefix##_8f, \
+	prefix##_90,prefix##_91,prefix##_92,prefix##_93,prefix##_94,prefix##_95,prefix##_96,prefix##_97, \
+	prefix##_98,prefix##_99,prefix##_9a,prefix##_9b,prefix##_9c,prefix##_9d,prefix##_9e,prefix##_9f, \
+	prefix##_a0,prefix##_a1,prefix##_a2,prefix##_a3,prefix##_a4,prefix##_a5,prefix##_a6,prefix##_a7, \
+	prefix##_a8,prefix##_a9,prefix##_aa,prefix##_ab,prefix##_ac,prefix##_ad,prefix##_ae,prefix##_af, \
+	prefix##_b0,prefix##_b1,prefix##_b2,prefix##_b3,prefix##_b4,prefix##_b5,prefix##_b6,prefix##_b7, \
+	prefix##_b8,prefix##_b9,prefix##_ba,prefix##_bb,prefix##_bc,prefix##_bd,prefix##_be,prefix##_bf, \
+	prefix##_c0,prefix##_c1,prefix##_c2,prefix##_c3,prefix##_c4,prefix##_c5,prefix##_c6,prefix##_c7, \
+	prefix##_c8,prefix##_c9,prefix##_ca,prefix##_cb,prefix##_cc,prefix##_cd,prefix##_ce,prefix##_cf, \
+	prefix##_d0,prefix##_d1,prefix##_d2,prefix##_d3,prefix##_d4,prefix##_d5,prefix##_d6,prefix##_d7, \
+	prefix##_d8,prefix##_d9,prefix##_da,prefix##_db,prefix##_dc,prefix##_dd,prefix##_de,prefix##_df, \
+	prefix##_e0,prefix##_e1,prefix##_e2,prefix##_e3,prefix##_e4,prefix##_e5,prefix##_e6,prefix##_e7, \
+	prefix##_e8,prefix##_e9,prefix##_ea,prefix##_eb,prefix##_ec,prefix##_ed,prefix##_ee,prefix##_ef, \
+	prefix##_f0,prefix##_f1,prefix##_f2,prefix##_f3,prefix##_f4,prefix##_f5,prefix##_f6,prefix##_f7, \
+	prefix##_f8,prefix##_f9,prefix##_fa,prefix##_fb,prefix##_fc,prefix##_fd,prefix##_fe,prefix##_ff \
+}
+
+PROTOTYPES(Z80op,op);
+PROTOTYPES(Z80cb,cb);
+PROTOTYPES(Z80dd,dd);
+PROTOTYPES(Z80ed,ed);
+PROTOTYPES(Z80fd,fd);
+PROTOTYPES(Z80xycb,xycb);
+
+/****************************************************************************/
+/* Burn an odd amount of cycles, that is instructions taking something		*/
+/* different from 4 T-states per opcode (and R increment)					*/
+/****************************************************************************/
+INLINE void BURNODD(z80_state_t *z80, int cycles, int opcodes, int cyclesum)
+{
+	if( cycles > 0 )
+	{
+		_Z80_R += (cycles / cyclesum) * opcodes;
+		z80->z80_ICount -= (cycles / cyclesum) * cyclesum;
+	}
+}
+
+/***************************************************************
+ * define an opcode function
+ ***************************************************************/
+#define OP(prefix,opcode) INLINE void prefix##_##opcode(z80_state_t *z80)
+
+/***************************************************************
+ * adjust cycle count by n T-states
+ ***************************************************************/
+#define CC(prefix,opcode) z80->z80_ICount -= cc[Z80_TABLE_##prefix][opcode]
+
+/***************************************************************
+ * execute an opcode
+ ***************************************************************/
+#define EXEC(prefix,opcode)										\
+{																\
+	unsigned op = opcode;										\
+	CC(prefix,op);												\
+	(*Z80##prefix[op])(z80);										\
+}
+
+#if BIG_SWITCH
+#define EXEC_INLINE(prefix,opcode)								\
+{																\
+	unsigned op = opcode;										\
+	CC(prefix,op);												\
+	switch(op)													\
+	{															\
+	case 0x00:prefix##_##00(z80);break; case 0x01:prefix##_##01(z80);break; case 0x02:prefix##_##02(z80);break; case 0x03:prefix##_##03(z80);break; \
+	case 0x04:prefix##_##04(z80);break; case 0x05:prefix##_##05(z80);break; case 0x06:prefix##_##06(z80);break; case 0x07:prefix##_##07(z80);break; \
+	case 0x08:prefix##_##08(z80);break; case 0x09:prefix##_##09(z80);break; case 0x0a:prefix##_##0a(z80);break; case 0x0b:prefix##_##0b(z80);break; \
+	case 0x0c:prefix##_##0c(z80);break; case 0x0d:prefix##_##0d(z80);break; case 0x0e:prefix##_##0e(z80);break; case 0x0f:prefix##_##0f(z80);break; \
+	case 0x10:prefix##_##10(z80);break; case 0x11:prefix##_##11(z80);break; case 0x12:prefix##_##12(z80);break; case 0x13:prefix##_##13(z80);break; \
+	case 0x14:prefix##_##14(z80);break; case 0x15:prefix##_##15(z80);break; case 0x16:prefix##_##16(z80);break; case 0x17:prefix##_##17(z80);break; \
+	case 0x18:prefix##_##18(z80);break; case 0x19:prefix##_##19(z80);break; case 0x1a:prefix##_##1a(z80);break; case 0x1b:prefix##_##1b(z80);break; \
+	case 0x1c:prefix##_##1c(z80);break; case 0x1d:prefix##_##1d(z80);break; case 0x1e:prefix##_##1e(z80);break; case 0x1f:prefix##_##1f(z80);break; \
+	case 0x20:prefix##_##20(z80);break; case 0x21:prefix##_##21(z80);break; case 0x22:prefix##_##22(z80);break; case 0x23:prefix##_##23(z80);break; \
+	case 0x24:prefix##_##24(z80);break; case 0x25:prefix##_##25(z80);break; case 0x26:prefix##_##26(z80);break; case 0x27:prefix##_##27(z80);break; \
+	case 0x28:prefix##_##28(z80);break; case 0x29:prefix##_##29(z80);break; case 0x2a:prefix##_##2a(z80);break; case 0x2b:prefix##_##2b(z80);break; \
+	case 0x2c:prefix##_##2c(z80);break; case 0x2d:prefix##_##2d(z80);break; case 0x2e:prefix##_##2e(z80);break; case 0x2f:prefix##_##2f(z80);break; \
+	case 0x30:prefix##_##30(z80);break; case 0x31:prefix##_##31(z80);break; case 0x32:prefix##_##32(z80);break; case 0x33:prefix##_##33(z80);break; \
+	case 0x34:prefix##_##34(z80);break; case 0x35:prefix##_##35(z80);break; case 0x36:prefix##_##36(z80);break; case 0x37:prefix##_##37(z80);break; \
+	case 0x38:prefix##_##38(z80);break; case 0x39:prefix##_##39(z80);break; case 0x3a:prefix##_##3a(z80);break; case 0x3b:prefix##_##3b(z80);break; \
+	case 0x3c:prefix##_##3c(z80);break; case 0x3d:prefix##_##3d(z80);break; case 0x3e:prefix##_##3e(z80);break; case 0x3f:prefix##_##3f(z80);break; \
+	case 0x40:prefix##_##40(z80);break; case 0x41:prefix##_##41(z80);break; case 0x42:prefix##_##42(z80);break; case 0x43:prefix##_##43(z80);break; \
+	case 0x44:prefix##_##44(z80);break; case 0x45:prefix##_##45(z80);break; case 0x46:prefix##_##46(z80);break; case 0x47:prefix##_##47(z80);break; \
+	case 0x48:prefix##_##48(z80);break; case 0x49:prefix##_##49(z80);break; case 0x4a:prefix##_##4a(z80);break; case 0x4b:prefix##_##4b(z80);break; \
+	case 0x4c:prefix##_##4c(z80);break; case 0x4d:prefix##_##4d(z80);break; case 0x4e:prefix##_##4e(z80);break; case 0x4f:prefix##_##4f(z80);break; \
+	case 0x50:prefix##_##50(z80);break; case 0x51:prefix##_##51(z80);break; case 0x52:prefix##_##52(z80);break; case 0x53:prefix##_##53(z80);break; \
+	case 0x54:prefix##_##54(z80);break; case 0x55:prefix##_##55(z80);break; case 0x56:prefix##_##56(z80);break; case 0x57:prefix##_##57(z80);break; \
+	case 0x58:prefix##_##58(z80);break; case 0x59:prefix##_##59(z80);break; case 0x5a:prefix##_##5a(z80);break; case 0x5b:prefix##_##5b(z80);break; \
+	case 0x5c:prefix##_##5c(z80);break; case 0x5d:prefix##_##5d(z80);break; case 0x5e:prefix##_##5e(z80);break; case 0x5f:prefix##_##5f(z80);break; \
+	case 0x60:prefix##_##60(z80);break; case 0x61:prefix##_##61(z80);break; case 0x62:prefix##_##62(z80);break; case 0x63:prefix##_##63(z80);break; \
+	case 0x64:prefix##_##64(z80);break; case 0x65:prefix##_##65(z80);break; case 0x66:prefix##_##66(z80);break; case 0x67:prefix##_##67(z80);break; \
+	case 0x68:prefix##_##68(z80);break; case 0x69:prefix##_##69(z80);break; case 0x6a:prefix##_##6a(z80);break; case 0x6b:prefix##_##6b(z80);break; \
+	case 0x6c:prefix##_##6c(z80);break; case 0x6d:prefix##_##6d(z80);break; case 0x6e:prefix##_##6e(z80);break; case 0x6f:prefix##_##6f(z80);break; \
+	case 0x70:prefix##_##70(z80);break; case 0x71:prefix##_##71(z80);break; case 0x72:prefix##_##72(z80);break; case 0x73:prefix##_##73(z80);break; \
+	case 0x74:prefix##_##74(z80);break; case 0x75:prefix##_##75(z80);break; case 0x76:prefix##_##76(z80);break; case 0x77:prefix##_##77(z80);break; \
+	case 0x78:prefix##_##78(z80);break; case 0x79:prefix##_##79(z80);break; case 0x7a:prefix##_##7a(z80);break; case 0x7b:prefix##_##7b(z80);break; \
+	case 0x7c:prefix##_##7c(z80);break; case 0x7d:prefix##_##7d(z80);break; case 0x7e:prefix##_##7e(z80);break; case 0x7f:prefix##_##7f(z80);break; \
+	case 0x80:prefix##_##80(z80);break; case 0x81:prefix##_##81(z80);break; case 0x82:prefix##_##82(z80);break; case 0x83:prefix##_##83(z80);break; \
+	case 0x84:prefix##_##84(z80);break; case 0x85:prefix##_##85(z80);break; case 0x86:prefix##_##86(z80);break; case 0x87:prefix##_##87(z80);break; \
+	case 0x88:prefix##_##88(z80);break; case 0x89:prefix##_##89(z80);break; case 0x8a:prefix##_##8a(z80);break; case 0x8b:prefix##_##8b(z80);break; \
+	case 0x8c:prefix##_##8c(z80);break; case 0x8d:prefix##_##8d(z80);break; case 0x8e:prefix##_##8e(z80);break; case 0x8f:prefix##_##8f(z80);break; \
+	case 0x90:prefix##_##90(z80);break; case 0x91:prefix##_##91(z80);break; case 0x92:prefix##_##92(z80);break; case 0x93:prefix##_##93(z80);break; \
+	case 0x94:prefix##_##94(z80);break; case 0x95:prefix##_##95(z80);break; case 0x96:prefix##_##96(z80);break; case 0x97:prefix##_##97(z80);break; \
+	case 0x98:prefix##_##98(z80);break; case 0x99:prefix##_##99(z80);break; case 0x9a:prefix##_##9a(z80);break; case 0x9b:prefix##_##9b(z80);break; \
+	case 0x9c:prefix##_##9c(z80);break; case 0x9d:prefix##_##9d(z80);break; case 0x9e:prefix##_##9e(z80);break; case 0x9f:prefix##_##9f(z80);break; \
+	case 0xa0:prefix##_##a0(z80);break; case 0xa1:prefix##_##a1(z80);break; case 0xa2:prefix##_##a2(z80);break; case 0xa3:prefix##_##a3(z80);break; \
+	case 0xa4:prefix##_##a4(z80);break; case 0xa5:prefix##_##a5(z80);break; case 0xa6:prefix##_##a6(z80);break; case 0xa7:prefix##_##a7(z80);break; \
+	case 0xa8:prefix##_##a8(z80);break; case 0xa9:prefix##_##a9(z80);break; case 0xaa:prefix##_##aa(z80);break; case 0xab:prefix##_##ab(z80);break; \
+	case 0xac:prefix##_##ac(z80);break; case 0xad:prefix##_##ad(z80);break; case 0xae:prefix##_##ae(z80);break; case 0xaf:prefix##_##af(z80);break; \
+	case 0xb0:prefix##_##b0(z80);break; case 0xb1:prefix##_##b1(z80);break; case 0xb2:prefix##_##b2(z80);break; case 0xb3:prefix##_##b3(z80);break; \
+	case 0xb4:prefix##_##b4(z80);break; case 0xb5:prefix##_##b5(z80);break; case 0xb6:prefix##_##b6(z80);break; case 0xb7:prefix##_##b7(z80);break; \
+	case 0xb8:prefix##_##b8(z80);break; case 0xb9:prefix##_##b9(z80);break; case 0xba:prefix##_##ba(z80);break; case 0xbb:prefix##_##bb(z80);break; \
+	case 0xbc:prefix##_##bc(z80);break; case 0xbd:prefix##_##bd(z80);break; case 0xbe:prefix##_##be(z80);break; case 0xbf:prefix##_##bf(z80);break; \
+	case 0xc0:prefix##_##c0(z80);break; case 0xc1:prefix##_##c1(z80);break; case 0xc2:prefix##_##c2(z80);break; case 0xc3:prefix##_##c3(z80);break; \
+	case 0xc4:prefix##_##c4(z80);break; case 0xc5:prefix##_##c5(z80);break; case 0xc6:prefix##_##c6(z80);break; case 0xc7:prefix##_##c7(z80);break; \
+	case 0xc8:prefix##_##c8(z80);break; case 0xc9:prefix##_##c9(z80);break; case 0xca:prefix##_##ca(z80);break; case 0xcb:prefix##_##cb(z80);break; \
+	case 0xcc:prefix##_##cc(z80);break; case 0xcd:prefix##_##cd(z80);break; case 0xce:prefix##_##ce(z80);break; case 0xcf:prefix##_##cf(z80);break; \
+	case 0xd0:prefix##_##d0(z80);break; case 0xd1:prefix##_##d1(z80);break; case 0xd2:prefix##_##d2(z80);break; case 0xd3:prefix##_##d3(z80);break; \
+	case 0xd4:prefix##_##d4(z80);break; case 0xd5:prefix##_##d5(z80);break; case 0xd6:prefix##_##d6(z80);break; case 0xd7:prefix##_##d7(z80);break; \
+	case 0xd8:prefix##_##d8(z80);break; case 0xd9:prefix##_##d9(z80);break; case 0xda:prefix##_##da(z80);break; case 0xdb:prefix##_##db(z80);break; \
+	case 0xdc:prefix##_##dc(z80);break; case 0xdd:prefix##_##dd(z80);break; case 0xde:prefix##_##de(z80);break; case 0xdf:prefix##_##df(z80);break; \
+	case 0xe0:prefix##_##e0(z80);break; case 0xe1:prefix##_##e1(z80);break; case 0xe2:prefix##_##e2(z80);break; case 0xe3:prefix##_##e3(z80);break; \
+	case 0xe4:prefix##_##e4(z80);break; case 0xe5:prefix##_##e5(z80);break; case 0xe6:prefix##_##e6(z80);break; case 0xe7:prefix##_##e7(z80);break; \
+	case 0xe8:prefix##_##e8(z80);break; case 0xe9:prefix##_##e9(z80);break; case 0xea:prefix##_##ea(z80);break; case 0xeb:prefix##_##eb(z80);break; \
+	case 0xec:prefix##_##ec(z80);break; case 0xed:prefix##_##ed(z80);break; case 0xee:prefix##_##ee(z80);break; case 0xef:prefix##_##ef(z80);break; \
+	case 0xf0:prefix##_##f0(z80);break; case 0xf1:prefix##_##f1(z80);break; case 0xf2:prefix##_##f2(z80);break; case 0xf3:prefix##_##f3(z80);break; \
+	case 0xf4:prefix##_##f4(z80);break; case 0xf5:prefix##_##f5(z80);break; case 0xf6:prefix##_##f6(z80);break; case 0xf7:prefix##_##f7(z80);break; \
+	case 0xf8:prefix##_##f8(z80);break; case 0xf9:prefix##_##f9(z80);break; case 0xfa:prefix##_##fa(z80);break; case 0xfb:prefix##_##fb(z80);break; \
+	case 0xfc:prefix##_##fc(z80);break; case 0xfd:prefix##_##fd(z80);break; case 0xfe:prefix##_##fe(z80);break; case 0xff:prefix##_##ff(z80);break; \
+	}																																	\
+}
+#else
+#define EXEC_INLINE EXEC
+#endif
+
+
+/***************************************************************
+ * Enter HALT state; write 1 to fake port on first execution
+ ***************************************************************/
+#define ENTER_HALT {											\
+	_PC--;														\
+	_HALT = 1;													\
+	if( !z80->after_EI )												\
+		z80_burn( z80, z80->z80_ICount );									\
+}
+
+/***************************************************************
+ * Leave HALT state; write 0 to fake port
+ ***************************************************************/
+#define LEAVE_HALT {											\
+	if( _HALT )													\
+	{															\
+		_HALT = 0;												\
+		_PC++;													\
+	}															\
+}
+
+/***************************************************************
+ * Input a byte from given I/O port
+ ***************************************************************/
+#define IN(port) ((UINT8)cpu_readport16(z80->userdata,port))
+
+/***************************************************************
+ * Output a byte to given I/O port
+ ***************************************************************/
+#define OUT(port,value) cpu_writeport16(z80->userdata,port,value)
+
+/***************************************************************
+ * Read a byte from given memory location
+ ***************************************************************/
+#define RM(addr) (UINT8)cpu_readmem16(z80->userdata,addr)
+
+/***************************************************************
+ * Read a word from given memory location
+ ***************************************************************/
+INLINE void RM16( z80_state_t *z80, UINT32 addr, PAIR *r )
+{
+	r->b.l = RM(addr);
+	r->b.h = RM((addr+1)&0xffff);
+}
+
+/***************************************************************
+ * Write a byte to given memory location
+ ***************************************************************/
+#define WM(addr,value) cpu_writemem16(z80->userdata,addr,value)
+
+/***************************************************************
+ * Write a word to given memory location
+ ***************************************************************/
+INLINE void WM16( z80_state_t *z80, UINT32 addr, PAIR *r )
+{
+	WM(addr,r->b.l);
+	WM((addr+1)&0xffff,r->b.h);
+}
+
+/***************************************************************
+ * ROP() is identical to RM() except it is used for
+ * reading opcodes. In case of system with memory mapped I/O,
+ * this function can be used to greatly speed up emulation
+ ***************************************************************/
+INLINE UINT8 ROP(z80_state_t *z80)
+{
+	unsigned pc = _PCD;
+	_PC++;
+	return cpu_readop(z80->userdata,pc);
+}
+
+/****************************************************************
+ * ARG() is identical to ROP() except it is used
+ * for reading opcode arguments. This difference can be used to
+ * support systems that use different encoding mechanisms for
+ * opcodes and opcode arguments
+ ***************************************************************/
+INLINE UINT8 ARG(z80_state_t *z80)
+{
+	unsigned pc = _PCD;
+	_PC++;
+	return cpu_readop_arg(z80->userdata, pc);
+}
+
+INLINE UINT32 ARG16(z80_state_t *z80)
+{
+	unsigned pc = _PCD;
+	_PC += 2;
+	return cpu_readop_arg(z80->userdata,pc) | (cpu_readop_arg(z80->userdata,(pc+1)&0xffff) << 8);
+}
+
+/***************************************************************
+ * Calculate the effective address EA of an opcode using
+ * IX+offset resp. IY+offset addressing.
+ ***************************************************************/
+#define EAX z80->EA = (UINT32)(UINT16)(_IX+(INT8)ARG(z80))
+#define EAY z80->EA = (UINT32)(UINT16)(_IY+(INT8)ARG(z80))
+
+/***************************************************************
+ * POP
+ ***************************************************************/
+#define POP(DR) { RM16(z80, _SPD, &z80->Z80.DR ); _SP += 2; }
+
+/***************************************************************
+ * PUSH
+ ***************************************************************/
+#define PUSH(SR) { _SP -= 2; WM16( z80, _SPD, &z80->Z80.SR ); }
+
+/***************************************************************
+ * JP
+ ***************************************************************/
+#if BUSY_LOOP_HACKS
+#define JP {													\
+	unsigned oldpc = _PCD-1;									\
+	_PCD = ARG16(z80);												\
+	change_pc16(_PCD);											\
+	/* speed up busy loop */									\
+	if( _PCD == oldpc )											\
+	{															\
+		if( !z80->after_EI )											\
+			BURNODD( z80, z80->z80_ICount, 1, cc[Z80_TABLE_op][0xc3] );	\
+	}															\
+	else														\
+	{															\
+		UINT8 op = cpu_readop(z80->userdata,_PCD);							\
+		if( _PCD == oldpc-1 )									\
+		{														\
+			/* NOP - JP $-1 or EI - JP $-1 */					\
+			if ( op == 0x00 || op == 0xfb )						\
+			{													\
+				if( !z80->after_EI )									\
+					BURNODD( z80, z80->z80_ICount-cc[Z80_TABLE_op][0x00], \
+						2, cc[Z80_TABLE_op][0x00]+cc[Z80_TABLE_op][0xc3]); \
+			}													\
+		}														\
+		else													\
+		/* LD SP,#xxxx - JP $-3 (Galaga) */						\
+		if( _PCD == oldpc-3 && op == 0x31 )						\
+		{														\
+			if( !z80->after_EI )										\
+				BURNODD( z80, z80->z80_ICount-cc[Z80_TABLE_op][0x31],		\
+					2, cc[Z80_TABLE_op][0x31]+cc[Z80_TABLE_op][0xc3]); \
+		}														\
+	}															\
+}
+#else
+#define JP {													\
+	_PCD = ARG16(z80);												\
+	change_pc16(_PCD);											\
+}
+#endif
+
+/***************************************************************
+ * JP_COND
+ ***************************************************************/
+
+#define JP_COND(cond)											\
+	if( cond )													\
+	{															\
+		_PCD = ARG16(z80);											\
+		change_pc16(_PCD);										\
+	}															\
+	else														\
+	{															\
+		_PC += 2;												\
+	}
+
+/***************************************************************
+ * JR
+ ***************************************************************/
+#define JR()													\
+{																\
+	unsigned oldpc = _PCD-1;									\
+	INT8 arg = (INT8)ARG(z80); /* ARG() also increments _PC */		\
+	_PC += arg;				/* so don't do _PC += ARG() */		\
+	change_pc16(_PCD);											\
+	/* speed up busy loop */									\
+	if( _PCD == oldpc )											\
+	{															\
+		if( !z80->after_EI )											\
+			BURNODD( z80, z80->z80_ICount, 1, cc[Z80_TABLE_op][0x18] );	\
+	}															\
+	else														\
+	{															\
+		UINT8 op = cpu_readop(z80->userdata,_PCD);							\
+		if( _PCD == oldpc-1 )									\
+		{														\
+			/* NOP - JR $-1 or EI - JR $-1 */					\
+			if ( op == 0x00 || op == 0xfb )						\
+			{													\
+				if( !z80->after_EI )									\
+				 BURNODD( z80, z80->z80_ICount-cc[Z80_TABLE_op][0x00],	\
+					 2, cc[Z80_TABLE_op][0x00]+cc[Z80_TABLE_op][0x18]); \
+			}													\
+		}														\
+		else													\
+		/* LD SP,#xxxx - JR $-3 */								\
+		if( _PCD == oldpc-3 && op == 0x31 )						\
+		{														\
+			if( !z80->after_EI )										\
+			 BURNODD( z80, z80->z80_ICount-cc[Z80_TABLE_op][0x31],		\
+				 2, cc[Z80_TABLE_op][0x31]+cc[Z80_TABLE_op][0x18]); \
+		}														\
+	}															\
+}
+
+/***************************************************************
+ * JR_COND
+ ***************************************************************/
+#define JR_COND(cond,opcode)									\
+	if( cond )													\
+	{															\
+		INT8 arg = (INT8)ARG(z80); /* ARG() also increments _PC */ \
+		_PC += arg;				/* so don't do _PC += ARG() */	\
+		CC(ex,opcode);											\
+		change_pc16(_PCD);										\
+	}															\
+	else _PC++;													\
+
+/***************************************************************
+ * CALL
+ ***************************************************************/
+#define CALL()													\
+	z80->EA = ARG16(z80);												\
+	PUSH( PC );													\
+	_PCD = z80->EA;													\
+	change_pc16(_PCD)
+
+/***************************************************************
+ * CALL_COND
+ ***************************************************************/
+#define CALL_COND(cond,opcode)									\
+	if( cond )													\
+	{															\
+		z80->EA = ARG16(z80);											\
+		PUSH( PC );												\
+		_PCD = z80->EA;												\
+		CC(ex,opcode);											\
+		change_pc16(_PCD);										\
+	}															\
+	else														\
+	{															\
+		_PC+=2;													\
+	}
+
+/***************************************************************
+ * RET_COND
+ ***************************************************************/
+#define RET_COND(cond,opcode)									\
+	if( cond )													\
+	{															\
+		POP(PC);												\
+		change_pc16(_PCD);										\
+		CC(ex,opcode);											\
+	}
+
+/***************************************************************
+ * RETN
+ ***************************************************************/
+#define RETN	{												\
+	POP(PC);													\
+	change_pc16(_PCD);											\
+	if( _IFF1 == 0 && _IFF2 == 1 )								\
+	{															\
+		_IFF1 = 1;												\
+		if( z80->Z80.irq_state != CLEAR_LINE ||						\
+			z80->Z80.request_irq >= 0 )								\
+		{														\
+			take_interrupt(z80);									\
+		}														\
+	}															\
+	else _IFF1 = _IFF2;											\
+}
+
+/***************************************************************
+ * RETI
+ ***************************************************************/
+#define RETI	{												\
+	int device = z80->Z80.service_irq;								\
+	POP(PC);													\
+	change_pc16(_PCD);											\
+/* according to http://www.msxnet.org/tech/z80-documented.pdf */\
+/*	_IFF1 = _IFF2;	*/											\
+	if( device >= 0 )											\
+	{															\
+		z80->Z80.irq[device].interrupt_reti(z80->Z80.irq[device].irq_param); \
+	}															\
+}
+
+/***************************************************************
+ * LD	R,A
+ ***************************************************************/
+#define LD_R_A {												\
+	_Z80_R = _Z80_A;													\
+	_R2 = _Z80_A & 0x80;				/* keep bit 7 of R */		\
+}
+
+/***************************************************************
+ * LD	A,R
+ ***************************************************************/
+#define LD_A_R {												\
+	_Z80_A = (_Z80_R & 0x7f) | _R2;										\
+	_F = (_F & CF) | z80->SZ[_Z80_A] | ( _IFF2 << 2 );					\
+}
+
+/***************************************************************
+ * LD	I,A
+ ***************************************************************/
+#define LD_I_A {												\
+	_Z80_I = _Z80_A;													\
+}
+
+/***************************************************************
+ * LD	A,I
+ ***************************************************************/
+#define LD_A_I {												\
+	_Z80_A = _Z80_I;													\
+	_F = (_F & CF) | z80->SZ[_Z80_A] | ( _IFF2 << 2 );					\
+}
+
+/***************************************************************
+ * RST
+ ***************************************************************/
+#define RST(addr)												\
+	PUSH( PC );													\
+	_PCD = addr;												\
+	change_pc16(_PCD)
+
+/***************************************************************
+ * INC	r8
+ ***************************************************************/
+INLINE UINT8 INC(z80_state_t *z80, UINT8 value)
+{
+	UINT8 res = value + 1;
+	_F = (_F & CF) | z80->SZHV_inc[res];
+	return (UINT8)res;
+}
+
+/***************************************************************
+ * DEC	r8
+ ***************************************************************/
+INLINE UINT8 DEC(z80_state_t *z80, UINT8 value)
+{
+	UINT8 res = value - 1;
+	_F = (_F & CF) | z80->SZHV_dec[res];
+	return res;
+}
+
+/***************************************************************
+ * RLCA
+ ***************************************************************/
+#if Z80_EXACT
+#define RLCA													\
+	_Z80_A = (_Z80_A << 1) | (_Z80_A >> 7);									\
+	_F = (_F & (SF | ZF | PF)) | (_Z80_A & (YF | XF | CF))
+#else
+#define RLCA													\
+	_Z80_A = (_Z80_A << 1) | (_Z80_A >> 7);									\
+	_F = (_F & (SF | ZF | YF | XF | PF)) | (_Z80_A & CF)
+#endif
+
+/***************************************************************
+ * RRCA
+ ***************************************************************/
+#if Z80_EXACT
+#define RRCA													\
+	_F = (_F & (SF | ZF | PF)) | (_Z80_A & CF);						\
+	_Z80_A = (_Z80_A >> 1) | (_Z80_A << 7);									\
+	_F |= (_Z80_A & (YF | XF) )
+#else
+#define RRCA													\
+	_F = (_F & (SF | ZF | YF | XF | PF)) | (_Z80_A & CF);			\
+	_Z80_A = (_Z80_A >> 1) | (_Z80_A << 7)
+#endif
+
+/***************************************************************
+ * RLA
+ ***************************************************************/
+#if Z80_EXACT
+#define RLA {													\
+	UINT8 res = (_Z80_A << 1) | (_F & CF);							\
+	UINT8 c = (_Z80_A & 0x80) ? CF : 0;								\
+	_F = (_F & (SF | ZF | PF)) | c | (res & (YF | XF));			\
+	_Z80_A = res;													\
+}
+#else
+#define RLA {													\
+	UINT8 res = (_Z80_A << 1) | (_F & CF);							\
+	UINT8 c = (_Z80_A & 0x80) ? CF : 0;								\
+	_F = (_F & (SF | ZF | YF | XF | PF)) | c;					\
+	_Z80_A = res;													\
+}
+#endif
+
+/***************************************************************
+ * RRA
+ ***************************************************************/
+#if Z80_EXACT
+#define RRA {													\
+	UINT8 res = (_Z80_A >> 1) | (_F << 7);							\
+	UINT8 c = (_Z80_A & 0x01) ? CF : 0;								\
+	_F = (_F & (SF | ZF | PF)) | c | (res & (YF | XF));			\
+	_Z80_A = res;													\
+}
+#else
+#define RRA {													\
+	UINT8 res = (_Z80_A >> 1) | (_F << 7);							\
+	UINT8 c = (_Z80_A & 0x01) ? CF : 0;								\
+	_F = (_F & (SF | ZF | YF | XF | PF)) | c;					\
+	_Z80_A = res;													\
+}
+#endif
+
+/***************************************************************
+ * RRD
+ ***************************************************************/
+#define RRD {													\
+	UINT8 n = RM(_HL);											\
+	WM( _HL, (n >> 4) | (_Z80_A << 4) );							\
+	_Z80_A = (_Z80_A & 0xf0) | (n & 0x0f);								\
+	_F = (_F & CF) | z80->SZP[_Z80_A];									\
+}
+
+/***************************************************************
+ * RLD
+ ***************************************************************/
+#define RLD {													\
+	UINT8 n = RM(_HL);											\
+	WM( _HL, (n << 4) | (_Z80_A & 0x0f) );							\
+	_Z80_A = (_Z80_A & 0xf0) | (n >> 4);								\
+	_F = (_F & CF) | z80->SZP[_Z80_A];									\
+}
+
+/***************************************************************
+ * ADD	A,n
+ ***************************************************************/
+#ifdef X86_ASM
+#if Z80_EXACT
+#define ADD(value)												\
+ asm (															\
+ " addb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " addb %1,%1			\n"										\
+ " addb %1,%1			\n" /* shift to P/V bit position */		\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n"										\
+ " movb %0,%%ah			\n" /* get result */					\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#else
+#define ADD(value)												\
+ asm (															\
+ " addb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " addb %1,%1			\n"										\
+ " addb %1,%1			\n" /* shift to P/V bit position */		\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n"										\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#endif
+#else
+#if BIG_FLAGS_ARRAY
+#define ADD(z80,value)												\
+{																\
+	UINT32 ah = _AFD & 0xff00;									\
+	UINT32 res = (UINT8)((ah >> 8) + value);					\
+	_F = z80->SZHVC_add[ah | res];									\
+	_Z80_A = res;													\
+}
+#else
+#define ADD(value)												\
+{																\
+	unsigned val = value;										\
+	unsigned res = _Z80_A + val;									\
+	_F = SZ[(UINT8)res] | ((res >> 8) & CF) |					\
+		((_Z80_A ^ res ^ val) & HF) |								\
+		(((val ^ _Z80_A ^ 0x80) & (val ^ res) & 0x80) >> 5);		\
+	_Z80_A = (UINT8)res;											\
+}
+#endif
+#endif
+
+/***************************************************************
+ * ADC	A,n
+ ***************************************************************/
+#ifdef X86_ASM
+#if Z80_EXACT
+#define ADC(value)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " adcb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " addb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ " movb %0,%%ah			\n" /* get result */					\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#else
+#define ADC(value)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " adcb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " addb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#endif
+#else
+#if BIG_FLAGS_ARRAY
+#define ADC(value)												\
+{																\
+	UINT32 ah = _AFD & 0xff00, c = _AFD & 1;					\
+	UINT32 res = (UINT8)((ah >> 8) + value + c);				\
+	_F = z80->SZHVC_add[(c << 16) | ah | res];						\
+	_Z80_A = res;													\
+}
+#else
+#define ADC(value)												\
+{																\
+	unsigned val = value;										\
+	unsigned res = _Z80_A + val + (_F & CF);						\
+	_F = SZ[res & 0xff] | ((res >> 8) & CF) |					\
+		((_Z80_A ^ res ^ val) & HF) |								\
+		(((val ^ _Z80_A ^ 0x80) & (val ^ res) & 0x80) >> 5);		\
+	_Z80_A = res;													\
+}
+#endif
+#endif
+
+/***************************************************************
+ * SUB	n
+ ***************************************************************/
+#ifdef X86_ASM
+#if Z80_EXACT
+#define SUB(value)												\
+ asm (															\
+ " subb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ " movb %0,%%ah			\n" /* get result */					\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#else
+#define SUB(value)												\
+ asm (															\
+ " subb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#endif
+#else
+#if BIG_FLAGS_ARRAY
+#define SUB(value)												\
+{																\
+	UINT32 ah = _AFD & 0xff00;									\
+	UINT32 res = (UINT8)((ah >> 8) - value);					\
+	_F = z80->SZHVC_sub[ah | res];									\
+	_Z80_A = res;													\
+}
+#else
+#define SUB(value)												\
+{																\
+	unsigned val = value;										\
+	unsigned res = _Z80_A - val;									\
+	_F = SZ[res & 0xff] | ((res >> 8) & CF) | NF |				\
+		((_Z80_A ^ res ^ val) & HF) |								\
+		(((val ^ _Z80_A) & (_Z80_A ^ res) & 0x80) >> 5);				\
+	_Z80_A = res;													\
+}
+#endif
+#endif
+
+/***************************************************************
+ * SBC	A,n
+ ***************************************************************/
+#ifdef X86_ASM
+#if Z80_EXACT
+#define SBC(value)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " sbbb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ " movb %0,%%ah			\n" /* get result */					\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#else
+#define SBC(value)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " sbbb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#endif
+#else
+#if BIG_FLAGS_ARRAY
+#define SBC(value)												\
+{																\
+	UINT32 ah = _AFD & 0xff00, c = _AFD & 1;					\
+	UINT32 res = (UINT8)((ah >> 8) - value - c);				\
+	_F = z80->SZHVC_sub[(c<<16) | ah | res];							\
+	_Z80_A = res;													\
+}
+#else
+#define SBC(value)												\
+{																\
+	unsigned val = value;										\
+	unsigned res = _Z80_A - val - (_F & CF);						\
+	_F = SZ[res & 0xff] | ((res >> 8) & CF) | NF |				\
+		((_Z80_A ^ res ^ val) & HF) |								\
+		(((val ^ _Z80_A) & (_Z80_A ^ res) & 0x80) >> 5);				\
+	_Z80_A = res;													\
+}
+#endif
+#endif
+
+/***************************************************************
+ * NEG
+ ***************************************************************/
+#define NEG {													\
+	UINT8 value = _Z80_A;											\
+	_Z80_A = 0;														\
+	SUB(value);													\
+}
+
+/***************************************************************
+ * DAA
+ ***************************************************************/
+#define DAA {													\
+	UINT8 cf, nf, hf, lo, hi, diff;								\
+	cf = _F & CF;												\
+	nf = _F & NF;												\
+	hf = _F & HF;												\
+	lo = _Z80_A & 15;												\
+	hi = _Z80_A / 16;												\
+																\
+	if (cf)														\
+	{															\
+		diff = (lo <= 9 && !hf) ? 0x60 : 0x66;					\
+	}															\
+	else														\
+	{															\
+		if (lo >= 10)											\
+		{														\
+			diff = hi <= 8 ? 0x06 : 0x66;						\
+		}														\
+		else													\
+		{														\
+			if (hi >= 10)										\
+			{													\
+				diff = hf ? 0x66 : 0x60;						\
+			}													\
+			else												\
+			{													\
+				diff = hf ? 0x06 : 0x00;						\
+			}													\
+		}														\
+	}															\
+	if (nf) _Z80_A -= diff;											\
+	else _Z80_A += diff;											\
+																\
+	_F = z80->SZP[_Z80_A] | (_F & NF);									\
+	if (cf || (lo <= 9 ? hi >= 10 : hi >= 9)) _F |= CF;			\
+	if (nf ? hf && lo <= 5 : lo >= 10)	_F |= HF;				\
+}
+
+/***************************************************************
+ * AND	n
+ ***************************************************************/
+#define AND(value)												\
+	_Z80_A &= value;												\
+	_F = z80->SZP[_Z80_A] | HF
+
+/***************************************************************
+ * OR	n
+ ***************************************************************/
+#define OR(value)												\
+	_Z80_A |= value;												\
+	_F = z80->SZP[_Z80_A]
+
+/***************************************************************
+ * XOR	n
+ ***************************************************************/
+#define XOR(value)												\
+	_Z80_A ^= value;												\
+	_F = z80->SZP[_Z80_A]
+
+/***************************************************************
+ * CP	n
+ ***************************************************************/
+#ifdef X86_ASM
+#if Z80_EXACT
+#define CP(value)												\
+ asm (															\
+ " cmpb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ " movb %2,%%ah			\n" /* get result */					\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#else
+#define CP(value)												\
+ asm (															\
+ " cmpb %2,%0			\n"										\
+ " lahf					\n"										\
+ " setob %1				\n" /* al = 1 if overflow */			\
+ " stc					\n" /* prepare to set N flag */			\
+ " adcb %1,%1			\n" /* shift to P/V bit position */		\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign, zero, half carry, carry */ \
+ " orb %%ah,%1			\n" /* combine with P/V */				\
+ :"=q" (_Z80_A), "=q" (_F)											\
+ :"q" (value), "1" (_F), "0" (_Z80_A)								\
+ )
+#endif
+#else
+#if BIG_FLAGS_ARRAY
+#define CP(value)												\
+{																\
+	unsigned val = value;										\
+	UINT32 ah = _AFD & 0xff00;									\
+	UINT32 res = (UINT8)((ah >> 8) - val);						\
+	_F = (z80->SZHVC_sub[ah | res] & ~(YF | XF)) |					\
+		(val & (YF | XF));										\
+}
+#else
+#define CP(value)												\
+{																\
+	unsigned val = value;										\
+	unsigned res = _Z80_A - val;									\
+	_F = (SZ[res & 0xff] & (SF | ZF)) |							\
+		(val & (YF | XF)) | ((res >> 8) & CF) | NF |			\
+		((_Z80_A ^ res ^ val) & HF) |								\
+		((((val ^ _Z80_A) & (_Z80_A ^ res)) >> 5) & VF);				\
+}
+#endif
+#endif
+
+/***************************************************************
+ * EX	AF,AF'
+ ***************************************************************/
+#define EX_AF {													\
+	PAIR tmp;													\
+	tmp = z80->Z80.AF; z80->Z80.AF = z80->Z80.AF2; z80->Z80.AF2 = tmp;				\
+}
+
+/***************************************************************
+ * EX	DE,HL
+ ***************************************************************/
+#define EX_DE_HL {												\
+	PAIR tmp;													\
+	tmp = z80->Z80.DE; z80->Z80.DE = z80->Z80.HL; z80->Z80.HL = tmp;				\
+}
+
+/***************************************************************
+ * EXX
+ ***************************************************************/
+#define EXX {													\
+	PAIR tmp;													\
+	tmp = z80->Z80.BC; z80->Z80.BC = z80->Z80.BC2; z80->Z80.BC2 = tmp;				\
+	tmp = z80->Z80.DE; z80->Z80.DE = z80->Z80.DE2; z80->Z80.DE2 = tmp;				\
+	tmp = z80->Z80.HL; z80->Z80.HL = z80->Z80.HL2; z80->Z80.HL2 = tmp;				\
+}
+
+/***************************************************************
+ * EX	(SP),r16
+ ***************************************************************/
+#define EXSP(DR)												\
+{																\
+	PAIR tmp = { { 0, 0, 0, 0 } };								\
+	RM16(z80, _SPD, &tmp );											\
+	WM16( z80, _SPD, &z80->Z80.DR );										\
+	z80->Z80.DR = tmp;												\
+}
+
+
+/***************************************************************
+ * ADD16
+ ***************************************************************/
+#ifdef	X86_ASM
+#if Z80_EXACT
+#define ADD16(z80,DR,SR)											\
+ asm (															\
+ " andb $0xc4,%1		\n"										\
+ " addb %%dl,%%cl		\n"										\
+ " adcb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " andb $0x11,%%ah		\n"										\
+ " orb %%ah,%1			\n"										\
+ " movb %%ch,%%ah		\n" /* get result MSB */				\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=c" (z80->Z80.DR.d), "=q" (_F)									\
+ :"0" (z80->Z80.DR.d), "1" (_F), "d" (Z80.SR.d)						\
+ )
+#else
+#define ADD16(z80,DR,SR)											\
+ asm (															\
+ " andb $0xc4,%1		\n"										\
+ " addb %%dl,%%cl		\n"										\
+ " adcb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " andb $0x11,%%ah		\n"										\
+ " orb %%ah,%1			\n"										\
+ :"=c" (z80->Z80.DR.d), "=q" (_F)									\
+ :"0" (z80->Z80.DR.d), "1" (_F), "d" (Z80.SR.d)						\
+ )
+#endif
+#else
+#define ADD16(z80,DR,SR)											\
+{																\
+	UINT32 res = z80->Z80.DR.d + z80->Z80.SR.d;							\
+	_F = (_F & (SF | ZF | VF)) |								\
+		(((z80->Z80.DR.d ^ res ^ z80->Z80.SR.d) >> 8) & HF) |				\
+		((res >> 16) & CF) | ((res >> 8) & (YF | XF));			\
+	z80->Z80.DR.w.l = (UINT16)res;									\
+}
+#endif
+
+/***************************************************************
+ * ADC	r16,r16
+ ***************************************************************/
+#ifdef	X86_ASM
+#if Z80_EXACT
+#define ADC16(Reg)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " adcb %%dl,%%cl		\n"										\
+ " lahf					\n"										\
+ " movb %%ah,%%dl		\n"										\
+ " adcb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " setob %1				\n"										\
+ " orb $0xbf,%%dl		\n" /* set all but zero */				\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign,zero,half carry and carry */\
+ " addb %1,%1			\n"										\
+ " orb %%ah,%1			\n" /* overflow into P/V */				\
+ " andb %%dl,%1			\n" /* mask zero */						\
+ " movb %%ch,%%ah		\n" /* get result MSB */				\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=c" (_HLD), "=q" (_F)										\
+ :"0" (_HLD), "1" (_F), "d" (Z80.Reg.d)							\
+ )
+#else
+#define ADC16(Reg)												\
+ asm (															\
+ " shrb $1,%1			\n"										\
+ " adcb %%dl,%%cl		\n"										\
+ " lahf					\n"										\
+ " movb %%ah,%%dl		\n"										\
+ " adcb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " setob %1				\n"										\
+ " orb $0xbf,%%dl		\n" /* set all but zero */				\
+ " addb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign,zero,half carry and carry */\
+ " addb %1,%1			\n"										\
+ " orb %%ah,%1			\n" /* overflow into P/V */				\
+ " andb %%dl,%1			\n" /* mask zero */						\
+ :"=c" (_HLD), "=q" (_F)										\
+ :"0" (_HLD), "1" (_F), "d" (Z80.Reg.d)							\
+ )
+#endif
+#else
+#define ADC16(Reg)												\
+{																\
+	UINT32 res = _HLD + z80->Z80.Reg.d + (_F & CF);					\
+	_F = (((_HLD ^ res ^ z80->Z80.Reg.d) >> 8) & HF) |				\
+		((res >> 16) & CF) |									\
+		((res >> 8) & (SF | YF | XF)) |							\
+		((res & 0xffff) ? 0 : ZF) |								\
+		(((z80->Z80.Reg.d ^ _HLD ^ 0x8000) & (z80->Z80.Reg.d ^ res) & 0x8000) >> 13); \
+	_HL = (UINT16)res;											\
+}
+#endif
+
+/***************************************************************
+ * SBC	r16,r16
+ ***************************************************************/
+#ifdef	X86_ASM
+#if Z80_EXACT
+#define SBC16(Reg)												\
+asm (															\
+ " shrb $1,%1			\n"										\
+ " sbbb %%dl,%%cl		\n"										\
+ " lahf					\n"										\
+ " movb %%ah,%%dl		\n"										\
+ " sbbb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " setob %1				\n"										\
+ " orb $0xbf,%%dl		\n" /* set all but zero */				\
+ " stc					\n"										\
+ " adcb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign,zero,half carry and carry */\
+ " addb %1,%1			\n"										\
+ " orb %%ah,%1			\n" /* overflow into P/V */				\
+ " andb %%dl,%1			\n" /* mask zero */						\
+ " movb %%ch,%%ah		\n" /* get result MSB */				\
+ " andb $0x28,%%ah		\n" /* maks flags 5+3 */				\
+ " orb %%ah,%1			\n" /* put them into flags */			\
+ :"=c" (_HLD), "=q" (_F)										\
+ :"0" (_HLD), "1" (_F), "d" (Z80.Reg.d)							\
+ )
+#else
+#define SBC16(Reg)												\
+asm (															\
+ " shrb $1,%1			\n"										\
+ " sbbb %%dl,%%cl		\n"										\
+ " lahf					\n"										\
+ " movb %%ah,%%dl		\n"										\
+ " sbbb %%dh,%%ch		\n"										\
+ " lahf					\n"										\
+ " setob %1				\n"										\
+ " orb $0xbf,%%dl		\n" /* set all but zero */				\
+ " stc					\n"										\
+ " adcb %1,%1			\n"										\
+ " andb $0xd1,%%ah		\n" /* sign,zero,half carry and carry */\
+ " addb %1,%1			\n"										\
+ " orb %%ah,%1			\n" /* overflow into P/V */				\
+ " andb %%dl,%1			\n" /* mask zero */						\
+ :"=c" (_HLD), "=q" (_F)										\
+ :"0" (_HLD), "1" (_F), "d" (Z80.Reg.d)							\
+ )
+#endif
+#else
+#define SBC16(Reg)												\
+{																\
+	UINT32 res = _HLD - z80->Z80.Reg.d - (_F & CF);					\
+	_F = (((_HLD ^ res ^ z80->Z80.Reg.d) >> 8) & HF) | NF |			\
+		((res >> 16) & CF) |									\
+		((res >> 8) & (SF | YF | XF)) |							\
+		((res & 0xffff) ? 0 : ZF) |								\
+		(((z80->Z80.Reg.d ^ _HLD) & (_HLD ^ res) &0x8000) >> 13);	\
+	_HL = (UINT16)res;											\
+}
+#endif
+
+/***************************************************************
+ * RLC	r8
+ ***************************************************************/
+INLINE UINT8 RLC(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x80) ? CF : 0;
+	res = ((res << 1) | (res >> 7)) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * RRC	r8
+ ***************************************************************/
+INLINE UINT8 RRC(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x01) ? CF : 0;
+	res = ((res >> 1) | (res << 7)) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * RL	r8
+ ***************************************************************/
+INLINE UINT8 RL(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x80) ? CF : 0;
+	res = ((res << 1) | (_F & CF)) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * RR	r8
+ ***************************************************************/
+INLINE UINT8 RR(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x01) ? CF : 0;
+	res = ((res >> 1) | (_F << 7)) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * SLA	r8
+ ***************************************************************/
+INLINE UINT8 SLA(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x80) ? CF : 0;
+	res = (res << 1) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * SRA	r8
+ ***************************************************************/
+INLINE UINT8 SRA(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x01) ? CF : 0;
+	res = ((res >> 1) | (res & 0x80)) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * SLL	r8
+ ***************************************************************/
+INLINE UINT8 SLL(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x80) ? CF : 0;
+	res = ((res << 1) | 0x01) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * SRL	r8
+ ***************************************************************/
+INLINE UINT8 SRL(z80_state_t *z80, UINT8 value)
+{
+	unsigned res = value;
+	unsigned c = (res & 0x01) ? CF : 0;
+	res = (res >> 1) & 0xff;
+	_F = z80->SZP[res] | c;
+	return res;
+}
+
+/***************************************************************
+ * BIT	bit,r8
+ ***************************************************************/
+#undef BIT
+#define BIT(z80,bit,reg)											\
+	_F = (_F & CF) | HF | z80->SZ_BIT[reg & (1<<bit)]
+
+/***************************************************************
+ * BIT	bit,(IX/Y+o)
+ ***************************************************************/
+#if Z80_EXACT
+#define BIT_XY(z80,bit,reg)											\
+	_F = (_F & CF) | HF | (z80->SZ_BIT[reg & (1<<bit)] & ~(YF|XF)) | ((z80->EA>>8) & (YF|XF))
+#else
+#define BIT_XY	BIT
+#endif
+
+/***************************************************************
+ * RES	bit,r8
+ ***************************************************************/
+INLINE UINT8 RES(z80_state_t *z80, UINT8 bit, UINT8 value)
+{
+	return value & ~(1<<bit);
+}
+
+/***************************************************************
+ * SET	bit,r8
+ ***************************************************************/
+INLINE UINT8 SET(z80_state_t *z80, UINT8 bit, UINT8 value)
+{
+	return value | (1<<bit);
+}
+
+/***************************************************************
+ * LDI
+ ***************************************************************/
+#if Z80_EXACT
+#define LDI {													\
+	UINT8 io = RM(_HL);											\
+	WM( _DE, io );												\
+	_F &= SF | ZF | CF;											\
+	if( (_Z80_A + io) & 0x02 ) _F |= YF; /* bit 1 -> flag 5 */		\
+	if( (_Z80_A + io) & 0x08 ) _F |= XF; /* bit 3 -> flag 3 */		\
+	_HL++; _DE++; _BC--;										\
+	if( _BC ) _F |= VF;											\
+}
+#else
+#define LDI {													\
+	WM( _DE, RM(_HL) );											\
+	_F &= SF | ZF | YF | XF | CF;								\
+	_HL++; _DE++; _BC--;										\
+	if( _BC ) _F |= VF;											\
+}
+#endif
+
+/***************************************************************
+ * CPI
+ ***************************************************************/
+#if Z80_EXACT
+#define CPI {													\
+	UINT8 val = RM(_HL);										\
+	UINT8 res = _Z80_A - val;										\
+	_HL++; _BC--;												\
+	_F = (_F & CF) | (z80->SZ[res] & ~(YF|XF)) | ((_Z80_A ^ val ^ res) & HF) | NF; \
+	if( _F & HF ) res -= 1;										\
+	if( res & 0x02 ) _F |= YF; /* bit 1 -> flag 5 */			\
+	if( res & 0x08 ) _F |= XF; /* bit 3 -> flag 3 */			\
+	if( _BC ) _F |= VF;											\
+}
+#else
+#define CPI {													\
+	UINT8 val = RM(_HL);										\
+	UINT8 res = _Z80_A - val;										\
+	_HL++; _BC--;												\
+	_F = (_F & CF) | z80->SZ[res] | ((_Z80_A ^ val ^ res) & HF) | NF;	\
+	if( _BC ) _F |= VF;											\
+}
+#endif
+
+/***************************************************************
+ * INI
+ ***************************************************************/
+#if Z80_EXACT
+#define INI {													\
+	unsigned t;													\
+	UINT8 io = IN(_BC);											\
+	_Z80_B--;														\
+	WM( _HL, io );												\
+	_HL++;														\
+	_F = z80->SZ[_Z80_B];												\
+	t = (unsigned)((_Z80_C + 1) & 0xff) + (unsigned)io;				\
+	if( io & SF ) _F |= NF;										\
+	if( t & 0x100 ) _F |= HF | CF;								\
+	_F |= z80->SZP[(UINT8)(t & 0x07) ^ _Z80_B] & PF;						\
+}
+#else
+#define INI {													\
+	_Z80_B--;														\
+	WM( _HL, IN(_BC) );											\
+	_HL++;														\
+	_F = (_Z80_B) ? NF : NF | ZF;									\
+}
+#endif
+
+/***************************************************************
+ * OUTI
+ ***************************************************************/
+#if Z80_EXACT
+#define OUTI {													\
+	unsigned t;													\
+	UINT8 io = RM(_HL);											\
+	_Z80_B--;														\
+	OUT( _BC, io );												\
+	_HL++;														\
+	_F = z80->SZ[_Z80_B];												\
+	t = (unsigned)_Z80_L + (unsigned)io;							\
+	if( io & SF ) _F |= NF;										\
+	if( t & 0x100 ) _F |= HF | CF;								\
+	_F |= z80->SZP[(UINT8)(t & 0x07) ^ _Z80_B] & PF;						\
+}
+#else
+#define OUTI {													\
+	_Z80_B--;														\
+	OUT( _BC, RM(_HL) );										\
+	_HL++;														\
+	_F = (_Z80_B) ? NF : NF | ZF;									\
+}
+#endif
+
+/***************************************************************
+ * LDD
+ ***************************************************************/
+#if Z80_EXACT
+#define LDD {													\
+	UINT8 io = RM(_HL);											\
+	WM( _DE, io );												\
+	_F &= SF | ZF | CF;											\
+	if( (_Z80_A + io) & 0x02 ) _F |= YF; /* bit 1 -> flag 5 */		\
+	if( (_Z80_A + io) & 0x08 ) _F |= XF; /* bit 3 -> flag 3 */		\
+	_HL--; _DE--; _BC--;										\
+	if( _BC ) _F |= VF;											\
+}
+#else
+#define LDD {													\
+	WM( _DE, RM(_HL) );											\
+	_F &= SF | ZF | YF | XF | CF;								\
+	_HL--; _DE--; _BC--;										\
+	if( _BC ) _F |= VF;											\
+}
+#endif
+
+/***************************************************************
+ * CPD
+ ***************************************************************/
+#if Z80_EXACT
+#define CPD {													\
+	UINT8 val = RM(_HL);										\
+	UINT8 res = _Z80_A - val;										\
+	_HL--; _BC--;												\
+	_F = (_F & CF) | (z80->SZ[res] & ~(YF|XF)) | ((_Z80_A ^ val ^ res) & HF) | NF; \
+	if( _F & HF ) res -= 1;										\
+	if( res & 0x02 ) _F |= YF; /* bit 1 -> flag 5 */			\
+	if( res & 0x08 ) _F |= XF; /* bit 3 -> flag 3 */			\
+	if( _BC ) _F |= VF;											\
+}
+#else
+#define CPD {													\
+	UINT8 val = RM(_HL);										\
+	UINT8 res = _Z80_A - val;										\
+	_HL--; _BC--;												\
+	_F = (_F & CF) | z80->SZ[res] | ((_Z80_A ^ val ^ res) & HF) | NF;	\
+	if( _BC ) _F |= VF;											\
+}
+#endif
+
+/***************************************************************
+ * IND
+ ***************************************************************/
+#if Z80_EXACT
+#define IND {													\
+	unsigned t;													\
+	UINT8 io = IN(_BC);											\
+	_Z80_B--;														\
+	WM( _HL, io );												\
+	_HL--;														\
+	_F = z80->SZ[_Z80_B];												\
+	t = ((unsigned)(_Z80_C - 1) & 0xff) + (unsigned)io;				\
+	if( io & SF ) _F |= NF;										\
+	if( t & 0x100 ) _F |= HF | CF;								\
+	_F |= z80->SZP[(UINT8)(t & 0x07) ^ _Z80_B] & PF;						\
+}
+#else
+#define IND {													\
+	_Z80_B--;														\
+	WM( _HL, IN(_BC) );											\
+	_HL--;														\
+	_F = (_Z80_B) ? NF : NF | ZF;									\
+}
+#endif
+
+/***************************************************************
+ * OUTD
+ ***************************************************************/
+#if Z80_EXACT
+#define OUTD {													\
+	unsigned t;													\
+	UINT8 io = RM(_HL);											\
+	_Z80_B--;														\
+	OUT( _BC, io );												\
+	_HL--;														\
+	_F = z80->SZ[_Z80_B];												\
+	t = (unsigned)_Z80_L + (unsigned)io;							\
+	if( io & SF ) _F |= NF;										\
+	if( t & 0x100 ) _F |= HF | CF;								\
+	_F |= z80->SZP[(UINT8)(t & 0x07) ^ _Z80_B] & PF;						\
+}
+#else
+#define OUTD {													\
+	_Z80_B--;														\
+	OUT( _BC, RM(_HL) );										\
+	_HL--;														\
+	_F = (_Z80_B) ? NF : NF | ZF;									\
+}
+#endif
+
+/***************************************************************
+ * LDIR
+ ***************************************************************/
+#define LDIR													\
+	LDI;														\
+	if( _BC )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb0);											\
+	}
+
+/***************************************************************
+ * CPIR
+ ***************************************************************/
+#define CPIR													\
+	CPI;														\
+	if( _BC && !(_F & ZF) )										\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb1);											\
+	}
+
+/***************************************************************
+ * INIR
+ ***************************************************************/
+#define INIR													\
+	INI;														\
+	if( _Z80_B )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb2);											\
+	}
+
+/***************************************************************
+ * OTIR
+ ***************************************************************/
+#define OTIR													\
+	OUTI;														\
+	if( _Z80_B )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb3);											\
+	}
+
+/***************************************************************
+ * LDDR
+ ***************************************************************/
+#define LDDR													\
+	LDD;														\
+	if( _BC )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb8);											\
+	}
+
+/***************************************************************
+ * CPDR
+ ***************************************************************/
+#define CPDR													\
+	CPD;														\
+	if( _BC && !(_F & ZF) )										\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xb9);											\
+	}
+
+/***************************************************************
+ * INDR
+ ***************************************************************/
+#define INDR													\
+	IND;														\
+	if( _Z80_B )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xba);											\
+	}
+
+/***************************************************************
+ * OTDR
+ ***************************************************************/
+#define OTDR													\
+	OUTD;														\
+	if( _Z80_B )													\
+	{															\
+		_PC -= 2;												\
+		CC(ex,0xbb);											\
+	}
+
+/***************************************************************
+ * EI
+ ***************************************************************/
+#define EI {													\
+	/* If interrupts were disabled, execute one more			\
+	 * instruction and check the IRQ line.						\
+	 * If not, simply set interrupt flip-flop 2					\
+	 */															\
+	if( _IFF1 == 0 )											\
+	{															\
+		_IFF1 = _IFF2 = 1;										\
+		_PPC = _PCD;											\
+		CALL_MAME_DEBUG;										\
+		_Z80_R++;													\
+		while( cpu_readop(z80->userdata,_PCD) == 0xfb ) /* more EIs? */		\
+		{														\
+			CC(op,0xfb);										\
+			_PPC =_PCD;											\
+			CALL_MAME_DEBUG;									\
+			_PC++;												\
+			_Z80_R++;												\
+		}														\
+		if( z80->Z80.irq_state != CLEAR_LINE ||						\
+			z80->Z80.request_irq >= 0 )								\
+		{														\
+			z80->after_EI = 1;	/* avoid cycle skip hacks */		\
+			EXEC(op,ROP(z80));										\
+			z80->after_EI = 0;										\
+			take_interrupt(z80);									\
+		} else EXEC(op,ROP(z80));									\
+	} else _IFF2 = 1;											\
+}
+
+/**********************************************************
+ * opcodes with CB prefix
+ * rotate, shift and bit operations
+ **********************************************************/
+OP(cb,00) { _Z80_B = RLC(z80, _Z80_B);											} /* RLC B			 */
+OP(cb,01) { _Z80_C = RLC(z80, _Z80_C);											} /* RLC C			 */
+OP(cb,02) { _Z80_D = RLC(z80, _Z80_D);											} /* RLC D			 */
+OP(cb,03) { _Z80_E = RLC(z80, _Z80_E);											} /* RLC E			 */
+OP(cb,04) { _Z80_H = RLC(z80, _Z80_H);											} /* RLC H			 */
+OP(cb,05) { _Z80_L = RLC(z80, _Z80_L);											} /* RLC L			 */
+OP(cb,06) { WM( _HL, RLC(z80, RM(_HL)) );								} /* RLC (HL)		 */
+OP(cb,07) { _Z80_A = RLC(z80, _Z80_A);											} /* RLC A			 */
+
+OP(cb,08) { _Z80_B = RRC(z80, _Z80_B);											} /* RRC B			 */
+OP(cb,09) { _Z80_C = RRC(z80, _Z80_C);											} /* RRC C			 */
+OP(cb,0a) { _Z80_D = RRC(z80, _Z80_D);											} /* RRC D			 */
+OP(cb,0b) { _Z80_E = RRC(z80, _Z80_E);											} /* RRC E			 */
+OP(cb,0c) { _Z80_H = RRC(z80, _Z80_H);											} /* RRC H			 */
+OP(cb,0d) { _Z80_L = RRC(z80, _Z80_L);											} /* RRC L			 */
+OP(cb,0e) { WM( _HL, RRC(z80, RM(_HL)) );								} /* RRC (HL)		 */
+OP(cb,0f) { _Z80_A = RRC(z80, _Z80_A);											} /* RRC A			 */
+
+OP(cb,10) { _Z80_B = RL(z80, _Z80_B);											} /* RL B			 */
+OP(cb,11) { _Z80_C = RL(z80, _Z80_C);											} /* RL C			 */
+OP(cb,12) { _Z80_D = RL(z80, _Z80_D);											} /* RL D			 */
+OP(cb,13) { _Z80_E = RL(z80, _Z80_E);											} /* RL E			 */
+OP(cb,14) { _Z80_H = RL(z80, _Z80_H);											} /* RL H			 */
+OP(cb,15) { _Z80_L = RL(z80, _Z80_L);											} /* RL L			 */
+OP(cb,16) { WM( _HL, RL(z80, RM(_HL)) );									} /* RL (HL)		 */
+OP(cb,17) { _Z80_A = RL(z80, _Z80_A);											} /* RL A			 */
+
+OP(cb,18) { _Z80_B = RR(z80, _Z80_B);											} /* RR B			 */
+OP(cb,19) { _Z80_C = RR(z80, _Z80_C);											} /* RR C			 */
+OP(cb,1a) { _Z80_D = RR(z80, _Z80_D);											} /* RR D			 */
+OP(cb,1b) { _Z80_E = RR(z80, _Z80_E);											} /* RR E			 */
+OP(cb,1c) { _Z80_H = RR(z80, _Z80_H);											} /* RR H			 */
+OP(cb,1d) { _Z80_L = RR(z80, _Z80_L);											} /* RR L			 */
+OP(cb,1e) { WM( _HL, RR(z80, RM(_HL)) );									} /* RR (HL)		 */
+OP(cb,1f) { _Z80_A = RR(z80, _Z80_A);											} /* RR A			 */
+
+OP(cb,20) { _Z80_B = SLA(z80, _Z80_B);											} /* SLA B			 */
+OP(cb,21) { _Z80_C = SLA(z80, _Z80_C);											} /* SLA C			 */
+OP(cb,22) { _Z80_D = SLA(z80, _Z80_D);											} /* SLA D			 */
+OP(cb,23) { _Z80_E = SLA(z80, _Z80_E);											} /* SLA E			 */
+OP(cb,24) { _Z80_H = SLA(z80, _Z80_H);											} /* SLA H			 */
+OP(cb,25) { _Z80_L = SLA(z80, _Z80_L);											} /* SLA L			 */
+OP(cb,26) { WM( _HL, SLA(z80, RM(_HL)) );								} /* SLA (HL)		 */
+OP(cb,27) { _Z80_A = SLA(z80, _Z80_A);											} /* SLA A			 */
+
+OP(cb,28) { _Z80_B = SRA(z80, _Z80_B);											} /* SRA B			 */
+OP(cb,29) { _Z80_C = SRA(z80, _Z80_C);											} /* SRA C			 */
+OP(cb,2a) { _Z80_D = SRA(z80, _Z80_D);											} /* SRA D			 */
+OP(cb,2b) { _Z80_E = SRA(z80, _Z80_E);											} /* SRA E			 */
+OP(cb,2c) { _Z80_H = SRA(z80, _Z80_H);											} /* SRA H			 */
+OP(cb,2d) { _Z80_L = SRA(z80, _Z80_L);											} /* SRA L			 */
+OP(cb,2e) { WM( _HL, SRA(z80, RM(_HL)) );								} /* SRA (HL)		 */
+OP(cb,2f) { _Z80_A = SRA(z80, _Z80_A);											} /* SRA A			 */
+
+OP(cb,30) { _Z80_B = SLL(z80, _Z80_B);											} /* SLL B			 */
+OP(cb,31) { _Z80_C = SLL(z80, _Z80_C);											} /* SLL C			 */
+OP(cb,32) { _Z80_D = SLL(z80, _Z80_D);											} /* SLL D			 */
+OP(cb,33) { _Z80_E = SLL(z80, _Z80_E);											} /* SLL E			 */
+OP(cb,34) { _Z80_H = SLL(z80, _Z80_H);											} /* SLL H			 */
+OP(cb,35) { _Z80_L = SLL(z80, _Z80_L);											} /* SLL L			 */
+OP(cb,36) { WM( _HL, SLL(z80, RM(_HL)) );								} /* SLL (HL)		 */
+OP(cb,37) { _Z80_A = SLL(z80, _Z80_A);											} /* SLL A			 */
+
+OP(cb,38) { _Z80_B = SRL(z80, _Z80_B);											} /* SRL B			 */
+OP(cb,39) { _Z80_C = SRL(z80, _Z80_C);											} /* SRL C			 */
+OP(cb,3a) { _Z80_D = SRL(z80, _Z80_D);											} /* SRL D			 */
+OP(cb,3b) { _Z80_E = SRL(z80, _Z80_E);											} /* SRL E			 */
+OP(cb,3c) { _Z80_H = SRL(z80, _Z80_H);											} /* SRL H			 */
+OP(cb,3d) { _Z80_L = SRL(z80, _Z80_L);											} /* SRL L			 */
+OP(cb,3e) { WM( _HL, SRL(z80, RM(_HL)) );								} /* SRL (HL)		 */
+OP(cb,3f) { _Z80_A = SRL(z80, _Z80_A);											} /* SRL A			 */
+
+OP(cb,40) { BIT(z80, 0,_Z80_B);												} /* BIT 0,B		 */
+OP(cb,41) { BIT(z80, 0,_Z80_C);												} /* BIT 0,C		 */
+OP(cb,42) { BIT(z80, 0,_Z80_D);												} /* BIT 0,D		 */
+OP(cb,43) { BIT(z80, 0,_Z80_E);												} /* BIT 0,E		 */
+OP(cb,44) { BIT(z80, 0,_Z80_H);												} /* BIT 0,H		 */
+OP(cb,45) { BIT(z80, 0,_Z80_L);												} /* BIT 0,L		 */
+OP(cb,46) { BIT(z80, 0,RM(_HL));											} /* BIT 0,(HL)	 */
+OP(cb,47) { BIT(z80, 0,_Z80_A);												} /* BIT 0,A		 */
+
+OP(cb,48) { BIT(z80, 1,_Z80_B);												} /* BIT 1,B		 */
+OP(cb,49) { BIT(z80, 1,_Z80_C);												} /* BIT 1,C		 */
+OP(cb,4a) { BIT(z80, 1,_Z80_D);												} /* BIT 1,D		 */
+OP(cb,4b) { BIT(z80, 1,_Z80_E);												} /* BIT 1,E		 */
+OP(cb,4c) { BIT(z80, 1,_Z80_H);												} /* BIT 1,H		 */
+OP(cb,4d) { BIT(z80, 1,_Z80_L);												} /* BIT 1,L		 */
+OP(cb,4e) { BIT(z80, 1,RM(_HL));											} /* BIT 1,(HL)	 */
+OP(cb,4f) { BIT(z80, 1,_Z80_A);												} /* BIT 1,A		 */
+
+OP(cb,50) { BIT(z80, 2,_Z80_B);												} /* BIT 2,B		 */
+OP(cb,51) { BIT(z80, 2,_Z80_C);												} /* BIT 2,C		 */
+OP(cb,52) { BIT(z80, 2,_Z80_D);												} /* BIT 2,D		 */
+OP(cb,53) { BIT(z80, 2,_Z80_E);												} /* BIT 2,E		 */
+OP(cb,54) { BIT(z80, 2,_Z80_H);												} /* BIT 2,H		 */
+OP(cb,55) { BIT(z80, 2,_Z80_L);												} /* BIT 2,L		 */
+OP(cb,56) { BIT(z80, 2,RM(_HL));											} /* BIT 2,(HL)	 */
+OP(cb,57) { BIT(z80, 2,_Z80_A);												} /* BIT 2,A		 */
+
+OP(cb,58) { BIT(z80, 3,_Z80_B);												} /* BIT 3,B		 */
+OP(cb,59) { BIT(z80, 3,_Z80_C);												} /* BIT 3,C		 */
+OP(cb,5a) { BIT(z80, 3,_Z80_D);												} /* BIT 3,D		 */
+OP(cb,5b) { BIT(z80, 3,_Z80_E);												} /* BIT 3,E		 */
+OP(cb,5c) { BIT(z80, 3,_Z80_H);												} /* BIT 3,H		 */
+OP(cb,5d) { BIT(z80, 3,_Z80_L);												} /* BIT 3,L		 */
+OP(cb,5e) { BIT(z80, 3,RM(_HL));											} /* BIT 3,(HL)	 */
+OP(cb,5f) { BIT(z80, 3,_Z80_A);												} /* BIT 3,A		 */
+
+OP(cb,60) { BIT(z80, 4,_Z80_B);												} /* BIT 4,B		 */
+OP(cb,61) { BIT(z80, 4,_Z80_C);												} /* BIT 4,C		 */
+OP(cb,62) { BIT(z80, 4,_Z80_D);												} /* BIT 4,D		 */
+OP(cb,63) { BIT(z80, 4,_Z80_E);												} /* BIT 4,E		 */
+OP(cb,64) { BIT(z80, 4,_Z80_H);												} /* BIT 4,H		 */
+OP(cb,65) { BIT(z80, 4,_Z80_L);												} /* BIT 4,L		 */
+OP(cb,66) { BIT(z80, 4,RM(_HL));											} /* BIT 4,(HL)	 */
+OP(cb,67) { BIT(z80, 4,_Z80_A);												} /* BIT 4,A		 */
+
+OP(cb,68) { BIT(z80, 5,_Z80_B);												} /* BIT 5,B		 */
+OP(cb,69) { BIT(z80, 5,_Z80_C);												} /* BIT 5,C		 */
+OP(cb,6a) { BIT(z80, 5,_Z80_D);												} /* BIT 5,D		 */
+OP(cb,6b) { BIT(z80, 5,_Z80_E);												} /* BIT 5,E		 */
+OP(cb,6c) { BIT(z80, 5,_Z80_H);												} /* BIT 5,H		 */
+OP(cb,6d) { BIT(z80, 5,_Z80_L);												} /* BIT 5,L		 */
+OP(cb,6e) { BIT(z80, 5,RM(_HL));											} /* BIT 5,(HL)	 */
+OP(cb,6f) { BIT(z80, 5,_Z80_A);												} /* BIT 5,A		 */
+
+OP(cb,70) { BIT(z80, 6,_Z80_B);												} /* BIT 6,B		 */
+OP(cb,71) { BIT(z80, 6,_Z80_C);												} /* BIT 6,C		 */
+OP(cb,72) { BIT(z80, 6,_Z80_D);												} /* BIT 6,D		 */
+OP(cb,73) { BIT(z80, 6,_Z80_E);												} /* BIT 6,E		 */
+OP(cb,74) { BIT(z80, 6,_Z80_H);												} /* BIT 6,H		 */
+OP(cb,75) { BIT(z80, 6,_Z80_L);												} /* BIT 6,L		 */
+OP(cb,76) { BIT(z80, 6,RM(_HL));											} /* BIT 6,(HL)	 */
+OP(cb,77) { BIT(z80, 6,_Z80_A);												} /* BIT 6,A		 */
+
+OP(cb,78) { BIT(z80, 7,_Z80_B);												} /* BIT 7,B		 */
+OP(cb,79) { BIT(z80, 7,_Z80_C);												} /* BIT 7,C		 */
+OP(cb,7a) { BIT(z80, 7,_Z80_D);												} /* BIT 7,D		 */
+OP(cb,7b) { BIT(z80, 7,_Z80_E);												} /* BIT 7,E		 */
+OP(cb,7c) { BIT(z80, 7,_Z80_H);												} /* BIT 7,H		 */
+OP(cb,7d) { BIT(z80, 7,_Z80_L);												} /* BIT 7,L		 */
+OP(cb,7e) { BIT(z80, 7,RM(_HL));											} /* BIT 7,(HL)	 */
+OP(cb,7f) { BIT(z80, 7,_Z80_A);												} /* BIT 7,A		 */
+
+OP(cb,80) { _Z80_B = RES(z80, 0,_Z80_B);											} /* RES 0,B		 */
+OP(cb,81) { _Z80_C = RES(z80, 0,_Z80_C);											} /* RES 0,C		 */
+OP(cb,82) { _Z80_D = RES(z80, 0,_Z80_D);											} /* RES 0,D		 */
+OP(cb,83) { _Z80_E = RES(z80, 0,_Z80_E);											} /* RES 0,E		 */
+OP(cb,84) { _Z80_H = RES(z80, 0,_Z80_H);											} /* RES 0,H		 */
+OP(cb,85) { _Z80_L = RES(z80, 0,_Z80_L);											} /* RES 0,L		 */
+OP(cb,86) { WM( _HL, RES(z80, 0,RM(_HL)) );								} /* RES 0,(HL)	 */
+OP(cb,87) { _Z80_A = RES(z80, 0,_Z80_A);											} /* RES 0,A		 */
+
+OP(cb,88) { _Z80_B = RES(z80, 1,_Z80_B);											} /* RES 1,B		 */
+OP(cb,89) { _Z80_C = RES(z80, 1,_Z80_C);											} /* RES 1,C		 */
+OP(cb,8a) { _Z80_D = RES(z80, 1,_Z80_D);											} /* RES 1,D		 */
+OP(cb,8b) { _Z80_E = RES(z80, 1,_Z80_E);											} /* RES 1,E		 */
+OP(cb,8c) { _Z80_H = RES(z80, 1,_Z80_H);											} /* RES 1,H		 */
+OP(cb,8d) { _Z80_L = RES(z80, 1,_Z80_L);											} /* RES 1,L		 */
+OP(cb,8e) { WM( _HL, RES(z80, 1,RM(_HL)) );								} /* RES 1,(HL)	 */
+OP(cb,8f) { _Z80_A = RES(z80, 1,_Z80_A);											} /* RES 1,A		 */
+
+OP(cb,90) { _Z80_B = RES(z80, 2,_Z80_B);											} /* RES 2,B		 */
+OP(cb,91) { _Z80_C = RES(z80, 2,_Z80_C);											} /* RES 2,C		 */
+OP(cb,92) { _Z80_D = RES(z80, 2,_Z80_D);											} /* RES 2,D		 */
+OP(cb,93) { _Z80_E = RES(z80, 2,_Z80_E);											} /* RES 2,E		 */
+OP(cb,94) { _Z80_H = RES(z80, 2,_Z80_H);											} /* RES 2,H		 */
+OP(cb,95) { _Z80_L = RES(z80, 2,_Z80_L);											} /* RES 2,L		 */
+OP(cb,96) { WM( _HL, RES(z80, 2,RM(_HL)) );								} /* RES 2,(HL)	 */
+OP(cb,97) { _Z80_A = RES(z80, 2,_Z80_A);											} /* RES 2,A		 */
+
+OP(cb,98) { _Z80_B = RES(z80, 3,_Z80_B);											} /* RES 3,B		 */
+OP(cb,99) { _Z80_C = RES(z80, 3,_Z80_C);											} /* RES 3,C		 */
+OP(cb,9a) { _Z80_D = RES(z80, 3,_Z80_D);											} /* RES 3,D		 */
+OP(cb,9b) { _Z80_E = RES(z80, 3,_Z80_E);											} /* RES 3,E		 */
+OP(cb,9c) { _Z80_H = RES(z80, 3,_Z80_H);											} /* RES 3,H		 */
+OP(cb,9d) { _Z80_L = RES(z80, 3,_Z80_L);											} /* RES 3,L		 */
+OP(cb,9e) { WM( _HL, RES(z80, 3,RM(_HL)) );								} /* RES 3,(HL)	 */
+OP(cb,9f) { _Z80_A = RES(z80, 3,_Z80_A);											} /* RES 3,A		 */
+
+OP(cb,a0) { _Z80_B = RES(z80, 4,_Z80_B);											} /* RES 4,B		 */
+OP(cb,a1) { _Z80_C = RES(z80, 4,_Z80_C);											} /* RES 4,C		 */
+OP(cb,a2) { _Z80_D = RES(z80, 4,_Z80_D);											} /* RES 4,D		 */
+OP(cb,a3) { _Z80_E = RES(z80, 4,_Z80_E);											} /* RES 4,E		 */
+OP(cb,a4) { _Z80_H = RES(z80, 4,_Z80_H);											} /* RES 4,H		 */
+OP(cb,a5) { _Z80_L = RES(z80, 4,_Z80_L);											} /* RES 4,L		 */
+OP(cb,a6) { WM( _HL, RES(z80, 4,RM(_HL)) );								} /* RES 4,(HL)	 */
+OP(cb,a7) { _Z80_A = RES(z80, 4,_Z80_A);											} /* RES 4,A		 */
+
+OP(cb,a8) { _Z80_B = RES(z80, 5,_Z80_B);											} /* RES 5,B		 */
+OP(cb,a9) { _Z80_C = RES(z80, 5,_Z80_C);											} /* RES 5,C		 */
+OP(cb,aa) { _Z80_D = RES(z80, 5,_Z80_D);											} /* RES 5,D		 */
+OP(cb,ab) { _Z80_E = RES(z80, 5,_Z80_E);											} /* RES 5,E		 */
+OP(cb,ac) { _Z80_H = RES(z80, 5,_Z80_H);											} /* RES 5,H		 */
+OP(cb,ad) { _Z80_L = RES(z80, 5,_Z80_L);											} /* RES 5,L		 */
+OP(cb,ae) { WM( _HL, RES(z80, 5,RM(_HL)) );								} /* RES 5,(HL)	 */
+OP(cb,af) { _Z80_A = RES(z80, 5,_Z80_A);											} /* RES 5,A		 */
+
+OP(cb,b0) { _Z80_B = RES(z80, 6,_Z80_B);											} /* RES 6,B		 */
+OP(cb,b1) { _Z80_C = RES(z80, 6,_Z80_C);											} /* RES 6,C		 */
+OP(cb,b2) { _Z80_D = RES(z80, 6,_Z80_D);											} /* RES 6,D		 */
+OP(cb,b3) { _Z80_E = RES(z80, 6,_Z80_E);											} /* RES 6,E		 */
+OP(cb,b4) { _Z80_H = RES(z80, 6,_Z80_H);											} /* RES 6,H		 */
+OP(cb,b5) { _Z80_L = RES(z80, 6,_Z80_L);											} /* RES 6,L		 */
+OP(cb,b6) { WM( _HL, RES(z80, 6,RM(_HL)) );								} /* RES 6,(HL)	 */
+OP(cb,b7) { _Z80_A = RES(z80, 6,_Z80_A);											} /* RES 6,A		 */
+
+OP(cb,b8) { _Z80_B = RES(z80, 7,_Z80_B);											} /* RES 7,B		 */
+OP(cb,b9) { _Z80_C = RES(z80, 7,_Z80_C);											} /* RES 7,C		 */
+OP(cb,ba) { _Z80_D = RES(z80, 7,_Z80_D);											} /* RES 7,D		 */
+OP(cb,bb) { _Z80_E = RES(z80, 7,_Z80_E);											} /* RES 7,E		 */
+OP(cb,bc) { _Z80_H = RES(z80, 7,_Z80_H);											} /* RES 7,H		 */
+OP(cb,bd) { _Z80_L = RES(z80, 7,_Z80_L);											} /* RES 7,L		 */
+OP(cb,be) { WM( _HL, RES(z80, 7,RM(_HL)) );								} /* RES 7,(HL)	 */
+OP(cb,bf) { _Z80_A = RES(z80, 7,_Z80_A);											} /* RES 7,A		 */
+
+OP(cb,c0) { _Z80_B = SET(z80, 0,_Z80_B);											} /* SET 0,B		 */
+OP(cb,c1) { _Z80_C = SET(z80, 0,_Z80_C);											} /* SET 0,C		 */
+OP(cb,c2) { _Z80_D = SET(z80, 0,_Z80_D);											} /* SET 0,D		 */
+OP(cb,c3) { _Z80_E = SET(z80, 0,_Z80_E);											} /* SET 0,E		 */
+OP(cb,c4) { _Z80_H = SET(z80, 0,_Z80_H);											} /* SET 0,H		 */
+OP(cb,c5) { _Z80_L = SET(z80, 0,_Z80_L);											} /* SET 0,L		 */
+OP(cb,c6) { WM( _HL, SET(z80, 0,RM(_HL)) );								} /* SET 0,(HL)	 */
+OP(cb,c7) { _Z80_A = SET(z80, 0,_Z80_A);											} /* SET 0,A		 */
+
+OP(cb,c8) { _Z80_B = SET(z80, 1,_Z80_B);											} /* SET 1,B		 */
+OP(cb,c9) { _Z80_C = SET(z80, 1,_Z80_C);											} /* SET 1,C		 */
+OP(cb,ca) { _Z80_D = SET(z80, 1,_Z80_D);											} /* SET 1,D		 */
+OP(cb,cb) { _Z80_E = SET(z80, 1,_Z80_E);											} /* SET 1,E		 */
+OP(cb,cc) { _Z80_H = SET(z80, 1,_Z80_H);											} /* SET 1,H		 */
+OP(cb,cd) { _Z80_L = SET(z80, 1,_Z80_L);											} /* SET 1,L		 */
+OP(cb,ce) { WM( _HL, SET(z80, 1,RM(_HL)) );								} /* SET 1,(HL)	 */
+OP(cb,cf) { _Z80_A = SET(z80, 1,_Z80_A);											} /* SET 1,A		 */
+
+OP(cb,d0) { _Z80_B = SET(z80, 2,_Z80_B);											} /* SET 2,B		 */
+OP(cb,d1) { _Z80_C = SET(z80, 2,_Z80_C);											} /* SET 2,C		 */
+OP(cb,d2) { _Z80_D = SET(z80, 2,_Z80_D);											} /* SET 2,D		 */
+OP(cb,d3) { _Z80_E = SET(z80, 2,_Z80_E);											} /* SET 2,E		 */
+OP(cb,d4) { _Z80_H = SET(z80, 2,_Z80_H);											} /* SET 2,H		 */
+OP(cb,d5) { _Z80_L = SET(z80, 2,_Z80_L);											} /* SET 2,L		 */
+OP(cb,d6) { WM( _HL, SET(z80, 2,RM(_HL)) );								}/* SET 2,(HL)		 */
+OP(cb,d7) { _Z80_A = SET(z80, 2,_Z80_A);											} /* SET 2,A		 */
+
+OP(cb,d8) { _Z80_B = SET(z80, 3,_Z80_B);											} /* SET 3,B		 */
+OP(cb,d9) { _Z80_C = SET(z80, 3,_Z80_C);											} /* SET 3,C		 */
+OP(cb,da) { _Z80_D = SET(z80, 3,_Z80_D);											} /* SET 3,D		 */
+OP(cb,db) { _Z80_E = SET(z80, 3,_Z80_E);											} /* SET 3,E		 */
+OP(cb,dc) { _Z80_H = SET(z80, 3,_Z80_H);											} /* SET 3,H		 */
+OP(cb,dd) { _Z80_L = SET(z80, 3,_Z80_L);											} /* SET 3,L		 */
+OP(cb,de) { WM( _HL, SET(z80, 3,RM(_HL)) );								} /* SET 3,(HL)	 */
+OP(cb,df) { _Z80_A = SET(z80, 3,_Z80_A);											} /* SET 3,A		 */
+
+OP(cb,e0) { _Z80_B = SET(z80, 4,_Z80_B);											} /* SET 4,B		 */
+OP(cb,e1) { _Z80_C = SET(z80, 4,_Z80_C);											} /* SET 4,C		 */
+OP(cb,e2) { _Z80_D = SET(z80, 4,_Z80_D);											} /* SET 4,D		 */
+OP(cb,e3) { _Z80_E = SET(z80, 4,_Z80_E);											} /* SET 4,E		 */
+OP(cb,e4) { _Z80_H = SET(z80, 4,_Z80_H);											} /* SET 4,H		 */
+OP(cb,e5) { _Z80_L = SET(z80, 4,_Z80_L);											} /* SET 4,L		 */
+OP(cb,e6) { WM( _HL, SET(z80, 4,RM(_HL)) );								} /* SET 4,(HL)	 */
+OP(cb,e7) { _Z80_A = SET(z80, 4,_Z80_A);											} /* SET 4,A		 */
+
+OP(cb,e8) { _Z80_B = SET(z80, 5,_Z80_B);											} /* SET 5,B		 */
+OP(cb,e9) { _Z80_C = SET(z80, 5,_Z80_C);											} /* SET 5,C		 */
+OP(cb,ea) { _Z80_D = SET(z80, 5,_Z80_D);											} /* SET 5,D		 */
+OP(cb,eb) { _Z80_E = SET(z80, 5,_Z80_E);											} /* SET 5,E		 */
+OP(cb,ec) { _Z80_H = SET(z80, 5,_Z80_H);											} /* SET 5,H		 */
+OP(cb,ed) { _Z80_L = SET(z80, 5,_Z80_L);											} /* SET 5,L		 */
+OP(cb,ee) { WM( _HL, SET(z80, 5,RM(_HL)) );								} /* SET 5,(HL)	 */
+OP(cb,ef) { _Z80_A = SET(z80, 5,_Z80_A);											} /* SET 5,A		 */
+
+OP(cb,f0) { _Z80_B = SET(z80, 6,_Z80_B);											} /* SET 6,B		 */
+OP(cb,f1) { _Z80_C = SET(z80, 6,_Z80_C);											} /* SET 6,C		 */
+OP(cb,f2) { _Z80_D = SET(z80, 6,_Z80_D);											} /* SET 6,D		 */
+OP(cb,f3) { _Z80_E = SET(z80, 6,_Z80_E);											} /* SET 6,E		 */
+OP(cb,f4) { _Z80_H = SET(z80, 6,_Z80_H);											} /* SET 6,H		 */
+OP(cb,f5) { _Z80_L = SET(z80, 6,_Z80_L);											} /* SET 6,L		 */
+OP(cb,f6) { WM( _HL, SET(z80, 6,RM(_HL)) );								} /* SET 6,(HL)	 */
+OP(cb,f7) { _Z80_A = SET(z80, 6,_Z80_A);											} /* SET 6,A		 */
+
+OP(cb,f8) { _Z80_B = SET(z80, 7,_Z80_B);											} /* SET 7,B		 */
+OP(cb,f9) { _Z80_C = SET(z80, 7,_Z80_C);											} /* SET 7,C		 */
+OP(cb,fa) { _Z80_D = SET(z80, 7,_Z80_D);											} /* SET 7,D		 */
+OP(cb,fb) { _Z80_E = SET(z80, 7,_Z80_E);											} /* SET 7,E		 */
+OP(cb,fc) { _Z80_H = SET(z80, 7,_Z80_H);											} /* SET 7,H		 */
+OP(cb,fd) { _Z80_L = SET(z80, 7,_Z80_L);											} /* SET 7,L		 */
+OP(cb,fe) { WM( _HL, SET(z80, 7,RM(_HL)) );								} /* SET 7,(HL)	 */
+OP(cb,ff) { _Z80_A = SET(z80, 7,_Z80_A);											} /* SET 7,A		 */
+
+
+/**********************************************************
+* opcodes with DD/FD CB prefix
+* rotate, shift and bit operations with (IX+o)
+**********************************************************/
+OP(xycb,00) { _Z80_B = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* RLC B=(XY+o)	 */
+OP(xycb,01) { _Z80_C = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* RLC C=(XY+o)	 */
+OP(xycb,02) { _Z80_D = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* RLC D=(XY+o)	 */
+OP(xycb,03) { _Z80_E = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* RLC E=(XY+o)	 */
+OP(xycb,04) { _Z80_H = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* RLC H=(XY+o)	 */
+OP(xycb,05) { _Z80_L = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* RLC L=(XY+o)	 */
+OP(xycb,06) { WM( z80->EA, RLC(z80, RM(z80->EA) ) );								} /* RLC (XY+o)	 */
+OP(xycb,07) { _Z80_A = RLC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* RLC A=(XY+o)	 */
+
+OP(xycb,08) { _Z80_B = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* RRC B=(XY+o)	 */
+OP(xycb,09) { _Z80_C = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* RRC C=(XY+o)	 */
+OP(xycb,0a) { _Z80_D = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* RRC D=(XY+o)	 */
+OP(xycb,0b) { _Z80_E = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* RRC E=(XY+o)	 */
+OP(xycb,0c) { _Z80_H = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* RRC H=(XY+o)	 */
+OP(xycb,0d) { _Z80_L = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* RRC L=(XY+o)	 */
+OP(xycb,0e) { WM( z80->EA,RRC(z80, RM(z80->EA) ) );								} /* RRC (XY+o)	 */
+OP(xycb,0f) { _Z80_A = RRC(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* RRC A=(XY+o)	 */
+
+OP(xycb,10) { _Z80_B = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* RL B=(XY+o)	 */
+OP(xycb,11) { _Z80_C = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* RL C=(XY+o)	 */
+OP(xycb,12) { _Z80_D = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* RL D=(XY+o)	 */
+OP(xycb,13) { _Z80_E = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* RL E=(XY+o)	 */
+OP(xycb,14) { _Z80_H = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* RL H=(XY+o)	 */
+OP(xycb,15) { _Z80_L = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* RL L=(XY+o)	 */
+OP(xycb,16) { WM( z80->EA,RL(z80, RM(z80->EA) ) );								} /* RL (XY+o)	 */
+OP(xycb,17) { _Z80_A = RL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* RL A=(XY+o)	 */
+
+OP(xycb,18) { _Z80_B = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* RR B=(XY+o)	 */
+OP(xycb,19) { _Z80_C = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* RR C=(XY+o)	 */
+OP(xycb,1a) { _Z80_D = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* RR D=(XY+o)	 */
+OP(xycb,1b) { _Z80_E = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* RR E=(XY+o)	 */
+OP(xycb,1c) { _Z80_H = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* RR H=(XY+o)	 */
+OP(xycb,1d) { _Z80_L = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* RR L=(XY+o)	 */
+OP(xycb,1e) { WM( z80->EA,RR(z80, RM(z80->EA) ) );								} /* RR (XY+o)	 */
+OP(xycb,1f) { _Z80_A = RR(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* RR A=(XY+o)	 */
+
+OP(xycb,20) { _Z80_B = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* SLA B=(XY+o)	 */
+OP(xycb,21) { _Z80_C = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* SLA C=(XY+o)	 */
+OP(xycb,22) { _Z80_D = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* SLA D=(XY+o)	 */
+OP(xycb,23) { _Z80_E = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* SLA E=(XY+o)	 */
+OP(xycb,24) { _Z80_H = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* SLA H=(XY+o)	 */
+OP(xycb,25) { _Z80_L = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* SLA L=(XY+o)	 */
+OP(xycb,26) { WM( z80->EA,SLA(z80, RM(z80->EA) ) );								} /* SLA (XY+o)	 */
+OP(xycb,27) { _Z80_A = SLA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* SLA A=(XY+o)	 */
+
+OP(xycb,28) { _Z80_B = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* SRA B=(XY+o)	 */
+OP(xycb,29) { _Z80_C = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* SRA C=(XY+o)	 */
+OP(xycb,2a) { _Z80_D = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* SRA D=(XY+o)	 */
+OP(xycb,2b) { _Z80_E = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* SRA E=(XY+o)	 */
+OP(xycb,2c) { _Z80_H = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* SRA H=(XY+o)	 */
+OP(xycb,2d) { _Z80_L = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* SRA L=(XY+o)	 */
+OP(xycb,2e) { WM( z80->EA,SRA(z80, RM(z80->EA) ) );								} /* SRA (XY+o)	 */
+OP(xycb,2f) { _Z80_A = SRA(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* SRA A=(XY+o)	 */
+
+OP(xycb,30) { _Z80_B = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* SLL B=(XY+o)	 */
+OP(xycb,31) { _Z80_C = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* SLL C=(XY+o)	 */
+OP(xycb,32) { _Z80_D = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* SLL D=(XY+o)	 */
+OP(xycb,33) { _Z80_E = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* SLL E=(XY+o)	 */
+OP(xycb,34) { _Z80_H = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* SLL H=(XY+o)	 */
+OP(xycb,35) { _Z80_L = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* SLL L=(XY+o)	 */
+OP(xycb,36) { WM( z80->EA,SLL(z80, RM(z80->EA) ) );								} /* SLL (XY+o)	 */
+OP(xycb,37) { _Z80_A = SLL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* SLL A=(XY+o)	 */
+
+OP(xycb,38) { _Z80_B = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_B );						} /* SRL B=(XY+o)	 */
+OP(xycb,39) { _Z80_C = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_C );						} /* SRL C=(XY+o)	 */
+OP(xycb,3a) { _Z80_D = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_D );						} /* SRL D=(XY+o)	 */
+OP(xycb,3b) { _Z80_E = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_E );						} /* SRL E=(XY+o)	 */
+OP(xycb,3c) { _Z80_H = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_H );						} /* SRL H=(XY+o)	 */
+OP(xycb,3d) { _Z80_L = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_L );						} /* SRL L=(XY+o)	 */
+OP(xycb,3e) { WM( z80->EA,SRL(z80, RM(z80->EA) ) );								} /* SRL (XY+o)	 */
+OP(xycb,3f) { _Z80_A = SRL(z80, RM(z80->EA) ); WM( z80->EA,_Z80_A );						} /* SRL A=(XY+o)	 */
+
+OP(xycb,40) { xycb_46(z80);											} /* BIT 0,B=(XY+o) */
+OP(xycb,41) { xycb_46(z80);													 } /* BIT	0,C=(XY+o)	*/
+OP(xycb,42) { xycb_46(z80);											} /* BIT 0,D=(XY+o) */
+OP(xycb,43) { xycb_46(z80);											} /* BIT 0,E=(XY+o) */
+OP(xycb,44) { xycb_46(z80);											} /* BIT 0,H=(XY+o) */
+OP(xycb,45) { xycb_46(z80);											} /* BIT 0,L=(XY+o) */
+OP(xycb,46) { BIT_XY(z80,0,RM(z80->EA));										} /* BIT 0,(XY+o)	 */
+OP(xycb,47) { xycb_46(z80);											} /* BIT 0,A=(XY+o) */
+
+OP(xycb,48) { xycb_4e(z80);											} /* BIT 1,B=(XY+o) */
+OP(xycb,49) { xycb_4e(z80);													 } /* BIT	1,C=(XY+o)	*/
+OP(xycb,4a) { xycb_4e(z80);											} /* BIT 1,D=(XY+o) */
+OP(xycb,4b) { xycb_4e(z80);											} /* BIT 1,E=(XY+o) */
+OP(xycb,4c) { xycb_4e(z80);											} /* BIT 1,H=(XY+o) */
+OP(xycb,4d) { xycb_4e(z80);											} /* BIT 1,L=(XY+o) */
+OP(xycb,4e) { BIT_XY(z80,1,RM(z80->EA));										} /* BIT 1,(XY+o)	 */
+OP(xycb,4f) { xycb_4e(z80);											} /* BIT 1,A=(XY+o) */
+
+OP(xycb,50) { xycb_56(z80);											} /* BIT 2,B=(XY+o) */
+OP(xycb,51) { xycb_56(z80);													 } /* BIT	2,C=(XY+o)	*/
+OP(xycb,52) { xycb_56(z80);											} /* BIT 2,D=(XY+o) */
+OP(xycb,53) { xycb_56(z80);											} /* BIT 2,E=(XY+o) */
+OP(xycb,54) { xycb_56(z80);											} /* BIT 2,H=(XY+o) */
+OP(xycb,55) { xycb_56(z80);											} /* BIT 2,L=(XY+o) */
+OP(xycb,56) { BIT_XY(z80,2,RM(z80->EA));										} /* BIT 2,(XY+o)	 */
+OP(xycb,57) { xycb_56(z80);											} /* BIT 2,A=(XY+o) */
+
+OP(xycb,58) { xycb_5e(z80);											} /* BIT 3,B=(XY+o) */
+OP(xycb,59) { xycb_5e(z80);													 } /* BIT	3,C=(XY+o)	*/
+OP(xycb,5a) { xycb_5e(z80);											} /* BIT 3,D=(XY+o) */
+OP(xycb,5b) { xycb_5e(z80);											} /* BIT 3,E=(XY+o) */
+OP(xycb,5c) { xycb_5e(z80);											} /* BIT 3,H=(XY+o) */
+OP(xycb,5d) { xycb_5e(z80);											} /* BIT 3,L=(XY+o) */
+OP(xycb,5e) { BIT_XY(z80,3,RM(z80->EA));										} /* BIT 3,(XY+o)	 */
+OP(xycb,5f) { xycb_5e(z80);											} /* BIT 3,A=(XY+o) */
+
+OP(xycb,60) { xycb_66(z80);											} /* BIT 4,B=(XY+o) */
+OP(xycb,61) { xycb_66(z80);													 } /* BIT	4,C=(XY+o)	*/
+OP(xycb,62) { xycb_66(z80);											} /* BIT 4,D=(XY+o) */
+OP(xycb,63) { xycb_66(z80);											} /* BIT 4,E=(XY+o) */
+OP(xycb,64) { xycb_66(z80);											} /* BIT 4,H=(XY+o) */
+OP(xycb,65) { xycb_66(z80);											} /* BIT 4,L=(XY+o) */
+OP(xycb,66) { BIT_XY(z80,4,RM(z80->EA));										} /* BIT 4,(XY+o)	 */
+OP(xycb,67) { xycb_66(z80);											} /* BIT 4,A=(XY+o) */
+
+OP(xycb,68) { xycb_6e(z80);											} /* BIT 5,B=(XY+o) */
+OP(xycb,69) { xycb_6e(z80);													 } /* BIT	5,C=(XY+o)	*/
+OP(xycb,6a) { xycb_6e(z80);											} /* BIT 5,D=(XY+o) */
+OP(xycb,6b) { xycb_6e(z80);											} /* BIT 5,E=(XY+o) */
+OP(xycb,6c) { xycb_6e(z80);											} /* BIT 5,H=(XY+o) */
+OP(xycb,6d) { xycb_6e(z80);											} /* BIT 5,L=(XY+o) */
+OP(xycb,6e) { BIT_XY(z80,5,RM(z80->EA));										} /* BIT 5,(XY+o)	 */
+OP(xycb,6f) { xycb_6e(z80);											} /* BIT 5,A=(XY+o) */
+
+OP(xycb,70) { xycb_76(z80);											} /* BIT 6,B=(XY+o) */
+OP(xycb,71) { xycb_76(z80);													 } /* BIT	6,C=(XY+o)	*/
+OP(xycb,72) { xycb_76(z80);											} /* BIT 6,D=(XY+o) */
+OP(xycb,73) { xycb_76(z80);											} /* BIT 6,E=(XY+o) */
+OP(xycb,74) { xycb_76(z80);											} /* BIT 6,H=(XY+o) */
+OP(xycb,75) { xycb_76(z80);											} /* BIT 6,L=(XY+o) */
+OP(xycb,76) { BIT_XY(z80,6,RM(z80->EA));										} /* BIT 6,(XY+o)	 */
+OP(xycb,77) { xycb_76(z80);											} /* BIT 6,A=(XY+o) */
+
+OP(xycb,78) { xycb_7e(z80);											} /* BIT 7,B=(XY+o) */
+OP(xycb,79) { xycb_7e(z80);													 } /* BIT	7,C=(XY+o)	*/
+OP(xycb,7a) { xycb_7e(z80);											} /* BIT 7,D=(XY+o) */
+OP(xycb,7b) { xycb_7e(z80);											} /* BIT 7,E=(XY+o) */
+OP(xycb,7c) { xycb_7e(z80);											} /* BIT 7,H=(XY+o) */
+OP(xycb,7d) { xycb_7e(z80);											} /* BIT 7,L=(XY+o) */
+OP(xycb,7e) { BIT_XY(z80,7,RM(z80->EA));										} /* BIT 7,(XY+o)	 */
+OP(xycb,7f) { xycb_7e(z80);											} /* BIT 7,A=(XY+o) */
+
+OP(xycb,80) { _Z80_B = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 0,B=(XY+o) */
+OP(xycb,81) { _Z80_C = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 0,C=(XY+o) */
+OP(xycb,82) { _Z80_D = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 0,D=(XY+o) */
+OP(xycb,83) { _Z80_E = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 0,E=(XY+o) */
+OP(xycb,84) { _Z80_H = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 0,H=(XY+o) */
+OP(xycb,85) { _Z80_L = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 0,L=(XY+o) */
+OP(xycb,86) { WM( z80->EA, RES(z80, 0,RM(z80->EA)) );								} /* RES 0,(XY+o)	 */
+OP(xycb,87) { _Z80_A = RES(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 0,A=(XY+o) */
+
+OP(xycb,88) { _Z80_B = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 1,B=(XY+o) */
+OP(xycb,89) { _Z80_C = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 1,C=(XY+o) */
+OP(xycb,8a) { _Z80_D = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 1,D=(XY+o) */
+OP(xycb,8b) { _Z80_E = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 1,E=(XY+o) */
+OP(xycb,8c) { _Z80_H = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 1,H=(XY+o) */
+OP(xycb,8d) { _Z80_L = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 1,L=(XY+o) */
+OP(xycb,8e) { WM( z80->EA, RES(z80, 1,RM(z80->EA)) );								} /* RES 1,(XY+o)	 */
+OP(xycb,8f) { _Z80_A = RES(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 1,A=(XY+o) */
+
+OP(xycb,90) { _Z80_B = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 2,B=(XY+o) */
+OP(xycb,91) { _Z80_C = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 2,C=(XY+o) */
+OP(xycb,92) { _Z80_D = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 2,D=(XY+o) */
+OP(xycb,93) { _Z80_E = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 2,E=(XY+o) */
+OP(xycb,94) { _Z80_H = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 2,H=(XY+o) */
+OP(xycb,95) { _Z80_L = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 2,L=(XY+o) */
+OP(xycb,96) { WM( z80->EA, RES(z80, 2,RM(z80->EA)) );								} /* RES 2,(XY+o)	 */
+OP(xycb,97) { _Z80_A = RES(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 2,A=(XY+o) */
+
+OP(xycb,98) { _Z80_B = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 3,B=(XY+o) */
+OP(xycb,99) { _Z80_C = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 3,C=(XY+o) */
+OP(xycb,9a) { _Z80_D = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 3,D=(XY+o) */
+OP(xycb,9b) { _Z80_E = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 3,E=(XY+o) */
+OP(xycb,9c) { _Z80_H = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 3,H=(XY+o) */
+OP(xycb,9d) { _Z80_L = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 3,L=(XY+o) */
+OP(xycb,9e) { WM( z80->EA, RES(z80, 3,RM(z80->EA)) );								} /* RES 3,(XY+o)	 */
+OP(xycb,9f) { _Z80_A = RES(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 3,A=(XY+o) */
+
+OP(xycb,a0) { _Z80_B = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 4,B=(XY+o) */
+OP(xycb,a1) { _Z80_C = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 4,C=(XY+o) */
+OP(xycb,a2) { _Z80_D = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 4,D=(XY+o) */
+OP(xycb,a3) { _Z80_E = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 4,E=(XY+o) */
+OP(xycb,a4) { _Z80_H = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 4,H=(XY+o) */
+OP(xycb,a5) { _Z80_L = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 4,L=(XY+o) */
+OP(xycb,a6) { WM( z80->EA, RES(z80, 4,RM(z80->EA)) );								} /* RES 4,(XY+o)	 */
+OP(xycb,a7) { _Z80_A = RES(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 4,A=(XY+o) */
+
+OP(xycb,a8) { _Z80_B = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 5,B=(XY+o) */
+OP(xycb,a9) { _Z80_C = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 5,C=(XY+o) */
+OP(xycb,aa) { _Z80_D = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 5,D=(XY+o) */
+OP(xycb,ab) { _Z80_E = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 5,E=(XY+o) */
+OP(xycb,ac) { _Z80_H = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 5,H=(XY+o) */
+OP(xycb,ad) { _Z80_L = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 5,L=(XY+o) */
+OP(xycb,ae) { WM( z80->EA, RES(z80, 5,RM(z80->EA)) );								} /* RES 5,(XY+o)	 */
+OP(xycb,af) { _Z80_A = RES(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 5,A=(XY+o) */
+
+OP(xycb,b0) { _Z80_B = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 6,B=(XY+o) */
+OP(xycb,b1) { _Z80_C = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 6,C=(XY+o) */
+OP(xycb,b2) { _Z80_D = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 6,D=(XY+o) */
+OP(xycb,b3) { _Z80_E = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 6,E=(XY+o) */
+OP(xycb,b4) { _Z80_H = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 6,H=(XY+o) */
+OP(xycb,b5) { _Z80_L = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 6,L=(XY+o) */
+OP(xycb,b6) { WM( z80->EA, RES(z80, 6,RM(z80->EA)) );								} /* RES 6,(XY+o)	 */
+OP(xycb,b7) { _Z80_A = RES(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 6,A=(XY+o) */
+
+OP(xycb,b8) { _Z80_B = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* RES 7,B=(XY+o) */
+OP(xycb,b9) { _Z80_C = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* RES 7,C=(XY+o) */
+OP(xycb,ba) { _Z80_D = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* RES 7,D=(XY+o) */
+OP(xycb,bb) { _Z80_E = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* RES 7,E=(XY+o) */
+OP(xycb,bc) { _Z80_H = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* RES 7,H=(XY+o) */
+OP(xycb,bd) { _Z80_L = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* RES 7,L=(XY+o) */
+OP(xycb,be) { WM( z80->EA, RES(z80, 7,RM(z80->EA)) );								} /* RES 7,(XY+o)	 */
+OP(xycb,bf) { _Z80_A = RES(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* RES 7,A=(XY+o) */
+
+OP(xycb,c0) { _Z80_B = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 0,B=(XY+o) */
+OP(xycb,c1) { _Z80_C = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 0,C=(XY+o) */
+OP(xycb,c2) { _Z80_D = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 0,D=(XY+o) */
+OP(xycb,c3) { _Z80_E = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 0,E=(XY+o) */
+OP(xycb,c4) { _Z80_H = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 0,H=(XY+o) */
+OP(xycb,c5) { _Z80_L = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 0,L=(XY+o) */
+OP(xycb,c6) { WM( z80->EA, SET(z80, 0,RM(z80->EA)) );								} /* SET 0,(XY+o)	 */
+OP(xycb,c7) { _Z80_A = SET(z80, 0, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 0,A=(XY+o) */
+
+OP(xycb,c8) { _Z80_B = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 1,B=(XY+o) */
+OP(xycb,c9) { _Z80_C = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 1,C=(XY+o) */
+OP(xycb,ca) { _Z80_D = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 1,D=(XY+o) */
+OP(xycb,cb) { _Z80_E = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 1,E=(XY+o) */
+OP(xycb,cc) { _Z80_H = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 1,H=(XY+o) */
+OP(xycb,cd) { _Z80_L = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 1,L=(XY+o) */
+OP(xycb,ce) { WM( z80->EA, SET(z80, 1,RM(z80->EA)) );								} /* SET 1,(XY+o)	 */
+OP(xycb,cf) { _Z80_A = SET(z80, 1, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 1,A=(XY+o) */
+
+OP(xycb,d0) { _Z80_B = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 2,B=(XY+o) */
+OP(xycb,d1) { _Z80_C = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 2,C=(XY+o) */
+OP(xycb,d2) { _Z80_D = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 2,D=(XY+o) */
+OP(xycb,d3) { _Z80_E = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 2,E=(XY+o) */
+OP(xycb,d4) { _Z80_H = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 2,H=(XY+o) */
+OP(xycb,d5) { _Z80_L = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 2,L=(XY+o) */
+OP(xycb,d6) { WM( z80->EA, SET(z80, 2,RM(z80->EA)) );								} /* SET 2,(XY+o)	 */
+OP(xycb,d7) { _Z80_A = SET(z80, 2, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 2,A=(XY+o) */
+
+OP(xycb,d8) { _Z80_B = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 3,B=(XY+o) */
+OP(xycb,d9) { _Z80_C = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 3,C=(XY+o) */
+OP(xycb,da) { _Z80_D = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 3,D=(XY+o) */
+OP(xycb,db) { _Z80_E = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 3,E=(XY+o) */
+OP(xycb,dc) { _Z80_H = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 3,H=(XY+o) */
+OP(xycb,dd) { _Z80_L = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 3,L=(XY+o) */
+OP(xycb,de) { WM( z80->EA, SET(z80, 3,RM(z80->EA)) );								} /* SET 3,(XY+o)	 */
+OP(xycb,df) { _Z80_A = SET(z80, 3, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 3,A=(XY+o) */
+
+OP(xycb,e0) { _Z80_B = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 4,B=(XY+o) */
+OP(xycb,e1) { _Z80_C = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 4,C=(XY+o) */
+OP(xycb,e2) { _Z80_D = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 4,D=(XY+o) */
+OP(xycb,e3) { _Z80_E = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 4,E=(XY+o) */
+OP(xycb,e4) { _Z80_H = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 4,H=(XY+o) */
+OP(xycb,e5) { _Z80_L = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 4,L=(XY+o) */
+OP(xycb,e6) { WM( z80->EA, SET(z80, 4,RM(z80->EA)) );								} /* SET 4,(XY+o)	 */
+OP(xycb,e7) { _Z80_A = SET(z80, 4, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 4,A=(XY+o) */
+
+OP(xycb,e8) { _Z80_B = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 5,B=(XY+o) */
+OP(xycb,e9) { _Z80_C = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 5,C=(XY+o) */
+OP(xycb,ea) { _Z80_D = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 5,D=(XY+o) */
+OP(xycb,eb) { _Z80_E = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 5,E=(XY+o) */
+OP(xycb,ec) { _Z80_H = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 5,H=(XY+o) */
+OP(xycb,ed) { _Z80_L = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 5,L=(XY+o) */
+OP(xycb,ee) { WM( z80->EA, SET(z80, 5,RM(z80->EA)) );								} /* SET 5,(XY+o)	 */
+OP(xycb,ef) { _Z80_A = SET(z80, 5, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 5,A=(XY+o) */
+
+OP(xycb,f0) { _Z80_B = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 6,B=(XY+o) */
+OP(xycb,f1) { _Z80_C = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 6,C=(XY+o) */
+OP(xycb,f2) { _Z80_D = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 6,D=(XY+o) */
+OP(xycb,f3) { _Z80_E = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 6,E=(XY+o) */
+OP(xycb,f4) { _Z80_H = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 6,H=(XY+o) */
+OP(xycb,f5) { _Z80_L = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 6,L=(XY+o) */
+OP(xycb,f6) { WM( z80->EA, SET(z80, 6,RM(z80->EA)) );								} /* SET 6,(XY+o)	 */
+OP(xycb,f7) { _Z80_A = SET(z80, 6, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 6,A=(XY+o) */
+
+OP(xycb,f8) { _Z80_B = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_B );					} /* SET 7,B=(XY+o) */
+OP(xycb,f9) { _Z80_C = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_C );					} /* SET 7,C=(XY+o) */
+OP(xycb,fa) { _Z80_D = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_D );					} /* SET 7,D=(XY+o) */
+OP(xycb,fb) { _Z80_E = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_E );					} /* SET 7,E=(XY+o) */
+OP(xycb,fc) { _Z80_H = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_H );					} /* SET 7,H=(XY+o) */
+OP(xycb,fd) { _Z80_L = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_L );					} /* SET 7,L=(XY+o) */
+OP(xycb,fe) { WM( z80->EA, SET(z80, 7,RM(z80->EA)) );								} /* SET 7,(XY+o)	 */
+OP(xycb,ff) { _Z80_A = SET(z80, 7, RM(z80->EA) ); WM( z80->EA,_Z80_A );					} /* SET 7,A=(XY+o) */
+
+OP(illegal,1) {
+	logerror("Z80 #%d ill. opcode $%02x $%02x\n",
+			cpu_getactivecpu(), cpu_readop(z80->userdata,(_PCD-1)&0xffff), cpu_readop(z80->userdata,_PCD));
+}
+
+/**********************************************************
+ * IX register related opcodes (DD prefix)
+ **********************************************************/
+OP(dd,00) { illegal_1(z80); op_00(z80);									} /* DB DD		 */
+OP(dd,01) { illegal_1(z80); op_01(z80);									} /* DB DD		 */
+OP(dd,02) { illegal_1(z80); op_02(z80);									} /* DB DD		 */
+OP(dd,03) { illegal_1(z80); op_03(z80);									} /* DB DD		 */
+OP(dd,04) { illegal_1(z80); op_04(z80);									} /* DB DD		 */
+OP(dd,05) { illegal_1(z80); op_05(z80);									} /* DB DD		 */
+OP(dd,06) { illegal_1(z80); op_06(z80);									} /* DB DD		 */
+OP(dd,07) { illegal_1(z80); op_07(z80);									} /* DB DD		 */
+
+OP(dd,08) { illegal_1(z80); op_08(z80);									} /* DB DD		 */
+OP(dd,09) { _Z80_R++; ADD16(z80,IX,BC);										} /* ADD IX,BC		 */
+OP(dd,0a) { illegal_1(z80); op_0a(z80);									} /* DB DD		 */
+OP(dd,0b) { illegal_1(z80); op_0b(z80);									} /* DB DD		 */
+OP(dd,0c) { illegal_1(z80); op_0c(z80);									} /* DB DD		 */
+OP(dd,0d) { illegal_1(z80); op_0d(z80);									} /* DB DD		 */
+OP(dd,0e) { illegal_1(z80); op_0e(z80);									} /* DB DD		 */
+OP(dd,0f) { illegal_1(z80); op_0f(z80);									} /* DB DD		 */
+
+OP(dd,10) { illegal_1(z80); op_10(z80);									} /* DB DD		 */
+OP(dd,11) { illegal_1(z80); op_11(z80);									} /* DB DD		 */
+OP(dd,12) { illegal_1(z80); op_12(z80);									} /* DB DD		 */
+OP(dd,13) { illegal_1(z80); op_13(z80);									} /* DB DD		 */
+OP(dd,14) { illegal_1(z80); op_14(z80);									} /* DB DD		 */
+OP(dd,15) { illegal_1(z80); op_15(z80);									} /* DB DD		 */
+OP(dd,16) { illegal_1(z80); op_16(z80);									} /* DB DD		 */
+OP(dd,17) { illegal_1(z80); op_17(z80);									} /* DB DD		 */
+
+OP(dd,18) { illegal_1(z80); op_18(z80);									} /* DB DD		 */
+OP(dd,19) { _Z80_R++; ADD16(z80,IX,DE);										} /* ADD IX,DE		 */
+OP(dd,1a) { illegal_1(z80); op_1a(z80);									} /* DB DD		 */
+OP(dd,1b) { illegal_1(z80); op_1b(z80);									} /* DB DD		 */
+OP(dd,1c) { illegal_1(z80); op_1c(z80);									} /* DB DD		 */
+OP(dd,1d) { illegal_1(z80); op_1d(z80);									} /* DB DD		 */
+OP(dd,1e) { illegal_1(z80); op_1e(z80);									} /* DB DD		 */
+OP(dd,1f) { illegal_1(z80); op_1f(z80);									} /* DB DD		 */
+
+OP(dd,20) { illegal_1(z80); op_20(z80);									} /* DB DD		 */
+OP(dd,21) { _Z80_R++; _IX = ARG16(z80);									} /* LD IX,w		 */
+OP(dd,22) { _Z80_R++; z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.IX );				} /* LD (w),IX	 */
+OP(dd,23) { _Z80_R++; _IX++;											} /* INC IX		 */
+OP(dd,24) { _Z80_R++; _HX = INC(z80,_HX);									} /* INC HX		 */
+OP(dd,25) { _Z80_R++; _HX = DEC(z80,_HX);									} /* DEC HX		 */
+OP(dd,26) { _Z80_R++; _HX = ARG(z80);										} /* LD HX,n		 */
+OP(dd,27) { illegal_1(z80); op_27(z80);									} /* DB DD		 */
+
+OP(dd,28) { illegal_1(z80); op_28(z80);									} /* DB DD		 */
+OP(dd,29) { _Z80_R++; ADD16(z80,IX,IX);										} /* ADD IX,IX		 */
+OP(dd,2a) { _Z80_R++; z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.IX );				} /* LD IX,(w)	 */
+OP(dd,2b) { _Z80_R++; _IX--;											} /* DEC IX		 */
+OP(dd,2c) { _Z80_R++; _LX = INC(z80,_LX);									} /* INC LX		 */
+OP(dd,2d) { _Z80_R++; _LX = DEC(z80,_LX);									} /* DEC LX		 */
+OP(dd,2e) { _Z80_R++; _LX = ARG(z80);										} /* LD LX,n		 */
+OP(dd,2f) { illegal_1(z80); op_2f(z80);									} /* DB DD		 */
+
+OP(dd,30) { illegal_1(z80); op_30(z80);									} /* DB DD		 */
+OP(dd,31) { illegal_1(z80); op_31(z80);									} /* DB DD		 */
+OP(dd,32) { illegal_1(z80); op_32(z80);									} /* DB DD		 */
+OP(dd,33) { illegal_1(z80); op_33(z80);									} /* DB DD		 */
+OP(dd,34) { _Z80_R++; EAX; WM( z80->EA, INC(z80,RM(z80->EA)) );						} /* INC (IX+o)	 */
+OP(dd,35) { _Z80_R++; EAX; WM( z80->EA, DEC(z80,RM(z80->EA)) );						} /* DEC (IX+o)	 */
+OP(dd,36) { _Z80_R++; EAX; WM( z80->EA, ARG(z80) );								} /* LD (IX+o),n	 */
+OP(dd,37) { illegal_1(z80); op_37(z80);									} /* DB DD		 */
+
+OP(dd,38) { illegal_1(z80); op_38(z80);									} /* DB DD		 */
+OP(dd,39) { _Z80_R++; ADD16(z80,IX,SP);										} /* ADD IX,SP		 */
+OP(dd,3a) { illegal_1(z80); op_3a(z80);									} /* DB DD		 */
+OP(dd,3b) { illegal_1(z80); op_3b(z80);									} /* DB DD		 */
+OP(dd,3c) { illegal_1(z80); op_3c(z80);									} /* DB DD		 */
+OP(dd,3d) { illegal_1(z80); op_3d(z80);									} /* DB DD		 */
+OP(dd,3e) { illegal_1(z80); op_3e(z80);									} /* DB DD		 */
+OP(dd,3f) { illegal_1(z80); op_3f(z80);									} /* DB DD		 */
+
+OP(dd,40) { illegal_1(z80); op_40(z80);									} /* DB DD		 */
+OP(dd,41) { illegal_1(z80); op_41(z80);									} /* DB DD		 */
+OP(dd,42) { illegal_1(z80); op_42(z80);									} /* DB DD		 */
+OP(dd,43) { illegal_1(z80); op_43(z80);									} /* DB DD		 */
+OP(dd,44) { _Z80_R++; _Z80_B = _HX;											} /* LD B,HX		 */
+OP(dd,45) { _Z80_R++; _Z80_B = _LX;											} /* LD B,LX		 */
+OP(dd,46) { _Z80_R++; EAX; _Z80_B = RM(z80->EA);									} /* LD B,(IX+o)	 */
+OP(dd,47) { illegal_1(z80); op_47(z80);									} /* DB DD		 */
+
+OP(dd,48) { illegal_1(z80); op_48(z80);									} /* DB DD		 */
+OP(dd,49) { illegal_1(z80); op_49(z80);									} /* DB DD		 */
+OP(dd,4a) { illegal_1(z80); op_4a(z80);									} /* DB DD		 */
+OP(dd,4b) { illegal_1(z80); op_4b(z80);									} /* DB DD		 */
+OP(dd,4c) { _Z80_R++; _Z80_C = _HX;											} /* LD C,HX		 */
+OP(dd,4d) { _Z80_R++; _Z80_C = _LX;											} /* LD C,LX		 */
+OP(dd,4e) { _Z80_R++; EAX; _Z80_C = RM(z80->EA);									} /* LD C,(IX+o)	 */
+OP(dd,4f) { illegal_1(z80); op_4f(z80);									} /* DB DD		 */
+
+OP(dd,50) { illegal_1(z80); op_50(z80);									} /* DB DD		 */
+OP(dd,51) { illegal_1(z80); op_51(z80);									} /* DB DD		 */
+OP(dd,52) { illegal_1(z80); op_52(z80);									} /* DB DD		 */
+OP(dd,53) { illegal_1(z80); op_53(z80);									} /* DB DD		 */
+OP(dd,54) { _Z80_R++; _Z80_D = _HX;											} /* LD D,HX		 */
+OP(dd,55) { _Z80_R++; _Z80_D = _LX;											} /* LD D,LX		 */
+OP(dd,56) { _Z80_R++; EAX; _Z80_D = RM(z80->EA);									} /* LD D,(IX+o)	 */
+OP(dd,57) { illegal_1(z80); op_57(z80);									} /* DB DD		 */
+
+OP(dd,58) { illegal_1(z80); op_58(z80);									} /* DB DD		 */
+OP(dd,59) { illegal_1(z80); op_59(z80);									} /* DB DD		 */
+OP(dd,5a) { illegal_1(z80); op_5a(z80);									} /* DB DD		 */
+OP(dd,5b) { illegal_1(z80); op_5b(z80);									} /* DB DD		 */
+OP(dd,5c) { _Z80_R++; _Z80_E = _HX;											} /* LD E,HX		 */
+OP(dd,5d) { _Z80_R++; _Z80_E = _LX;											} /* LD E,LX		 */
+OP(dd,5e) { _Z80_R++; EAX; _Z80_E = RM(z80->EA);									} /* LD E,(IX+o)	 */
+OP(dd,5f) { illegal_1(z80); op_5f(z80);									} /* DB DD		 */
+
+OP(dd,60) { _Z80_R++; _HX = _Z80_B;											} /* LD HX,B		 */
+OP(dd,61) { _Z80_R++; _HX = _Z80_C;											} /* LD HX,C		 */
+OP(dd,62) { _Z80_R++; _HX = _Z80_D;											} /* LD HX,D		 */
+OP(dd,63) { _Z80_R++; _HX = _Z80_E;											} /* LD HX,E		 */
+OP(dd,64) {															} /* LD HX,HX		 */
+OP(dd,65) { _Z80_R++; _HX = _LX;										} /* LD HX,LX		 */
+OP(dd,66) { _Z80_R++; EAX; _Z80_H = RM(z80->EA);									} /* LD H,(IX+o)	 */
+OP(dd,67) { _Z80_R++; _HX = _Z80_A;											} /* LD HX,A		 */
+
+OP(dd,68) { _Z80_R++; _LX = _Z80_B;											} /* LD LX,B		 */
+OP(dd,69) { _Z80_R++; _LX = _Z80_C;											} /* LD LX,C		 */
+OP(dd,6a) { _Z80_R++; _LX = _Z80_D;											} /* LD LX,D		 */
+OP(dd,6b) { _Z80_R++; _LX = _Z80_E;											} /* LD LX,E		 */
+OP(dd,6c) { _Z80_R++; _LX = _HX;										} /* LD LX,HX		 */
+OP(dd,6d) {															} /* LD LX,LX		 */
+OP(dd,6e) { _Z80_R++; EAX; _Z80_L = RM(z80->EA);									} /* LD L,(IX+o)	 */
+OP(dd,6f) { _Z80_R++; _LX = _Z80_A;											} /* LD LX,A		 */
+
+OP(dd,70) { _Z80_R++; EAX; WM( z80->EA, _Z80_B );								} /* LD (IX+o),B	 */
+OP(dd,71) { _Z80_R++; EAX; WM( z80->EA, _Z80_C );								} /* LD (IX+o),C	 */
+OP(dd,72) { _Z80_R++; EAX; WM( z80->EA, _Z80_D );								} /* LD (IX+o),D	 */
+OP(dd,73) { _Z80_R++; EAX; WM( z80->EA, _Z80_E );								} /* LD (IX+o),E	 */
+OP(dd,74) { _Z80_R++; EAX; WM( z80->EA, _Z80_H );								} /* LD (IX+o),H	 */
+OP(dd,75) { _Z80_R++; EAX; WM( z80->EA, _Z80_L );								} /* LD (IX+o),L	 */
+OP(dd,76) { illegal_1(z80); op_76(z80);									}		 /* DB DD		 */
+OP(dd,77) { _Z80_R++; EAX; WM( z80->EA, _Z80_A );								} /* LD (IX+o),A	 */
+
+OP(dd,78) { illegal_1(z80); op_78(z80);									} /* DB DD		 */
+OP(dd,79) { illegal_1(z80); op_79(z80);									} /* DB DD		 */
+OP(dd,7a) { illegal_1(z80); op_7a(z80);									} /* DB DD		 */
+OP(dd,7b) { illegal_1(z80); op_7b(z80);									} /* DB DD		 */
+OP(dd,7c) { _Z80_R++; _Z80_A = _HX;											} /* LD A,HX		 */
+OP(dd,7d) { _Z80_R++; _Z80_A = _LX;											} /* LD A,LX		 */
+OP(dd,7e) { _Z80_R++; EAX; _Z80_A = RM(z80->EA);									} /* LD A,(IX+o)	 */
+OP(dd,7f) { illegal_1(z80); op_7f(z80);									} /* DB DD		 */
+
+OP(dd,80) { illegal_1(z80); op_80(z80);									} /* DB DD		 */
+OP(dd,81) { illegal_1(z80); op_81(z80);									} /* DB DD		 */
+OP(dd,82) { illegal_1(z80); op_82(z80);									} /* DB DD		 */
+OP(dd,83) { illegal_1(z80); op_83(z80);									} /* DB DD		 */
+OP(dd,84) { _Z80_R++; ADD(z80,_HX);											} /* ADD A,HX		 */
+OP(dd,85) { _Z80_R++; ADD(z80,_LX);											} /* ADD A,LX		 */
+OP(dd,86) { _Z80_R++; EAX; ADD(z80,RM(z80->EA));									} /* ADD A,(IX+o)	 */
+OP(dd,87) { illegal_1(z80); op_87(z80);									} /* DB DD		 */
+
+OP(dd,88) { illegal_1(z80); op_88(z80);									} /* DB DD		 */
+OP(dd,89) { illegal_1(z80); op_89(z80);									} /* DB DD		 */
+OP(dd,8a) { illegal_1(z80); op_8a(z80);									} /* DB DD		 */
+OP(dd,8b) { illegal_1(z80); op_8b(z80);									} /* DB DD		 */
+OP(dd,8c) { _Z80_R++; ADC(_HX);											} /* ADC A,HX		 */
+OP(dd,8d) { _Z80_R++; ADC(_LX);											} /* ADC A,LX		 */
+OP(dd,8e) { _Z80_R++; EAX; ADC(RM(z80->EA));									} /* ADC A,(IX+o)	 */
+OP(dd,8f) { illegal_1(z80); op_8f(z80);									} /* DB DD		 */
+
+OP(dd,90) { illegal_1(z80); op_90(z80);									} /* DB DD		 */
+OP(dd,91) { illegal_1(z80); op_91(z80);									} /* DB DD		 */
+OP(dd,92) { illegal_1(z80); op_92(z80);									} /* DB DD		 */
+OP(dd,93) { illegal_1(z80); op_93(z80);									} /* DB DD		 */
+OP(dd,94) { _Z80_R++; SUB(_HX);											} /* SUB HX		 */
+OP(dd,95) { _Z80_R++; SUB(_LX);											} /* SUB LX		 */
+OP(dd,96) { _Z80_R++; EAX; SUB(RM(z80->EA));									} /* SUB (IX+o)	 */
+OP(dd,97) { illegal_1(z80); op_97(z80);									} /* DB DD		 */
+
+OP(dd,98) { illegal_1(z80); op_98(z80);									} /* DB DD		 */
+OP(dd,99) { illegal_1(z80); op_99(z80);									} /* DB DD		 */
+OP(dd,9a) { illegal_1(z80); op_9a(z80);									} /* DB DD		 */
+OP(dd,9b) { illegal_1(z80); op_9b(z80);									} /* DB DD		 */
+OP(dd,9c) { _Z80_R++; SBC(_HX);											} /* SBC A,HX		 */
+OP(dd,9d) { _Z80_R++; SBC(_LX);											} /* SBC A,LX		 */
+OP(dd,9e) { _Z80_R++; EAX; SBC(RM(z80->EA));									} /* SBC A,(IX+o)	 */
+OP(dd,9f) { illegal_1(z80); op_9f(z80);									} /* DB DD		 */
+
+OP(dd,a0) { illegal_1(z80); op_a0(z80);									} /* DB DD		 */
+OP(dd,a1) { illegal_1(z80); op_a1(z80);									} /* DB DD		 */
+OP(dd,a2) { illegal_1(z80); op_a2(z80);									} /* DB DD		 */
+OP(dd,a3) { illegal_1(z80); op_a3(z80);									} /* DB DD		 */
+OP(dd,a4) { _Z80_R++; AND(_HX);											} /* AND HX		 */
+OP(dd,a5) { _Z80_R++; AND(_LX);											} /* AND LX		 */
+OP(dd,a6) { _Z80_R++; EAX; AND(RM(z80->EA));									} /* AND (IX+o)	 */
+OP(dd,a7) { illegal_1(z80); op_a7(z80);									} /* DB DD		 */
+
+OP(dd,a8) { illegal_1(z80); op_a8(z80);									} /* DB DD		 */
+OP(dd,a9) { illegal_1(z80); op_a9(z80);									} /* DB DD		 */
+OP(dd,aa) { illegal_1(z80); op_aa(z80);									} /* DB DD		 */
+OP(dd,ab) { illegal_1(z80); op_ab(z80);									} /* DB DD		 */
+OP(dd,ac) { _Z80_R++; XOR(_HX);											} /* XOR HX		 */
+OP(dd,ad) { _Z80_R++; XOR(_LX);											} /* XOR LX		 */
+OP(dd,ae) { _Z80_R++; EAX; XOR(RM(z80->EA));									} /* XOR (IX+o)	 */
+OP(dd,af) { illegal_1(z80); op_af(z80);									} /* DB DD		 */
+
+OP(dd,b0) { illegal_1(z80); op_b0(z80);									} /* DB DD		 */
+OP(dd,b1) { illegal_1(z80); op_b1(z80);									} /* DB DD		 */
+OP(dd,b2) { illegal_1(z80); op_b2(z80);									} /* DB DD		 */
+OP(dd,b3) { illegal_1(z80); op_b3(z80);									} /* DB DD		 */
+OP(dd,b4) { _Z80_R++; OR(_HX);											} /* OR HX		 */
+OP(dd,b5) { _Z80_R++; OR(_LX);											} /* OR LX		 */
+OP(dd,b6) { _Z80_R++; EAX; OR(RM(z80->EA));									} /* OR (IX+o)	 */
+OP(dd,b7) { illegal_1(z80); op_b7(z80);									} /* DB DD		 */
+
+OP(dd,b8) { illegal_1(z80); op_b8(z80);									} /* DB DD		 */
+OP(dd,b9) { illegal_1(z80); op_b9(z80);									} /* DB DD		 */
+OP(dd,ba) { illegal_1(z80); op_ba(z80);									} /* DB DD		 */
+OP(dd,bb) { illegal_1(z80); op_bb(z80);									} /* DB DD		 */
+OP(dd,bc) { _Z80_R++; CP(_HX);											} /* CP HX		 */
+OP(dd,bd) { _Z80_R++; CP(_LX);											} /* CP LX		 */
+OP(dd,be) { _Z80_R++; EAX; CP(RM(z80->EA));									} /* CP (IX+o)	 */
+OP(dd,bf) { illegal_1(z80); op_bf(z80);									} /* DB DD		 */
+
+OP(dd,c0) { illegal_1(z80); op_c0(z80);									} /* DB DD		 */
+OP(dd,c1) { illegal_1(z80); op_c1(z80);									} /* DB DD		 */
+OP(dd,c2) { illegal_1(z80); op_c2(z80);									} /* DB DD		 */
+OP(dd,c3) { illegal_1(z80); op_c3(z80);									} /* DB DD		 */
+OP(dd,c4) { illegal_1(z80); op_c4(z80);									} /* DB DD		 */
+OP(dd,c5) { illegal_1(z80); op_c5(z80);									} /* DB DD		 */
+OP(dd,c6) { illegal_1(z80); op_c6(z80);									} /* DB DD		 */
+OP(dd,c7) { illegal_1(z80); op_c7(z80);									}		 /* DB DD		 */
+
+OP(dd,c8) { illegal_1(z80); op_c8(z80);									} /* DB DD		 */
+OP(dd,c9) { illegal_1(z80); op_c9(z80);									} /* DB DD		 */
+OP(dd,ca) { illegal_1(z80); op_ca(z80);									} /* DB DD		 */
+OP(dd,cb) { _Z80_R++; EAX; EXEC(xycb,ARG(z80));							} /* ** DD CB xx	 */
+OP(dd,cc) { illegal_1(z80); op_cc(z80);									} /* DB DD		 */
+OP(dd,cd) { illegal_1(z80); op_cd(z80);									} /* DB DD		 */
+OP(dd,ce) { illegal_1(z80); op_ce(z80);									} /* DB DD		 */
+OP(dd,cf) { illegal_1(z80); op_cf(z80);									} /* DB DD		 */
+
+OP(dd,d0) { illegal_1(z80); op_d0(z80);									} /* DB DD		 */
+OP(dd,d1) { illegal_1(z80); op_d1(z80);									} /* DB DD		 */
+OP(dd,d2) { illegal_1(z80); op_d2(z80);									} /* DB DD		 */
+OP(dd,d3) { illegal_1(z80); op_d3(z80);									} /* DB DD		 */
+OP(dd,d4) { illegal_1(z80); op_d4(z80);									} /* DB DD		 */
+OP(dd,d5) { illegal_1(z80); op_d5(z80);									} /* DB DD		 */
+OP(dd,d6) { illegal_1(z80); op_d6(z80);									} /* DB DD		 */
+OP(dd,d7) { illegal_1(z80); op_d7(z80);									} /* DB DD		 */
+
+OP(dd,d8) { illegal_1(z80); op_d8(z80);									} /* DB DD		 */
+OP(dd,d9) { illegal_1(z80); op_d9(z80);									} /* DB DD		 */
+OP(dd,da) { illegal_1(z80); op_da(z80);									} /* DB DD		 */
+OP(dd,db) { illegal_1(z80); op_db(z80);									} /* DB DD		 */
+OP(dd,dc) { illegal_1(z80); op_dc(z80);									} /* DB DD		 */
+OP(dd,dd) { illegal_1(z80); op_dd(z80);									} /* DB DD		 */
+OP(dd,de) { illegal_1(z80); op_de(z80);									} /* DB DD		 */
+OP(dd,df) { illegal_1(z80); op_df(z80);									} /* DB DD		 */
+
+OP(dd,e0) { illegal_1(z80); op_e0(z80);									} /* DB DD		 */
+OP(dd,e1) { _Z80_R++; POP(IX);											} /* POP IX		 */
+OP(dd,e2) { illegal_1(z80); op_e2(z80);									} /* DB DD		 */
+OP(dd,e3) { _Z80_R++; EXSP(IX);											} /* EX (SP),IX	 */
+OP(dd,e4) { illegal_1(z80); op_e4(z80);									} /* DB DD		 */
+OP(dd,e5) { _Z80_R++; PUSH( IX );										} /* PUSH IX		 */
+OP(dd,e6) { illegal_1(z80); op_e6(z80);									} /* DB DD		 */
+OP(dd,e7) { illegal_1(z80); op_e7(z80);									} /* DB DD		 */
+
+OP(dd,e8) { illegal_1(z80); op_e8(z80);									} /* DB DD		 */
+OP(dd,e9) { _Z80_R++; _PC = _IX; change_pc16(_PCD);						} /* JP (IX)		 */
+OP(dd,ea) { illegal_1(z80); op_ea(z80);									} /* DB DD		 */
+OP(dd,eb) { illegal_1(z80); op_eb(z80);									} /* DB DD		 */
+OP(dd,ec) { illegal_1(z80); op_ec(z80);									} /* DB DD		 */
+OP(dd,ed) { illegal_1(z80); op_ed(z80);									} /* DB DD		 */
+OP(dd,ee) { illegal_1(z80); op_ee(z80);									} /* DB DD		 */
+OP(dd,ef) { illegal_1(z80); op_ef(z80);									} /* DB DD		 */
+
+OP(dd,f0) { illegal_1(z80); op_f0(z80);									} /* DB DD		 */
+OP(dd,f1) { illegal_1(z80); op_f1(z80);									} /* DB DD		 */
+OP(dd,f2) { illegal_1(z80); op_f2(z80);									} /* DB DD		 */
+OP(dd,f3) { illegal_1(z80); op_f3(z80);									} /* DB DD		 */
+OP(dd,f4) { illegal_1(z80); op_f4(z80);									} /* DB DD		 */
+OP(dd,f5) { illegal_1(z80); op_f5(z80);									} /* DB DD		 */
+OP(dd,f6) { illegal_1(z80); op_f6(z80);									} /* DB DD		 */
+OP(dd,f7) { illegal_1(z80); op_f7(z80);									} /* DB DD		 */
+
+OP(dd,f8) { illegal_1(z80); op_f8(z80);									} /* DB DD		 */
+OP(dd,f9) { _Z80_R++; _SP = _IX;										} /* LD SP,IX		 */
+OP(dd,fa) { illegal_1(z80); op_fa(z80);									} /* DB DD		 */
+OP(dd,fb) { illegal_1(z80); op_fb(z80);									} /* DB DD		 */
+OP(dd,fc) { illegal_1(z80); op_fc(z80);									} /* DB DD		 */
+OP(dd,fd) { illegal_1(z80); op_fd(z80);									} /* DB DD		 */
+OP(dd,fe) { illegal_1(z80); op_fe(z80);									} /* DB DD		 */
+OP(dd,ff) { illegal_1(z80); op_ff(z80);									} /* DB DD		 */
+
+/**********************************************************
+ * IY register related opcodes (FD prefix)
+ **********************************************************/
+OP(fd,00) { illegal_1(z80); op_00(z80);									} /* DB FD		 */
+OP(fd,01) { illegal_1(z80); op_01(z80);									} /* DB FD		 */
+OP(fd,02) { illegal_1(z80); op_02(z80);									} /* DB FD		 */
+OP(fd,03) { illegal_1(z80); op_03(z80);									} /* DB FD		 */
+OP(fd,04) { illegal_1(z80); op_04(z80);									} /* DB FD		 */
+OP(fd,05) { illegal_1(z80); op_05(z80);									} /* DB FD		 */
+OP(fd,06) { illegal_1(z80); op_06(z80);									} /* DB FD		 */
+OP(fd,07) { illegal_1(z80); op_07(z80);									} /* DB FD		 */
+
+OP(fd,08) { illegal_1(z80); op_08(z80);									} /* DB FD		 */
+OP(fd,09) { _Z80_R++; ADD16(z80,IY,BC);										} /* ADD IY,BC		 */
+OP(fd,0a) { illegal_1(z80); op_0a(z80);									} /* DB FD		 */
+OP(fd,0b) { illegal_1(z80); op_0b(z80);									} /* DB FD		 */
+OP(fd,0c) { illegal_1(z80); op_0c(z80);									} /* DB FD		 */
+OP(fd,0d) { illegal_1(z80); op_0d(z80);									} /* DB FD		 */
+OP(fd,0e) { illegal_1(z80); op_0e(z80);									} /* DB FD		 */
+OP(fd,0f) { illegal_1(z80); op_0f(z80);									} /* DB FD		 */
+
+OP(fd,10) { illegal_1(z80); op_10(z80);									} /* DB FD		 */
+OP(fd,11) { illegal_1(z80); op_11(z80);									} /* DB FD		 */
+OP(fd,12) { illegal_1(z80); op_12(z80);									} /* DB FD		 */
+OP(fd,13) { illegal_1(z80); op_13(z80);									} /* DB FD		 */
+OP(fd,14) { illegal_1(z80); op_14(z80);									} /* DB FD		 */
+OP(fd,15) { illegal_1(z80); op_15(z80);									} /* DB FD		 */
+OP(fd,16) { illegal_1(z80); op_16(z80);									} /* DB FD		 */
+OP(fd,17) { illegal_1(z80); op_17(z80);									} /* DB FD		 */
+
+OP(fd,18) { illegal_1(z80); op_18(z80);									} /* DB FD		 */
+OP(fd,19) { _Z80_R++; ADD16(z80,IY,DE);										} /* ADD IY,DE		 */
+OP(fd,1a) { illegal_1(z80); op_1a(z80);									} /* DB FD		 */
+OP(fd,1b) { illegal_1(z80); op_1b(z80);									} /* DB FD		 */
+OP(fd,1c) { illegal_1(z80); op_1c(z80);									} /* DB FD		 */
+OP(fd,1d) { illegal_1(z80); op_1d(z80);									} /* DB FD		 */
+OP(fd,1e) { illegal_1(z80); op_1e(z80);									} /* DB FD		 */
+OP(fd,1f) { illegal_1(z80); op_1f(z80);									} /* DB FD		 */
+
+OP(fd,20) { illegal_1(z80); op_20(z80);									} /* DB FD		 */
+OP(fd,21) { _Z80_R++; _IY = ARG16(z80);									} /* LD IY,w		 */
+OP(fd,22) { _Z80_R++; z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.IY );				} /* LD (w),IY	 */
+OP(fd,23) { _Z80_R++; _IY++;											} /* INC IY		 */
+OP(fd,24) { _Z80_R++; _HY = INC(z80,_HY);									} /* INC HY		 */
+OP(fd,25) { _Z80_R++; _HY = DEC(z80,_HY);									} /* DEC HY		 */
+OP(fd,26) { _Z80_R++; _HY = ARG(z80);										} /* LD HY,n		 */
+OP(fd,27) { illegal_1(z80); op_27(z80);									} /* DB FD		 */
+
+OP(fd,28) { illegal_1(z80); op_28(z80);									} /* DB FD		 */
+OP(fd,29) { _Z80_R++; ADD16(z80,IY,IY);										} /* ADD IY,IY		 */
+OP(fd,2a) { _Z80_R++; z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.IY );				} /* LD IY,(w)	 */
+OP(fd,2b) { _Z80_R++; _IY--;											} /* DEC IY		 */
+OP(fd,2c) { _Z80_R++; _LY = INC(z80,_LY);									} /* INC LY		 */
+OP(fd,2d) { _Z80_R++; _LY = DEC(z80,_LY);									} /* DEC LY		 */
+OP(fd,2e) { _Z80_R++; _LY = ARG(z80);										} /* LD LY,n		 */
+OP(fd,2f) { illegal_1(z80); op_2f(z80);									} /* DB FD		 */
+
+OP(fd,30) { illegal_1(z80); op_30(z80);									} /* DB FD		 */
+OP(fd,31) { illegal_1(z80); op_31(z80);									} /* DB FD		 */
+OP(fd,32) { illegal_1(z80); op_32(z80);									} /* DB FD		 */
+OP(fd,33) { illegal_1(z80); op_33(z80);									} /* DB FD		 */
+OP(fd,34) { _Z80_R++; EAY; WM( z80->EA, INC(z80,RM(z80->EA)) );						} /* INC (IY+o)	 */
+OP(fd,35) { _Z80_R++; EAY; WM( z80->EA, DEC(z80,RM(z80->EA)) );						} /* DEC (IY+o)	 */
+OP(fd,36) { _Z80_R++; EAY; WM( z80->EA, ARG(z80) );								} /* LD (IY+o),n	 */
+OP(fd,37) { illegal_1(z80); op_37(z80);									} /* DB FD		 */
+
+OP(fd,38) { illegal_1(z80); op_38(z80);									} /* DB FD		 */
+OP(fd,39) { _Z80_R++; ADD16(z80,IY,SP);										} /* ADD IY,SP		 */
+OP(fd,3a) { illegal_1(z80); op_3a(z80);									} /* DB FD		 */
+OP(fd,3b) { illegal_1(z80); op_3b(z80);									} /* DB FD		 */
+OP(fd,3c) { illegal_1(z80); op_3c(z80);									} /* DB FD		 */
+OP(fd,3d) { illegal_1(z80); op_3d(z80);									} /* DB FD		 */
+OP(fd,3e) { illegal_1(z80); op_3e(z80);									} /* DB FD		 */
+OP(fd,3f) { illegal_1(z80); op_3f(z80);									} /* DB FD		 */
+
+OP(fd,40) { illegal_1(z80); op_40(z80);									} /* DB FD		 */
+OP(fd,41) { illegal_1(z80); op_41(z80);									} /* DB FD		 */
+OP(fd,42) { illegal_1(z80); op_42(z80);									} /* DB FD		 */
+OP(fd,43) { illegal_1(z80); op_43(z80);									} /* DB FD		 */
+OP(fd,44) { _Z80_R++; _Z80_B = _HY;											} /* LD B,HY		 */
+OP(fd,45) { _Z80_R++; _Z80_B = _LY;											} /* LD B,LY		 */
+OP(fd,46) { _Z80_R++; EAY; _Z80_B = RM(z80->EA);									} /* LD B,(IY+o)	 */
+OP(fd,47) { illegal_1(z80); op_47(z80);									} /* DB FD		 */
+
+OP(fd,48) { illegal_1(z80); op_48(z80);									} /* DB FD		 */
+OP(fd,49) { illegal_1(z80); op_49(z80);									} /* DB FD		 */
+OP(fd,4a) { illegal_1(z80); op_4a(z80);									} /* DB FD		 */
+OP(fd,4b) { illegal_1(z80); op_4b(z80);									} /* DB FD		 */
+OP(fd,4c) { _Z80_R++; _Z80_C = _HY;											} /* LD C,HY		 */
+OP(fd,4d) { _Z80_R++; _Z80_C = _LY;											} /* LD C,LY		 */
+OP(fd,4e) { _Z80_R++; EAY; _Z80_C = RM(z80->EA);									} /* LD C,(IY+o)	 */
+OP(fd,4f) { illegal_1(z80); op_4f(z80);									} /* DB FD		 */
+
+OP(fd,50) { illegal_1(z80); op_50(z80);									} /* DB FD		 */
+OP(fd,51) { illegal_1(z80); op_51(z80);									} /* DB FD		 */
+OP(fd,52) { illegal_1(z80); op_52(z80);									} /* DB FD		 */
+OP(fd,53) { illegal_1(z80); op_53(z80);									} /* DB FD		 */
+OP(fd,54) { _Z80_R++; _Z80_D = _HY;											} /* LD D,HY		 */
+OP(fd,55) { _Z80_R++; _Z80_D = _LY;											} /* LD D,LY		 */
+OP(fd,56) { _Z80_R++; EAY; _Z80_D = RM(z80->EA);									} /* LD D,(IY+o)	 */
+OP(fd,57) { illegal_1(z80); op_57(z80);									} /* DB FD		 */
+
+OP(fd,58) { illegal_1(z80); op_58(z80);									} /* DB FD		 */
+OP(fd,59) { illegal_1(z80); op_59(z80);									} /* DB FD		 */
+OP(fd,5a) { illegal_1(z80); op_5a(z80);									} /* DB FD		 */
+OP(fd,5b) { illegal_1(z80); op_5b(z80);									} /* DB FD		 */
+OP(fd,5c) { _Z80_R++; _Z80_E = _HY;											} /* LD E,HY		 */
+OP(fd,5d) { _Z80_R++; _Z80_E = _LY;											} /* LD E,LY		 */
+OP(fd,5e) { _Z80_R++; EAY; _Z80_E = RM(z80->EA);									} /* LD E,(IY+o)	 */
+OP(fd,5f) { illegal_1(z80); op_5f(z80);									} /* DB FD		 */
+
+OP(fd,60) { _Z80_R++; _HY = _Z80_B;											} /* LD HY,B		 */
+OP(fd,61) { _Z80_R++; _HY = _Z80_C;											} /* LD HY,C		 */
+OP(fd,62) { _Z80_R++; _HY = _Z80_D;											} /* LD HY,D		 */
+OP(fd,63) { _Z80_R++; _HY = _Z80_E;											} /* LD HY,E		 */
+OP(fd,64) { _Z80_R++;													} /* LD HY,HY		 */
+OP(fd,65) { _Z80_R++; _HY = _LY;										} /* LD HY,LY		 */
+OP(fd,66) { _Z80_R++; EAY; _Z80_H = RM(z80->EA);									} /* LD H,(IY+o)	 */
+OP(fd,67) { _Z80_R++; _HY = _Z80_A;											} /* LD HY,A		 */
+
+OP(fd,68) { _Z80_R++; _LY = _Z80_B;											} /* LD LY,B		 */
+OP(fd,69) { _Z80_R++; _LY = _Z80_C;											} /* LD LY,C		 */
+OP(fd,6a) { _Z80_R++; _LY = _Z80_D;											} /* LD LY,D		 */
+OP(fd,6b) { _Z80_R++; _LY = _Z80_E;											} /* LD LY,E		 */
+OP(fd,6c) { _Z80_R++; _LY = _HY;										} /* LD LY,HY		 */
+OP(fd,6d) { _Z80_R++;													} /* LD LY,LY		 */
+OP(fd,6e) { _Z80_R++; EAY; _Z80_L = RM(z80->EA);									} /* LD L,(IY+o)	 */
+OP(fd,6f) { _Z80_R++; _LY = _Z80_A;											} /* LD LY,A		 */
+
+OP(fd,70) { _Z80_R++; EAY; WM( z80->EA, _Z80_B );								} /* LD (IY+o),B	 */
+OP(fd,71) { _Z80_R++; EAY; WM( z80->EA, _Z80_C );								} /* LD (IY+o),C	 */
+OP(fd,72) { _Z80_R++; EAY; WM( z80->EA, _Z80_D );								} /* LD (IY+o),D	 */
+OP(fd,73) { _Z80_R++; EAY; WM( z80->EA, _Z80_E );								} /* LD (IY+o),E	 */
+OP(fd,74) { _Z80_R++; EAY; WM( z80->EA, _Z80_H );								} /* LD (IY+o),H	 */
+OP(fd,75) { _Z80_R++; EAY; WM( z80->EA, _Z80_L );								} /* LD (IY+o),L	 */
+OP(fd,76) { illegal_1(z80); op_76(z80);									}		 /* DB FD		 */
+OP(fd,77) { _Z80_R++; EAY; WM( z80->EA, _Z80_A );								} /* LD (IY+o),A	 */
+
+OP(fd,78) { illegal_1(z80); op_78(z80);									} /* DB FD		 */
+OP(fd,79) { illegal_1(z80); op_79(z80);									} /* DB FD		 */
+OP(fd,7a) { illegal_1(z80); op_7a(z80);									} /* DB FD		 */
+OP(fd,7b) { illegal_1(z80); op_7b(z80);									} /* DB FD		 */
+OP(fd,7c) { _Z80_R++; _Z80_A = _HY;											} /* LD A,HY		 */
+OP(fd,7d) { _Z80_R++; _Z80_A = _LY;											} /* LD A,LY		 */
+OP(fd,7e) { _Z80_R++; EAY; _Z80_A = RM(z80->EA);									} /* LD A,(IY+o)	 */
+OP(fd,7f) { illegal_1(z80); op_7f(z80);									} /* DB FD		 */
+
+OP(fd,80) { illegal_1(z80); op_80(z80);									} /* DB FD		 */
+OP(fd,81) { illegal_1(z80); op_81(z80);									} /* DB FD		 */
+OP(fd,82) { illegal_1(z80); op_82(z80);									} /* DB FD		 */
+OP(fd,83) { illegal_1(z80); op_83(z80);									} /* DB FD		 */
+OP(fd,84) { _Z80_R++; ADD(z80,_HY);											} /* ADD A,HY		 */
+OP(fd,85) { _Z80_R++; ADD(z80,_LY);											} /* ADD A,LY		 */
+OP(fd,86) { _Z80_R++; EAY; ADD(z80,RM(z80->EA));									} /* ADD A,(IY+o)	 */
+OP(fd,87) { illegal_1(z80); op_87(z80);									} /* DB FD		 */
+
+OP(fd,88) { illegal_1(z80); op_88(z80);									} /* DB FD		 */
+OP(fd,89) { illegal_1(z80); op_89(z80);									} /* DB FD		 */
+OP(fd,8a) { illegal_1(z80); op_8a(z80);									} /* DB FD		 */
+OP(fd,8b) { illegal_1(z80); op_8b(z80);									} /* DB FD		 */
+OP(fd,8c) { _Z80_R++; ADC(_HY);											} /* ADC A,HY		 */
+OP(fd,8d) { _Z80_R++; ADC(_LY);											} /* ADC A,LY		 */
+OP(fd,8e) { _Z80_R++; EAY; ADC(RM(z80->EA));									} /* ADC A,(IY+o)	 */
+OP(fd,8f) { illegal_1(z80); op_8f(z80);									} /* DB FD		 */
+
+OP(fd,90) { illegal_1(z80); op_90(z80);									} /* DB FD		 */
+OP(fd,91) { illegal_1(z80); op_91(z80);									} /* DB FD		 */
+OP(fd,92) { illegal_1(z80); op_92(z80);									} /* DB FD		 */
+OP(fd,93) { illegal_1(z80); op_93(z80);									} /* DB FD		 */
+OP(fd,94) { _Z80_R++; SUB(_HY);											} /* SUB HY		 */
+OP(fd,95) { _Z80_R++; SUB(_LY);											} /* SUB LY		 */
+OP(fd,96) { _Z80_R++; EAY; SUB(RM(z80->EA));									} /* SUB (IY+o)	 */
+OP(fd,97) { illegal_1(z80); op_97(z80);									} /* DB FD		 */
+
+OP(fd,98) { illegal_1(z80); op_98(z80);									} /* DB FD		 */
+OP(fd,99) { illegal_1(z80); op_99(z80);									} /* DB FD		 */
+OP(fd,9a) { illegal_1(z80); op_9a(z80);									} /* DB FD		 */
+OP(fd,9b) { illegal_1(z80); op_9b(z80);									} /* DB FD		 */
+OP(fd,9c) { _Z80_R++; SBC(_HY);											} /* SBC A,HY		 */
+OP(fd,9d) { _Z80_R++; SBC(_LY);											} /* SBC A,LY		 */
+OP(fd,9e) { _Z80_R++; EAY; SBC(RM(z80->EA));									} /* SBC A,(IY+o)	 */
+OP(fd,9f) { illegal_1(z80); op_9f(z80);									} /* DB FD		 */
+
+OP(fd,a0) { illegal_1(z80); op_a0(z80);									} /* DB FD		 */
+OP(fd,a1) { illegal_1(z80); op_a1(z80);									} /* DB FD		 */
+OP(fd,a2) { illegal_1(z80); op_a2(z80);									} /* DB FD		 */
+OP(fd,a3) { illegal_1(z80); op_a3(z80);									} /* DB FD		 */
+OP(fd,a4) { _Z80_R++; AND(_HY);											} /* AND HY		 */
+OP(fd,a5) { _Z80_R++; AND(_LY);											} /* AND LY		 */
+OP(fd,a6) { _Z80_R++; EAY; AND(RM(z80->EA));									} /* AND (IY+o)	 */
+OP(fd,a7) { illegal_1(z80); op_a7(z80);									} /* DB FD		 */
+
+OP(fd,a8) { illegal_1(z80); op_a8(z80);									} /* DB FD		 */
+OP(fd,a9) { illegal_1(z80); op_a9(z80);									} /* DB FD		 */
+OP(fd,aa) { illegal_1(z80); op_aa(z80);									} /* DB FD		 */
+OP(fd,ab) { illegal_1(z80); op_ab(z80);									} /* DB FD		 */
+OP(fd,ac) { _Z80_R++; XOR(_HY);											} /* XOR HY		 */
+OP(fd,ad) { _Z80_R++; XOR(_LY);											} /* XOR LY		 */
+OP(fd,ae) { _Z80_R++; EAY; XOR(RM(z80->EA));									} /* XOR (IY+o)	 */
+OP(fd,af) { illegal_1(z80); op_af(z80);									} /* DB FD		 */
+
+OP(fd,b0) { illegal_1(z80); op_b0(z80);									} /* DB FD		 */
+OP(fd,b1) { illegal_1(z80); op_b1(z80);									} /* DB FD		 */
+OP(fd,b2) { illegal_1(z80); op_b2(z80);									} /* DB FD		 */
+OP(fd,b3) { illegal_1(z80); op_b3(z80);									} /* DB FD		 */
+OP(fd,b4) { _Z80_R++; OR(_HY);											} /* OR HY		 */
+OP(fd,b5) { _Z80_R++; OR(_LY);											} /* OR LY		 */
+OP(fd,b6) { _Z80_R++; EAY; OR(RM(z80->EA));									} /* OR (IY+o)	 */
+OP(fd,b7) { illegal_1(z80); op_b7(z80);									} /* DB FD		 */
+
+OP(fd,b8) { illegal_1(z80); op_b8(z80);									} /* DB FD		 */
+OP(fd,b9) { illegal_1(z80); op_b9(z80);									} /* DB FD		 */
+OP(fd,ba) { illegal_1(z80); op_ba(z80);									} /* DB FD		 */
+OP(fd,bb) { illegal_1(z80); op_bb(z80);									} /* DB FD		 */
+OP(fd,bc) { _Z80_R++; CP(_HY);											} /* CP HY		 */
+OP(fd,bd) { _Z80_R++; CP(_LY);											} /* CP LY		 */
+OP(fd,be) { _Z80_R++; EAY; CP(RM(z80->EA));									} /* CP (IY+o)	 */
+OP(fd,bf) { illegal_1(z80); op_bf(z80);									} /* DB FD		 */
+
+OP(fd,c0) { illegal_1(z80); op_c0(z80);									} /* DB FD		 */
+OP(fd,c1) { illegal_1(z80); op_c1(z80);									} /* DB FD		 */
+OP(fd,c2) { illegal_1(z80); op_c2(z80);									} /* DB FD		 */
+OP(fd,c3) { illegal_1(z80); op_c3(z80);									} /* DB FD		 */
+OP(fd,c4) { illegal_1(z80); op_c4(z80);									} /* DB FD		 */
+OP(fd,c5) { illegal_1(z80); op_c5(z80);									} /* DB FD		 */
+OP(fd,c6) { illegal_1(z80); op_c6(z80);									} /* DB FD		 */
+OP(fd,c7) { illegal_1(z80); op_c7(z80);									} /* DB FD		 */
+
+OP(fd,c8) { illegal_1(z80); op_c8(z80);									} /* DB FD		 */
+OP(fd,c9) { illegal_1(z80); op_c9(z80);									} /* DB FD		 */
+OP(fd,ca) { illegal_1(z80); op_ca(z80);									} /* DB FD		 */
+OP(fd,cb) { _Z80_R++; EAY; EXEC(xycb,ARG(z80));							} /* ** FD CB xx	 */
+OP(fd,cc) { illegal_1(z80); op_cc(z80);									} /* DB FD		 */
+OP(fd,cd) { illegal_1(z80); op_cd(z80);									} /* DB FD		 */
+OP(fd,ce) { illegal_1(z80); op_ce(z80);									} /* DB FD		 */
+OP(fd,cf) { illegal_1(z80); op_cf(z80);									} /* DB FD		 */
+
+OP(fd,d0) { illegal_1(z80); op_d0(z80);									} /* DB FD		 */
+OP(fd,d1) { illegal_1(z80); op_d1(z80);									} /* DB FD		 */
+OP(fd,d2) { illegal_1(z80); op_d2(z80);									} /* DB FD		 */
+OP(fd,d3) { illegal_1(z80); op_d3(z80);									} /* DB FD		 */
+OP(fd,d4) { illegal_1(z80); op_d4(z80);									} /* DB FD		 */
+OP(fd,d5) { illegal_1(z80); op_d5(z80);									} /* DB FD		 */
+OP(fd,d6) { illegal_1(z80); op_d6(z80);									} /* DB FD		 */
+OP(fd,d7) { illegal_1(z80); op_d7(z80);									} /* DB FD		 */
+
+OP(fd,d8) { illegal_1(z80); op_d8(z80);									} /* DB FD		 */
+OP(fd,d9) { illegal_1(z80); op_d9(z80);									} /* DB FD		 */
+OP(fd,da) { illegal_1(z80); op_da(z80);									} /* DB FD		 */
+OP(fd,db) { illegal_1(z80); op_db(z80);									} /* DB FD		 */
+OP(fd,dc) { illegal_1(z80); op_dc(z80);									} /* DB FD		 */
+OP(fd,dd) { illegal_1(z80); op_dd(z80);									} /* DB FD		 */
+OP(fd,de) { illegal_1(z80); op_de(z80);									} /* DB FD		 */
+OP(fd,df) { illegal_1(z80); op_df(z80);									} /* DB FD		 */
+
+OP(fd,e0) { illegal_1(z80); op_e0(z80);									} /* DB FD		 */
+OP(fd,e1) { _Z80_R++; POP(IY);											} /* POP IY		 */
+OP(fd,e2) { illegal_1(z80); op_e2(z80);									} /* DB FD		 */
+OP(fd,e3) { _Z80_R++; EXSP(IY);											} /* EX (SP),IY	 */
+OP(fd,e4) { illegal_1(z80); op_e4(z80);									} /* DB FD		 */
+OP(fd,e5) { _Z80_R++; PUSH( IY );										} /* PUSH IY		 */
+OP(fd,e6) { illegal_1(z80); op_e6(z80);									} /* DB FD		 */
+OP(fd,e7) { illegal_1(z80); op_e7(z80);									} /* DB FD		 */
+
+OP(fd,e8) { illegal_1(z80); op_e8(z80);									} /* DB FD		 */
+OP(fd,e9) { _Z80_R++; _PC = _IY; change_pc16(_PCD);						} /* JP (IY)		 */
+OP(fd,ea) { illegal_1(z80); op_ea(z80);									} /* DB FD		 */
+OP(fd,eb) { illegal_1(z80); op_eb(z80);									} /* DB FD		 */
+OP(fd,ec) { illegal_1(z80); op_ec(z80);									} /* DB FD		 */
+OP(fd,ed) { illegal_1(z80); op_ed(z80);									} /* DB FD		 */
+OP(fd,ee) { illegal_1(z80); op_ee(z80);									} /* DB FD		 */
+OP(fd,ef) { illegal_1(z80); op_ef(z80);									} /* DB FD		 */
+
+OP(fd,f0) { illegal_1(z80); op_f0(z80);									} /* DB FD		 */
+OP(fd,f1) { illegal_1(z80); op_f1(z80);									} /* DB FD		 */
+OP(fd,f2) { illegal_1(z80); op_f2(z80);									} /* DB FD		 */
+OP(fd,f3) { illegal_1(z80); op_f3(z80);									} /* DB FD		 */
+OP(fd,f4) { illegal_1(z80); op_f4(z80);									} /* DB FD		 */
+OP(fd,f5) { illegal_1(z80); op_f5(z80);									} /* DB FD		 */
+OP(fd,f6) { illegal_1(z80); op_f6(z80);									} /* DB FD		 */
+OP(fd,f7) { illegal_1(z80); op_f7(z80);									} /* DB FD		 */
+
+OP(fd,f8) { illegal_1(z80); op_f8(z80);									} /* DB FD		 */
+OP(fd,f9) { _Z80_R++; _SP = _IY;										} /* LD SP,IY		 */
+OP(fd,fa) { illegal_1(z80); op_fa(z80);									} /* DB FD		 */
+OP(fd,fb) { illegal_1(z80); op_fb(z80);									} /* DB FD		 */
+OP(fd,fc) { illegal_1(z80); op_fc(z80);									} /* DB FD		 */
+OP(fd,fd) { illegal_1(z80); op_fd(z80);									} /* DB FD		 */
+OP(fd,fe) { illegal_1(z80); op_fe(z80);									} /* DB FD		 */
+OP(fd,ff) { illegal_1(z80); op_ff(z80);									} /* DB FD		 */
+
+OP(illegal,2)
+{
+	logerror("Z80 #%d ill. opcode $ed $%02x\n",
+			cpu_getactivecpu(), cpu_readop(z80->userdata,(_PCD-1)&0xffff));
+}
+
+/**********************************************************
+ * special opcodes (ED prefix)
+ **********************************************************/
+OP(ed,00) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,01) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,02) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,03) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,04) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,05) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,06) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,07) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,08) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,09) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,0f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,10) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,11) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,12) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,13) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,14) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,15) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,16) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,17) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,18) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,19) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,1f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,20) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,21) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,22) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,23) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,24) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,25) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,26) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,27) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,28) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,29) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,2f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,30) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,31) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,32) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,33) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,34) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,35) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,36) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,37) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,38) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,39) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,3f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,40) { _Z80_B = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_B];					} /* IN B,(C)		 */
+OP(ed,41) { OUT(_BC,_Z80_B);											} /* OUT (C),B		 */
+OP(ed,42) { SBC16( BC );											} /* SBC HL,BC		 */
+OP(ed,43) { z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.BC );						} /* LD (w),BC	 */
+OP(ed,44) { NEG;													} /* NEG			 */
+OP(ed,45) { RETN;													} /* RETN;			 */
+OP(ed,46) { _IM = 0;												} /* IM 0			 */
+OP(ed,47) { LD_I_A;													} /* LD I,A		 */
+
+OP(ed,48) { _Z80_C = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_C];					} /* IN C,(C)		 */
+OP(ed,49) { OUT(_BC,_Z80_C);											} /* OUT (C),C		 */
+OP(ed,4a) { ADC16( BC );											} /* ADC HL,BC		 */
+OP(ed,4b) { z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.BC );						} /* LD BC,(w)	 */
+OP(ed,4c) { NEG;													} /* NEG			 */
+OP(ed,4d) { RETI;													} /* RETI			 */
+OP(ed,4e) { _IM = 0;												} /* IM 0			 */
+OP(ed,4f) { LD_R_A;													} /* LD R,A		 */
+
+OP(ed,50) { _Z80_D = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_D];					} /* IN D,(C)		 */
+OP(ed,51) { OUT(_BC,_Z80_D);											} /* OUT (C),D		 */
+OP(ed,52) { SBC16( DE );											} /* SBC HL,DE		 */
+OP(ed,53) { z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.DE );						} /* LD (w),DE	 */
+OP(ed,54) { NEG;													} /* NEG			 */
+OP(ed,55) { RETN;													} /* RETN;			 */
+OP(ed,56) { _IM = 1;												} /* IM 1			 */
+OP(ed,57) { LD_A_I;													} /* LD A,I		 */
+
+OP(ed,58) { _Z80_E = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_E];					} /* IN E,(C)		 */
+OP(ed,59) { OUT(_BC,_Z80_E);											} /* OUT (C),E		 */
+OP(ed,5a) { ADC16( DE );											} /* ADC HL,DE		 */
+OP(ed,5b) { z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.DE );						} /* LD DE,(w)	 */
+OP(ed,5c) { NEG;													} /* NEG			 */
+OP(ed,5d) { RETI;													} /* RETI			 */
+OP(ed,5e) { _IM = 2;												} /* IM 2			 */
+OP(ed,5f) { LD_A_R;													} /* LD A,R		 */
+
+OP(ed,60) { _Z80_H = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_H];					} /* IN H,(C)		 */
+OP(ed,61) { OUT(_BC,_Z80_H);											} /* OUT (C),H		 */
+OP(ed,62) { SBC16( HL );											} /* SBC HL,HL		 */
+OP(ed,63) { z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.HL );						} /* LD (w),HL	 */
+OP(ed,64) { NEG;													} /* NEG			 */
+OP(ed,65) { RETN;													} /* RETN;			 */
+OP(ed,66) { _IM = 0;												} /* IM 0			 */
+OP(ed,67) { RRD;													} /* RRD (HL)		 */
+
+OP(ed,68) { _Z80_L = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_L];					} /* IN L,(C)		 */
+OP(ed,69) { OUT(_BC,_Z80_L);											} /* OUT (C),L		 */
+OP(ed,6a) { ADC16( HL );											} /* ADC HL,HL		 */
+OP(ed,6b) { z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.HL );						} /* LD HL,(w)	 */
+OP(ed,6c) { NEG;													} /* NEG			 */
+OP(ed,6d) { RETI;													} /* RETI			 */
+OP(ed,6e) { _IM = 0;												} /* IM 0			 */
+OP(ed,6f) { RLD;													} /* RLD (HL)		 */
+
+OP(ed,70) { UINT8 res = IN(_BC); _F = (_F & CF) | z80->SZP[res];			} /* IN 0,(C)		 */
+OP(ed,71) { OUT(_BC,0);												} /* OUT (C),0		 */
+OP(ed,72) { SBC16( SP );											} /* SBC HL,SP		 */
+OP(ed,73) { z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.SP );						} /* LD (w),SP	 */
+OP(ed,74) { NEG;													} /* NEG			 */
+OP(ed,75) { RETN;													} /* RETN;			 */
+OP(ed,76) { _IM = 1;												} /* IM 1			 */
+OP(ed,77) { illegal_2(z80);											} /* DB ED,77		 */
+
+OP(ed,78) { _Z80_A = IN(_BC); _F = (_F & CF) | z80->SZP[_Z80_A];					} /* IN E,(C)		 */
+OP(ed,79) { OUT(_BC,_Z80_A);											} /* OUT (C),E		 */
+OP(ed,7a) { ADC16( SP );											} /* ADC HL,SP		 */
+OP(ed,7b) { z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.SP );						} /* LD SP,(w)	 */
+OP(ed,7c) { NEG;													} /* NEG			 */
+OP(ed,7d) { RETI;													} /* RETI			 */
+OP(ed,7e) { _IM = 2;												} /* IM 2			 */
+OP(ed,7f) { illegal_2(z80);											} /* DB ED,7F		 */
+
+OP(ed,80) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,81) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,82) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,83) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,84) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,85) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,86) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,87) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,88) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,89) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,8f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,90) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,91) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,92) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,93) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,94) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,95) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,96) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,97) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,98) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,99) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9a) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9b) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9c) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9d) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9e) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,9f) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,a0) { LDI;													} /* LDI			 */
+OP(ed,a1) { CPI;													} /* CPI			 */
+OP(ed,a2) { INI;													} /* INI			 */
+OP(ed,a3) { OUTI;													} /* OUTI			 */
+OP(ed,a4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,a5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,a6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,a7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,a8) { LDD;													} /* LDD			 */
+OP(ed,a9) { CPD;													} /* CPD			 */
+OP(ed,aa) { IND;													} /* IND			 */
+OP(ed,ab) { OUTD;													} /* OUTD			 */
+OP(ed,ac) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ad) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ae) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,af) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,b0) { LDIR;													} /* LDIR			 */
+OP(ed,b1) { CPIR;													} /* CPIR			 */
+OP(ed,b2) { INIR;													} /* INIR			 */
+OP(ed,b3) { OTIR;													} /* OTIR			 */
+OP(ed,b4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,b5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,b6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,b7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,b8) { LDDR;													} /* LDDR			 */
+OP(ed,b9) { CPDR;													} /* CPDR			 */
+OP(ed,ba) { INDR;													} /* INDR			 */
+OP(ed,bb) { OTDR;													} /* OTDR			 */
+OP(ed,bc) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,bd) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,be) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,bf) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,c0) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c1) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c2) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c3) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,c8) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,c9) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ca) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,cb) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,cc) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,cd) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ce) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,cf) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,d0) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d1) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d2) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d3) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,d8) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,d9) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,da) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,db) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,dc) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,dd) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,de) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,df) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,e0) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e1) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e2) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e3) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,e8) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,e9) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ea) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,eb) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ec) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ed) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ee) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ef) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,f0) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f1) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f2) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f3) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f4) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f5) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f6) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f7) { illegal_2(z80);											} /* DB ED		 */
+
+OP(ed,f8) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,f9) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,fa) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,fb) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,fc) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,fd) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,fe) { illegal_2(z80);											} /* DB ED		 */
+OP(ed,ff) { illegal_2(z80);											} /* DB ED		 */
+
+#if TIME_LOOP_HACKS
+
+#define CHECK_BC_LOOP												\
+if( _BC > 1 && _PCD < 0xfffc ) {									\
+	UINT8 op1 = cpu_readop(z80->userdata,_PCD);									\
+	UINT8 op2 = cpu_readop(z80->userdata,_PCD+1);									\
+	if( (op1==0x78 && op2==0xb1) || (op1==0x79 && op2==0xb0) )		\
+	{																\
+		UINT8 op3 = cpu_readop(z80->userdata,_PCD+2);								\
+		UINT8 op4 = cpu_readop(z80->userdata,_PCD+3);								\
+		if( op3==0x20 && op4==0xfb )								\
+		{															\
+			int cnt =												\
+				cc[Z80_TABLE_op][0x78] +							\
+				cc[Z80_TABLE_op][0xb1] +							\
+				cc[Z80_TABLE_op][0x20] +							\
+				cc[Z80_TABLE_ex][0x20];								\
+			while( _BC > 0 && z80->z80_ICount > cnt )					\
+			{														\
+				BURNODD( z80, cnt, 4, cnt );								\
+				_BC--;												\
+			}														\
+		}															\
+		else														\
+		if( op3 == 0xc2 )											\
+		{															\
+			UINT8 ad1 = cpu_readop_arg(z80->userdata,_PCD+3);						\
+			UINT8 ad2 = cpu_readop_arg(z80->userdata,_PCD+4);						\
+			if( (ad1 + 256 * ad2) == (_PCD - 1) )					\
+			{														\
+				int cnt =											\
+					cc[Z80_TABLE_op][0x78] +						\
+					cc[Z80_TABLE_op][0xb1] +						\
+					cc[Z80_TABLE_op][0xc2] +						\
+					cc[Z80_TABLE_ex][0xc2];							\
+				while( _BC > 0 && z80->z80_ICount > cnt )				\
+				{													\
+					BURNODD( z80, cnt, 4, cnt );							\
+					_BC--;											\
+				}													\
+			}														\
+		}															\
+	}																\
+}
+
+#define CHECK_DE_LOOP												\
+if( _DE > 1 && _PCD < 0xfffc ) {									\
+	UINT8 op1 = cpu_readop(z80->userdata,_PCD);									\
+	UINT8 op2 = cpu_readop(z80->userdata,_PCD+1);									\
+	if( (op1==0x7a && op2==0xb3) || (op1==0x7b && op2==0xb2) )		\
+	{																\
+		UINT8 op3 = cpu_readop(z80->userdata,_PCD+2);								\
+		UINT8 op4 = cpu_readop(z80->userdata,_PCD+3);								\
+		if( op3==0x20 && op4==0xfb )								\
+		{															\
+			int cnt =												\
+				cc[Z80_TABLE_op][0x7a] +							\
+				cc[Z80_TABLE_op][0xb3] +							\
+				cc[Z80_TABLE_op][0x20] +							\
+				cc[Z80_TABLE_ex][0x20];								\
+			while( _DE > 0 && z80->z80_ICount > cnt )					\
+			{														\
+				BURNODD( z80, cnt, 4, cnt );								\
+				_DE--;												\
+			}														\
+		}															\
+		else														\
+		if( op3==0xc2 )												\
+		{															\
+			UINT8 ad1 = cpu_readop_arg(z80->userdata,_PCD+3);						\
+			UINT8 ad2 = cpu_readop_arg(z80->userdata,_PCD+4);						\
+			if( (ad1 + 256 * ad2) == (_PCD - 1) )					\
+			{														\
+				int cnt =											\
+					cc[Z80_TABLE_op][0x7a] +						\
+					cc[Z80_TABLE_op][0xb3] +						\
+					cc[Z80_TABLE_op][0xc2] +						\
+					cc[Z80_TABLE_ex][0xc2];							\
+				while( _DE > 0 && z80->z80_ICount > cnt )				\
+				{													\
+					BURNODD( z80, cnt, 4, cnt );							\
+					_DE--;											\
+				}													\
+			}														\
+		}															\
+	}																\
+}
+
+#define CHECK_HL_LOOP												\
+if( _HL > 1 && _PCD < 0xfffc ) {									\
+	UINT8 op1 = cpu_readop(z80->userdata,_PCD);									\
+	UINT8 op2 = cpu_readop(z80->userdata,_PCD+1);									\
+	if( (op1==0x7c && op2==0xb5) || (op1==0x7d && op2==0xb4) )		\
+	{																\
+		UINT8 op3 = cpu_readop(z80->userdata,_PCD+2);								\
+		UINT8 op4 = cpu_readop(z80->userdata,_PCD+3);								\
+		if( op3==0x20 && op4==0xfb )								\
+		{															\
+			int cnt =												\
+				cc[Z80_TABLE_op][0x7c] +							\
+				cc[Z80_TABLE_op][0xb5] +							\
+				cc[Z80_TABLE_op][0x20] +							\
+				cc[Z80_TABLE_ex][0x20];								\
+			while( _HL > 0 && z80->z80_ICount > cnt )					\
+			{														\
+				BURNODD( z80, cnt, 4, cnt );								\
+				_HL--;												\
+			}														\
+		}															\
+		else														\
+		if( op3==0xc2 )												\
+		{															\
+			UINT8 ad1 = cpu_readop_arg(z80->userdata,_PCD+3);						\
+			UINT8 ad2 = cpu_readop_arg(z80->userdata,_PCD+4);						\
+			if( (ad1 + 256 * ad2) == (_PCD - 1) )					\
+			{														\
+				int cnt =											\
+					cc[Z80_TABLE_op][0x7c] +						\
+					cc[Z80_TABLE_op][0xb5] +						\
+					cc[Z80_TABLE_op][0xc2] +						\
+					cc[Z80_TABLE_ex][0xc2];							\
+				while( _HL > 0 && z80->z80_ICount > cnt )				\
+				{													\
+					BURNODD( z80, cnt, 4, cnt );							\
+					_HL--;											\
+				}													\
+			}														\
+		}															\
+	}																\
+}
+
+#else
+
+#define CHECK_BC_LOOP
+#define CHECK_DE_LOOP
+#define CHECK_HL_LOOP
+
+#endif
+
+/**********************************************************
+ * main opcodes
+ **********************************************************/
+OP(op,00) {															} /* NOP			 */
+OP(op,01) { _BC = ARG16(z80);											} /* LD BC,w		 */
+OP(op,02) { WM( _BC, _Z80_A );											} /* LD (BC),A	 */
+OP(op,03) { _BC++;													} /* INC BC		 */
+OP(op,04) { _Z80_B = INC(z80,_Z80_B);											} /* INC B			 */
+OP(op,05) { _Z80_B = DEC(z80,_Z80_B);											} /* DEC B			 */
+OP(op,06) { _Z80_B = ARG(z80);												} /* LD B,n		 */
+OP(op,07) { RLCA;													} /* RLCA			 */
+
+OP(op,08) { EX_AF;													} /* EX AF,AF'	 */
+OP(op,09) { ADD16(z80,HL,BC);											} /* ADD HL,BC		 */
+OP(op,0a) { _Z80_A = RM(_BC);											} /* LD A,(BC)	 */
+OP(op,0b) { _BC--; CHECK_BC_LOOP;									} /* DEC BC		 */
+OP(op,0c) { _Z80_C = INC(z80,_Z80_C);											} /* INC C			 */
+OP(op,0d) { _Z80_C = DEC(z80,_Z80_C);											} /* DEC C			 */
+OP(op,0e) { _Z80_C = ARG(z80);												} /* LD C,n		 */
+OP(op,0f) { RRCA;													} /* RRCA			 */
+
+OP(op,10) { _Z80_B--; JR_COND( _Z80_B, 0x10 );								} /* DJNZ o			 */
+OP(op,11) { _DE = ARG16(z80);											} /* LD DE,w		 */
+OP(op,12) { WM( _DE, _Z80_A );											} /* LD (DE),A	 */
+OP(op,13) { _DE++;													} /* INC DE		 */
+OP(op,14) { _Z80_D = INC(z80,_Z80_D);											} /* INC D			 */
+OP(op,15) { _Z80_D = DEC(z80,_Z80_D);											} /* DEC D			 */
+OP(op,16) { _Z80_D = ARG(z80);												} /* LD D,n		 */
+OP(op,17) { RLA;													} /* RLA			 */
+
+OP(op,18) { JR();													} /* JR o			 */
+OP(op,19) { ADD16(z80,HL,DE);											} /* ADD HL,DE		 */
+OP(op,1a) { _Z80_A = RM(_DE);											} /* LD A,(DE)	 */
+OP(op,1b) { _DE--; CHECK_DE_LOOP;									} /* DEC DE		 */
+OP(op,1c) { _Z80_E = INC(z80,_Z80_E);											} /* INC E			 */
+OP(op,1d) { _Z80_E = DEC(z80,_Z80_E);											} /* DEC E			 */
+OP(op,1e) { _Z80_E = ARG(z80);												} /* LD E,n		 */
+OP(op,1f) { RRA;													} /* RRA			 */
+
+OP(op,20) { JR_COND( !(_F & ZF), 0x20 );							} /* JR NZ,o		 */
+OP(op,21) { _HL = ARG16(z80);											} /* LD HL,w		 */
+OP(op,22) { z80->EA = ARG16(z80); WM16(z80, z80->EA, &z80->Z80.HL );						} /* LD (w),HL	 */
+OP(op,23) { _HL++;													} /* INC HL		 */
+OP(op,24) { _Z80_H = INC(z80,_Z80_H);											} /* INC H			 */
+OP(op,25) { _Z80_H = DEC(z80,_Z80_H);											} /* DEC H			 */
+OP(op,26) { _Z80_H = ARG(z80);												} /* LD H,n		 */
+OP(op,27) { DAA;													} /* DAA			 */
+
+OP(op,28) { JR_COND( _F & ZF, 0x28 );								} /* JR Z,o		 */
+OP(op,29) { ADD16(z80,HL,HL);											} /* ADD HL,HL		 */
+OP(op,2a) { z80->EA = ARG16(z80); RM16(z80, z80->EA, &z80->Z80.HL );						} /* LD HL,(w)	 */
+OP(op,2b) { _HL--; CHECK_HL_LOOP;									} /* DEC HL		 */
+OP(op,2c) { _Z80_L = INC(z80,_Z80_L);											} /* INC L			 */
+OP(op,2d) { _Z80_L = DEC(z80,_Z80_L);											} /* DEC L			 */
+OP(op,2e) { _Z80_L = ARG(z80);												} /* LD L,n		 */
+OP(op,2f) { _Z80_A ^= 0xff; _F = (_F&(SF|ZF|PF|CF))|HF|NF|(_Z80_A&(YF|XF)); } /* CPL			 */
+
+OP(op,30) { JR_COND( !(_F & CF), 0x30 );							} /* JR NC,o		 */
+OP(op,31) { _SP = ARG16(z80);											} /* LD SP,w		 */
+OP(op,32) { z80->EA = ARG16(z80); WM( z80->EA, _Z80_A );								} /* LD (w),A		 */
+OP(op,33) { _SP++;													} /* INC SP		 */
+OP(op,34) { WM( _HL, INC(z80,RM(_HL)) );								} /* INC (HL)		 */
+OP(op,35) { WM( _HL, DEC(z80,RM(_HL)) );								} /* DEC (HL)		 */
+OP(op,36) { WM( _HL, ARG(z80) );										} /* LD (HL),n	 */
+OP(op,37) { _F = (_F & (SF|ZF|PF)) | CF | (_Z80_A & (YF|XF));			} /* SCF			 */
+
+OP(op,38) { JR_COND( _F & CF, 0x38 );								} /* JR C,o		 */
+OP(op,39) { ADD16(z80,HL,SP);											} /* ADD HL,SP		 */
+OP(op,3a) { z80->EA = ARG16(z80); _Z80_A = RM( z80->EA );							} /* LD A,(w)		 */
+OP(op,3b) { _SP--;													} /* DEC SP		 */
+OP(op,3c) { _Z80_A = INC(z80,_Z80_A);											} /* INC A			 */
+OP(op,3d) { _Z80_A = DEC(z80,_Z80_A);											} /* DEC A			 */
+OP(op,3e) { _Z80_A = ARG(z80);												} /* LD A,n		 */
+OP(op,3f) { _F = ((_F&(SF|ZF|PF|CF))|((_F&CF)<<4)|(_Z80_A&(YF|XF)))^CF; } /* CCF			 */
+/*OP(op,3f) { _F = ((_F & ~(HF|NF)) | ((_F & CF)<<4)) ^ CF;			 } CCF				 */
+
+OP(op,40) {															} /* LD B,B		 */
+OP(op,41) { _Z80_B = _Z80_C;												} /* LD B,C		 */
+OP(op,42) { _Z80_B = _Z80_D;												} /* LD B,D		 */
+OP(op,43) { _Z80_B = _Z80_E;												} /* LD B,E		 */
+OP(op,44) { _Z80_B = _Z80_H;												} /* LD B,H		 */
+OP(op,45) { _Z80_B = _Z80_L;												} /* LD B,L		 */
+OP(op,46) { _Z80_B = RM(_HL);											} /* LD B,(HL)	 */
+OP(op,47) { _Z80_B = _Z80_A;												} /* LD B,A		 */
+
+OP(op,48) { _Z80_C = _Z80_B;												} /* LD C,B		 */
+OP(op,49) {															} /* LD C,C		 */
+OP(op,4a) { _Z80_C = _Z80_D;												} /* LD C,D		 */
+OP(op,4b) { _Z80_C = _Z80_E;												} /* LD C,E		 */
+OP(op,4c) { _Z80_C = _Z80_H;												} /* LD C,H		 */
+OP(op,4d) { _Z80_C = _Z80_L;												} /* LD C,L		 */
+OP(op,4e) { _Z80_C = RM(_HL);											} /* LD C,(HL)	 */
+OP(op,4f) { _Z80_C = _Z80_A;												} /* LD C,A		 */
+
+OP(op,50) { _Z80_D = _Z80_B;												} /* LD D,B		 */
+OP(op,51) { _Z80_D = _Z80_C;												} /* LD D,C		 */
+OP(op,52) {															} /* LD D,D		 */
+OP(op,53) { _Z80_D = _Z80_E;												} /* LD D,E		 */
+OP(op,54) { _Z80_D = _Z80_H;												} /* LD D,H		 */
+OP(op,55) { _Z80_D = _Z80_L;												} /* LD D,L		 */
+OP(op,56) { _Z80_D = RM(_HL);											} /* LD D,(HL)	 */
+OP(op,57) { _Z80_D = _Z80_A;												} /* LD D,A		 */
+
+OP(op,58) { _Z80_E = _Z80_B;												} /* LD E,B		 */
+OP(op,59) { _Z80_E = _Z80_C;												} /* LD E,C		 */
+OP(op,5a) { _Z80_E = _Z80_D;												} /* LD E,D		 */
+OP(op,5b) {															} /* LD E,E		 */
+OP(op,5c) { _Z80_E = _Z80_H;												} /* LD E,H		 */
+OP(op,5d) { _Z80_E = _Z80_L;												} /* LD E,L		 */
+OP(op,5e) { _Z80_E = RM(_HL);											} /* LD E,(HL)	 */
+OP(op,5f) { _Z80_E = _Z80_A;												} /* LD E,A		 */
+
+OP(op,60) { _Z80_H = _Z80_B;												} /* LD H,B		 */
+OP(op,61) { _Z80_H = _Z80_C;												} /* LD H,C		 */
+OP(op,62) { _Z80_H = _Z80_D;												} /* LD H,D		 */
+OP(op,63) { _Z80_H = _Z80_E;												} /* LD H,E		 */
+OP(op,64) {															} /* LD H,H		 */
+OP(op,65) { _Z80_H = _Z80_L;												} /* LD H,L		 */
+OP(op,66) { _Z80_H = RM(_HL);											} /* LD H,(HL)	 */
+OP(op,67) { _Z80_H = _Z80_A;												} /* LD H,A		 */
+
+OP(op,68) { _Z80_L = _Z80_B;												} /* LD L,B		 */
+OP(op,69) { _Z80_L = _Z80_C;												} /* LD L,C		 */
+OP(op,6a) { _Z80_L = _Z80_D;												} /* LD L,D		 */
+OP(op,6b) { _Z80_L = _Z80_E;												} /* LD L,E		 */
+OP(op,6c) { _Z80_L = _Z80_H;												} /* LD L,H		 */
+OP(op,6d) {															} /* LD L,L		 */
+OP(op,6e) { _Z80_L = RM(_HL);											} /* LD L,(HL)	 */
+OP(op,6f) { _Z80_L = _Z80_A;												} /* LD L,A		 */
+
+OP(op,70) { WM( _HL, _Z80_B );											} /* LD (HL),B	 */
+OP(op,71) { WM( _HL, _Z80_C );											} /* LD (HL),C	 */
+OP(op,72) { WM( _HL, _Z80_D );											} /* LD (HL),D	 */
+OP(op,73) { WM( _HL, _Z80_E );											} /* LD (HL),E	 */
+OP(op,74) { WM( _HL, _Z80_H );											} /* LD (HL),H	 */
+OP(op,75) { WM( _HL, _Z80_L );											} /* LD (HL),L	 */
+OP(op,76) { ENTER_HALT;												} /* HALT			 */
+OP(op,77) { WM( _HL, _Z80_A );											} /* LD (HL),A	 */
+
+OP(op,78) { _Z80_A = _Z80_B;												} /* LD A,B		 */
+OP(op,79) { _Z80_A = _Z80_C;												} /* LD A,C		 */
+OP(op,7a) { _Z80_A = _Z80_D;												} /* LD A,D		 */
+OP(op,7b) { _Z80_A = _Z80_E;												} /* LD A,E		 */
+OP(op,7c) { _Z80_A = _Z80_H;												} /* LD A,H		 */
+OP(op,7d) { _Z80_A = _Z80_L;												} /* LD A,L		 */
+OP(op,7e) { _Z80_A = RM(_HL);											} /* LD A,(HL)	 */
+OP(op,7f) {															} /* LD A,A		 */
+
+OP(op,80) { ADD(z80,_Z80_B);												} /* ADD A,B		 */
+OP(op,81) { ADD(z80,_Z80_C);												} /* ADD A,C		 */
+OP(op,82) { ADD(z80,_Z80_D);												} /* ADD A,D		 */
+OP(op,83) { ADD(z80,_Z80_E);												} /* ADD A,E		 */
+OP(op,84) { ADD(z80,_Z80_H);												} /* ADD A,H		 */
+OP(op,85) { ADD(z80,_Z80_L);												} /* ADD A,L		 */
+OP(op,86) { ADD(z80,RM(_HL));											} /* ADD A,(HL)	 */
+OP(op,87) { ADD(z80,_Z80_A);												} /* ADD A,A		 */
+
+OP(op,88) { ADC(_Z80_B);												} /* ADC A,B		 */
+OP(op,89) { ADC(_Z80_C);												} /* ADC A,C		 */
+OP(op,8a) { ADC(_Z80_D);												} /* ADC A,D		 */
+OP(op,8b) { ADC(_Z80_E);												} /* ADC A,E		 */
+OP(op,8c) { ADC(_Z80_H);												} /* ADC A,H		 */
+OP(op,8d) { ADC(_Z80_L);												} /* ADC A,L		 */
+OP(op,8e) { ADC(RM(_HL));											} /* ADC A,(HL)	 */
+OP(op,8f) { ADC(_Z80_A);												} /* ADC A,A		 */
+
+OP(op,90) { SUB(_Z80_B);												} /* SUB B			 */
+OP(op,91) { SUB(_Z80_C);												} /* SUB C			 */
+OP(op,92) { SUB(_Z80_D);												} /* SUB D			 */
+OP(op,93) { SUB(_Z80_E);												} /* SUB E			 */
+OP(op,94) { SUB(_Z80_H);												} /* SUB H			 */
+OP(op,95) { SUB(_Z80_L);												} /* SUB L			 */
+OP(op,96) { SUB(RM(_HL));											} /* SUB (HL)		 */
+OP(op,97) { SUB(_Z80_A);												} /* SUB A			 */
+
+OP(op,98) { SBC(_Z80_B);												} /* SBC A,B		 */
+OP(op,99) { SBC(_Z80_C);												} /* SBC A,C		 */
+OP(op,9a) { SBC(_Z80_D);												} /* SBC A,D		 */
+OP(op,9b) { SBC(_Z80_E);												} /* SBC A,E		 */
+OP(op,9c) { SBC(_Z80_H);												} /* SBC A,H		 */
+OP(op,9d) { SBC(_Z80_L);												} /* SBC A,L		 */
+OP(op,9e) { SBC(RM(_HL));											} /* SBC A,(HL)	 */
+OP(op,9f) { SBC(_Z80_A);												} /* SBC A,A		 */
+
+OP(op,a0) { AND(_Z80_B);												} /* AND B			 */
+OP(op,a1) { AND(_Z80_C);												} /* AND C			 */
+OP(op,a2) { AND(_Z80_D);												} /* AND D			 */
+OP(op,a3) { AND(_Z80_E);												} /* AND E			 */
+OP(op,a4) { AND(_Z80_H);												} /* AND H			 */
+OP(op,a5) { AND(_Z80_L);												} /* AND L			 */
+OP(op,a6) { AND(RM(_HL));											} /* AND (HL)		 */
+OP(op,a7) { AND(_Z80_A);												} /* AND A			 */
+
+OP(op,a8) { XOR(_Z80_B);												} /* XOR B			 */
+OP(op,a9) { XOR(_Z80_C);												} /* XOR C			 */
+OP(op,aa) { XOR(_Z80_D);												} /* XOR D			 */
+OP(op,ab) { XOR(_Z80_E);												} /* XOR E			 */
+OP(op,ac) { XOR(_Z80_H);												} /* XOR H			 */
+OP(op,ad) { XOR(_Z80_L);												} /* XOR L			 */
+OP(op,ae) { XOR(RM(_HL));											} /* XOR (HL)		 */
+OP(op,af) { XOR(_Z80_A);												} /* XOR A			 */
+
+OP(op,b0) { OR(_Z80_B);													} /* OR B			 */
+OP(op,b1) { OR(_Z80_C);													} /* OR C			 */
+OP(op,b2) { OR(_Z80_D);													} /* OR D			 */
+OP(op,b3) { OR(_Z80_E);													} /* OR E			 */
+OP(op,b4) { OR(_Z80_H);													} /* OR H			 */
+OP(op,b5) { OR(_Z80_L);													} /* OR L			 */
+OP(op,b6) { OR(RM(_HL));											} /* OR (HL)		 */
+OP(op,b7) { OR(_Z80_A);													} /* OR A			 */
+
+OP(op,b8) { CP(_Z80_B);													} /* CP B			 */
+OP(op,b9) { CP(_Z80_C);													} /* CP C			 */
+OP(op,ba) { CP(_Z80_D);													} /* CP D			 */
+OP(op,bb) { CP(_Z80_E);													} /* CP E			 */
+OP(op,bc) { CP(_Z80_H);													} /* CP H			 */
+OP(op,bd) { CP(_Z80_L);													} /* CP L			 */
+OP(op,be) { CP(RM(_HL));											} /* CP (HL)		 */
+OP(op,bf) { CP(_Z80_A);													} /* CP A			 */
+
+OP(op,c0) { RET_COND( !(_F & ZF), 0xc0 );							} /* RET NZ		 */
+OP(op,c1) { POP(BC);												} /* POP BC		 */
+OP(op,c2) { JP_COND( !(_F & ZF) );									} /* JP NZ,a		 */
+OP(op,c3) { JP;														} /* JP a			 */
+OP(op,c4) { CALL_COND( !(_F & ZF), 0xc4 );							} /* CALL NZ,a		 */
+OP(op,c5) { PUSH( BC );												} /* PUSH BC		 */
+OP(op,c6) { ADD(z80,ARG(z80));												} /* ADD A,n		 */
+OP(op,c7) { RST(0x00);												} /* RST 0			 */
+
+OP(op,c8) { RET_COND( _F & ZF, 0xc8 );								} /* RET Z			 */
+OP(op,c9) { POP(PC); change_pc16(_PCD);								} /* RET			 */
+OP(op,ca) { JP_COND( _F & ZF );										} /* JP Z,a		 */
+OP(op,cb) { _Z80_R++; EXEC(cb,ROP(z80));									} /* **** CB xx		 */
+OP(op,cc) { CALL_COND( _F & ZF, 0xcc );								} /* CALL Z,a		 */
+OP(op,cd) { CALL();													} /* CALL a			 */
+OP(op,ce) { ADC(ARG(z80));												} /* ADC A,n		 */
+OP(op,cf) { RST(0x08);												} /* RST 1			 */
+
+OP(op,d0) { RET_COND( !(_F & CF), 0xd0 );							} /* RET NC		 */
+OP(op,d1) { POP(DE);												} /* POP DE		 */
+OP(op,d2) { JP_COND( !(_F & CF) );									} /* JP NC,a		 */
+OP(op,d3) { unsigned n = ARG(z80) | (_Z80_A << 8); OUT( n, _Z80_A );			} /* OUT (n),A		 */
+OP(op,d4) { CALL_COND( !(_F & CF), 0xd4 );							} /* CALL NC,a		 */
+OP(op,d5) { PUSH( DE );												} /* PUSH DE		 */
+OP(op,d6) { SUB(ARG(z80));												} /* SUB n			 */
+OP(op,d7) { RST(0x10);												} /* RST 2			 */
+
+OP(op,d8) { RET_COND( _F & CF, 0xd8 );								} /* RET C			 */
+OP(op,d9) { EXX;													} /* EXX			 */
+OP(op,da) { JP_COND( _F & CF );										} /* JP C,a		 */
+OP(op,db) { unsigned n = ARG(z80) | (_Z80_A << 8); _Z80_A = IN( n );			} /* IN A,(n)		 */
+OP(op,dc) { CALL_COND( _F & CF, 0xdc );								} /* CALL C,a		 */
+OP(op,dd) { _Z80_R++; EXEC(dd,ROP(z80));									} /* **** DD xx		 */
+OP(op,de) { SBC(ARG(z80));												} /* SBC A,n		 */
+OP(op,df) { RST(0x18);												} /* RST 3			 */
+
+OP(op,e0) { RET_COND( !(_F & PF), 0xe0 );							} /* RET PO		 */
+OP(op,e1) { POP(HL);												} /* POP HL		 */
+OP(op,e2) { JP_COND( !(_F & PF) );									} /* JP PO,a		 */
+OP(op,e3) { EXSP(HL);												} /* EX HL,(SP)	 */
+OP(op,e4) { CALL_COND( !(_F & PF), 0xe4 );							} /* CALL PO,a		 */
+OP(op,e5) { PUSH( HL );												} /* PUSH HL		 */
+OP(op,e6) { AND(ARG(z80));												} /* AND n			 */
+OP(op,e7) { RST(0x20);												} /* RST 4			 */
+
+OP(op,e8) { RET_COND( _F & PF, 0xe8 );								} /* RET PE		 */
+OP(op,e9) { _PC = _HL; change_pc16(_PCD);							} /* JP (HL)		 */
+OP(op,ea) { JP_COND( _F & PF );										} /* JP PE,a		 */
+OP(op,eb) { EX_DE_HL;												} /* EX DE,HL		 */
+OP(op,ec) { CALL_COND( _F & PF, 0xec );								} /* CALL PE,a		 */
+OP(op,ed) { _Z80_R++; EXEC(ed,ROP(z80));									} /* **** ED xx		 */
+OP(op,ee) { XOR(ARG(z80));												} /* XOR n			 */
+OP(op,ef) { RST(0x28);												} /* RST 5			 */
+
+OP(op,f0) { RET_COND( !(_F & SF), 0xf0 );							} /* RET P			 */
+OP(op,f1) { POP(AF);												} /* POP AF		 */
+OP(op,f2) { JP_COND( !(_F & SF) );									} /* JP P,a		 */
+OP(op,f3) { _IFF1 = _IFF2 = 0;										} /* DI				 */
+OP(op,f4) { CALL_COND( !(_F & SF), 0xf4 );							} /* CALL P,a		 */
+OP(op,f5) { PUSH( AF );												} /* PUSH AF		 */
+OP(op,f6) { OR(ARG(z80));												} /* OR n			 */
+OP(op,f7) { RST(0x30);												} /* RST 6			 */
+
+OP(op,f8) { RET_COND( _F & SF, 0xf8 );								} /* RET M			 */
+OP(op,f9) { _SP = _HL;												} /* LD SP,HL		 */
+OP(op,fa) { JP_COND(_F & SF);										} /* JP M,a		 */
+OP(op,fb) { EI;														} /* EI				 */
+OP(op,fc) { CALL_COND( _F & SF, 0xfc );								} /* CALL M,a		 */
+OP(op,fd) { _Z80_R++; EXEC(fd,ROP(z80));									} /* **** FD xx		 */
+OP(op,fe) { CP(ARG(z80));												} /* CP n			 */
+OP(op,ff) { RST(0x38);												} /* RST 7			 */
+
+
+static void take_interrupt(z80_state_t *z80)
+{
+	if( _IFF1 )
+	{
+		int irq_vector;
+
+		/* there isn't a valid previous program counter */
+		_PPC = -1;
+
+		/* Check if processor was halted */
+		LEAVE_HALT;
+
+		if( z80->Z80.irq_max )			/* daisy chain mode */
+		{
+			if( z80->Z80.request_irq >= 0 )
+			{
+				/* Clear both interrupt flip flops */
+				_IFF1 = _IFF2 = 0;
+				irq_vector = z80->Z80.irq[z80->Z80.request_irq].interrupt_entry(z80->Z80.irq[z80->Z80.request_irq].irq_param);
+				LOG(("Z80 #%d daisy chain irq_vector $%02x\n", cpu_getactivecpu(), irq_vector));
+				z80->Z80.request_irq = -1;
+			} else return;
+		}
+		else
+		{
+			/* Clear both interrupt flip flops */
+			_IFF1 = _IFF2 = 0;
+			/* call back the cpu interface to retrieve the vector */
+			irq_vector = (*z80->Z80.irq_callback)(0);
+			LOG(("Z80 #%d single int. irq_vector $%02x\n", cpu_getactivecpu(), irq_vector));
+		}
+
+		/* Interrupt mode 2. Call [z80->Z80.I:databyte] */
+		if( _IM == 2 )
+		{
+			irq_vector = (irq_vector & 0xff) | (_Z80_I << 8);
+			PUSH( PC );
+			RM16(z80, irq_vector, &z80->Z80.PC );
+			LOG(("Z80 #%d IM2 [$%04x] = $%04x\n",cpu_getactivecpu() , irq_vector, _PCD));
+			/* CALL opcode timing */
+			z80->Z80.extra_cycles += cc[Z80_TABLE_op][0xcd];
+		}
+		else
+		/* Interrupt mode 1. RST 38h */
+		if( _IM == 1 )
+		{
+			LOG(("Z80 #%d IM1 $0038\n",cpu_getactivecpu() ));
+			PUSH( PC );
+			_PCD = 0x0038;
+			/* RST $38 + 'interrupt latency' cycles */
+			z80->Z80.extra_cycles += cc[Z80_TABLE_op][0xff] + cc[Z80_TABLE_ex][0xff];
+		}
+		else
+		{
+			/* Interrupt mode 0. We check for CALL and JP instructions, */
+			/* if neither of these were found we assume a 1 byte opcode */
+			/* was placed on the databus								*/
+			LOG(("Z80 #%d IM0 $%04x\n",cpu_getactivecpu() , irq_vector));
+			switch (irq_vector & 0xff0000)
+			{
+				case 0xcd0000:	/* call */
+					PUSH( PC );
+					_PCD = irq_vector & 0xffff;
+					 /* CALL $xxxx + 'interrupt latency' cycles */
+					z80->Z80.extra_cycles += cc[Z80_TABLE_op][0xcd] + cc[Z80_TABLE_ex][0xff];
+					break;
+				case 0xc30000:	/* jump */
+					_PCD = irq_vector & 0xffff;
+					/* JP $xxxx + 2 cycles */
+					z80->Z80.extra_cycles += cc[Z80_TABLE_op][0xc3] + cc[Z80_TABLE_ex][0xff];
+					break;
+				default:		/* rst (or other opcodes?) */
+					PUSH( PC );
+					_PCD = irq_vector & 0x0038;
+					/* RST $xx + 2 cycles */
+					z80->Z80.extra_cycles += cc[Z80_TABLE_op][_PCD] + cc[Z80_TABLE_ex][_PCD];
+					break;
+			}
+		}
+		change_pc16(_PCD);
+	}
+}
+
+/****************************************************************************
+ * Processor initialization
+ ****************************************************************************/
+z80_state_t *z80_init(void)
+{
+//	int cpu = 0;//cpu_getactivecpu();
+	int i, p;
+	z80_state_t *z80 = malloc (sizeof (z80_state_t));
+	memset (z80, 0, sizeof (z80_state_t));
+#if BIG_FLAGS_ARRAY
+	if( !z80->SZHVC_add || !z80->SZHVC_sub )
+	{
+		int oldval, newval, val;
+		UINT8 *padd, *padc, *psub, *psbc;
+		/* allocate big flag arrays once */
+		z80->SZHVC_add = (UINT8 *)malloc(2*256*256);
+		z80->SZHVC_sub = (UINT8 *)malloc(2*256*256);
+		if( !z80->SZHVC_add || !z80->SZHVC_sub )
+		{
+			LOG(("Z80: failed to allocate 2 * 128K flags arrays!!!\n"));
+			exit(1);
+		}
+		padd = &z80->SZHVC_add[	0*256];
+		padc = &z80->SZHVC_add[256*256];
+		psub = &z80->SZHVC_sub[	0*256];
+		psbc = &z80->SZHVC_sub[256*256];
+		for (oldval = 0; oldval < 256; oldval++)
+		{
+			for (newval = 0; newval < 256; newval++)
+			{
+				/* add or adc w/o carry set */
+				val = newval - oldval;
+				*padd = (newval) ? ((newval & 0x80) ? SF : 0) : ZF;
+#if Z80_EXACT
+				*padd |= (newval & (YF | XF));	/* undocumented flag bits 5+3 */
+#endif
+				if( (newval & 0x0f) < (oldval & 0x0f) ) *padd |= HF;
+				if( newval < oldval ) *padd |= CF;
+				if( (val^oldval^0x80) & (val^newval) & 0x80 ) *padd |= VF;
+				padd++;
+
+				/* adc with carry set */
+				val = newval - oldval - 1;
+				*padc = (newval) ? ((newval & 0x80) ? SF : 0) : ZF;
+#if Z80_EXACT
+				*padc |= (newval & (YF | XF));	/* undocumented flag bits 5+3 */
+#endif
+				if( (newval & 0x0f) <= (oldval & 0x0f) ) *padc |= HF;
+				if( newval <= oldval ) *padc |= CF;
+				if( (val^oldval^0x80) & (val^newval) & 0x80 ) *padc |= VF;
+				padc++;
+
+				/* cp, sub or sbc w/o carry set */
+				val = oldval - newval;
+				*psub = NF | ((newval) ? ((newval & 0x80) ? SF : 0) : ZF);
+#if Z80_EXACT
+				*psub |= (newval & (YF | XF));	/* undocumented flag bits 5+3 */
+#endif
+				if( (newval & 0x0f) > (oldval & 0x0f) ) *psub |= HF;
+				if( newval > oldval ) *psub |= CF;
+				if( (val^oldval) & (oldval^newval) & 0x80 ) *psub |= VF;
+				psub++;
+
+				/* sbc with carry set */
+				val = oldval - newval - 1;
+				*psbc = NF | ((newval) ? ((newval & 0x80) ? SF : 0) : ZF);
+#if Z80_EXACT
+				*psbc |= (newval & (YF | XF));	/* undocumented flag bits 5+3 */
+#endif
+				if( (newval & 0x0f) >= (oldval & 0x0f) ) *psbc |= HF;
+				if( newval >= oldval ) *psbc |= CF;
+				if( (val^oldval) & (oldval^newval) & 0x80 ) *psbc |= VF;
+				psbc++;
+			}
+		}
+	}
+#endif
+	for (i = 0; i < 256; i++)
+	{
+		p = 0;
+		if( i&0x01 ) ++p;
+		if( i&0x02 ) ++p;
+		if( i&0x04 ) ++p;
+		if( i&0x08 ) ++p;
+		if( i&0x10 ) ++p;
+		if( i&0x20 ) ++p;
+		if( i&0x40 ) ++p;
+		if( i&0x80 ) ++p;
+		z80->SZ[i] = i ? i & SF : ZF;
+#if Z80_EXACT
+		z80->SZ[i] |= (i & (YF | XF));		/* undocumented flag bits 5+3 */
+#endif
+		z80->SZ_BIT[i] = i ? i & SF : ZF | PF;
+#if Z80_EXACT
+		z80->SZ_BIT[i] |= (i & (YF | XF));	/* undocumented flag bits 5+3 */
+#endif
+		z80->SZP[i] = z80->SZ[i] | ((p & 1) ? 0 : PF);
+		z80->SZHV_inc[i] = z80->SZ[i];
+		if( i == 0x80 ) z80->SZHV_inc[i] |= VF;
+		if( (i & 0x0f) == 0x00 ) z80->SZHV_inc[i] |= HF;
+		z80->SZHV_dec[i] = z80->SZ[i] | NF;
+		if( i == 0x7f ) z80->SZHV_dec[i] |= VF;
+		if( (i & 0x0f) == 0x0f ) z80->SZHV_dec[i] |= HF;
+	}
+
+/*
+	state_save_register_UINT16("z80", cpu, "AF", &z80->Z80.AF.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "BC", &z80->Z80.BC.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "DE", &z80->Z80.DE.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "HL", &z80->Z80.HL.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "IX", &z80->Z80.IX.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "IY", &z80->Z80.IY.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "PC", &z80->Z80.PC.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "SP", &z80->Z80.SP.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "AF2", &z80->Z80.AF2.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "BC2", &z80->Z80.BC2.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "DE2", &z80->Z80.DE2.w.l, 1);
+	state_save_register_UINT16("z80", cpu, "HL2", &z80->Z80.HL2.w.l, 1);
+	state_save_register_UINT8("z80", cpu, "R", &z80->Z80.R, 1);
+	state_save_register_UINT8("z80", cpu, "R2", &z80->Z80.R2, 1);
+	state_save_register_UINT8("z80", cpu, "IFF1", &z80->Z80.IFF1, 1);
+	state_save_register_UINT8("z80", cpu, "IFF2", &z80->Z80.IFF2, 1);
+	state_save_register_UINT8("z80", cpu, "HALT", &z80->Z80.HALT, 1);
+	state_save_register_UINT8("z80", cpu, "IM", &z80->Z80.IM, 1);
+	state_save_register_UINT8("z80", cpu, "I", &z80->Z80.I, 1);
+	state_save_register_UINT8("z80", cpu, "irq_max", &z80->Z80.irq_max, 1);
+	state_save_register_INT8("z80", cpu, "request_irq", &z80->Z80.request_irq, 1);
+	state_save_register_INT8("z80", cpu, "service_irq", &z80->Z80.service_irq, 1);
+	state_save_register_UINT8("z80", cpu, "int_state", z80->Z80.int_state, 4);
+	state_save_register_UINT8("z80", cpu, "nmi_state", &z80->Z80.nmi_state, 1);
+	state_save_register_UINT8("z80", cpu, "irq_state", &z80->Z80.irq_state, 1);
+*/
+	/* daisy chain needs to be saved by z80ctc.c somehow */
+
+	return z80;
+}
+
+void z80_free (z80_state_t *z80) {
+ if (z80) {
+ if( z80->SZHVC_add) {
+ free (z80->SZHVC_add);
+ }
+ if (z80->SZHVC_sub) {
+ free (z80->SZHVC_sub);
+ }
+ free (z80);
+ }
+}
+
+/****************************************************************************
+ * Reset registers to their initial values
+ ****************************************************************************/
+void z80_reset(z80_state_t *z80, void *param)
+{
+	Z80_DaisyChain *daisy_chain = (Z80_DaisyChain *)param;
+	memset(&z80->Z80, 0, sizeof(z80->Z80));
+	_IX = _IY = 0xffff; /* IX and IY are FFFF after a reset! */
+	_F = ZF;			/* Zero flag is set */
+	z80->Z80.request_irq = -1;
+	z80->Z80.service_irq = -1;
+	z80->Z80.nmi_state = CLEAR_LINE;
+	z80->Z80.irq_state = CLEAR_LINE;
+
+	if( daisy_chain )
+	{
+		while( daisy_chain->irq_param != -1 && z80->Z80.irq_max < Z80_MAXDAISY )
+		{
+			/* set callbackhandler after reti */
+			z80->Z80.irq[z80->Z80.irq_max] = *daisy_chain;
+			/* device reset */
+			if( z80->Z80.irq[z80->Z80.irq_max].reset )
+				z80->Z80.irq[z80->Z80.irq_max].reset(z80->Z80.irq[z80->Z80.irq_max].irq_param);
+			z80->Z80.irq_max++;
+			daisy_chain++;
+		}
+	}
+
+	change_pc16(_PCD);
+}
+
+void z80_exit(z80_state_t *z80)
+{
+#if BIG_FLAGS_ARRAY
+	if (z80->SZHVC_add) free(z80->SZHVC_add);
+	z80->SZHVC_add = NULL;
+	if (z80->SZHVC_sub) free(z80->SZHVC_sub);
+	z80->SZHVC_sub = NULL;
+#endif
+}
+
+/****************************************************************************
+ * Execute 'cycles' T-states. Return number of T-states really executed
+ ****************************************************************************/
+int z80_execute(z80_state_t *z80, int cycles)
+{
+	z80->z80_ICount = cycles - z80->Z80.extra_cycles;
+	z80->Z80.extra_cycles = 0;
+
+	do
+	{
+		_PPC = _PCD;
+		CALL_MAME_DEBUG;
+		_Z80_R++;
+		EXEC_INLINE(op,ROP(z80));
+	} while( z80->z80_ICount > 0 );
+
+	z80->z80_ICount -= z80->Z80.extra_cycles;
+	z80->Z80.extra_cycles = 0;
+
+	return cycles - z80->z80_ICount;
+}
+
+/****************************************************************************
+ * Burn 'cycles' T-states. Adjust R register for the lost time
+ ****************************************************************************/
+void z80_burn(z80_state_t *z80, int cycles)
+{
+	if( cycles > 0 )
+	{
+		/* NOP takes 4 cycles per instruction */
+		int n = (cycles + 3) / 4;
+		_Z80_R += n;
+		z80->z80_ICount -= 4 * n;
+	}
+}
+
+/****************************************************************************
+ * Get all registers in given buffer
+ ****************************************************************************/
+unsigned z80_get_context (z80_state_t *z80, void *dst)
+{
+	if( dst )
+		*(Z80_Regs*)dst = z80->Z80;
+	return sizeof(Z80_Regs);
+}
+
+/****************************************************************************
+ * Set all registers to given values
+ ****************************************************************************/
+void z80_set_context (z80_state_t *z80, void *src)
+{
+	if( src )
+		z80->Z80 = *(Z80_Regs*)src;
+	change_pc16(_PCD);
+}
+
+/****************************************************************************
+ * Get a pointer to a cycle count table
+ ****************************************************************************/
+const void *z80_get_cycle_table (z80_state_t *z80, int which)
+{
+	if (which >= 0 && which <= Z80_TABLE_xycb)
+		return cc[which];
+	return NULL;
+}
+
+/****************************************************************************
+ * Set a new cycle count table
+ ****************************************************************************/
+void z80_set_cycle_table (z80_state_t *z80, int which, void *new_table)
+{
+	if (which >= 0 && which <= Z80_TABLE_ex)
+		cc[which] = new_table;
+}
+
+/****************************************************************************
+ * Return a specific register
+ ****************************************************************************/
+unsigned z80_get_reg (z80_state_t *z80, int regnum)
+{
+	switch( regnum )
+	{
+		//case REG_PC: return _PCD;
+		case Z80_PC: return z80->Z80.PC.w.l;
+		//case REG_SP: return _SPD;
+		case Z80_SP: return z80->Z80.SP.w.l;
+		case Z80_AF: return z80->Z80.AF.w.l;
+		case Z80_BC: return z80->Z80.BC.w.l;
+		case Z80_DE: return z80->Z80.DE.w.l;
+		case Z80_HL: return z80->Z80.HL.w.l;
+		case Z80_IX: return z80->Z80.IX.w.l;
+		case Z80_IY: return z80->Z80.IY.w.l;
+		case Z80_R: return (z80->Z80.R & 0x7f) | (z80->Z80.R2 & 0x80);
+		case Z80_I: return z80->Z80.I;
+		case Z80_AF2: return z80->Z80.AF2.w.l;
+		case Z80_BC2: return z80->Z80.BC2.w.l;
+		case Z80_DE2: return z80->Z80.DE2.w.l;
+		case Z80_HL2: return z80->Z80.HL2.w.l;
+		case Z80_IM: return z80->Z80.IM;
+		case Z80_IFF1: return z80->Z80.IFF1;
+		case Z80_IFF2: return z80->Z80.IFF2;
+		case Z80_HALT: return z80->Z80.HALT;
+		case Z80_NMI_STATE: return z80->Z80.nmi_state;
+		case Z80_IRQ_STATE: return z80->Z80.irq_state;
+		case Z80_DC0: return z80->Z80.int_state[0];
+		case Z80_DC1: return z80->Z80.int_state[1];
+		case Z80_DC2: return z80->Z80.int_state[2];
+		case Z80_DC3: return z80->Z80.int_state[3];
+		case REG_PREVIOUSPC: return z80->Z80.PREPC.w.l;
+		default:
+			if( regnum <= REG_SP_CONTENTS )
+			{
+				unsigned offset = _SPD + 2 * (REG_SP_CONTENTS - regnum);
+				if( offset < 0xffff )
+					return RM( offset ) | ( RM( offset + 1) << 8 );
+			}
+	}
+	return 0;
+}
+
+/****************************************************************************
+ * Set a specific register
+ ****************************************************************************/
+void z80_set_reg (z80_state_t *z80, int regnum, unsigned val)
+{
+	switch( regnum )
+	{
+		//case REG_PC: _PC = val; change_pc16(_PCD); break;
+		case Z80_PC: z80->Z80.PC.w.l = val; break;
+		//case REG_SP: _SP = val; break;
+		case Z80_SP: z80->Z80.SP.w.l = val; break;
+		case Z80_AF: z80->Z80.AF.w.l = val; break;
+		case Z80_BC: z80->Z80.BC.w.l = val; break;
+		case Z80_DE: z80->Z80.DE.w.l = val; break;
+		case Z80_HL: z80->Z80.HL.w.l = val; break;
+		case Z80_IX: z80->Z80.IX.w.l = val; break;
+		case Z80_IY: z80->Z80.IY.w.l = val; break;
+		case Z80_R: z80->Z80.R = val; z80->Z80.R2 = val & 0x80; break;
+		case Z80_I: z80->Z80.I = val; break;
+		case Z80_AF2: z80->Z80.AF2.w.l = val; break;
+		case Z80_BC2: z80->Z80.BC2.w.l = val; break;
+		case Z80_DE2: z80->Z80.DE2.w.l = val; break;
+		case Z80_HL2: z80->Z80.HL2.w.l = val; break;
+		case Z80_IM: z80->Z80.IM = val; break;
+		case Z80_IFF1: z80->Z80.IFF1 = val; break;
+		case Z80_IFF2: z80->Z80.IFF2 = val; break;
+		case Z80_HALT: z80->Z80.HALT = val; break;
+		case Z80_NMI_STATE: z80_set_irq_line(z80,IRQ_LINE_NMI,val); break;
+		case Z80_IRQ_STATE: z80_set_irq_line(z80,0,val); break;
+		case Z80_DC0: z80->Z80.int_state[0] = val; break;
+		case Z80_DC1: z80->Z80.int_state[1] = val; break;
+		case Z80_DC2: z80->Z80.int_state[2] = val; break;
+		case Z80_DC3: z80->Z80.int_state[3] = val; break;
+		default:
+			if( regnum <= REG_SP_CONTENTS )
+			{
+				unsigned offset = _SPD + 2 * (REG_SP_CONTENTS - regnum);
+				if( offset < 0xffff )
+				{
+					WM( offset, val & 0xff );
+					WM( offset+1, (val >> 8) & 0xff );
+				}
+			}
+	}
+}
+
+/****************************************************************************
+ * Set IRQ line state
+ ****************************************************************************/
+void z80_set_irq_line(z80_state_t *z80, int irqline, int state)
+{
+	if (irqline == IRQ_LINE_NMI)
+	{
+		if( z80->Z80.nmi_state == state ) return;
+
+		LOG(("Z80 #%d set_irq_line (NMI) %d\n", cpu_getactivecpu(), state));
+		z80->Z80.nmi_state = state;
+		if( state == CLEAR_LINE ) return;
+
+		LOG(("Z80 #%d take NMI\n", cpu_getactivecpu()));
+		_PPC = -1;			/* there isn't a valid previous program counter */
+		LEAVE_HALT;			/* Check if processor was halted */
+
+		_IFF1 = 0;
+		PUSH( PC );
+		_PCD = 0x0066;
+		z80->Z80.extra_cycles += 11;
+	}
+	else
+	{
+		LOG(("Z80 #%d set_irq_line %d\n",cpu_getactivecpu() , state));
+		z80->Z80.irq_state = state;
+		if( state == CLEAR_LINE ) return;
+
+		if( z80->Z80.irq_max )
+		{
+			int daisychain, device, int_state;
+			daisychain = (*z80->Z80.irq_callback)(irqline);
+			device = daisychain >> 8;
+			int_state = daisychain & 0xff;
+			LOG(("Z80 #%d daisy chain $%04x -> device %d, state $%02x",cpu_getactivecpu(), daisychain, device, int_state));
+
+			if( z80->Z80.int_state[device] != int_state )
+			{
+				LOG((" change\n"));
+				/* set new interrupt status */
+				z80->Z80.int_state[device] = int_state;
+				/* check interrupt status */
+				z80->Z80.request_irq = z80->Z80.service_irq = -1;
+
+				/* search higher IRQ or IEO */
+				for( device = 0 ; device < z80->Z80.irq_max ; device ++ )
+				{
+					/* IEO = disable ? */
+					if( z80->Z80.int_state[device] & Z80_INT_IEO )
+					{
+						z80->Z80.request_irq = -1;		/* if IEO is disable , masking lower IRQ */
+						z80->Z80.service_irq = device;	/* set highest interrupt service device */
+					}
+					/* IRQ = request ? */
+					if( z80->Z80.int_state[device] & Z80_INT_REQ )
+						z80->Z80.request_irq = device;
+				}
+				LOG(("Z80 #%d daisy chain service_irq $%02x, request_irq $%02x\n", cpu_getactivecpu(), z80->Z80.service_irq, z80->Z80.request_irq));
+				if( z80->Z80.request_irq < 0 ) return;
+			}
+			else
+			{
+				LOG((" no change\n"));
+				return;
+			}
+		}
+		take_interrupt(z80);
+	}
+}
+
+/****************************************************************************
+ * Set IRQ vector callback
+ ****************************************************************************/
+void z80_set_irq_callback(z80_state_t *z80, int (*callback)(int))
+{
+	LOG(("Z80 #%d set_irq_callback $%08x\n",cpu_getactivecpu() , (int)callback));
+	z80->Z80.irq_callback = callback;
+}
+
+/****************************************************************************
+ * Return a formatted string for a register
+ ****************************************************************************/
+const char *z80_info(z80_state_t *z80, void *context, int regnum)
+{
+	static char buffer[32][47+1];
+	static int which = 0;
+	Z80_Regs *r = context;
+
+	which = (which+1) % 32;
+	buffer[which][0] = '\0';
+	if( !context )
+		r = &z80->Z80;
+
+	switch( regnum )
+	{
+		case CPU_INFO_REG+Z80_PC: sprintf(buffer[which], "PC:%04X", r->PC.w.l); break;
+		case CPU_INFO_REG+Z80_SP: sprintf(buffer[which], "SP:%04X", r->SP.w.l); break;
+		case CPU_INFO_REG+Z80_AF: sprintf(buffer[which], "AF:%04X", r->AF.w.l); break;
+		case CPU_INFO_REG+Z80_BC: sprintf(buffer[which], "BC:%04X", r->BC.w.l); break;
+		case CPU_INFO_REG+Z80_DE: sprintf(buffer[which], "DE:%04X", r->DE.w.l); break;
+		case CPU_INFO_REG+Z80_HL: sprintf(buffer[which], "HL:%04X", r->HL.w.l); break;
+		case CPU_INFO_REG+Z80_IX: sprintf(buffer[which], "IX:%04X", r->IX.w.l); break;
+		case CPU_INFO_REG+Z80_IY: sprintf(buffer[which], "IY:%04X", r->IY.w.l); break;
+		case CPU_INFO_REG+Z80_R: sprintf(buffer[which], "R:%02X", (r->R & 0x7f) | (r->R2 & 0x80)); break;
+		case CPU_INFO_REG+Z80_I: sprintf(buffer[which], "I:%02X", r->I); break;
+		case CPU_INFO_REG+Z80_AF2: sprintf(buffer[which], "AF'%04X", r->AF2.w.l); break;
+		case CPU_INFO_REG+Z80_BC2: sprintf(buffer[which], "BC'%04X", r->BC2.w.l); break;
+		case CPU_INFO_REG+Z80_DE2: sprintf(buffer[which], "DE'%04X", r->DE2.w.l); break;
+		case CPU_INFO_REG+Z80_HL2: sprintf(buffer[which], "HL'%04X", r->HL2.w.l); break;
+		case CPU_INFO_REG+Z80_IM: sprintf(buffer[which], "IM:%X", r->IM); break;
+		case CPU_INFO_REG+Z80_IFF1: sprintf(buffer[which], "IFF1:%X", r->IFF1); break;
+		case CPU_INFO_REG+Z80_IFF2: sprintf(buffer[which], "IFF2:%X", r->IFF2); break;
+		case CPU_INFO_REG+Z80_HALT: sprintf(buffer[which], "HALT:%X", r->HALT); break;
+		case CPU_INFO_REG+Z80_NMI_STATE: sprintf(buffer[which], "NMI:%X", r->nmi_state); break;
+		case CPU_INFO_REG+Z80_IRQ_STATE: sprintf(buffer[which], "IRQ:%X", r->irq_state); break;
+		case CPU_INFO_REG+Z80_DC0: if(z80->Z80.irq_max >= 1) sprintf(buffer[which], "DC0:%X", r->int_state[0]); break;
+		case CPU_INFO_REG+Z80_DC1: if(z80->Z80.irq_max >= 2) sprintf(buffer[which], "DC1:%X", r->int_state[1]); break;
+		case CPU_INFO_REG+Z80_DC2: if(z80->Z80.irq_max >= 3) sprintf(buffer[which], "DC2:%X", r->int_state[2]); break;
+		case CPU_INFO_REG+Z80_DC3: if(z80->Z80.irq_max >= 4) sprintf(buffer[which], "DC3:%X", r->int_state[3]); break;
+		case CPU_INFO_FLAGS:
+			sprintf(buffer[which], "%c%c%c%c%c%c%c%c",
+				r->AF.b.l & 0x80 ? 'S':'.',
+				r->AF.b.l & 0x40 ? 'Z':'.',
+				r->AF.b.l & 0x20 ? '5':'.',
+				r->AF.b.l & 0x10 ? 'H':'.',
+				r->AF.b.l & 0x08 ? '3':'.',
+				r->AF.b.l & 0x04 ? 'P':'.',
+				r->AF.b.l & 0x02 ? 'N':'.',
+				r->AF.b.l & 0x01 ? 'C':'.');
+			break;
+		case CPU_INFO_NAME: return "Z80";
+		case CPU_INFO_FAMILY: return "Zilog Z80";
+		case CPU_INFO_VERSION: return "3.5";
+		case CPU_INFO_FILE: return __FILE__;
+		case CPU_INFO_CREDITS: return "Copyright (C) 1998,1999,2000 Juergen Buchmueller, all rights reserved.";
+		case CPU_INFO_REG_LAYOUT: return (const char *)z80_reg_layout;
+		case CPU_INFO_WIN_LAYOUT: return (const char *)z80_win_layout;
+	}
+	return buffer[which];
+}
+
+unsigned z80_dasm( z80_state_t *z80, char *buffer, unsigned pc )
+{
+#ifdef MAME_DEBUG
+	return DasmZ80( buffer, pc );
+#else
+	sprintf( buffer, "$%02X", cpu_readop(z80->userdata,pc) );
+	return 1;
+#endif
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/z80.h Added

@@ -0,0 +1,117 @@
+#ifndef Z80_H
+#define Z80_H
+
+#include "cpuintrf.h"
+#include "osd_cpu.h"
+
+#undef VERBOSE
+#define VERBOSE 0
+
+#if VERBOSE
+#define LOG(x)	logerror x
+#else
+#define LOG(x)
+#endif
+
+/* execute main opcodes inside a big switch statement */
+#ifndef BIG_SWITCH
+#define BIG_SWITCH			1
+#endif
+
+/* big flags array for ADD/ADC/SUB/SBC/CP results */
+#define BIG_FLAGS_ARRAY		1
+
+/* Set to 1 for a more exact (but somewhat slower) Z80 emulation */
+#define Z80_EXACT			1
+
+/* on JP and JR opcodes check for tight loops */
+#define BUSY_LOOP_HACKS		1
+
+/* check for delay loops counting down BC */
+#define TIME_LOOP_HACKS		1
+
+#ifdef X86_ASM
+#undef	BIG_FLAGS_ARRAY
+#define BIG_FLAGS_ARRAY		0
+#endif
+
+enum {
+	Z80_PC=1, Z80_SP, Z80_AF, Z80_BC, Z80_DE, Z80_HL,
+	Z80_IX, Z80_IY,	Z80_AF2, Z80_BC2, Z80_DE2, Z80_HL2,
+	Z80_R, Z80_I, Z80_IM, Z80_IFF1, Z80_IFF2, Z80_HALT,
+	Z80_NMI_STATE, Z80_IRQ_STATE, Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3
+};
+
+enum {
+	Z80_TABLE_op,
+	Z80_TABLE_cb,
+	Z80_TABLE_ed,
+	Z80_TABLE_xy,
+	Z80_TABLE_xycb,
+	Z80_TABLE_ex	/* cycles counts for taken jr/jp/call and interrupt latency (rst opcodes) */
+};
+
+/****************************************************************************/
+/* The Z80 registers. HALT is set to 1 when the CPU is halted, the refresh	*/
+/* register is calculated as follows: refresh=(Regs.R&127)|(Regs.R2&128)	*/
+/****************************************************************************/
+typedef struct {
+/* 00 */	PAIR	PREPC,PC,SP,AF,BC,DE,HL,IX,IY;
+/* 24 */	PAIR	AF2,BC2,DE2,HL2;
+/* 34 */	UINT8	R,R2,IFF1,IFF2,HALT,IM,I;
+/* 3B */	UINT8	irq_max;			/* number of daisy chain devices		*/
+/* 3C */	INT8	request_irq;		/* daisy chain next request device		*/
+/* 3D */	INT8	service_irq;		/* daisy chain next reti handling device */
+/* 3E */	UINT8	nmi_state;			/* nmi line state */
+/* 3F */	UINT8	irq_state;			/* irq line state */
+/* 40 */	UINT8	int_state[Z80_MAXDAISY];
+/* 44 */	Z80_DaisyChain irq[Z80_MAXDAISY];
+/* 84 */	int		(*irq_callback)(int irqline);
+/* 88 */	int		extra_cycles;		/* extra cycles for interrupts */
+}	Z80_Regs;
+
+
+typedef struct {
+    int z80_ICount;              /* T-state count                        */
+    Z80_Regs Z80;
+    UINT32 EA;
+    int after_EI;
+
+    UINT8 SZ[256];		/* zero and sign flags */
+    UINT8 SZ_BIT[256];	/* zero, sign and parity/overflow (=zero) flags for BIT opcode */
+    UINT8 SZP[256];		/* zero, sign and parity flags */
+    UINT8 SZHV_inc[256]; /* zero, sign, half carry and overflow flags INC r8 */
+    UINT8 SZHV_dec[256]; /* zero, sign, half carry and overflow flags DEC r8 */
+
+#if BIG_FLAGS_ARRAY
+    UINT8 *SZHVC_add;
+    UINT8 *SZHVC_sub;
+#endif
+
+    void *userdata;
+} z80_state_t;
+
+z80_state_t *z80_init(void);
+void z80_free (z80_state_t *z80);
+void z80_reset (z80_state_t *z80, void *param);
+void z80_exit (z80_state_t *z80);
+int z80_execute(z80_state_t *z80, int cycles);
+void z80_burn(z80_state_t *z80, int cycles);
+unsigned z80_get_context (z80_state_t *z80, void *dst);
+void z80_set_context (z80_state_t *z80, void *src);
+const void *z80_get_cycle_table (z80_state_t *z80, int which);
+void z80_set_cycle_table (z80_state_t *z80, int which, void *new_tbl);
+unsigned z80_get_reg (z80_state_t *z80, int regnum);
+void z80_set_reg (z80_state_t *z80, int regnum, unsigned val);
+void z80_set_irq_line(z80_state_t *z80, int irqline, int state);
+void z80_set_irq_callback(z80_state_t *z80, int (*irq_callback)(int));
+const char *z80_info(z80_state_t *z80, void *context, int regnum);
+unsigned z80_dasm(z80_state_t *z80, char *buffer, unsigned pc);
+
+#ifdef MAME_DEBUG
+unsigned DasmZ80(z80_state_t *z80, char *buffer, unsigned pc);
+#endif
+
+void cps1_decode(unsigned char *rom, int swap_key1,int swap_key2,int addr_key,int xor_key);
+#endif
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/z80dasm.c Added

@@ -0,0 +1,597 @@
+/*****************************************************************************
+ *
+ *	 z80dasm.c
+ *	 Portable Z80 disassembler
+ *
+ *	 Copyright (C) 1998 Juergen Buchmueller, all rights reserved.
+ *
+ *	 - This source code is released as freeware for non-commercial purposes.
+ *	 - You are free to use and redistribute this code in modified or
+ *	 unmodified form, provided you list me in the credits.
+ *	 - If you modify this source code, you must add a notice to each modified
+ *	 source file that it has been changed. If you're a nice person, you
+ *	 will clearly mark each change too. :)
+ *	 - If you wish to use this for commercial purposes, please contact me at
+ *	 pullmoll@t-online.de
+ *	 - The author of this copywritten work reserves the right to change the
+ * terms of its usage and license at any time, including retroactively
+ * - This entire notice must remain in the source code.
+ *
+ *****************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#ifdef	MAME_DEBUG
+#include "driver.h"
+#include "mamedbg.h"
+#include "z80.h"
+
+enum e_mnemonics {
+	zADC ,zADD ,zAND	,zBIT ,zCALL ,zCCF ,zCP	,zCPD ,
+	zCPDR ,zCPI ,zCPIR ,zCPL ,zDAA ,zDB	 ,zDEC	,zDI ,
+	zDJNZ ,zEI	 ,zEX	,zEXX ,zHLT ,zIM	 ,zIN	,zINC ,
+	zIND ,zINDR ,zINI	,zINIR ,zJP ,zJR	 ,zLD	,zLDD ,
+	zLDDR ,zLDI ,zLDIR ,zNEG ,zNOP ,zOR	 ,zOTDR ,zOTIR ,
+	zOUT ,zOUTD ,zOUTI ,zPOP ,zPUSH ,zRES ,zRET	,zRETI ,
+	zRETN ,zRL	 ,zRLA	,zRLC ,zRLCA ,zRLD ,zRR	,zRRA ,
+	zRRC ,zRRCA ,zRRD	,zRST ,zSBC ,zSCF ,zSET	,zSLA ,
+	zSLL ,zSRA ,zSRL	,zSUB ,zXOR
+};
+
+static const char *s_mnemonic[] = {
+	"adc", "add", "and", "bit", "call","ccf", "cp", "cpd",
+	"cpdr","cpi", "cpir","cpl", "daa", "db", "dec", "di",
+	"djnz","ei", "ex", "exx", "halt","im", "in", "inc",
+	"ind", "indr","ini", "inir","jp", "jr", "ld", "ldd",
+	"lddr","ldi", "ldir","neg", "nop", "or", "otdr","otir",
+	"out", "outd","outi","pop", "push","res", "ret", "reti",
+	"retn","rl", "rla", "rlc", "rlca","rld", "rr", "rra",
+	"rrc", "rrca","rrd", "rst", "sbc", "scf", "set", "sla",
+	"sll", "sra", "srl", "sub", "xor "
+};
+
+typedef struct {
+	UINT8	access;
+	UINT8	mnemonic;
+	const char *arguments;
+}	z80dasm;
+
+#define _0	EA_NONE
+#define _JP EA_ABS_PC
+#define _JR EA_REL_PC
+#define _RM EA_MEM_RD
+#define _WM EA_MEM_WR
+#define _RW EA_MEM_RDWR
+#define _RP EA_PORT_RD
+#define _WP EA_PORT_WR
+
+static z80dasm mnemonic_xx_cb[256]= {
+	{_RW,zRLC,"b=Y"}, {_RW,zRLC,"c=Y"}, {_RW,zRLC,"d=Y"}, {_RW,zRLC,"e=Y"},
+	{_RW,zRLC,"h=Y"}, {_RW,zRLC,"l=Y"}, {_RW,zRLC,"Y"}, {_RW,zRLC,"a=Y"},
+	{_RW,zRRC,"b=Y"}, {_RW,zRRC,"c=Y"}, {_RW,zRRC,"d=Y"}, {_RW,zRRC,"e=Y"},
+	{_RW,zRRC,"h=Y"}, {_RW,zRRC,"l=Y"}, {_RW,zRRC,"Y"}, {_RW,zRRC,"a=Y"},
+	{_RW,zRL,"b=Y"}, {_RW,zRL,"c=Y"}, {_RW,zRL,"d=Y"}, {_RW,zRL,"e=Y"},
+	{_RW,zRL,"h=Y"}, {_RW,zRL,"l=Y"}, {_RW,zRL,"Y"}, {_RW,zRL,"a=Y"},
+	{_RW,zRR,"b=Y"}, {_RW,zRR,"c=Y"}, {_RW,zRR,"d=Y"}, {_RW,zRR,"e=Y"},
+	{_RW,zRR,"h=Y"}, {_RW,zRR,"l=Y"}, {_RW,zRR,"Y"}, {_RW,zRR,"a=Y"},
+	{_RW,zSLA,"b=Y"}, {_RW,zSLA,"c=Y"}, {_RW,zSLA,"d=Y"}, {_RW,zSLA,"e=Y"},
+	{_RW,zSLA,"h=Y"}, {_RW,zSLA,"l=Y"}, {_RW,zSLA,"Y"}, {_RW,zSLA,"a=Y"},
+	{_RW,zSRA,"b=Y"}, {_RW,zSRA,"c=Y"}, {_RW,zSRA,"d=Y"}, {_RW,zSRA,"e=Y"},
+	{_RW,zSRA,"h=Y"}, {_RW,zSRA,"l=Y"}, {_RW,zSRA,"Y"}, {_RW,zSRA,"a=Y"},
+	{_RW,zSLL,"b=Y"}, {_RW,zSLL,"c=Y"}, {_RW,zSLL,"d=Y"}, {_RW,zSLL,"e=Y"},
+	{_RW,zSLL,"h=Y"}, {_RW,zSLL,"l=Y"}, {_RW,zSLL,"Y"}, {_RW,zSLL,"a=Y"},
+	{_RW,zSRL,"b=Y"}, {_RW,zSRL,"c=Y"}, {_RW,zSRL,"d=Y"}, {_RW,zSRL,"e=Y"},
+	{_RW,zSRL,"h=Y"}, {_RW,zSRL,"l=Y"}, {_RW,zSRL,"Y"}, {_RW,zSRL,"a=Y"},
+	{_RM,zBIT,"b=0,Y"}, {_RM,zBIT,"c=0,Y"}, {_RM,zBIT,"d=0,Y"}, {_RM,zBIT,"e=0,Y"},
+	{_RM,zBIT,"h=0,Y"}, {_RM,zBIT,"l=0,Y"}, {_RM,zBIT,"0,Y"}, {_RM,zBIT,"a=0,Y"},
+	{_RM,zBIT,"b=1,Y"}, {_RM,zBIT,"c=1,Y"}, {_RM,zBIT,"d=1,Y"}, {_RM,zBIT,"e=1,Y"},
+	{_RM,zBIT,"h=1,Y"}, {_RM,zBIT,"l=1,Y"}, {_RM,zBIT,"1,Y"}, {_RM,zBIT,"a=1,Y"},
+	{_RM,zBIT,"b=2,Y"}, {_RM,zBIT,"c=2,Y"}, {_RM,zBIT,"d=2,Y"}, {_RM,zBIT,"e=2,Y"},
+	{_RM,zBIT,"h=2,Y"}, {_RM,zBIT,"l=2,Y"}, {_RM,zBIT,"2,Y"}, {_RM,zBIT,"a=2,Y"},
+	{_RM,zBIT,"b=3,Y"}, {_RM,zBIT,"c=3,Y"}, {_RM,zBIT,"d=3,Y"}, {_RM,zBIT,"e=3,Y"},
+	{_RM,zBIT,"h=3,Y"}, {_RM,zBIT,"l=3,Y"}, {_RM,zBIT,"3,Y"}, {_RM,zBIT,"a=3,Y"},
+	{_RM,zBIT,"b=4,Y"}, {_RM,zBIT,"c=4,Y"}, {_RM,zBIT,"d=4,Y"}, {_RM,zBIT,"e=4,Y"},
+	{_RM,zBIT,"h=4,Y"}, {_RM,zBIT,"l=4,Y"}, {_RM,zBIT,"4,Y"}, {_RM,zBIT,"a=4,Y"},
+	{_RM,zBIT,"b=5,Y"}, {_RM,zBIT,"c=5,Y"}, {_RM,zBIT,"d=5,Y"}, {_RM,zBIT,"e=5,Y"},
+	{_RM,zBIT,"h=5,Y"}, {_RM,zBIT,"l=5,Y"}, {_RM,zBIT,"5,Y"}, {_RM,zBIT,"a=5,Y"},
+	{_RM,zBIT,"b=6,Y"}, {_RM,zBIT,"c=6,Y"}, {_RM,zBIT,"d=6,Y"}, {_RM,zBIT,"e=6,Y"},
+	{_RM,zBIT,"h=6,Y"}, {_RM,zBIT,"l=6,Y"}, {_RM,zBIT,"6,Y"}, {_RM,zBIT,"a=6,Y"},
+	{_RM,zBIT,"b=7,Y"}, {_RM,zBIT,"c=7,Y"}, {_RM,zBIT,"d=7,Y"}, {_RM,zBIT,"e=7,Y"},
+	{_RM,zBIT,"h=7,Y"}, {_RM,zBIT,"l=7,Y"}, {_RM,zBIT,"7,Y"}, {_RM,zBIT,"a=7,Y"},
+	{_WM,zRES,"b=0,Y"}, {_WM,zRES,"c=0,Y"}, {_WM,zRES,"d=0,Y"}, {_WM,zRES,"e=0,Y"},
+	{_WM,zRES,"h=0,Y"}, {_WM,zRES,"l=0,Y"}, {_WM,zRES,"0,Y"}, {_WM,zRES,"a=0,Y"},
+	{_WM,zRES,"b=1,Y"}, {_WM,zRES,"c=1,Y"}, {_WM,zRES,"d=1,Y"}, {_WM,zRES,"e=1,Y"},
+	{_WM,zRES,"h=1,Y"}, {_WM,zRES,"l=1,Y"}, {_WM,zRES,"1,Y"}, {_WM,zRES,"a=1,Y"},
+	{_WM,zRES,"b=2,Y"}, {_WM,zRES,"c=2,Y"}, {_WM,zRES,"d=2,Y"}, {_WM,zRES,"e=2,Y"},
+	{_WM,zRES,"h=2,Y"}, {_WM,zRES,"l=2,Y"}, {_WM,zRES,"2,Y"}, {_WM,zRES,"a=2,Y"},
+	{_WM,zRES,"b=3,Y"}, {_WM,zRES,"c=3,Y"}, {_WM,zRES,"d=3,Y"}, {_WM,zRES,"e=3,Y"},
+	{_WM,zRES,"h=3,Y"}, {_WM,zRES,"l=3,Y"}, {_WM,zRES,"3,Y"}, {_WM,zRES,"a=3,Y"},
+	{_WM,zRES,"b=4,Y"}, {_WM,zRES,"c=4,Y"}, {_WM,zRES,"d=4,Y"}, {_WM,zRES,"e=4,Y"},
+	{_WM,zRES,"h=4,Y"}, {_WM,zRES,"l=4,Y"}, {_WM,zRES,"4,Y"}, {_WM,zRES,"a=4,Y"},
+	{_WM,zRES,"b=5,Y"}, {_WM,zRES,"c=5,Y"}, {_WM,zRES,"d=5,Y"}, {_WM,zRES,"e=5,Y"},
+	{_WM,zRES,"h=5,Y"}, {_WM,zRES,"l=5,Y"}, {_WM,zRES,"5,Y"}, {_WM,zRES,"a=5,Y"},
+	{_WM,zRES,"b=6,Y"}, {_WM,zRES,"c=6,Y"}, {_WM,zRES,"d=6,Y"}, {_WM,zRES,"e=6,Y"},
+	{_WM,zRES,"h=6,Y"}, {_WM,zRES,"l=6,Y"}, {_WM,zRES,"6,Y"}, {_WM,zRES,"a=6,Y"},
+	{_WM,zRES,"b=7,Y"}, {_WM,zRES,"c=7,Y"}, {_WM,zRES,"d=7,Y"}, {_WM,zRES,"e=7,Y"},
+	{_WM,zRES,"h=7,Y"}, {_WM,zRES,"l=7,Y"}, {_WM,zRES,"7,Y"}, {_WM,zRES,"a=7,Y"},
+	{_WM,zSET,"b=0,Y"}, {_WM,zSET,"c=0,Y"}, {_WM,zSET,"d=0,Y"}, {_WM,zSET,"e=0,Y"},
+	{_WM,zSET,"h=0,Y"}, {_WM,zSET,"l=0,Y"}, {_WM,zSET,"0,Y"}, {_WM,zSET,"a=0,Y"},
+	{_WM,zSET,"b=1,Y"}, {_WM,zSET,"c=1,Y"}, {_WM,zSET,"d=1,Y"}, {_WM,zSET,"e=1,Y"},
+	{_WM,zSET,"h=1,Y"}, {_WM,zSET,"l=1,Y"}, {_WM,zSET,"1,Y"}, {_WM,zSET,"a=1,Y"},
+	{_WM,zSET,"b=2,Y"}, {_WM,zSET,"c=2,Y"}, {_WM,zSET,"d=2,Y"}, {_WM,zSET,"e=2,Y"},
+	{_WM,zSET,"h=2,Y"}, {_WM,zSET,"l=2,Y"}, {_WM,zSET,"2,Y"}, {_WM,zSET,"a=2,Y"},
+	{_WM,zSET,"b=3,Y"}, {_WM,zSET,"c=3,Y"}, {_WM,zSET,"d=3,Y"}, {_WM,zSET,"e=3,Y"},
+	{_WM,zSET,"h=3,Y"}, {_WM,zSET,"l=3,Y"}, {_WM,zSET,"3,Y"}, {_WM,zSET,"a=3,Y"},
+	{_WM,zSET,"b=4,Y"}, {_WM,zSET,"c=4,Y"}, {_WM,zSET,"d=4,Y"}, {_WM,zSET,"e=4,Y"},
+	{_WM,zSET,"h=4,Y"}, {_WM,zSET,"l=4,Y"}, {_WM,zSET,"4,Y"}, {_WM,zSET,"a=4,Y"},
+	{_WM,zSET,"b=5,Y"}, {_WM,zSET,"c=5,Y"}, {_WM,zSET,"d=5,Y"}, {_WM,zSET,"e=5,Y"},
+	{_WM,zSET,"h=5,Y"}, {_WM,zSET,"l=5,Y"}, {_WM,zSET,"5,Y"}, {_WM,zSET,"a=5,Y"},
+	{_WM,zSET,"b=6,Y"}, {_WM,zSET,"c=6,Y"}, {_WM,zSET,"d=6,Y"}, {_WM,zSET,"e=6,Y"},
+	{_WM,zSET,"h=6,Y"}, {_WM,zSET,"l=6,Y"}, {_WM,zSET,"6,Y"}, {_WM,zSET,"a=6,Y"},
+	{_WM,zSET,"b=7,Y"}, {_WM,zSET,"c=7,Y"}, {_WM,zSET,"d=7,Y"}, {_WM,zSET,"e=7,Y"},
+	{_WM,zSET,"h=7,Y"}, {_WM,zSET,"l=7,Y"}, {_WM,zSET,"7,Y"}, {_WM,zSET,"a=7,Y"}
+};
+
+static z80dasm mnemonic_cb[256] = {
+	{_0, zRLC,"b"}, {_0, zRLC,"c"}, {_0, zRLC,"d"}, {_0, zRLC,"e"},
+	{_0, zRLC,"h"}, {_0, zRLC,"l"}, {_RW,zRLC,"(hl)"}, {_0, zRLC,"a"},
+	{_0, zRRC,"b"}, {_0, zRRC,"c"}, {_0, zRRC,"d"}, {_0, zRRC,"e"},
+	{_0, zRRC,"h"}, {_0, zRRC,"l"}, {_RW,zRRC,"(hl)"}, {_0, zRRC,"a"},
+	{_0, zRL,"b"}, {_0, zRL,"c"}, {_0, zRL,"d"}, {_0, zRL,"e"},
+	{_0, zRL,"h"}, {_0, zRL,"l"}, {_RW,zRL,"(hl)"}, {_0, zRL,"a"},
+	{_0, zRR,"b"}, {_0, zRR,"c"}, {_0, zRR,"d"}, {_0, zRR,"e"},
+	{_0, zRR,"h"}, {_0, zRR,"l"}, {_RW,zRR,"(hl)"}, {_0, zRR,"a"},
+	{_0, zSLA,"b"}, {_0, zSLA,"c"}, {_0, zSLA,"d"}, {_0, zSLA,"e"},
+	{_0, zSLA,"h"}, {_0, zSLA,"l"}, {_RW,zSLA,"(hl)"}, {_0, zSLA,"a"},
+	{_0, zSRA,"b"}, {_0, zSRA,"c"}, {_0, zSRA,"d"}, {_0, zSRA,"e"},
+	{_0, zSRA,"h"}, {_0, zSRA,"l"}, {_RW,zSRA,"(hl)"}, {_0, zSRA,"a"},
+	{_0, zSLL,"b"}, {_0, zSLL,"c"}, {_0, zSLL,"d"}, {_0, zSLL,"e"},
+	{_0, zSLL,"h"}, {_0, zSLL,"l"}, {_RW,zSLL,"(hl)"}, {_0, zSLL,"a"},
+	{_0, zSRL,"b"}, {_0, zSRL,"c"}, {_0, zSRL,"d"}, {_0, zSRL,"e"},
+	{_0, zSRL,"h"}, {_0, zSRL,"l"}, {_RW,zSRL,"(hl)"}, {_0, zSRL,"a"},
+	{_0, zBIT,"0,b"}, {_0, zBIT,"0,c"}, {_0, zBIT,"0,d"}, {_0, zBIT,"0,e"},
+	{_0, zBIT,"0,h"}, {_0, zBIT,"0,l"}, {_RM,zBIT,"0,(hl)"},{_0, zBIT,"0,a"},
+	{_0, zBIT,"1,b"}, {_0, zBIT,"1,c"}, {_0, zBIT,"1,d"}, {_0, zBIT,"1,e"},
+	{_0, zBIT,"1,h"}, {_0, zBIT,"1,l"}, {_RM,zBIT,"1,(hl)"},{_0, zBIT,"1,a"},
+	{_0, zBIT,"2,b"}, {_0, zBIT,"2,c"}, {_0, zBIT,"2,d"}, {_0, zBIT,"2,e"},
+	{_0, zBIT,"2,h"}, {_0, zBIT,"2,l"}, {_RM,zBIT,"2,(hl)"},{_0, zBIT,"2,a"},
+	{_0, zBIT,"3,b"}, {_0, zBIT,"3,c"}, {_0, zBIT,"3,d"}, {_0, zBIT,"3,e"},
+	{_0, zBIT,"3,h"}, {_0, zBIT,"3,l"}, {_RM,zBIT,"3,(hl)"},{_0, zBIT,"3,a"},
+	{_0, zBIT,"4,b"}, {_0, zBIT,"4,c"}, {_0, zBIT,"4,d"}, {_0, zBIT,"4,e"},
+	{_0, zBIT,"4,h"}, {_0, zBIT,"4,l"}, {_RM,zBIT,"4,(hl)"},{_0, zBIT,"4,a"},
+	{_0, zBIT,"5,b"}, {_0, zBIT,"5,c"}, {_0, zBIT,"5,d"}, {_0, zBIT,"5,e"},
+	{_0, zBIT,"5,h"}, {_0, zBIT,"5,l"}, {_RM,zBIT,"5,(hl)"},{_0, zBIT,"5,a"},
+	{_0, zBIT,"6,b"}, {_0, zBIT,"6,c"}, {_0, zBIT,"6,d"}, {_0, zBIT,"6,e"},
+	{_0, zBIT,"6,h"}, {_0, zBIT,"6,l"}, {_RM,zBIT,"6,(hl)"},{_0, zBIT,"6,a"},
+	{_0, zBIT,"7,b"}, {_0, zBIT,"7,c"}, {_0, zBIT,"7,d"}, {_0, zBIT,"7,e"},
+	{_0, zBIT,"7,h"}, {_0, zBIT,"7,l"}, {_RM,zBIT,"7,(hl)"},{_0, zBIT,"7,a"},
+	{_0, zRES,"0,b"}, {_0, zRES,"0,c"}, {_0, zRES,"0,d"}, {_0, zRES,"0,e"},
+	{_0, zRES,"0,h"}, {_0, zRES,"0,l"}, {_WM,zRES,"0,(hl)"},{_0, zRES,"0,a"},
+	{_0, zRES,"1,b"}, {_0, zRES,"1,c"}, {_0, zRES,"1,d"}, {_0, zRES,"1,e"},
+	{_0, zRES,"1,h"}, {_0, zRES,"1,l"}, {_WM,zRES,"1,(hl)"},{_0, zRES,"1,a"},
+	{_0, zRES,"2,b"}, {_0, zRES,"2,c"}, {_0, zRES,"2,d"}, {_0, zRES,"2,e"},
+	{_0, zRES,"2,h"}, {_0, zRES,"2,l"}, {_WM,zRES,"2,(hl)"},{_0, zRES,"2,a"},
+	{_0, zRES,"3,b"}, {_0, zRES,"3,c"}, {_0, zRES,"3,d"}, {_0, zRES,"3,e"},
+	{_0, zRES,"3,h"}, {_0, zRES,"3,l"}, {_WM,zRES,"3,(hl)"},{_0, zRES,"3,a"},
+	{_0, zRES,"4,b"}, {_0, zRES,"4,c"}, {_0, zRES,"4,d"}, {_0, zRES,"4,e"},
+	{_0, zRES,"4,h"}, {_0, zRES,"4,l"}, {_WM,zRES,"4,(hl)"},{_0, zRES,"4,a"},
+	{_0, zRES,"5,b"}, {_0, zRES,"5,c"}, {_0, zRES,"5,d"}, {_0, zRES,"5,e"},
+	{_0, zRES,"5,h"}, {_0, zRES,"5,l"}, {_WM,zRES,"5,(hl)"},{_0, zRES,"5,a"},
+	{_0, zRES,"6,b"}, {_0, zRES,"6,c"}, {_0, zRES,"6,d"}, {_0, zRES,"6,e"},
+	{_0, zRES,"6,h"}, {_0, zRES,"6,l"}, {_WM,zRES,"6,(hl)"},{_0, zRES,"6,a"},
+	{_0, zRES,"7,b"}, {_0, zRES,"7,c"}, {_0, zRES,"7,d"}, {_0, zRES,"7,e"},
+	{_0, zRES,"7,h"}, {_0, zRES,"7,l"}, {_WM,zRES,"7,(hl)"},{_0, zRES,"7,a"},
+	{_0, zSET,"0,b"}, {_0, zSET,"0,c"}, {_0, zSET,"0,d"}, {_0, zSET,"0,e"},
+	{_0, zSET,"0,h"}, {_0, zSET,"0,l"}, {_WM,zSET,"0,(hl)"},{_0, zSET,"0,a"},
+	{_0, zSET,"1,b"}, {_0, zSET,"1,c"}, {_0, zSET,"1,d"}, {_0, zSET,"1,e"},
+	{_0, zSET,"1,h"}, {_0, zSET,"1,l"}, {_WM,zSET,"1,(hl)"},{_0, zSET,"1,a"},
+	{_0, zSET,"2,b"}, {_0, zSET,"2,c"}, {_0, zSET,"2,d"}, {_0, zSET,"2,e"},
+	{_0, zSET,"2,h"}, {_0, zSET,"2,l"}, {_WM,zSET,"2,(hl)"},{_0, zSET,"2,a"},
+	{_0, zSET,"3,b"}, {_0, zSET,"3,c"}, {_0, zSET,"3,d"}, {_0, zSET,"3,e"},
+	{_0, zSET,"3,h"}, {_0, zSET,"3,l"}, {_WM,zSET,"3,(hl)"},{_0, zSET,"3,a"},
+	{_0, zSET,"4,b"}, {_0, zSET,"4,c"}, {_0, zSET,"4,d"}, {_0, zSET,"4,e"},
+	{_0, zSET,"4,h"}, {_0, zSET,"4,l"}, {_WM,zSET,"4,(hl)"},{_0, zSET,"4,a"},
+	{_0, zSET,"5,b"}, {_0, zSET,"5,c"}, {_0, zSET,"5,d"}, {_0, zSET,"5,e"},
+	{_0, zSET,"5,h"}, {_0, zSET,"5,l"}, {_WM,zSET,"5,(hl)"},{_0, zSET,"5,a"},
+	{_0, zSET,"6,b"}, {_0, zSET,"6,c"}, {_0, zSET,"6,d"}, {_0, zSET,"6,e"},
+	{_0, zSET,"6,h"}, {_0, zSET,"6,l"}, {_WM,zSET,"6,(hl)"},{_0, zSET,"6,a"},
+	{_0, zSET,"7,b"}, {_0, zSET,"7,c"}, {_0, zSET,"7,d"}, {_0, zSET,"7,e"},
+	{_0, zSET,"7,h"}, {_0, zSET,"7,l"}, {_WM,zSET,"7,(hl)"},{_0, zSET,"7,a"}
+};
+
+static z80dasm mnemonic_ed[256]= {
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RP,zIN,"b,(c)"}, {_WP,zOUT,"(c),b"}, {_0, zSBC,"hl,bc"}, {_WM,zLD,"(W),bc"},
+	{_0, zNEG,0},		{_0, zRETN,0},		{_0, zIM,"0"}, {_0, zLD,"i,a"},
+	{_RP,zIN,"c,(c)"}, {_WP,zOUT,"(c),c"}, {_0, zADC,"hl,bc"}, {_RM,zLD,"bc,(W)"},
+	{_0, zNEG,"*"}, {_0, zRETI,0}, {_0, zIM,"0"}, {_0, zLD,"r,a"},
+	{_RP,zIN,"d,(c)"}, {_WP,zOUT,"(c),d"}, {_0, zSBC,"hl,de"}, {_WM,zLD,"(W),de"},
+	{_0, zNEG,"*"}, {_0, zRETN,0}, {_0, zIM,"1"}, {_0, zLD,"a,i"},
+	{_RP,zIN,"e,(c)"}, {_WP,zOUT,"(c),e"}, {_0, zADC,"hl,de"}, {_RM,zLD,"de,(W)"},
+	{_0, zNEG,"*"}, {_0, zRETI,0}, {_0, zIM,"2"}, {_0, zLD,"a,r"},
+	{_RP,zIN,"h,(c)"}, {_WP,zOUT,"(c),h"}, {_0, zSBC,"hl,hl"}, {_WM,zLD,"(W),hl"},
+	{_0, zNEG,"*"}, {_0, zRETN,0}, {_0, zIM,"0"}, {_RW,zRRD,"(hl)"},
+	{_RP,zIN,"l,(c)"}, {_WP,zOUT,"(c),l"}, {_0, zADC,"hl,hl"}, {_RM,zLD,"hl,(W)"},
+	{_0, zNEG,"*"}, {_0, zRETI,0}, {_0, zIM,"0"}, {_RW,zRLD,"(hl)"},
+	{_RP,zIN,"0,(c)"}, {_WP,zOUT,"(c),0"}, {_0, zSBC,"hl,sp"}, {_WM,zLD,"(W),sp"},
+	{_0, zNEG,"*"}, {_0, zRETN,0}, {_0, zIM,"1"}, {_0, zDB,"?"},
+	{_RP,zIN,"a,(c)"}, {_WP,zOUT,"(c),a"}, {_0, zADC,"hl,sp"}, {_RM,zLD,"sp,(W)"},
+	{_0, zNEG,"*"}, {_0, zRETI,0}, {_0, zIM,"2"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RW,zLDI,0},		{_RM,zCPI,0},		{_RP,zINI,0},		{_WP,zOUTI,0},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RW,zLDD,0},		{_RM,zCPD,0},		{_RP,zIND,0},		{_WP,zOUTD,0},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RW,zLDIR,0},		{_RM,zCPIR,0},		{_RP,zINIR,0},		{_WP,zOTIR,0},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RW,zLDDR,0},		{_RM,zCPDR,0},		{_RP,zINDR,0},		{_WP,zOTDR,0},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}
+};
+
+static z80dasm mnemonic_xx[256]= {
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zADD,"I,bc"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zADD,"I,de"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zLD,"I,N"}, {_WM,zLD,"(W),I"}, {_0, zINC,"I"},
+	{_0, zINC,"Ih"}, {_0, zDEC,"Ih"}, {_0, zLD,"Ih,B"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zADD,"I,I"}, {_RM,zLD,"I,(W)"}, {_0, zDEC,"I"},
+	{_0, zINC,"Il"}, {_0, zDEC,"Il"}, {_0, zLD,"Il,B"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_RW,zINC,"X"}, {_RW,zDEC,"X"}, {_WM,zLD,"X,B"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zADD,"I,sp"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zLD,"b,Ih"}, {_0, zLD,"b,Il"}, {_RM,zLD,"b,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zLD,"c,Ih"}, {_0, zLD,"c,Il"}, {_RM,zLD,"c,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zLD,"d,Ih"}, {_0, zLD,"d,Il"}, {_RM,zLD,"d,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zLD,"e,Ih"}, {_0, zLD,"e,Il"}, {_RM,zLD,"e,X"}, {_0, zDB,"?"},
+	{_0, zLD,"Ih,b"}, {_0, zLD,"Ih,c"}, {_0, zLD,"Ih,d"}, {_0, zLD,"Ih,e"},
+	{_0, zLD,"Ih,Ih"}, {_0, zLD,"Ih,Il"}, {_RM,zLD,"h,X"}, {_0, zLD,"Ih,a"},
+	{_0, zLD,"Il,b"}, {_0, zLD,"Il,c"}, {_0, zLD,"Il,d"}, {_0, zLD,"Il,e"},
+	{_0, zLD,"Il,Ih"}, {_0, zLD,"Il,Il"}, {_RM,zLD,"l,X"}, {_0, zLD,"Il,a"},
+	{_WM,zLD,"X,b"}, {_WM,zLD,"X,c"}, {_WM,zLD,"X,d"}, {_WM,zLD,"X,e"},
+	{_WM,zLD,"X,h"}, {_WM,zLD,"X,l"}, {_0, zDB,"?"}, {_WM,zLD,"X,a"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zLD,"a,Ih"}, {_0, zLD,"a,Il"}, {_RM,zLD,"a,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zADD,"a,Ih"}, {_0, zADD,"a,Il"}, {_RM,zADD,"a,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zADC,"a,Ih"}, {_0, zADC,"a,Il"}, {_RM,zADC,"a,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zSUB,"Ih"}, {_0, zSUB,"Il"}, {_RM,zSUB,"X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zSBC,"a,Ih"}, {_0, zSBC,"a,Il"}, {_RM,zSBC,"a,X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zAND,"Ih"}, {_0, zAND,"Il"}, {_RM,zAND,"X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zXOR,"Ih"}, {_0, zXOR,"Il"}, {_RM,zXOR,"X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zOR,"Ih"}, {_0, zOR,"Il"}, {_RM,zOR,"X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zCP,"Ih"}, {_0, zCP,"Il"}, {_RM,zCP,"X"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"cb"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zPOP,"I"}, {_0, zDB,"?"}, {_RW,zEX,"(sp),I"},
+	{_0, zDB,"?"}, {_0, zPUSH,"I"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_JP,zJP,"(I)"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zLD,"sp,I"}, {_0, zDB,"?"}, {_0, zDB,"?"},
+	{_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}, {_0, zDB,"?"}
+};
+
+static z80dasm mnemonic_main[256]= {
+	{_0, zNOP,0},		{_0, zLD,"bc,N"}, {_WM,zLD,"(bc),a"}, {_0, zINC,"bc"},
+	{_0, zINC,"b"}, {_0, zDEC,"b"}, {_0, zLD,"b,B"}, {_0, zRLCA,0},
+	{_0, zEX,"af,af'"}, {_0, zADD,"hl,bc"}, {_RM,zLD,"a,(bc)"}, {_0, zDEC,"bc"},
+	{_0, zINC,"c"}, {_0, zDEC,"c"}, {_0, zLD,"c,B"}, {_0, zRRCA,0},
+	{_JR,zDJNZ,"O"}, {_0, zLD,"de,N"}, {_WM,zLD,"(de),a"}, {_0, zINC,"de"},
+	{_0, zINC,"d"}, {_0, zDEC,"d"}, {_0, zLD,"d,B"}, {_0, zRLA,0},
+	{_JR,zJR,"O"}, {_0, zADD,"hl,de"}, {_RM,zLD,"a,(de)"}, {_0, zDEC,"de"},
+	{_0, zINC,"e"}, {_0, zDEC,"e"}, {_0, zLD,"e,B"}, {_0, zRRA,0},
+	{_JR,zJR,"nz,O"}, {_0, zLD,"hl,N"}, {_WM,zLD,"(W),hl"}, {_0, zINC,"hl"},
+	{_0, zINC,"h"}, {_0, zDEC,"h"}, {_0, zLD,"h,B"}, {_0, zDAA,0},
+	{_JR,zJR,"z,O"}, {_0, zADD,"hl,hl"}, {_RM,zLD,"hl,(W)"}, {_0, zDEC,"hl"},
+	{_0, zINC,"l"}, {_0, zDEC,"l"}, {_0, zLD,"l,B"}, {_0, zCPL,0},
+	{_JR,zJR,"nc,O"}, {_0, zLD,"sp,N"}, {_WM,zLD,"(W),a"}, {_0, zINC,"sp"},
+	{_RW,zINC,"(hl)"}, {_RW,zDEC,"(hl)"}, {_WM,zLD,"(hl),B"}, {_0, zSCF,0},
+	{_JR,zJR,"c,O"}, {_0, zADD,"hl,sp"}, {_RM,zLD,"a,(W)"}, {_0, zDEC,"sp"},
+	{_0, zINC,"a"}, {_0, zDEC,"a"}, {_0, zLD,"a,B"}, {_0, zCCF,0},
+	{_0, zLD,"b,b"}, {_0, zLD,"b,c"}, {_0, zLD,"b,d"}, {_0, zLD,"b,e"},
+	{_0, zLD,"b,h"}, {_0, zLD,"b,l"}, {_RM,zLD,"b,(hl)"}, {_0, zLD,"b,a"},
+	{_0, zLD,"c,b"}, {_0, zLD,"c,c"}, {_0, zLD,"c,d"}, {_0, zLD,"c,e"},
+	{_0, zLD,"c,h"}, {_0, zLD,"c,l"}, {_RM,zLD,"c,(hl)"}, {_0, zLD,"c,a"},
+	{_0, zLD,"d,b"}, {_0, zLD,"d,c"}, {_0, zLD,"d,d"}, {_0, zLD,"d,e"},
+	{_0, zLD,"d,h"}, {_0, zLD,"d,l"}, {_RM,zLD,"d,(hl)"}, {_0, zLD,"d,a"},
+	{_0, zLD,"e,b"}, {_0, zLD,"e,c"}, {_0, zLD,"e,d"}, {_0, zLD,"e,e"},
+	{_0, zLD,"e,h"}, {_0, zLD,"e,l"}, {_RM,zLD,"e,(hl)"}, {_0, zLD,"e,a"},
+	{_0, zLD,"h,b"}, {_0, zLD,"h,c"}, {_0, zLD,"h,d"}, {_0, zLD,"h,e"},
+	{_0, zLD,"h,h"}, {_0, zLD,"h,l"}, {_RM,zLD,"h,(hl)"}, {_0, zLD,"h,a"},
+	{_0, zLD,"l,b"}, {_0, zLD,"l,c"}, {_0, zLD,"l,d"}, {_0, zLD,"l,e"},
+	{_0, zLD,"l,h"}, {_0, zLD,"l,l"}, {_RM,zLD,"l,(hl)"}, {_0, zLD,"l,a"},
+	{_WM,zLD,"(hl),b"}, {_WM,zLD,"(hl),c"}, {_WM,zLD,"(hl),d"}, {_WM,zLD,"(hl),e"},
+	{_WM,zLD,"(hl),h"}, {_WM,zLD,"(hl),l"}, {_0, zHLT,0}, {_WM,zLD,"(hl),a"},
+	{_0, zLD,"a,b"}, {_0, zLD,"a,c"}, {_0, zLD,"a,d"}, {_0, zLD,"a,e"},
+	{_0, zLD,"a,h"}, {_0, zLD,"a,l"}, {_RM,zLD,"a,(hl)"}, {_0, zLD,"a,a"},
+	{_0, zADD,"a,b"}, {_0, zADD,"a,c"}, {_0, zADD,"a,d"}, {_0, zADD,"a,e"},
+	{_0, zADD,"a,h"}, {_0, zADD,"a,l"}, {_RM,zADD,"a,(hl)"},{_0, zADD,"a,a"},
+	{_0, zADC,"a,b"}, {_0, zADC,"a,c"}, {_0, zADC,"a,d"}, {_0, zADC,"a,e"},
+	{_0, zADC,"a,h"}, {_0, zADC,"a,l"}, {_RM,zADC,"a,(hl)"},{_0, zADC,"a,a"},
+	{_0, zSUB,"b"}, {_0, zSUB,"c"}, {_0, zSUB,"d"}, {_0, zSUB,"e"},
+	{_0, zSUB,"h"}, {_0, zSUB,"l"}, {_RM,zSUB,"(hl)"}, {_0, zSUB,"a"},
+	{_0, zSBC,"a,b"}, {_0, zSBC,"a,c"}, {_0, zSBC,"a,d"}, {_0, zSBC,"a,e"},
+	{_0, zSBC,"a,h"}, {_0, zSBC,"a,l"}, {_RM,zSBC,"a,(hl)"},{_0, zSBC,"a,a"},
+	{_0, zAND,"b"}, {_0, zAND,"c"}, {_0, zAND,"d"}, {_0, zAND,"e"},
+	{_0, zAND,"h"}, {_0, zAND,"l"}, {_RM,zAND,"(hl)"}, {_0, zAND,"a"},
+	{_0, zXOR,"b"}, {_0, zXOR,"c"}, {_0, zXOR,"d"}, {_0, zXOR,"e"},
+	{_0, zXOR,"h"}, {_0, zXOR,"l"}, {_RM,zXOR,"(hl)"}, {_0, zXOR,"a"},
+	{_0, zOR,"b"}, {_0, zOR,"c"}, {_0, zOR,"d"}, {_0, zOR,"e"},
+	{_0, zOR,"h"}, {_0, zOR,"l"}, {_RM,zOR,"(hl)"}, {_0, zOR,"a"},
+	{_0, zCP,"b"}, {_0, zCP,"c"}, {_0, zCP,"d"}, {_0, zCP,"e"},
+	{_0, zCP,"h"}, {_0, zCP,"l"}, {_RM,zCP,"(hl)"}, {_0, zCP,"a"},
+	{_0, zRET,"nz"}, {_0, zPOP,"bc"}, {_JP,zJP,"nz,A"}, {_JP,zJP,"A"},
+	{_JP,zCALL,"nz,A"}, {_0, zPUSH,"bc"}, {_0, zADD,"a,B"}, {_JP,zRST,"V"},
+	{_0, zRET,"z"}, {_0, zRET,0}, {_JP,zJP,"z,A"}, {_0, zDB,"cb"},
+	{_JP,zCALL,"z,A"}, {_JP,zCALL,"A"}, {_0, zADC,"a,B"}, {_JP,zRST,"V"},
+	{_0, zRET,"nc"}, {_0, zPOP,"de"}, {_JP,zJP,"nc,A"}, {_WP,zOUT,"(P),a"},
+	{_JP,zCALL,"nc,A"}, {_0, zPUSH,"de"}, {_0, zSUB,"B"}, {_JP,zRST,"V"},
+	{_0, zRET,"c"}, {_0, zEXX,0}, {_JP,zJP,"c,A"}, {_RP,zIN,"a,(P)"},
+	{_JP,zCALL,"c,A"}, {_0, zDB,"dd"}, {_0, zSBC,"a,B"}, {_JP,zRST,"V"},
+	{_0, zRET,"po"}, {_0, zPOP,"hl"}, {_JP,zJP,"po,A"}, {_RW,zEX,"(sp),hl"},
+	{_JP,zCALL,"po,A"}, {_0, zPUSH,"hl"}, {_0, zAND,"B"}, {_JP,zRST,"V"},
+	{_0, zRET,"pe"}, {_JP,zJP,"(hl)"}, {_JP,zJP,"pe,A"}, {_0, zEX,"de,hl"},
+	{_JP,zCALL,"pe,A"}, {_0, zDB,"ed"}, {_0, zXOR,"B"}, {_JP,zRST,"V"},
+	{_0, zRET,"p"}, {_0, zPOP,"af"}, {_JP,zJP,"p,A"}, {_0, zDI,0},
+	{_JP,zCALL,"p,A"}, {_0, zPUSH,"af"}, {_0, zOR,"B"}, {_JP,zRST,"V"},
+	{_0, zRET,"m"}, {_0, zLD,"sp,hl"}, {_JP,zJP,"m,A"}, {_0, zEI,0},
+	{_JP,zCALL,"m,A"}, {_0, zDB,"fd"}, {_0, zCP,"B"}, {_JP,zRST,"V"}
+};
+
+static char sign(INT8 offset)
+{
+ return (offset < 0)? '-':'+';
+}
+
+static int offs(INT8 offset)
+{
+	if (offset < 0) return -offset;
+	return offset;
+}
+
+/****************************************************************************
+ * Disassemble opcode at PC and return number of bytes it takes
+ ****************************************************************************/
+unsigned DasmZ80( char *buffer, unsigned pc )
+{
+ z80dasm *d;
+	const char *symbol, *src;
+	const char *ixy;
+	char *dst;
+	unsigned PC = pc;
+	INT8 offset = 0;
+	UINT8 op, op1;
+	UINT16 ea = 0, xy = 0;
+
+	ixy = "oops!!";
+	dst = buffer;
+	symbol = NULL;
+
+	op = cpu_readop( pc++ );
+ op1 = 0; /* keep GCC happy */
+
+ switch (op)
+	{
+	case 0xcb:
+		op = cpu_readop(pc++);
+ d = &mnemonic_cb[op];
+		break;
+	case 0xed:
+		op1 = cpu_readop(pc++);
+ d = &mnemonic_ed[op1];
+		break;
+	case 0xdd:
+		ixy = "ix";
+		op1 = cpu_readop(pc++);
+		if( op1 == 0xcb )
+		{
+			offset = (INT8) cpu_readop_arg(pc++);
+			op1 = cpu_readop_arg(pc++); /* fourth byte from OP_RAM! */
+			xy = z80_get_reg( Z80_IX );
+			ea = (xy + offset) & 0xffff;
+			d = &mnemonic_xx_cb[op1];
+		}
+		else d = &mnemonic_xx[op1];
+ break;
+	case 0xfd:
+		ixy = "iy";
+		op1 = cpu_readop(pc++);
+		if( op1 == 0xcb )
+		{
+			offset = (INT8) cpu_readop_arg(pc++);
+			op1 = cpu_readop_arg(pc++); /* fourth byte from OP_RAM! */
+			xy = z80_get_reg( Z80_IY );
+			ea = (ea + offset) & 0xffff;
+			d = &mnemonic_xx_cb[op1];
+		}
+		else d = &mnemonic_xx[op1];
+ break;
+	default:
+		d = &mnemonic_main[op];
+		break;
+	}
+
+ if( d->arguments )
+	{
+		dst += sprintf(dst, "%-4s ", s_mnemonic[d->mnemonic]);
+		src = d->arguments;
+		while( *src )
+		{
+			switch( *src )
+			{
+			case '?': /* illegal opcode */
+				dst += sprintf( dst, "$%02x,$%02x", op, op1);
+				break;
+			case 'A':
+				ea = cpu_readop_arg(pc) + ( cpu_readop_arg((pc+1)&0xffff) << 8);
+				pc += 2;
+				symbol = set_ea_info(0, ea, EA_UINT16, d->access);
+				dst += sprintf( dst, "%s", symbol );
+ break;
+ case 'B': /* Byte op arg */
+				ea = cpu_readop_arg( pc++ );
+				symbol = set_ea_info(1, ea, EA_UINT8, EA_VALUE);
+				dst += sprintf( dst, "%s", symbol );
+				break;
+			case '(': /* Memory byte at (HL) */
+ *dst++ = *src;
+				if( !strncmp( src, "(bc)", 4) )
+				{
+					ea = z80_get_reg( Z80_BC );
+					set_ea_info(0, ea, EA_UINT8, d->access);
+				}
+ else
+				if( !strncmp( src, "(de)", 4) )
+				{
+					ea = z80_get_reg( Z80_DE );
+					set_ea_info(0, ea, EA_UINT8, d->access);
+ }
+ else
+ if( !strncmp( src, "(hl)", 4) )
+				{
+					ea = z80_get_reg( Z80_HL );
+					if( d->access == EA_ABS_PC )
+						set_ea_info(0, ea, EA_DEFAULT, EA_ABS_PC);
+					else
+						set_ea_info(0, ea, EA_UINT8, d->access);
+ }
+				else
+				if( !strncmp( src, "(sp)", 4) )
+				{
+					ea = z80_get_reg( Z80_SP );
+					set_ea_info(0, ea, EA_UINT16, d->access);
+ }
+				else
+				if( !strncmp( src, "(P)", 3) )
+				{
+					ea = (z80_get_reg( Z80_AF ) & 0xff00) | cpu_readop_arg( pc );
+ set_ea_info(0, ea, EA_UINT16, d->access);
+ }
+ else
+ if( !strncmp( src, "(c)", 3) )
+				{
+					ea = z80_get_reg( Z80_BC );
+					set_ea_info(0, ea, EA_UINT16, d->access);
+ }
+ else
+				if( !strncmp( src, "(I)", 3) )
+				{
+					ea = xy;
+					set_ea_info(0, ea, EA_DEFAULT, d->access);
+ }
+ break;
+			case 'N': /* Immediate 16 bit */
+				ea = cpu_readop_arg(pc) + ( cpu_readop_arg((pc+1)&0xffff) << 8 );
+				pc += 2;
+				symbol = set_ea_info(1, ea, EA_UINT16, EA_VALUE );
+				dst += sprintf( dst, "%s", symbol );
+ break;
+			case 'O': /* Offset relative to PC */
+				offset = (INT8) cpu_readop_arg(pc++);
+				symbol = set_ea_info(0, PC, offset + 2, d->access);
+				dst += sprintf( dst, "%s", symbol );
+				break;
+			case 'P': /* Port number */
+				ea = cpu_readop_arg( pc++ );
+				dst += sprintf( dst, "$%02X", ea );
+ break;
+ case 'V': /* Restart vector */
+				ea = op & 0x38;
+				symbol = set_ea_info(0, ea, EA_UINT8, d->access);
+				dst += sprintf( dst, "%s", symbol );
+				break;
+			case 'W': /* Memory address word */
+				ea = cpu_readop_arg(pc) + ( cpu_readop_arg((pc+1)&0xffff) << 8);
+				pc += 2;
+				symbol = set_ea_info(0, ea, EA_UINT16, d->access);
+				dst += sprintf( dst, "%s", symbol );
+				break;
+			case 'X':
+				offset = (INT8) cpu_readop_arg(pc++);
+ ea = (xy + offset) & 0xffff;
+ case 'Y':
+				symbol = set_ea_info(0, ea, EA_UINT8, d->access);
+				dst += sprintf( dst,"(%s%c$%02x)", ixy, sign(offset), offs(offset) );
+				break;
+			case 'I':
+				dst += sprintf( dst, "%s", ixy);
+				break;
+			default:
+				*dst++ = *src;
+			}
+			src++;
+		}
+		*dst = '\0';
+	}
+	else
+	{
+		dst += sprintf(dst, "%s", s_mnemonic[d->mnemonic]);
+ }
+
+ return pc - PC;
+}
+
+#endif
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_qsf/z80dasm.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/eng_ssf.c Added

@@ -0,0 +1,347 @@
+/*
+	Audio Overload SDK - SSF file format engine
+
+	Copyright (c) 2007 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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.
+*/
+
+/*
+
+Sega driver commands:
+
+00 - NOP
+01 - SEQUENCE_START
+02 - SEQUENCE_STOP
+03 - SEQUENCE_PAUSE
+04 - SEQUENCE_CONTINUE
+05 - SEQUENCE_VOLUME
+06 - SEQUENCE_ALLSTOP
+07 - SEQUENCE_TEMPO
+08 - SEQUENCE_MAP
+09 - HOST_MIDI
+0A - VOLUME_ANALYZE_START
+0B - VOLUME_ANALYZE_STOP
+0C - DSP CLEAR
+0D - ALL OFF
+0E - SEQUENCE PAN
+0F - N/A
+10 - SOUND INITIALIZE
+11 - Yamaha 3D check (8C)
+12 - QSound check (8B)
+13 - Yamaha 3D init (8D)
+80 - CD level
+81 - CD pan
+82 - MASTER VOLUME
+83 - EFFECT_CHANGE
+84 - NOP
+85 - PCM stream play start
+86 - PCM stream play end
+87 - MIXER_CHANGE
+88 - Mixer parameter change
+89 - Hardware check
+8A - PCM parameter change
+8B - QSound check
+8C - Yamaha 3D check
+8D - Yamaha 3D init
+
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+#include "corlett.h"
+#include "sat_hw.h"
+#include "scsp.h"
+#include "m68kcpu.h"
+
+#define DEBUG_LOADER	(0)
+
+typedef struct {
+ corlett_t	*c;
+ char 		psfby[256];
+ uint32		decaybegin, decayend, total_samples;
+ uint8 init_sat_ram[512*1024];
+ m68ki_cpu_core *cpu;
+} ssf_synth_t;
+
+void *ssf_start(const char *path, uint8 *buffer, uint32 length)
+{
+ ssf_synth_t *s = malloc (sizeof (ssf_synth_t));
+ memset (s, 0, sizeof (ssf_synth_t));
+	uint8 *file, *lib_decoded, *lib_raw_file;
+	uint32 offset, lengthMS, fadeMS;
+	uint64 file_len, lib_len, lib_raw_length;
+	corlett_t *lib;
+	char *libfile;
+	int i;
+
+ s->cpu = m68k_init ();
+//	// clear Saturn work RAM before we start scribbling in it
+//	memset(cpu->sat_ram, 0, 512*1024);
+
+	// Decode the current SSF
+	if (corlett_decode(buffer, length, &file, &file_len, &s->c) != AO_SUCCESS)
+	{
+		ssf_stop (s);
+		return NULL;
+	}
+
+	#if DEBUG_LOADER
+	printf("%d bytes decoded\n", file_len);
+	#endif
+
+	// Get the library file, if any
+	for (i=0; i<9; i++) 
+	{
+		libfile = i ? s->c->libaux[i-1] : s->c->lib;
+		if (libfile[0] != 0)
+		{
+			uint64 tmp_length;
+	
+ char libpath[PATH_MAX];
+ ao_getlibpath (path, s->c->lib, libpath, sizeof (libpath));
+			#if DEBUG_LOADER	
+			printf("Loading library: %s\n", c->lib);
+			#endif
+			if (ao_get_lib(libfile, &lib_raw_file, &tmp_length) != AO_SUCCESS)
+			{
+ ssf_stop (s);
+ return NULL;
+			}
+			lib_raw_length = tmp_length;
+		
+			if (corlett_decode(lib_raw_file, lib_raw_length, &lib_decoded, &lib_len, &lib) != AO_SUCCESS)
+			{
+				free(lib_raw_file);
+ ssf_stop (s);
+ return NULL;
+			}
+				
+			// Free up raw file
+			free(lib_raw_file);
+
+			// patch the file into ram
+			offset = lib_decoded[0] | lib_decoded[1]<<8 | lib_decoded[2]<<16 | lib_decoded[3]<<24;
+
+			// guard against invalid data
+			if ((offset + (lib_len-4)) > 0x7ffff)
+			{
+				lib_len = 0x80000-offset+4;
+			}
+			memcpy(&s->cpu->sat_ram[offset], lib_decoded+4, lib_len-4);
+
+			// Dispose the corlett structure for the lib - we don't use it
+			free(lib);
+		}
+	}
+
+	// now patch the file into RAM over the libraries
+	offset = file[3]<<24 | file[2]<<16 | file[1]<<8 | file[0];
+
+	// guard against invalid data
+	if ((offset + (file_len-4)) > 0x7ffff)
+	{
+		file_len = 0x80000-offset+4;
+	}
+
+	memcpy(&s->cpu->sat_ram[offset], file+4, file_len-4);
+
+	free(file);
+	
+	// Finally, set psfby tag
+	strcpy(s->psfby, "n/a");
+	if (s->c)
+	{
+		for (i = 0; i < MAX_UNKNOWN_TAGS; i++)
+		{
+			if (!strcasecmp(s->c->tag_name[i], "psfby"))
+				strcpy(s->psfby, s->c->tag_data[i]);
+		}
+	}
+
+	#if DEBUG_LOADER
+	{
+		FILE *f;
+
+		f = fopen("satram.bin", "wb");
+		fwrite(cpu->sat_ram, 512*1024, 1, f);
+		fclose(f);
+	}
+	#endif
+
+	// now flip everything (this makes sense because he's using starscream)
+	for (i = 0; i < 512*1024; i+=2)
+	{
+		uint8 temp;
+
+		temp = s->cpu->sat_ram[i];
+		s->cpu->sat_ram[i] = s->cpu->sat_ram[i+1];
+		s->cpu->sat_ram[i+1] = temp;
+	}
+
+	// backup for fast restarting
+	memcpy (s->init_sat_ram, s->cpu->sat_ram, sizeof (s->init_sat_ram));
+
+	sat_hw_init(s->cpu);
+
+	// now figure out the time in samples for the length/fade
+	lengthMS = psfTimeToMS(s->c->inf_length);
+	fadeMS = psfTimeToMS(s->c->inf_fade);
+	s->total_samples = 0;
+
+	if (lengthMS == 0)
+	{
+		lengthMS = ~0;
+	}
+
+	if (lengthMS == ~0)
+	{
+		s->decaybegin = lengthMS;
+	}
+	else
+	{
+		lengthMS = (lengthMS * 441) / 10;
+		fadeMS = (fadeMS * 441) / 10;
+
+		s->decaybegin = lengthMS;
+		s->decayend = lengthMS + fadeMS;
+	}
+
+	return s;
+}
+
+int32 ssf_gen(void *handle, int16 *buffer, uint32 samples)
+{	
+ ssf_synth_t *s = handle;
+	int i;
+	int16 output[samples], output2[samples];
+	int16 *stereo[2];
+	int16 *outp = buffer;
+
+	for (i = 0; i < samples; i++)
+	{
+		m68k_execute(s->cpu, (11300000/60)/735);
+		stereo[0] = &output[i];
+		stereo[1] = &output2[i];
+		SCSP_Update(s->cpu->SCSP, NULL, stereo, 1);
+	}
+
+	for (i = 0; i < samples; i++)
+	{
+		// process the fade tags
+		if (s->total_samples >= s->decaybegin)
+		{
+			if (s->total_samples >= s->decayend)
+			{
+				// song is done here, call out as necessary to make your player stop
+				output[i] = 0;
+				output2[i] = 0;
+			}
+			else
+			{
+				int32 fader = 256 - (256*(s->total_samples - s->decaybegin)/(s->decayend-s->decaybegin));
+				output[i] = (output[i] * fader)>>8;
+				output2[i] = (output2[i] * fader)>>8;
+
+				s->total_samples++;
+			}
+		}
+		else
+		{
+			s->total_samples++;
+		}
+
+		*outp++ = output[i];
+		*outp++ = output2[i];
+	}
+
+	return AO_SUCCESS;
+}
+
+int32 ssf_stop(void *handle)
+{
+ ssf_synth_t *s = handle;
+ if (s) {
+ if (s->c) {
+ free (s->c);
+ }
+ if (s->cpu) {
+ sat_hw_free (s->cpu);
+ free (s->cpu);
+ }
+ free (s);
+ }
+ return AO_SUCCESS;
+}
+
+int32 ssf_command(void *handle, int32 command, int32 parameter)
+
+{
+ ssf_synth_t *s = handle;
+	switch (command)
+	{
+		case COMMAND_RESTART:
+ sat_hw_free (s->cpu);
+ memcpy (s->cpu->sat_ram, s->init_sat_ram, sizeof (s->init_sat_ram));
+ sat_hw_init (s->cpu);
+ s->total_samples = 0;
+			return AO_SUCCESS;
+		
+	}
+	return AO_FAIL;
+}
+
+int32 ssf_fill_info(void *handle, ao_display_info *info)
+{
+ ssf_synth_t *s = handle;
+	if (s->c == NULL)
+		return AO_FAIL;
+		
+	strcpy(info->title[1], "Name: ");
+	sprintf(info->info[1], "%s", s->c->inf_title);
+
+	strcpy(info->title[2], "Game: ");
+	sprintf(info->info[2], "%s", s->c->inf_game);
+	
+	strcpy(info->title[3], "Artist: ");
+	sprintf(info->info[3], "%s", s->c->inf_artist);
+
+	strcpy(info->title[4], "Copyright: ");
+	sprintf(info->info[4], "%s", s->c->inf_copy);
+
+	strcpy(info->title[5], "Year: ");
+	sprintf(info->info[5], "%s", s->c->inf_year);
+
+	strcpy(info->title[6], "Length: ");
+	sprintf(info->info[6], "%s", s->c->inf_length);
+
+	strcpy(info->title[7], "Fade: ");
+	sprintf(info->info[7], "%s", s->c->inf_fade);
+
+	strcpy(info->title[8], "Ripper: ");
+	sprintf(info->info[8], "%s", s->psfby);
+
+	return AO_SUCCESS;
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68k.h Added

@@ -0,0 +1,347 @@
+#ifndef M68K__HEADER
+#define M68K__HEADER
+
+struct m68ki_cpu_core_s;
+
+/* ======================================================================== */
+/* ========================= LICENSING & COPYRIGHT ======================== */
+/* ======================================================================== */
+/*
+ * MUSASHI
+ * Version 3.3
+ *
+ * A portable Motorola M680x0 processor emulation engine.
+ * Copyright 1998-2001 Karl Stenerud. All rights reserved.
+ *
+ * This code may be freely used for non-commercial purposes as long as this
+ * copyright notice remains unaltered in the source code and any binary files
+ * containing this code in compiled form.
+ *
+ * All other lisencing terms must be negotiated with the author
+ * (Karl Stenerud).
+ *
+ * The latest version of this code can be obtained at:
+ * http://kstenerud.cjb.net
+ */
+
+
+
+/* ======================================================================== */
+/* ============================ GENERAL DEFINES =========================== */
+
+/* ======================================================================== */
+
+/* There are 7 levels of interrupt to the 68K.
+ * A transition from < 7 to 7 will cause a non-maskable interrupt (NMI).
+ */
+#define M68K_IRQ_NONE 0
+#define M68K_IRQ_1 1
+#define M68K_IRQ_2 2
+#define M68K_IRQ_3 3
+#define M68K_IRQ_4 4
+#define M68K_IRQ_5 5
+#define M68K_IRQ_6 6
+#define M68K_IRQ_7 7
+
+
+/* Special interrupt acknowledge values.
+ * Use these as special returns from the interrupt acknowledge callback
+ * (specified later in this header).
+ */
+
+/* Causes an interrupt autovector (0x18 + interrupt level) to be taken.
+ * This happens in a real 68K if VPA or AVEC is asserted during an interrupt
+ * acknowledge cycle instead of DTACK.
+ */
+#define M68K_INT_ACK_AUTOVECTOR 0xffffffff
+
+/* Causes the spurious interrupt vector (0x18) to be taken
+ * This happens in a real 68K if BERR is asserted during the interrupt
+ * acknowledge cycle (i.e. no devices responded to the acknowledge).
+ */
+#define M68K_INT_ACK_SPURIOUS 0xfffffffe
+
+
+/* CPU types for use in m68k_set_cpu_type() */
+enum
+{
+	M68K_CPU_TYPE_INVALID,
+	M68K_CPU_TYPE_68000,
+	M68K_CPU_TYPE_68010,
+	M68K_CPU_TYPE_68EC020,
+	M68K_CPU_TYPE_68020,
+	M68K_CPU_TYPE_68030,	/* Supported by disassembler ONLY */
+	M68K_CPU_TYPE_68040		/* Supported by disassembler ONLY */
+};
+
+/* Registers used by m68k_get_reg() and m68k_set_reg() */
+typedef enum
+{
+	/* Real registers */
+	M68K_REG_D0,		/* Data registers */
+	M68K_REG_D1,
+	M68K_REG_D2,
+	M68K_REG_D3,
+	M68K_REG_D4,
+	M68K_REG_D5,
+	M68K_REG_D6,
+	M68K_REG_D7,
+	M68K_REG_A0,		/* Address registers */
+	M68K_REG_A1,
+	M68K_REG_A2,
+	M68K_REG_A3,
+	M68K_REG_A4,
+	M68K_REG_A5,
+	M68K_REG_A6,
+	M68K_REG_A7,
+	M68K_REG_PC,		/* Program Counter */
+	M68K_REG_SR,		/* Status Register */
+	M68K_REG_SP,		/* The current Stack Pointer (located in A7) */
+	M68K_REG_USP,		/* User Stack Pointer */
+	M68K_REG_ISP,		/* Interrupt Stack Pointer */
+	M68K_REG_MSP,		/* Master Stack Pointer */
+	M68K_REG_SFC,		/* Source Function Code */
+	M68K_REG_DFC,		/* Destination Function Code */
+	M68K_REG_VBR,		/* Vector Base Register */
+	M68K_REG_CACR,		/* Cache Control Register */
+	M68K_REG_CAAR,		/* Cache Address Register */
+
+	/* Assumed registers */
+	/* These are cheat registers which emulate the 1-longword prefetch
+	 * present in the 68000 and 68010.
+	 */
+	M68K_REG_PREF_ADDR,	/* Last prefetch address */
+	M68K_REG_PREF_DATA,	/* Last prefetch data */
+
+	/* Convenience registers */
+	M68K_REG_PPC,		/* Previous value in the program counter */
+	M68K_REG_IR,		/* Instruction register */
+	M68K_REG_CPU_TYPE	/* Type of CPU being run */
+} m68k_register_t;
+
+/* ======================================================================== */
+/* ====================== FUNCTIONS CALLED BY THE CPU ===================== */
+/* ======================================================================== */
+
+/* You will have to implement these functions */
+
+/* read/write functions called by the CPU to access memory.
+ * while values used are 32 bits, only the appropriate number
+ * of bits are relevant (i.e. in write_memory_8, only the lower 8 bits
+ * of value should be written to memory).
+ *
+ * NOTE: I have separated the immediate and PC-relative memory fetches
+ * from the other memory fetches because some systems require
+ * differentiation between PROGRAM and DATA fetches (usually
+ * for security setups such as encryption).
+ * This separation can either be achieved by setting
+ * M68K_SEPARATE_READS in m68kconf.h and defining
+ * the read functions, or by setting M68K_EMULATE_FC and
+ * making a function code callback function.
+ * Using the callback offers better emulation coverage
+ * because you can also monitor whether the CPU is in SYSTEM or
+ * USER mode, but it is also slower.
+ */
+
+/* Read from anywhere */
+unsigned int m68k_read_memory_8(struct m68ki_cpu_core_s *cpu, unsigned int address);
+unsigned int m68k_read_memory_16(struct m68ki_cpu_core_s *cpu, unsigned int address);
+unsigned int m68k_read_memory_32(struct m68ki_cpu_core_s *cpu, unsigned int address);
+
+/* Read data immediately following the PC */
+//INLINE unsigned int m68k_read_immediate_16(unsigned int address);
+//INLINE unsigned int m68k_read_immediate_32(unsigned int address);
+
+/* Read data relative to the PC */
+//INLINE unsigned int m68k_read_pcrelative_8(unsigned int address);
+//INLINE unsigned int m68k_read_pcrelative_16(unsigned int address);
+//INLINE unsigned int m68k_read_pcrelative_32(unsigned int address);
+
+/* Memory access for the disassembler */
+unsigned int m68k_read_disassembler_8 (struct m68ki_cpu_core_s *cpu, unsigned int address);
+unsigned int m68k_read_disassembler_16 (struct m68ki_cpu_core_s *cpu, unsigned int address);
+unsigned int m68k_read_disassembler_32 (struct m68ki_cpu_core_s *cpu, unsigned int address);
+
+/* Write to anywhere */
+void m68k_write_memory_8(struct m68ki_cpu_core_s *cpu, unsigned int address, unsigned int value);
+void m68k_write_memory_16(struct m68ki_cpu_core_s *cpu, unsigned int address, unsigned int value);
+void m68k_write_memory_32(struct m68ki_cpu_core_s *cpu, unsigned int address, unsigned int value);
+
+/* Special call to simulate undocumented 68k behavior when move.l with a
+ * predecrement destination mode is executed.
+ * To simulate real 68k behavior, first write the high word to
+ * [address+2], and then write the low word to [address].
+ *
+ * Enable this functionality with M68K_SIMULATE_PD_WRITES in m68kconf.h.
+ */
+//INLINE void m68k_write_memory_32_pd(unsigned int address, unsigned int value);
+
+
+
+/* ======================================================================== */
+/* ============================== CALLBACKS =============================== */
+/* ======================================================================== */
+
+/* These functions allow you to set callbacks to the host when specific events
+ * occur. Note that you must enable the corresponding value in m68kconf.h
+ * in order for these to do anything useful.
+ * Note: I have defined default callbacks which are used if you have enabled
+ * the corresponding #define in m68kconf.h but either haven't assigned a
+ * callback or have assigned a callback of NULL.
+ */
+
+/* Set the callback for an interrupt acknowledge.
+ * You must enable M68K_EMULATE_INT_ACK in m68kconf.h.
+ * The CPU will call the callback with the interrupt level being acknowledged.
+ * The host program must return either a vector from 0x02-0xff, or one of the
+ * special interrupt acknowledge values specified earlier in this header.
+ * If this is not implemented, the CPU will always assume an autovectored
+ * interrupt, and will automatically clear the interrupt request when it
+ * services the interrupt.
+ * Default behavior: return M68K_INT_ACK_AUTOVECTOR.
+ */
+void m68k_set_int_ack_callback(struct m68ki_cpu_core_s *cpu, int (*callback)(struct m68ki_cpu_core_s *cpu, int int_level));
+
+
+/* Set the callback for a breakpoint acknowledge (68010+).
+ * You must enable M68K_EMULATE_BKPT_ACK in m68kconf.h.
+ * The CPU will call the callback with whatever was in the data field of the
+ * BKPT instruction for 68020+, or 0 for 68010.
+ * Default behavior: do nothing.
+ */
+void m68k_set_bkpt_ack_callback(struct m68ki_cpu_core_s *cpu, void (*callback)(struct m68ki_cpu_core_s *cpu, unsigned int data));
+
+
+/* Set the callback for the RESET instruction.
+ * You must enable M68K_EMULATE_RESET in m68kconf.h.
+ * The CPU calls this callback every time it encounters a RESET instruction.
+ * Default behavior: do nothing.
+ */
+void m68k_set_reset_instr_callback(struct m68ki_cpu_core_s *cpu, void (*callback)(struct m68ki_cpu_core_s *cpu));
+
+
+/* Set the callback for informing of a large PC change.
+ * You must enable M68K_MONITOR_PC in m68kconf.h.
+ * The CPU calls this callback with the new PC value every time the PC changes
+ * by a large value (currently set for changes by longwords).
+ * Default behavior: do nothing.
+ */
+void m68k_set_pc_changed_callback(struct m68ki_cpu_core_s *cpu, void (*callback)(struct m68ki_cpu_core_s *cpu, unsigned int new_pc));
+
+
+/* Set the callback for CPU function code changes.
+ * You must enable M68K_EMULATE_FC in m68kconf.h.
+ * The CPU calls this callback with the function code before every memory
+ * access to set the CPU's function code according to what kind of memory
+ * access it is (supervisor/user, program/data and such).
+ * Default behavior: do nothing.
+ */
+void m68k_set_fc_callback(struct m68ki_cpu_core_s *cpu, void (*callback)(struct m68ki_cpu_core_s *cpu, unsigned int new_fc));
+
+
+/* Set a callback for the instruction cycle of the CPU.
+ * You must enable M68K_INSTRUCTION_HOOK in m68kconf.h.
+ * The CPU calls this callback just before fetching the opcode in the
+ * instruction cycle.
+ * Default behavior: do nothing.
+ */
+void m68k_set_instr_hook_callback(struct m68ki_cpu_core_s *cpu, void (*callback)(struct m68ki_cpu_core_s *cpu));
+
+
+
+/* ======================================================================== */
+/* ====================== FUNCTIONS TO ACCESS THE CPU ===================== */
+/* ======================================================================== */
+
+/* Use this function to set the CPU type you want to emulate.
+ * Currently supported types are: M68K_CPU_TYPE_68000, M68K_CPU_TYPE_68010,
+ * M68K_CPU_TYPE_EC020, and M68K_CPU_TYPE_68020.
+ */
+void m68k_set_cpu_type(struct m68ki_cpu_core_s *cpu, unsigned int cpu_type);
+
+/* Do whatever initialisations the core requires. Should be called
+ * at least once at init time.
+ */
+struct m68ki_cpu_core_s *m68k_init(void);
+
+/* Pulse the RESET pin on the CPU.
+ * You *MUST* reset the CPU at least once to initialize the emulation
+ * Note: If you didn't call m68k_set_cpu_type() before resetting
+ * the CPU for the first time, the CPU will be set to
+ * M68K_CPU_TYPE_68000.
+ */
+void m68k_pulse_reset(struct m68ki_cpu_core_s *cpu);
+
+/* execute num_cycles worth of instructions. returns number of cycles used */
+int m68k_execute(struct m68ki_cpu_core_s *cpu, int num_cycles);
+
+/* These functions let you read/write/modify the number of cycles left to run
+ * while m68k_execute() is running.
+ * These are useful if the 68k accesses a memory-mapped port on another device
+ * that requires immediate processing by another CPU.
+ */
+int m68k_cycles_run(struct m68ki_cpu_core_s *cpu); /* Number of cycles run so far */
+int m68k_cycles_remaining(struct m68ki_cpu_core_s *cpu); /* Number of cycles left */
+void m68k_modify_timeslice(struct m68ki_cpu_core_s *cpu, int cycles); /* Modify cycles left */
+void m68k_end_timeslice(struct m68ki_cpu_core_s *cpu); /* End timeslice now */
+
+/* Set the IPL0-IPL2 pins on the CPU (IRQ).
+ * A transition from < 7 to 7 will cause a non-maskable interrupt (NMI).
+ * Setting IRQ to 0 will clear an interrupt request.
+ */
+void m68k_set_irq(struct m68ki_cpu_core_s *cpu, unsigned int int_level);
+
+
+/* Halt the CPU as if you pulsed the HALT pin. */
+void m68k_pulse_halt(struct m68ki_cpu_core_s *cpu);
+
+
+#if 0
+/* Context switching to allow multiple CPUs */
+
+/* Get the size of the cpu context in bytes */
+unsigned int m68k_context_size(struct m68ki_cpu_core_s *cpu);
+
+/* Get a cpu context */
+unsigned int m68k_get_context(struct m68ki_cpu_core_s *cpu, void* dst);
+
+/* set the current cpu context */
+void m68k_set_context(struct m68ki_cpu_core_s *cpu, void* dst);
+#endif
+
+/* Register the CPU state information */
+void m68k_state_register(struct m68ki_cpu_core_s *cpu, const char *type);
+
+
+/* Peek at the internals of a CPU context. This can either be a context
+ * retrieved using m68k_get_context() or the currently running context.
+ * If context is NULL, the currently running CPU context will be used.
+ */
+unsigned int m68k_get_reg(struct m68ki_cpu_core_s *cpu, void* context, m68k_register_t reg);
+
+/* Poke values into the internals of the currently running CPU context */
+void m68k_set_reg(struct m68ki_cpu_core_s *cpu, m68k_register_t reg, unsigned int value);
+
+/* Check if an instruction is valid for the specified CPU type */
+unsigned int m68k_is_valid_instruction(struct m68ki_cpu_core_s *cpu, unsigned int instruction, unsigned int cpu_type);
+
+/* Disassemble 1 instruction using the epecified CPU type at pc. Stores
+ * disassembly in str_buff and returns the size of the instruction in bytes.
+ */
+unsigned int m68k_disassemble(struct m68ki_cpu_core_s *cpu, char* str_buff, unsigned int pc, unsigned int cpu_type);
+
+
+/* ======================================================================== */
+/* ============================= CONFIGURATION ============================ */
+/* ======================================================================== */
+
+/* Import the configuration for this build */
+#include "m68kconf.h"
+
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68K__HEADER */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kconf.h Added

@@ -0,0 +1,181 @@
+/* ======================================================================== */
+/* ========================= LICENSING & COPYRIGHT ======================== */
+/* ======================================================================== */
+/*
+ *                                  MUSASHI
+ *                                Version 3.3
+ *
+ * A portable Motorola M680x0 processor emulation engine.
+ * Copyright 1998-2001 Karl Stenerud.  All rights reserved.
+ *
+ * This code may be freely used for non-commercial purposes as long as this
+ * copyright notice remains unaltered in the source code and any binary files
+ * containing this code in compiled form.
+ *
+ * All other lisencing terms must be negotiated with the author
+ * (Karl Stenerud).
+ *
+ * The latest version of this code can be obtained at:
+ * http://kstenerud.cjb.net
+ */
+
+
+
+#ifndef M68KCONF__HEADER
+#define M68KCONF__HEADER
+
+
+/* Configuration switches.
+ * Use OPT_SPECIFY_HANDLER for configuration options that allow callbacks.
+ * OPT_SPECIFY_HANDLER causes the core to link directly to the function
+ * or macro you specify, rather than using callback functions whose pointer
+ * must be passed in using m68k_set_xxx_callback().
+ */
+#define OPT_OFF             0
+#define OPT_ON              1
+#define OPT_SPECIFY_HANDLER 2
+
+
+/* ======================================================================== */
+/* ============================== MAME STUFF ============================== */
+/* ======================================================================== */
+
+/* If you're compiling this for MAME, only change M68K_COMPILE_FOR_MAME
+ * to OPT_ON and use m68kmame.h to configure the 68k core.
+ */
+#ifndef M68K_COMPILE_FOR_MAME
+#define M68K_COMPILE_FOR_MAME      OPT_OFF
+#endif /* M68K_COMPILE_FOR_MAME */
+
+#if M68K_COMPILE_FOR_MAME == OPT_ON
+#include "m68kmame.h"
+#else
+
+
+
+/* ======================================================================== */
+/* ============================= CONFIGURATION ============================ */
+/* ======================================================================== */
+
+/* Turn ON if you want to use the following M68K variants */
+#define M68K_EMULATE_010            OPT_OFF
+#define M68K_EMULATE_EC020          OPT_OFF
+#define M68K_EMULATE_020            OPT_OFF
+
+
+/* If ON, the CPU will call m68k_read_immediate_xx() for immediate addressing
+ * and m68k_read_pcrelative_xx() for PC-relative addressing.
+ * If off, all read requests from the CPU will be redirected to m68k_read_xx()
+ */
+#define M68K_SEPARATE_READS         OPT_OFF
+
+/* If ON, the CPU will call m68k_write_32_pd() when it executes move.l with a
+ * predecrement destination EA mode instead of m68k_write_32().
+ * To simulate real 68k behavior, m68k_write_32_pd() must first write the high
+ * word to [address+2], and then write the low word to [address].
+ */
+#define M68K_SIMULATE_PD_WRITES     OPT_OFF
+
+/* If ON, CPU will call the interrupt acknowledge callback when it services an
+ * interrupt.
+ * If off, all interrupts will be autovectored and all interrupt requests will
+ * auto-clear when the interrupt is serviced.
+ */
+#define M68K_EMULATE_INT_ACK        OPT_ON
+#define M68K_INT_ACK_CALLBACK(A)    your_int_ack_handler_function(A)
+
+
+/* If ON, CPU will call the breakpoint acknowledge callback when it encounters
+ * a breakpoint instruction and it is running a 68010+.
+ */
+#define M68K_EMULATE_BKPT_ACK       OPT_OFF
+#define M68K_BKPT_ACK_CALLBACK()    your_bkpt_ack_handler_function()
+
+
+/* If ON, the CPU will monitor the trace flags and take trace exceptions
+ */
+#define M68K_EMULATE_TRACE          OPT_OFF
+
+
+/* If ON, CPU will call the output reset callback when it encounters a reset
+ * instruction.
+ */
+#define M68K_EMULATE_RESET          OPT_OFF
+#define M68K_RESET_CALLBACK()       your_reset_handler_function()
+
+
+/* If ON, CPU will call the set fc callback on every memory access to
+ * differentiate between user/supervisor, program/data access like a real
+ * 68000 would.  This should be enabled and the callback should be set if you
+ * want to properly emulate the m68010 or higher. (moves uses function codes
+ * to read/write data from different address spaces)
+ */
+#define M68K_EMULATE_FC             OPT_OFF
+#define M68K_SET_FC_CALLBACK(A)     your_set_fc_handler_function(A)
+
+
+/* If ON, CPU will call the pc changed callback when it changes the PC by a
+ * large value.  This allows host programs to be nicer when it comes to
+ * fetching immediate data and instructions on a banked memory system.
+ */
+#define M68K_MONITOR_PC             OPT_OFF
+#define M68K_SET_PC_CALLBACK(A)     your_pc_changed_handler_function(A)
+
+
+/* If ON, CPU will call the instruction hook callback before every
+ * instruction.
+ */
+#define M68K_INSTRUCTION_HOOK       OPT_OFF
+#define M68K_INSTRUCTION_CALLBACK() your_instruction_hook_function()
+
+
+/* If ON, the CPU will emulate the 4-byte prefetch queue of a real 68000 */
+#define M68K_EMULATE_PREFETCH       OPT_ON
+
+
+/* If ON, the CPU will generate address error exceptions if it tries to
+ * access a word or longword at an odd address.
+ * NOTE: Do not enable this!  It is not working!
+ */
+#define M68K_EMULATE_ADDRESS_ERROR  OPT_OFF
+
+
+/* Turn ON to enable logging of illegal instruction calls.
+ * M68K_LOG_FILEHANDLE must be #defined to a stdio file stream.
+ * Turn on M68K_LOG_1010_1111 to log all 1010 and 1111 calls.
+ */
+#define M68K_LOG_ENABLE             OPT_OFF
+#define M68K_LOG_1010_1111          OPT_OFF
+#define M68K_LOG_FILEHANDLE         some_file_handle
+
+
+/* ----------------------------- COMPATIBILITY ---------------------------- */
+
+/* The following options set optimizations that violate the current ANSI
+ * standard, but will be compliant under the forthcoming C9X standard.
+ */
+
+
+/* If ON, the enulation core will use 64-bit integers to speed up some
+ * operations.
+*/
+#define M68K_USE_64_BIT  OPT_OFF
+
+
+/* Set to your compiler's static inline keyword to enable it, or
+ * set it to blank to disable it.
+ * If you define INLINE in the makefile, it will override this value.
+ * NOTE: not enabling inline functions will SEVERELY slow down emulation.
+ */
+#ifndef INLINE
+#define INLINE static __inline__
+#endif /* INLINE */
+
+#endif /* M68K_COMPILE_FOR_MAME */
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68KCONF__HEADER */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kcpu.c Added

@@ -0,0 +1,859 @@
+/* ======================================================================== */
+/* ========================= LICENSING & COPYRIGHT ======================== */
+/* ======================================================================== */
+
+#if 0
+static const char* copyright_notice =
+"MUSASHI\n"
+"Version 3.3 (2001-01-29)\n"
+"A portable Motorola M680x0 processor emulation engine.\n"
+"Copyright 1998-2001 Karl Stenerud. All rights reserved.\n"
+"\n"
+"This code may be freely used for non-commercial purpooses as long as this\n"
+"copyright notice remains unaltered in the source code and any binary files\n"
+"containing this code in compiled form.\n"
+"\n"
+"All other lisencing terms must be negotiated with the author\n"
+"(Karl Stenerud).\n"
+"\n"
+"The latest version of this code can be obtained at:\n"
+"http://kstenerud.cjb.net\n"
+;
+#endif
+
+
+/* ======================================================================== */
+/* ================================= NOTES ================================ */
+/* ======================================================================== */
+
+
+
+/* ======================================================================== */
+/* ================================ INCLUDES ============================== */
+/* ======================================================================== */
+
+#include <stdlib.h>
+#include <string.h>
+#include "m68kops.h"
+#include "m68kcpu.h"
+
+/* ======================================================================== */
+/* ================================= DATA ================================= */
+/* ======================================================================== */
+
+#ifdef M68K_LOG_ENABLE
+char* m68ki_cpu_names[9] =
+{
+	"Invalid CPU",
+	"M68000",
+	"M68010",
+	"Invalid CPU",
+	"M68EC020"
+	"Invalid CPU",
+	"Invalid CPU",
+	"Invalid CPU",
+	"M68020"
+};
+#endif /* M68K_LOG_ENABLE */
+
+/* Used by shift & rotate instructions */
+uint8 m68ki_shift_8_table[65] =
+{
+	0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff
+};
+uint16 m68ki_shift_16_table[65] =
+{
+	0x0000, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00, 0xff00,
+	0xff80, 0xffc0, 0xffe0, 0xfff0, 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff,
+	0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+	0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+	0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+	0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+	0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
+	0xffff, 0xffff
+};
+uint m68ki_shift_32_table[65] =
+{
+	0x00000000, 0x80000000, 0xc0000000, 0xe0000000, 0xf0000000, 0xf8000000,
+	0xfc000000, 0xfe000000, 0xff000000, 0xff800000, 0xffc00000, 0xffe00000,
+	0xfff00000, 0xfff80000, 0xfffc0000, 0xfffe0000, 0xffff0000, 0xffff8000,
+	0xffffc000, 0xffffe000, 0xfffff000, 0xfffff800, 0xfffffc00, 0xfffffe00,
+	0xffffff00, 0xffffff80, 0xffffffc0, 0xffffffe0, 0xfffffff0, 0xfffffff8,
+	0xfffffffc, 0xfffffffe, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+};
+
+
+/* Number of clock cycles to use for exception processing.
+ * I used 4 for any vectors that are undocumented for processing times.
+ */
+uint8 m68ki_exception_cycle_table[3][256] =
+{
+	{ /* 000 */
+		 4, /* 0: Reset - Initial Stack Pointer */
+		 4, /* 1: Reset - Initial Program Counter */
+		 50, /* 2: Bus Error (unemulated) */
+		 50, /* 3: Address Error (unemulated) */
+		 34, /* 4: Illegal Instruction */
+		 38, /* 5: Divide by Zero -- ASG: changed from 42 */
+		 40, /* 6: CHK -- ASG: chanaged from 44 */
+		 34, /* 7: TRAPV */
+		 34, /* 8: Privilege Violation */
+		 34, /* 9: Trace */
+		 4, /* 10: 1010 */
+		 4, /* 11: 1111 */
+		 4, /* 12: RESERVED */
+		 4, /* 13: Coprocessor Protocol Violation (unemulated) */
+		 4, /* 14: Format Error */
+		 44, /* 15: Uninitialized Interrupt */
+		 4, /* 16: RESERVED */
+		 4, /* 17: RESERVED */
+		 4, /* 18: RESERVED */
+		 4, /* 19: RESERVED */
+		 4, /* 20: RESERVED */
+		 4, /* 21: RESERVED */
+		 4, /* 22: RESERVED */
+		 4, /* 23: RESERVED */
+		 44, /* 24: Spurious Interrupt */
+		 44, /* 25: Level 1 Interrupt Autovector */
+		 44, /* 26: Level 2 Interrupt Autovector */
+		 44, /* 27: Level 3 Interrupt Autovector */
+		 44, /* 28: Level 4 Interrupt Autovector */
+		 44, /* 29: Level 5 Interrupt Autovector */
+		 44, /* 30: Level 6 Interrupt Autovector */
+		 44, /* 31: Level 7 Interrupt Autovector */
+		 34, /* 32: TRAP #0 -- ASG: chanaged from 38 */
+		 34, /* 33: TRAP #1 */
+		 34, /* 34: TRAP #2 */
+		 34, /* 35: TRAP #3 */
+		 34, /* 36: TRAP #4 */
+		 34, /* 37: TRAP #5 */
+		 34, /* 38: TRAP #6 */
+		 34, /* 39: TRAP #7 */
+		 34, /* 40: TRAP #8 */
+		 34, /* 41: TRAP #9 */
+		 34, /* 42: TRAP #10 */
+		 34, /* 43: TRAP #11 */
+		 34, /* 44: TRAP #12 */
+		 34, /* 45: TRAP #13 */
+		 34, /* 46: TRAP #14 */
+		 34, /* 47: TRAP #15 */
+		 4, /* 48: FP Branch or Set on Unknown Condition (unemulated) */
+		 4, /* 49: FP Inexact Result (unemulated) */
+		 4, /* 50: FP Divide by Zero (unemulated) */
+		 4, /* 51: FP Underflow (unemulated) */
+		 4, /* 52: FP Operand Error (unemulated) */
+		 4, /* 53: FP Overflow (unemulated) */
+		 4, /* 54: FP Signaling NAN (unemulated) */
+		 4, /* 55: FP Unimplemented Data Type (unemulated) */
+		 4, /* 56: MMU Configuration Error (unemulated) */
+		 4, /* 57: MMU Illegal Operation Error (unemulated) */
+		 4, /* 58: MMU Access Level Violation Error (unemulated) */
+		 4, /* 59: RESERVED */
+		 4, /* 60: RESERVED */
+		 4, /* 61: RESERVED */
+		 4, /* 62: RESERVED */
+		 4, /* 63: RESERVED */
+		 /* 64-255: User Defined */
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
+	},
+	{ /* 010 */
+		 4, /* 0: Reset - Initial Stack Pointer */
+		 4, /* 1: Reset - Initial Program Counter */
+		126, /* 2: Bus Error (unemulated) */
+		126, /* 3: Address Error (unemulated) */
+		 38, /* 4: Illegal Instruction */
+		 44, /* 5: Divide by Zero */
+		 44, /* 6: CHK */
+		 34, /* 7: TRAPV */
+		 38, /* 8: Privilege Violation */
+		 38, /* 9: Trace */
+		 4, /* 10: 1010 */
+		 4, /* 11: 1111 */
+		 4, /* 12: RESERVED */
+		 4, /* 13: Coprocessor Protocol Violation (unemulated) */
+		 4, /* 14: Format Error */
+		 44, /* 15: Uninitialized Interrupt */
+		 4, /* 16: RESERVED */
+		 4, /* 17: RESERVED */
+		 4, /* 18: RESERVED */
+		 4, /* 19: RESERVED */
+		 4, /* 20: RESERVED */
+		 4, /* 21: RESERVED */
+		 4, /* 22: RESERVED */
+		 4, /* 23: RESERVED */
+		 46, /* 24: Spurious Interrupt */
+		 46, /* 25: Level 1 Interrupt Autovector */
+		 46, /* 26: Level 2 Interrupt Autovector */
+		 46, /* 27: Level 3 Interrupt Autovector */
+		 46, /* 28: Level 4 Interrupt Autovector */
+		 46, /* 29: Level 5 Interrupt Autovector */
+		 46, /* 30: Level 6 Interrupt Autovector */
+		 46, /* 31: Level 7 Interrupt Autovector */
+		 38, /* 32: TRAP #0 */
+		 38, /* 33: TRAP #1 */
+		 38, /* 34: TRAP #2 */
+		 38, /* 35: TRAP #3 */
+		 38, /* 36: TRAP #4 */
+		 38, /* 37: TRAP #5 */
+		 38, /* 38: TRAP #6 */
+		 38, /* 39: TRAP #7 */
+		 38, /* 40: TRAP #8 */
+		 38, /* 41: TRAP #9 */
+		 38, /* 42: TRAP #10 */
+		 38, /* 43: TRAP #11 */
+		 38, /* 44: TRAP #12 */
+		 38, /* 45: TRAP #13 */
+		 38, /* 46: TRAP #14 */
+		 38, /* 47: TRAP #15 */
+		 4, /* 48: FP Branch or Set on Unknown Condition (unemulated) */
+		 4, /* 49: FP Inexact Result (unemulated) */
+		 4, /* 50: FP Divide by Zero (unemulated) */
+		 4, /* 51: FP Underflow (unemulated) */
+		 4, /* 52: FP Operand Error (unemulated) */
+		 4, /* 53: FP Overflow (unemulated) */
+		 4, /* 54: FP Signaling NAN (unemulated) */
+		 4, /* 55: FP Unimplemented Data Type (unemulated) */
+		 4, /* 56: MMU Configuration Error (unemulated) */
+		 4, /* 57: MMU Illegal Operation Error (unemulated) */
+		 4, /* 58: MMU Access Level Violation Error (unemulated) */
+		 4, /* 59: RESERVED */
+		 4, /* 60: RESERVED */
+		 4, /* 61: RESERVED */
+		 4, /* 62: RESERVED */
+		 4, /* 63: RESERVED */
+		 /* 64-255: User Defined */
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
+	},
+	{ /* 020 */
+		 4, /* 0: Reset - Initial Stack Pointer */
+		 4, /* 1: Reset - Initial Program Counter */
+		 50, /* 2: Bus Error (unemulated) */
+		 50, /* 3: Address Error (unemulated) */
+		 20, /* 4: Illegal Instruction */
+		 38, /* 5: Divide by Zero */
+		 40, /* 6: CHK */
+		 20, /* 7: TRAPV */
+		 34, /* 8: Privilege Violation */
+		 25, /* 9: Trace */
+		 20, /* 10: 1010 */
+		 20, /* 11: 1111 */
+		 4, /* 12: RESERVED */
+		 4, /* 13: Coprocessor Protocol Violation (unemulated) */
+		 4, /* 14: Format Error */
+		 30, /* 15: Uninitialized Interrupt */
+		 4, /* 16: RESERVED */
+		 4, /* 17: RESERVED */
+		 4, /* 18: RESERVED */
+		 4, /* 19: RESERVED */
+		 4, /* 20: RESERVED */
+		 4, /* 21: RESERVED */
+		 4, /* 22: RESERVED */
+		 4, /* 23: RESERVED */
+		 30, /* 24: Spurious Interrupt */
+		 30, /* 25: Level 1 Interrupt Autovector */
+		 30, /* 26: Level 2 Interrupt Autovector */
+		 30, /* 27: Level 3 Interrupt Autovector */
+		 30, /* 28: Level 4 Interrupt Autovector */
+		 30, /* 29: Level 5 Interrupt Autovector */
+		 30, /* 30: Level 6 Interrupt Autovector */
+		 30, /* 31: Level 7 Interrupt Autovector */
+		 20, /* 32: TRAP #0 */
+		 20, /* 33: TRAP #1 */
+		 20, /* 34: TRAP #2 */
+		 20, /* 35: TRAP #3 */
+		 20, /* 36: TRAP #4 */
+		 20, /* 37: TRAP #5 */
+		 20, /* 38: TRAP #6 */
+		 20, /* 39: TRAP #7 */
+		 20, /* 40: TRAP #8 */
+		 20, /* 41: TRAP #9 */
+		 20, /* 42: TRAP #10 */
+		 20, /* 43: TRAP #11 */
+		 20, /* 44: TRAP #12 */
+		 20, /* 45: TRAP #13 */
+		 20, /* 46: TRAP #14 */
+		 20, /* 47: TRAP #15 */
+		 4, /* 48: FP Branch or Set on Unknown Condition (unemulated) */
+		 4, /* 49: FP Inexact Result (unemulated) */
+		 4, /* 50: FP Divide by Zero (unemulated) */
+		 4, /* 51: FP Underflow (unemulated) */
+		 4, /* 52: FP Operand Error (unemulated) */
+		 4, /* 53: FP Overflow (unemulated) */
+		 4, /* 54: FP Signaling NAN (unemulated) */
+		 4, /* 55: FP Unimplemented Data Type (unemulated) */
+		 4, /* 56: MMU Configuration Error (unemulated) */
+		 4, /* 57: MMU Illegal Operation Error (unemulated) */
+		 4, /* 58: MMU Access Level Violation Error (unemulated) */
+		 4, /* 59: RESERVED */
+		 4, /* 60: RESERVED */
+		 4, /* 61: RESERVED */
+		 4, /* 62: RESERVED */
+		 4, /* 63: RESERVED */
+		 /* 64-255: User Defined */
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+		 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4
+	}
+};
+
+uint8 m68ki_ea_idx_cycle_table[64] =
+{
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, /* ..01.000 no memory indirect, base NULL */
+	 5, /* ..01..01 memory indirect, base NULL, outer NULL */
+	 7, /* ..01..10 memory indirect, base NULL, outer 16 */
+	 7, /* ..01..11 memory indirect, base NULL, outer 32 */
+	 0, 5, 7, 7, 0, 5, 7, 7, 0, 5, 7, 7,
+	 2, /* ..10.000 no memory indirect, base 16 */
+	 7, /* ..10..01 memory indirect, base 16, outer NULL */
+	 9, /* ..10..10 memory indirect, base 16, outer 16 */
+	 9, /* ..10..11 memory indirect, base 16, outer 32 */
+	 0, 7, 9, 9, 0, 7, 9, 9, 0, 7, 9, 9,
+	 6, /* ..11.000 no memory indirect, base 32 */
+	11, /* ..11..01 memory indirect, base 32, outer NULL */
+	13, /* ..11..10 memory indirect, base 32, outer 16 */
+	13, /* ..11..11 memory indirect, base 32, outer 32 */
+	 0, 11, 13, 13, 0, 11, 13, 13, 0, 11, 13, 13
+};
+
+
+
+/* ======================================================================== */
+/* =============================== CALLBACKS ============================== */
+/* ======================================================================== */
+
+/* Default callbacks used if the callback hasn't been set yet, or if the
+ * callback is set to NULL
+ */
+
+/* Interrupt acknowledge */
+static int default_int_ack_callback(m68ki_cpu_core *cpu, int int_level)
+{
+	cpu->default_int_ack_callback_data = int_level;
+	CPU_INT_LEVEL = 0;
+	return M68K_INT_ACK_AUTOVECTOR;
+}
+
+/* Breakpoint acknowledge */
+static void default_bkpt_ack_callback(m68ki_cpu_core *cpu, unsigned int data)
+{
+	cpu->default_bkpt_ack_callback_data = data;
+}
+
+/* Called when a reset instruction is executed */
+static void default_reset_instr_callback(m68ki_cpu_core *cpu)
+{
+}
+
+/* Called when the program counter changed by a large value */
+static void default_pc_changed_callback(m68ki_cpu_core *cpu, unsigned int new_pc)
+{
+	cpu->default_pc_changed_callback_data = new_pc;
+}
+
+/* Called every time there's bus activity (read/write to/from memory */
+static void default_set_fc_callback(m68ki_cpu_core *cpu, unsigned int new_fc)
+{
+	cpu->default_set_fc_callback_data = new_fc;
+}
+
+/* Called every instruction cycle prior to execution */
+static void default_instr_hook_callback(m68ki_cpu_core *cpu)
+{
+}
+
+
+
+/* ======================================================================== */
+/* ================================= API ================================== */
+/* ======================================================================== */
+
+/* Access the internals of the CPU */
+unsigned int m68k_get_reg(m68ki_cpu_core *_cpu, void* context, m68k_register_t regnum)
+{
+	m68ki_cpu_core* cpu = context != NULL ?(m68ki_cpu_core*)context : _cpu;
+
+	switch(regnum)
+	{
+		case M68K_REG_D0:	return cpu->dar[0];
+		case M68K_REG_D1:	return cpu->dar[1];
+		case M68K_REG_D2:	return cpu->dar[2];
+		case M68K_REG_D3:	return cpu->dar[3];
+		case M68K_REG_D4:	return cpu->dar[4];
+		case M68K_REG_D5:	return cpu->dar[5];
+		case M68K_REG_D6:	return cpu->dar[6];
+		case M68K_REG_D7:	return cpu->dar[7];
+		case M68K_REG_A0:	return cpu->dar[8];
+		case M68K_REG_A1:	return cpu->dar[9];
+		case M68K_REG_A2:	return cpu->dar[10];
+		case M68K_REG_A3:	return cpu->dar[11];
+		case M68K_REG_A4:	return cpu->dar[12];
+		case M68K_REG_A5:	return cpu->dar[13];
+		case M68K_REG_A6:	return cpu->dar[14];
+		case M68K_REG_A7:	return cpu->dar[15];
+		case M68K_REG_PC:	return MASK_OUT_ABOVE_32(cpu->pc);
+		case M68K_REG_SR:	return	cpu->t1_flag						|
+									cpu->t0_flag						|
+									(cpu->s_flag << 11)					|
+									(cpu->m_flag << 11)					|
+									cpu->int_mask						|
+									((cpu->x_flag & XFLAG_SET) >> 4)	|
+									((cpu->n_flag & NFLAG_SET) >> 4)	|
+									((!cpu->not_z_flag) << 2)			|
+									((cpu->v_flag & VFLAG_SET) >> 6)	|
+									((cpu->c_flag & CFLAG_SET) >> 8);
+		case M68K_REG_SP:	return cpu->dar[15];
+		case M68K_REG_USP:	return cpu->s_flag ? cpu->sp[0] : cpu->dar[15];
+		case M68K_REG_ISP:	return cpu->s_flag && !cpu->m_flag ? cpu->dar[15] : cpu->sp[4];
+		case M68K_REG_MSP:	return cpu->s_flag && cpu->m_flag ? cpu->dar[15] : cpu->sp[6];
+		case M68K_REG_SFC:	return cpu->sfc;
+		case M68K_REG_DFC:	return cpu->dfc;
+		case M68K_REG_VBR:	return cpu->vbr;
+		case M68K_REG_CACR:	return cpu->cacr;
+		case M68K_REG_CAAR:	return cpu->caar;
+		case M68K_REG_PREF_ADDR:	return cpu->pref_addr;
+		case M68K_REG_PREF_DATA:	return cpu->pref_data;
+		case M68K_REG_PPC:	return MASK_OUT_ABOVE_32(cpu->ppc);
+		case M68K_REG_IR:	return cpu->ir;
+		case M68K_REG_CPU_TYPE:
+			switch(cpu->cpu_type)
+			{
+				case CPU_TYPE_000:		return (unsigned int)M68K_CPU_TYPE_68000;
+				case CPU_TYPE_010:		return (unsigned int)M68K_CPU_TYPE_68010;
+				case CPU_TYPE_EC020:	return (unsigned int)M68K_CPU_TYPE_68EC020;
+				case CPU_TYPE_020:		return (unsigned int)M68K_CPU_TYPE_68020;
+			}
+			return M68K_CPU_TYPE_INVALID;
+		default:			return 0;
+	}
+	return 0;
+}
+
+void m68k_set_reg(m68ki_cpu_core *cpu, m68k_register_t regnum, unsigned int value)
+{
+	switch(regnum)
+	{
+		case M68K_REG_D0:	REG_D[0] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D1:	REG_D[1] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D2:	REG_D[2] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D3:	REG_D[3] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D4:	REG_D[4] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D5:	REG_D[5] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D6:	REG_D[6] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_D7:	REG_D[7] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A0:	REG_A[0] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A1:	REG_A[1] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A2:	REG_A[2] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A3:	REG_A[3] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A4:	REG_A[4] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A5:	REG_A[5] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A6:	REG_A[6] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_A7:	REG_A[7] = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_PC:	m68ki_jump(cpu, MASK_OUT_ABOVE_32(value)); return;
+		case M68K_REG_SR:	m68ki_set_sr(cpu, value); return;
+		case M68K_REG_SP:	REG_SP = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_USP:	if(FLAG_S)
+								REG_USP = MASK_OUT_ABOVE_32(value);
+							else
+								REG_SP = MASK_OUT_ABOVE_32(value);
+							return;
+		case M68K_REG_ISP:	if(FLAG_S && !FLAG_M)
+								REG_SP = MASK_OUT_ABOVE_32(value);
+							else
+								REG_ISP = MASK_OUT_ABOVE_32(value);
+							return;
+		case M68K_REG_MSP:	if(FLAG_S && FLAG_M)
+								REG_SP = MASK_OUT_ABOVE_32(value);
+							else
+								REG_MSP = MASK_OUT_ABOVE_32(value);
+							return;
+		case M68K_REG_VBR:	REG_VBR = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_SFC:	REG_SFC = value & 7; return;
+		case M68K_REG_DFC:	REG_DFC = value & 7; return;
+		case M68K_REG_CACR:	REG_CACR = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_CAAR:	REG_CAAR = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_PPC:	REG_PPC = MASK_OUT_ABOVE_32(value); return;
+		case M68K_REG_IR:	REG_IR = MASK_OUT_ABOVE_16(value); return;
+		case M68K_REG_CPU_TYPE: m68k_set_cpu_type(cpu, value); return;
+		default:			return;
+	}
+}
+
+/* Set the callbacks */
+void m68k_set_int_ack_callback(m68ki_cpu_core *cpu, int (*callback)(m68ki_cpu_core *cpu, int int_level))
+{
+	CALLBACK_INT_ACK = callback ? callback : default_int_ack_callback;
+}
+
+void m68k_set_bkpt_ack_callback(m68ki_cpu_core *cpu, void (*callback)(m68ki_cpu_core *cpu, unsigned int data))
+{
+	CALLBACK_BKPT_ACK = callback ? callback : default_bkpt_ack_callback;
+}
+
+void m68k_set_reset_instr_callback(m68ki_cpu_core *cpu, void (*callback)(m68ki_cpu_core *cpu))
+{
+	CALLBACK_RESET_INSTR = callback ? callback : default_reset_instr_callback;
+}
+
+void m68k_set_pc_changed_callback(m68ki_cpu_core *cpu, void (*callback)(m68ki_cpu_core *cpu, unsigned int new_pc))
+{
+	CALLBACK_PC_CHANGED = callback ? callback : default_pc_changed_callback;
+}
+
+void m68k_set_fc_callback(m68ki_cpu_core *cpu, void (*callback)(m68ki_cpu_core *cpu, unsigned int new_fc))
+{
+	CALLBACK_SET_FC = callback ? callback : default_set_fc_callback;
+}
+
+void m68k_set_instr_hook_callback(m68ki_cpu_core *cpu, void (*callback)(m68ki_cpu_core *cpu))
+{
+	CALLBACK_INSTR_HOOK = callback ? callback : default_instr_hook_callback;
+}
+
+#include <stdio.h>
+/* Set the CPU type. */
+void m68k_set_cpu_type(m68ki_cpu_core *cpu, unsigned int cpu_type)
+{
+	switch(cpu_type)
+	{
+		case M68K_CPU_TYPE_68000:
+			CPU_TYPE = CPU_TYPE_000;
+			CPU_ADDRESS_MASK = 0x00ffffff;
+			CPU_SR_MASK = 0xa71f; /* T1 -- S -- -- I2 I1 I0 -- -- -- X N Z V C */
+			CYC_INSTRUCTION = m68ki_cycles[0];
+			CYC_EXCEPTION = m68ki_exception_cycle_table[0];
+			CYC_BCC_NOTAKE_B = -2;
+			CYC_BCC_NOTAKE_W = 2;
+			CYC_DBCC_F_NOEXP = -2;
+			CYC_DBCC_F_EXP = 2;
+			CYC_SCC_R_FALSE = 2;
+			CYC_MOVEM_W = 2;
+			CYC_MOVEM_L = 3;
+			CYC_SHIFT = 1;
+			CYC_RESET = 132;
+			return;
+		case M68K_CPU_TYPE_68010:
+			CPU_TYPE = CPU_TYPE_010;
+			CPU_ADDRESS_MASK = 0x00ffffff;
+			CPU_SR_MASK = 0xa71f; /* T1 -- S -- -- I2 I1 I0 -- -- -- X N Z V C */
+			CYC_INSTRUCTION = m68ki_cycles[1];
+			CYC_EXCEPTION = m68ki_exception_cycle_table[1];
+			CYC_BCC_NOTAKE_B = -4;
+			CYC_BCC_NOTAKE_W = 0;
+			CYC_DBCC_F_NOEXP = 0;
+			CYC_DBCC_F_EXP = 6;
+			CYC_SCC_R_FALSE = 0;
+			CYC_MOVEM_W = 2;
+			CYC_MOVEM_L = 3;
+			CYC_SHIFT = 1;
+			CYC_RESET = 130;
+			return;
+		case M68K_CPU_TYPE_68EC020:
+			CPU_TYPE = CPU_TYPE_EC020;
+			CPU_ADDRESS_MASK = 0x00ffffff;
+			CPU_SR_MASK = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
+			CYC_INSTRUCTION = m68ki_cycles[2];
+			CYC_EXCEPTION = m68ki_exception_cycle_table[2];
+			CYC_BCC_NOTAKE_B = -2;
+			CYC_BCC_NOTAKE_W = 0;
+			CYC_DBCC_F_NOEXP = 0;
+			CYC_DBCC_F_EXP = 4;
+			CYC_SCC_R_FALSE = 0;
+			CYC_MOVEM_W = 2;
+			CYC_MOVEM_L = 2;
+			CYC_SHIFT = 0;
+			CYC_RESET = 518;
+			return;
+		case M68K_CPU_TYPE_68020:
+			CPU_TYPE = CPU_TYPE_020;
+			CPU_ADDRESS_MASK = 0xffffffff;
+			CPU_SR_MASK = 0xf71f; /* T1 T0 S M -- I2 I1 I0 -- -- -- X N Z V C */
+			CYC_INSTRUCTION = m68ki_cycles[2];
+			CYC_EXCEPTION = m68ki_exception_cycle_table[2];
+			CYC_BCC_NOTAKE_B = -2;
+			CYC_BCC_NOTAKE_W = 0;
+			CYC_DBCC_F_NOEXP = 0;
+			CYC_DBCC_F_EXP = 4;
+			CYC_SCC_R_FALSE = 0;
+			CYC_MOVEM_W = 2;
+			CYC_MOVEM_L = 2;
+			CYC_SHIFT = 0;
+			CYC_RESET = 518;
+			return;
+	}
+}
+
+/* Execute some instructions until we use up num_cycles clock cycles */
+/* ASG: removed per-instruction interrupt checks */
+int m68k_execute(m68ki_cpu_core *cpu, int num_cycles)
+{
+	/* Make sure we're not stopped */
+	if(!CPU_STOPPED)
+	{
+		/* Set our pool of clock cycles available */
+		SET_CYCLES(num_cycles);
+		cpu->m68ki_initial_cycles = num_cycles;
+
+		/* ASG: update cycles */
+		USE_CYCLES(CPU_INT_CYCLES);
+		CPU_INT_CYCLES = 0;
+
+		/* Return point if we had an address error */
+		m68ki_set_address_error_trap(); /* auto-disable (see m68kcpu.h) */
+
+		/* Main loop. Keep going until we run out of clock cycles */
+		do
+		{
+			/* Set tracing accodring to T1. (T0 is done inside instruction) */
+			m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
+
+			/* Set the address space for reads */
+			m68ki_use_data_space(); /* auto-disable (see m68kcpu.h) */
+
+			/* Call external hook to peek at CPU */
+			m68ki_instr_hook(); /* auto-disable (see m68kcpu.h) */
+
+//			if (REG_PC == m68k_trap0) printf("at trap0 (crash), prev_pc = %x\n", REG_PPC);
+
+			/* Record previous program counter */
+			REG_PPC = REG_PC;
+
+			/* Read an instruction and call its handler */
+			REG_IR = m68ki_read_imm_16(cpu);
+			m68ki_instruction_jump_table[REG_IR](cpu);
+			USE_CYCLES(CYC_INSTRUCTION[REG_IR]);
+
+			/* Trace m68k_exception, if necessary */
+			m68ki_exception_if_trace(); /* auto-disable (see m68kcpu.h) */
+		} while(GET_CYCLES() > 0);
+
+		/* set previous PC to current PC for the next entry into the loop */
+		REG_PPC = REG_PC;
+
+		/* ASG: update cycles */
+		USE_CYCLES(CPU_INT_CYCLES);
+		CPU_INT_CYCLES = 0;
+
+		/* return how many clocks we used */
+		return cpu->m68ki_initial_cycles - GET_CYCLES();
+	}
+
+	/* We get here if the CPU is stopped or halted */
+	SET_CYCLES(0);
+	CPU_INT_CYCLES = 0;
+
+	return num_cycles;
+}
+
+
+int m68k_cycles_run(m68ki_cpu_core *cpu)
+{
+	return cpu->m68ki_initial_cycles - GET_CYCLES();
+}
+
+int m68k_cycles_remaining(m68ki_cpu_core *cpu)
+{
+	return GET_CYCLES();
+}
+
+/* Change the timeslice */
+void m68k_modify_timeslice(m68ki_cpu_core *cpu, int cycles)
+{
+	cpu->m68ki_initial_cycles += cycles;
+	ADD_CYCLES(cycles);
+}
+
+
+void m68k_end_timeslice(m68ki_cpu_core *cpu)
+{
+	cpu->m68ki_initial_cycles = GET_CYCLES();
+	SET_CYCLES(0);
+}
+
+
+/* ASG: rewrote so that the int_level is a mask of the IPL0/IPL1/IPL2 bits */
+/* KS: Modified so that IPL* bits match with mask positions in the SR
+ * and cleaned out remenants of the interrupt controller.
+ */
+void m68k_set_irq(m68ki_cpu_core *cpu, unsigned int int_level)
+{
+	uint old_level = CPU_INT_LEVEL;
+	CPU_INT_LEVEL = int_level << 8;
+
+	/* A transition from < 7 to 7 always interrupts (NMI) */
+	/* Note: Level 7 can also level trigger like a normal IRQ */
+	if(old_level != 0x0700 && CPU_INT_LEVEL == 0x0700)
+		m68ki_exception_interrupt(cpu, 7); /* Edge triggered level 7 (NMI) */
+	else
+		m68ki_check_interrupts(cpu); /* Level triggered (IRQ) */
+}
+
+m68ki_cpu_core *m68k_init(void)
+{
+	static uint emulation_initialized = 0;
+
+	/* The first call to this function initializes the opcode handler jump table */
+	if(!emulation_initialized)
+		{
+		m68ki_build_opcode_table();
+		emulation_initialized = 1;
+	}
+
+	m68ki_cpu_core *cpu = malloc (sizeof (m68ki_cpu_core));
+	memset (cpu, 0, sizeof (m68ki_cpu_core));
+
+	m68k_set_int_ack_callback(cpu, NULL);
+	m68k_set_bkpt_ack_callback(cpu, NULL);
+	m68k_set_reset_instr_callback(cpu, NULL);
+	m68k_set_pc_changed_callback(cpu, NULL);
+	m68k_set_fc_callback(cpu, NULL);
+	m68k_set_instr_hook_callback(cpu, NULL);
+	return cpu;
+}
+
+/* Pulse the RESET line on the CPU */
+void m68k_pulse_reset(m68ki_cpu_core *cpu)
+{
+	/* Clear all stop levels and eat up all remaining cycles */
+	CPU_STOPPED = 0;
+	SET_CYCLES(0);
+
+	CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET;
+
+	/* Turn off tracing */
+	FLAG_T1 = FLAG_T0 = 0;
+	m68ki_clear_trace();
+	/* Interrupt mask to level 7 */
+	FLAG_INT_MASK = 0x0700;
+	/* Reset VBR */
+	REG_VBR = 0;
+	/* Go to supervisor mode */
+	m68ki_set_sm_flag(cpu, SFLAG_SET | MFLAG_CLEAR);
+
+	/* Invalidate the prefetch queue */
+#if M68K_EMULATE_PREFETCH
+	/* Set to arbitrary number since our first fetch is from 0 */
+	CPU_PREF_ADDR = 0x1000;
+#endif /* M68K_EMULATE_PREFETCH */
+
+	/* Read the initial stack pointer and program counter */
+	m68ki_jump(cpu, 0);
+	REG_SP = m68ki_read_imm_32(cpu);
+	REG_PC = m68ki_read_imm_32(cpu);
+	m68ki_jump(cpu, REG_PC);
+
+	CPU_RUN_MODE = RUN_MODE_NORMAL;
+}
+
+/* Pulse the HALT line on the CPU */
+void m68k_pulse_halt(m68ki_cpu_core *cpu)
+{
+	CPU_STOPPED |= STOP_LEVEL_HALT;
+}
+
+#if 0
+
+/* Get and set the current CPU context */
+/* This is to allow for multiple CPUs */
+unsigned int m68k_context_size(m68ki_cpu_core *cpu)
+{
+	return sizeof(m68ki_cpu_core);
+}
+
+unsigned int m68k_get_context(m68ki_cpu_core *cpu, void* dst)
+{
+	if(dst) *(m68ki_cpu_core*)dst = cpu;
+	return sizeof(m68ki_cpu_core);
+}
+
+void m68k_set_context(void* src)
+{
+	if(src) m68ki_cpu = *(m68ki_cpu_core*)src;
+}
+
+#endif
+
+/* ======================================================================== */
+/* ============================== MAME STUFF ============================== */
+/* ======================================================================== */
+
+#if M68K_COMPILE_FOR_MAME == OPT_ON
+
+#include "state.h"
+
+static struct {
+	UINT16 sr;
+	int stopped;
+	int halted;
+} m68k_substate;
+
+static void m68k_prepare_substate(void)
+{
+	m68k_substate.sr = m68ki_get_sr();
+	m68k_substate.stopped = (CPU_STOPPED & STOP_LEVEL_STOP) != 0;
+	m68k_substate.halted = (CPU_STOPPED & STOP_LEVEL_HALT) != 0;
+}
+
+static void m68k_post_load(void)
+{
+	m68ki_set_sr_noint_nosp(m68k_substate.sr);
+	CPU_STOPPED = m68k_substate.stopped ? STOP_LEVEL_STOP : 0
+		 | m68k_substate.halted ? STOP_LEVEL_HALT : 0;
+	m68ki_jump(REG_PC);
+}
+
+void m68k_state_register(const char *type)
+{
+	int cpu = cpu_getactivecpu();
+
+	state_save_register_UINT32(type, cpu, "D" , REG_D, 8);
+	state_save_register_UINT32(type, cpu, "A" , REG_A, 8);
+	state_save_register_UINT32(type, cpu, "PPC" , &REG_PPC, 1);
+	state_save_register_UINT32(type, cpu, "PC" , &REG_PC, 1);
+	state_save_register_UINT32(type, cpu, "USP" , &REG_USP, 1);
+	state_save_register_UINT32(type, cpu, "ISP" , &REG_ISP, 1);
+	state_save_register_UINT32(type, cpu, "MSP" , &REG_MSP, 1);
+	state_save_register_UINT32(type, cpu, "VBR" , &REG_VBR, 1);
+	state_save_register_UINT32(type, cpu, "SFC" , &REG_SFC, 1);
+	state_save_register_UINT32(type, cpu, "DFC" , &REG_DFC, 1);
+	state_save_register_UINT32(type, cpu, "CACR" , &REG_CACR, 1);
+	state_save_register_UINT32(type, cpu, "CAAR" , &REG_CAAR, 1);
+	state_save_register_UINT16(type, cpu, "SR" , &m68k_substate.sr, 1);
+	state_save_register_UINT32(type, cpu, "INT_LEVEL" , &CPU_INT_LEVEL, 1);
+	state_save_register_UINT32(type, cpu, "INT_CYCLES", &CPU_INT_CYCLES, 1);
+	state_save_register_int (type, cpu, "STOPPED" , &m68k_substate.stopped);
+	state_save_register_int (type, cpu, "HALTED" , &m68k_substate.halted);
+	state_save_register_UINT32(type, cpu, "PREF_ADDR" , &CPU_PREF_ADDR, 1);
+	state_save_register_UINT32(type, cpu, "PREF_DATA" , &CPU_PREF_DATA, 1);
+	state_save_register_func_presave(m68k_prepare_substate);
+	state_save_register_func_postload(m68k_post_load);
+}
+
+#endif /* M68K_COMPILE_FOR_MAME */
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kcpu.h Added

@@ -0,0 +1,1989 @@
+#include <stdio.h>
+#ifdef _MSC_VER
+#include "ao.h"
+#else
+#undef INLINE
+#define INLINE static inline
+#endif
+/* ======================================================================== */
+/* ========================= LICENSING & COPYRIGHT ======================== */
+/* ======================================================================== */
+/*
+ * MUSASHI
+ * Version 3.3
+ *
+ * A portable Motorola M680x0 processor emulation engine.
+ * Copyright 1998-2001 Karl Stenerud. All rights reserved.
+ *
+ * This code may be freely used for non-commercial purposes as long as this
+ * copyright notice remains unaltered in the source code and any binary files
+ * containing this code in compiled form.
+ *
+ * All other lisencing terms must be negotiated with the author
+ * (Karl Stenerud).
+ *
+ * The latest version of this code can be obtained at:
+ * http://kstenerud.cjb.net
+ */
+
+
+
+
+#ifndef M68KCPU__HEADER
+#define M68KCPU__HEADER
+
+#include "m68k.h"
+#include <limits.h>
+
+#if M68K_EMULATE_ADDRESS_ERROR
+#include <setjmp.h>
+#endif /* M68K_EMULATE_ADDRESS_ERROR */
+
+/* ======================================================================== */
+/* ==================== ARCHITECTURE-DEPENDANT DEFINES ==================== */
+/* ======================================================================== */
+
+/* Check for > 32bit sizes */
+#if UINT_MAX > 0xffffffff
+	#define M68K_INT_GT_32_BIT 1
+#else
+	#define M68K_INT_GT_32_BIT 0
+#endif
+
+/* Data types used in this emulation core */
+#undef sint8
+#undef sint16
+#undef sint32
+#undef sint64
+#undef uint8
+#undef uint16
+#undef uint32
+#undef uint64
+#undef sint
+#undef uint
+
+#define sint8 signed char			/* ASG: changed from char to signed char */
+#define sint16 signed short
+#define sint32 signed long
+#define uint8 unsigned char
+#define uint16 unsigned short
+#define uint32 unsigned int
+/* signed and unsigned int must be at least 32 bits wide */
+#define sint signed int
+#define uint unsigned int
+
+
+#if 0
+#if M68K_USE_64_BIT
+#define sint64 signed long long
+#define uint64 unsigned long long
+#else
+#define sint64 sint32
+#define uint64 uint32
+#endif /* M68K_USE_64_BIT */
+#endif
+
+
+/* Allow for architectures that don't have 8-bit sizes */
+#if UCHAR_MAX == 0xff
+	#define MAKE_INT_8(A) (sint8)(A)
+#else
+	#undef sint8
+	#define sint8 signed int
+	#undef uint8
+	#define uint8 unsigned int
+	INLINE sint MAKE_INT_8(uint value)
+	{
+		return (value & 0x80) ? value | ~0xff : value & 0xff;
+	}
+#endif /* UCHAR_MAX == 0xff */
+
+
+/* Allow for architectures that don't have 16-bit sizes */
+#if USHRT_MAX == 0xffff
+	#define MAKE_INT_16(A) (sint16)(A)
+#else
+	#undef sint16
+	#define sint16 signed int
+	#undef uint16
+	#define uint16 unsigned int
+	INLINE sint MAKE_INT_16(uint value)
+	{
+		return (value & 0x8000) ? value | ~0xffff : value & 0xffff;
+	}
+#endif /* USHRT_MAX == 0xffff */
+
+
+/* Allow for architectures that don't have 32-bit sizes */
+#if ULONG_MAX == 0xffffffff
+	#define MAKE_INT_32(A) (sint32)(A)
+#else
+	#undef sint32
+	#define sint32 signed int
+	#undef uint32
+	#define uint32 unsigned int
+	INLINE sint MAKE_INT_32(uint value)
+	{
+		return (value & 0x80000000) ? value | ~0xffffffff : value & 0xffffffff;
+	}
+#endif /* ULONG_MAX == 0xffffffff */
+
+/* ======================================================================== */
+/* =============================== PROTOTYPES ============================= */
+/* ======================================================================== */
+
+
+typedef struct m68ki_cpu_core_s
+{
+	uint cpu_type; /* CPU Type: 68000, 68010, 68EC020, or 68020 */
+	uint dar[16]; /* Data and Address Registers */
+	uint ppc;		 /* Previous program counter */
+	uint pc; /* Program Counter */
+	uint sp[7]; /* User, Interrupt, and Master Stack Pointers */
+	uint vbr; /* Vector Base Register (m68010+) */
+	uint sfc; /* Source Function Code Register (m68010+) */
+	uint dfc; /* Destination Function Code Register (m68010+) */
+	uint cacr; /* Cache Control Register (m68020, unemulated) */
+	uint caar; /* Cache Address Register (m68020, unemulated) */
+	uint ir; /* Instruction Register */
+	uint t1_flag; /* Trace 1 */
+	uint t0_flag; /* Trace 0 */
+	uint s_flag; /* Supervisor */
+	uint m_flag; /* Master/Interrupt state */
+	uint x_flag; /* Extend */
+	uint n_flag; /* Negative */
+	uint not_z_flag; /* Zero, inverted for speedups */
+	uint v_flag; /* Overflow */
+	uint c_flag; /* Carry */
+	uint int_mask; /* I0-I2 */
+	uint int_level; /* State of interrupt pins IPL0-IPL2 -- ASG: changed from ints_pending */
+	uint int_cycles; /* ASG: extra cycles from generated interrupts */
+	uint stopped; /* Stopped state */
+	uint pref_addr; /* Last prefetch address */
+	uint pref_data; /* Data in the prefetch queue */
+	uint address_mask; /* Available address pins */
+	uint sr_mask; /* Implemented status register bits */
+	uint instr_mode; /* Stores whether we are in instruction mode or group 0/1 exception mode */
+	uint run_mode; /* Stores whether we are processing a reset, bus error, address error, or something else */
+
+	/* Clocks required for instructions / exceptions */
+	uint cyc_bcc_notake_b;
+	uint cyc_bcc_notake_w;
+	uint cyc_dbcc_f_noexp;
+	uint cyc_dbcc_f_exp;
+	uint cyc_scc_r_false;
+	uint cyc_movem_w;
+	uint cyc_movem_l;
+	uint cyc_shift;
+	uint cyc_reset;
+	uint8* cyc_instruction;
+	uint8* cyc_exception;
+
+	/* Callbacks to host */
+	int (*int_ack_callback)(struct m68ki_cpu_core_s *cpu, int int_line); /* Interrupt Acknowledge */
+	void (*bkpt_ack_callback)(struct m68ki_cpu_core_s *cpu, unsigned int data); /* Breakpoint Acknowledge */
+	void (*reset_instr_callback)(struct m68ki_cpu_core_s *cpu); /* Called when a RESET instruction is encountered */
+	void (*pc_changed_callback)(struct m68ki_cpu_core_s *cpu, unsigned int new_pc); /* Called when the PC changes by a large amount */
+	void (*set_fc_callback)(struct m68ki_cpu_core_s *cpu, unsigned int new_fc); /* Called when the CPU function code changes */
+	void (*instr_hook_callback)(struct m68ki_cpu_core_s *cpu); /* Called every instruction cycle prior to execution */
+
+#if M68K_EMULATE_ADDRESS_ERROR
+ jmp_buf m68ki_aerr_trap;
+#endif /* M68K_EMULATE_ADDRESS_ERROR */
+
+ uint m68ki_aerr_address;
+ uint m68ki_aerr_write_mode;
+ uint m68ki_aerr_fc;
+
+ int default_int_ack_callback_data;
+ unsigned int default_bkpt_ack_callback_data;
+ unsigned int default_pc_changed_callback_data;
+ unsigned int default_set_fc_callback_data;
+ int m68k_trap0;
+ int m68ki_initial_cycles;
+ int m68ki_remaining_cycles; /* Number of clocks remaining */
+ uint m68ki_tracing;
+ uint m68ki_address_space;
+
+ uint8 sat_ram[512*1024];
+
+ void *SCSP;
+} m68ki_cpu_core;
+
+
+extern uint8 m68ki_shift_8_table[];
+extern uint16 m68ki_shift_16_table[];
+extern uint m68ki_shift_32_table[];
+extern uint8 m68ki_exception_cycle_table[][256];
+extern uint8 m68ki_ea_idx_cycle_table[];
+
+m68ki_cpu_core *m68k_init(void);
+/* Execute some instructions until we use up num_cycles clock cycles */
+/* ASG: removed per-instruction interrupt checks */
+int m68k_execute(m68ki_cpu_core *cpu, int num_cycles);
+
+
+/* ======================================================================== */
+/* ============================ GENERAL DEFINES =========================== */
+/* ======================================================================== */
+
+/* Exception Vectors handled by emulation */
+#define EXCEPTION_BUS_ERROR 2 /* This one is not emulated! */
+#define EXCEPTION_ADDRESS_ERROR 3 /* This one is partially emulated (doesn't stack a proper frame yet) */
+#define EXCEPTION_ILLEGAL_INSTRUCTION 4
+#define EXCEPTION_ZERO_DIVIDE 5
+#define EXCEPTION_CHK 6
+#define EXCEPTION_TRAPV 7
+#define EXCEPTION_PRIVILEGE_VIOLATION 8
+#define EXCEPTION_TRACE 9
+#define EXCEPTION_1010 10
+#define EXCEPTION_1111 11
+#define EXCEPTION_FORMAT_ERROR 14
+#define EXCEPTION_UNINITIALIZED_INTERRUPT 15
+#define EXCEPTION_SPURIOUS_INTERRUPT 24
+#define EXCEPTION_INTERRUPT_AUTOVECTOR 24
+#define EXCEPTION_TRAP_BASE 32
+
+/* Function codes set by CPU during data/address bus activity */
+#define FUNCTION_CODE_USER_DATA 1
+#define FUNCTION_CODE_USER_PROGRAM 2
+#define FUNCTION_CODE_SUPERVISOR_DATA 5
+#define FUNCTION_CODE_SUPERVISOR_PROGRAM 6
+#define FUNCTION_CODE_CPU_SPACE 7
+
+/* CPU types for deciding what to emulate */
+#define CPU_TYPE_000 1
+#define CPU_TYPE_010 2
+#define CPU_TYPE_EC020 4
+#define CPU_TYPE_020 8
+
+/* Different ways to stop the CPU */
+#define STOP_LEVEL_STOP 1
+#define STOP_LEVEL_HALT 2
+
+/* Used for 68000 address error processing */
+#define INSTRUCTION_YES 0
+#define INSTRUCTION_NO 0x08
+#define MODE_READ 0x10
+#define MODE_WRITE 0
+
+#define RUN_MODE_NORMAL 0
+#define RUN_MODE_BERR_AERR_RESET 1
+
+#ifndef NULL
+#define NULL ((void*)0)
+#endif
+
+/* ======================================================================== */
+/* ================================ MACROS ================================ */
+/* ======================================================================== */
+
+
+/* ---------------------------- General Macros ---------------------------- */
+
+/* Bit Isolation Macros */
+#define BIT_0(A) ((A) & 0x00000001)
+#define BIT_1(A) ((A) & 0x00000002)
+#define BIT_2(A) ((A) & 0x00000004)
+#define BIT_3(A) ((A) & 0x00000008)
+#define BIT_4(A) ((A) & 0x00000010)
+#define BIT_5(A) ((A) & 0x00000020)
+#define BIT_6(A) ((A) & 0x00000040)
+#define BIT_7(A) ((A) & 0x00000080)
+#define BIT_8(A) ((A) & 0x00000100)
+#define BIT_9(A) ((A) & 0x00000200)
+#define BIT_A(A) ((A) & 0x00000400)
+#define BIT_B(A) ((A) & 0x00000800)
+#define BIT_C(A) ((A) & 0x00001000)
+#define BIT_D(A) ((A) & 0x00002000)
+#define BIT_E(A) ((A) & 0x00004000)
+#define BIT_F(A) ((A) & 0x00008000)
+#define BIT_10(A) ((A) & 0x00010000)
+#define BIT_11(A) ((A) & 0x00020000)
+#define BIT_12(A) ((A) & 0x00040000)
+#define BIT_13(A) ((A) & 0x00080000)
+#define BIT_14(A) ((A) & 0x00100000)
+#define BIT_15(A) ((A) & 0x00200000)
+#define BIT_16(A) ((A) & 0x00400000)
+#define BIT_17(A) ((A) & 0x00800000)
+#define BIT_18(A) ((A) & 0x01000000)
+#define BIT_19(A) ((A) & 0x02000000)
+#define BIT_1A(A) ((A) & 0x04000000)
+#define BIT_1B(A) ((A) & 0x08000000)
+#define BIT_1C(A) ((A) & 0x10000000)
+#define BIT_1D(A) ((A) & 0x20000000)
+#define BIT_1E(A) ((A) & 0x40000000)
+#define BIT_1F(A) ((A) & 0x80000000)
+
+/* Get the most significant bit for specific sizes */
+#define GET_MSB_8(A) ((A) & 0x80)
+#define GET_MSB_9(A) ((A) & 0x100)
+#define GET_MSB_16(A) ((A) & 0x8000)
+#define GET_MSB_17(A) ((A) & 0x10000)
+#define GET_MSB_32(A) ((A) & 0x80000000)
+#if M68K_USE_64_BIT
+#define GET_MSB_33(A) ((A) & 0x100000000)
+#endif /* M68K_USE_64_BIT */
+
+/* Isolate nibbles */
+#define LOW_NIBBLE(A) ((A) & 0x0f)
+#define HIGH_NIBBLE(A) ((A) & 0xf0)
+
+/* These are used to isolate 8, 16, and 32 bit sizes */
+#define MASK_OUT_ABOVE_2(A) ((A) & 3)
+#define MASK_OUT_ABOVE_8(A) ((A) & 0xff)
+#define MASK_OUT_ABOVE_16(A) ((A) & 0xffff)
+#define MASK_OUT_BELOW_2(A) ((A) & ~3)
+#define MASK_OUT_BELOW_8(A) ((A) & ~0xff)
+#define MASK_OUT_BELOW_16(A) ((A) & ~0xffff)
+
+/* No need to mask if we are 32 bit */
+#if M68K_INT_GT_32_BIT || M68K_USE_64_BIT
+	#define MASK_OUT_ABOVE_32(A) ((A) & 0xffffffff)
+	#define MASK_OUT_BELOW_32(A) ((A) & ~0xffffffff)
+#else
+	#define MASK_OUT_ABOVE_32(A) (A)
+	#define MASK_OUT_BELOW_32(A) 0
+#endif /* M68K_INT_GT_32_BIT || M68K_USE_64_BIT */
+
+/* Simulate address lines of 68k family */
+#define ADDRESS_68K(A) ((A)&CPU_ADDRESS_MASK)
+
+
+/* Shift & Rotate Macros. */
+#define LSL(A, C) ((A) << (C))
+#define LSR(A, C) ((A) >> (C))
+
+/* Some > 32-bit optimizations */
+#if M68K_INT_GT_32_BIT
+	/* Shift left and right */
+	#define LSR_32(A, C) ((A) >> (C))
+	#define LSL_32(A, C) ((A) << (C))
+#else
+	/* We have to do this because the morons at ANSI decided that shifts
+	 * by >= data size are undefined.
+	 */
+	#define LSR_32(A, C) ((C) < 32 ? (A) >> (C) : 0)
+	#define LSL_32(A, C) ((C) < 32 ? (A) << (C) : 0)
+#endif /* M68K_INT_GT_32_BIT */
+
+#if M68K_USE_64_BIT
+	#define LSL_32_64(A, C) ((A) << (C))
+	#define LSR_32_64(A, C) ((A) >> (C))
+	#define ROL_33_64(A, C) (LSL_32_64(A, C) | LSR_32_64(A, 33-(C)))
+	#define ROR_33_64(A, C) (LSR_32_64(A, C) | LSL_32_64(A, 33-(C)))
+#endif /* M68K_USE_64_BIT */
+
+#define ROL_8(A, C) MASK_OUT_ABOVE_8(LSL(A, C) | LSR(A, 8-(C)))
+#define ROL_9(A, C) (LSL(A, C) | LSR(A, 9-(C)))
+#define ROL_16(A, C) MASK_OUT_ABOVE_16(LSL(A, C) | LSR(A, 16-(C)))
+#define ROL_17(A, C) (LSL(A, C) | LSR(A, 17-(C)))
+#define ROL_32(A, C) MASK_OUT_ABOVE_32(LSL_32(A, C) | LSR_32(A, 32-(C)))
+#define ROL_33(A, C) (LSL_32(A, C) | LSR_32(A, 33-(C)))
+
+#define ROR_8(A, C) MASK_OUT_ABOVE_8(LSR(A, C) | LSL(A, 8-(C)))
+#define ROR_9(A, C) (LSR(A, C) | LSL(A, 9-(C)))
+#define ROR_16(A, C) MASK_OUT_ABOVE_16(LSR(A, C) | LSL(A, 16-(C)))
+#define ROR_17(A, C) (LSR(A, C) | LSL(A, 17-(C)))
+#define ROR_32(A, C) MASK_OUT_ABOVE_32(LSR_32(A, C) | LSL_32(A, 32-(C)))
+#define ROR_33(A, C) (LSR_32(A, C) | LSL_32(A, 33-(C)))
+
+
+
+/* ------------------------------ CPU Access ------------------------------ */
+
+/* Access the CPU registers */
+#define CPU_TYPE cpu->cpu_type
+
+#define REG_DA cpu->dar /* easy access to data and address regs */
+#define REG_D cpu->dar
+#define REG_A (cpu->dar+8)
+#define REG_PPC 		 cpu->ppc
+#define REG_PC cpu->pc
+#define REG_SP_BASE cpu->sp
+#define REG_USP cpu->sp[0]
+#define REG_ISP cpu->sp[4]
+#define REG_MSP cpu->sp[6]
+#define REG_SP cpu->dar[15]
+#define REG_VBR cpu->vbr
+#define REG_SFC cpu->sfc
+#define REG_DFC cpu->dfc
+#define REG_CACR cpu->cacr
+#define REG_CAAR cpu->caar
+#define REG_IR cpu->ir
+
+#define FLAG_T1 cpu->t1_flag
+#define FLAG_T0 cpu->t0_flag
+#define FLAG_S cpu->s_flag
+#define FLAG_M cpu->m_flag
+#define FLAG_X cpu->x_flag
+#define FLAG_N cpu->n_flag
+#define FLAG_Z cpu->not_z_flag
+#define FLAG_V cpu->v_flag
+#define FLAG_C cpu->c_flag
+#define FLAG_INT_MASK cpu->int_mask
+
+#define CPU_INT_LEVEL cpu->int_level /* ASG: changed from CPU_INTS_PENDING */
+#define CPU_INT_CYCLES cpu->int_cycles /* ASG */
+#define CPU_STOPPED cpu->stopped
+#define CPU_PREF_ADDR cpu->pref_addr
+#define CPU_PREF_DATA cpu->pref_data
+#define CPU_ADDRESS_MASK cpu->address_mask
+#define CPU_SR_MASK cpu->sr_mask
+#define CPU_INSTR_MODE cpu->instr_mode
+#define CPU_RUN_MODE cpu->run_mode
+
+#define CYC_INSTRUCTION cpu->cyc_instruction
+#define CYC_EXCEPTION cpu->cyc_exception
+#define CYC_BCC_NOTAKE_B cpu->cyc_bcc_notake_b
+#define CYC_BCC_NOTAKE_W cpu->cyc_bcc_notake_w
+#define CYC_DBCC_F_NOEXP cpu->cyc_dbcc_f_noexp
+#define CYC_DBCC_F_EXP cpu->cyc_dbcc_f_exp
+#define CYC_SCC_R_FALSE cpu->cyc_scc_r_false
+#define CYC_MOVEM_W cpu->cyc_movem_w
+#define CYC_MOVEM_L cpu->cyc_movem_l
+#define CYC_SHIFT cpu->cyc_shift
+#define CYC_RESET cpu->cyc_reset
+
+
+#define CALLBACK_INT_ACK cpu->int_ack_callback
+#define CALLBACK_BKPT_ACK cpu->bkpt_ack_callback
+#define CALLBACK_RESET_INSTR cpu->reset_instr_callback
+#define CALLBACK_PC_CHANGED cpu->pc_changed_callback
+#define CALLBACK_SET_FC cpu->set_fc_callback
+#define CALLBACK_INSTR_HOOK cpu->instr_hook_callback
+
+
+
+/* ----------------------------- Configuration ---------------------------- */
+
+/* These defines are dependant on the configuration defines in m68kconf.h */
+
+/* Disable certain comparisons if we're not using all CPU types */
+#if M68K_EMULATE_020
+	#define CPU_TYPE_IS_020_PLUS(A) ((A) & CPU_TYPE_020)
+	#define CPU_TYPE_IS_020_LESS(A) 1
+#else
+	#define CPU_TYPE_IS_020_PLUS(A) 0
+	#define CPU_TYPE_IS_020_LESS(A) 1
+#endif
+
+#if M68K_EMULATE_EC020
+	#define CPU_TYPE_IS_EC020_PLUS(A) ((A) & (CPU_TYPE_EC020 | CPU_TYPE_020))
+	#define CPU_TYPE_IS_EC020_LESS(A) ((A) & (CPU_TYPE_000 | CPU_TYPE_010 | CPU_TYPE_EC020))
+#else
+	#define CPU_TYPE_IS_EC020_PLUS(A) CPU_TYPE_IS_020_PLUS(A)
+	#define CPU_TYPE_IS_EC020_LESS(A) CPU_TYPE_IS_020_LESS(A)
+#endif
+
+#if M68K_EMULATE_010
+	#define CPU_TYPE_IS_010(A) ((A) == CPU_TYPE_010)
+	#define CPU_TYPE_IS_010_PLUS(A) ((A) & (CPU_TYPE_010 | CPU_TYPE_EC020 | CPU_TYPE_020))
+	#define CPU_TYPE_IS_010_LESS(A) ((A) & (CPU_TYPE_000 | CPU_TYPE_010))
+#else
+	#define CPU_TYPE_IS_010(A) 0
+	#define CPU_TYPE_IS_010_PLUS(A) CPU_TYPE_IS_EC020_PLUS(A)
+	#define CPU_TYPE_IS_010_LESS(A) CPU_TYPE_IS_EC020_LESS(A)
+#endif
+
+#if M68K_EMULATE_020 || M68K_EMULATE_EC020
+	#define CPU_TYPE_IS_020_VARIANT(A) ((A) & (CPU_TYPE_EC020 | CPU_TYPE_020))
+#else
+	#define CPU_TYPE_IS_020_VARIANT(A) 0
+#endif
+
+#if M68K_EMULATE_020 || M68K_EMULATE_EC020 || M68K_EMULATE_010
+	#define CPU_TYPE_IS_000(A) ((A) == CPU_TYPE_000)
+#else
+	#define CPU_TYPE_IS_000(A) 1
+#endif
+
+
+#if !M68K_SEPARATE_READS
+#define m68k_read_immediate_16(A) m68ki_read_program_16(A)
+#define m68k_read_immediate_32(A) m68ki_read_program_32(A)
+
+#define m68k_read_pcrelative_8(A) m68ki_read_program_8(A)
+#define m68k_read_pcrelative_16(A) m68ki_read_program_16(A)
+#define m68k_read_pcrelative_32(A) m68ki_read_program_32(A)
+#endif /* M68K_SEPARATE_READS */
+
+
+/* Enable or disable callback functions */
+#if M68K_EMULATE_INT_ACK
+	#if M68K_EMULATE_INT_ACK == OPT_SPECIFY_HANDLER
+		#define m68ki_int_ack(cpu, A) M68K_INT_ACK_CALLBACK(cpu, A)
+	#else
+		#define m68ki_int_ack(cpu, A) CALLBACK_INT_ACK(cpu, A)
+	#endif
+#else
+	/* Default action is to used autovector mode, which is most common */
+	#define m68ki_int_ack(cpu, A) M68K_INT_ACK_AUTOVECTOR
+#endif /* M68K_EMULATE_INT_ACK */
+
+#if M68K_EMULATE_BKPT_ACK
+	#if M68K_EMULATE_BKPT_ACK == OPT_SPECIFY_HANDLER
+		#define m68ki_bkpt_ack(A) M68K_BKPT_ACK_CALLBACK(A)
+	#else
+		#define m68ki_bkpt_ack(A) CALLBACK_BKPT_ACK(A)
+	#endif
+#else
+	#define m68ki_bkpt_ack(A)
+#endif /* M68K_EMULATE_BKPT_ACK */
+
+#if M68K_EMULATE_RESET
+	#if M68K_EMULATE_RESET == OPT_SPECIFY_HANDLER
+		#define m68ki_output_reset() M68K_RESET_CALLBACK()
+	#else
+		#define m68ki_output_reset() CALLBACK_RESET_INSTR()
+	#endif
+#else
+	#define m68ki_output_reset()
+#endif /* M68K_EMULATE_RESET */
+
+#if M68K_INSTRUCTION_HOOK
+	#if M68K_INSTRUCTION_HOOK == OPT_SPECIFY_HANDLER
+		#define m68ki_instr_hook() M68K_INSTRUCTION_CALLBACK()
+	#else
+		#define m68ki_instr_hook() CALLBACK_INSTR_HOOK()
+	#endif
+#else
+	#define m68ki_instr_hook()
+#endif /* M68K_INSTRUCTION_HOOK */
+
+#if M68K_MONITOR_PC
+	#if M68K_MONITOR_PC == OPT_SPECIFY_HANDLER
+		#define m68ki_pc_changed(A) M68K_SET_PC_CALLBACK(ADDRESS_68K(A))
+	#else
+		#define m68ki_pc_changed(A) CALLBACK_PC_CHANGED(ADDRESS_68K(A))
+	#endif
+#else
+	#define m68ki_pc_changed(A)
+#endif /* M68K_MONITOR_PC */
+
+
+/* Enable or disable function code emulation */
+#if M68K_EMULATE_FC
+	#if M68K_EMULATE_FC == OPT_SPECIFY_HANDLER
+		#define m68ki_set_fc(A) M68K_SET_FC_CALLBACK(A)
+	#else
+		#define m68ki_set_fc(A) CALLBACK_SET_FC(A)
+	#endif
+	#define m68ki_use_data_space() m68ki_address_space = FUNCTION_CODE_USER_DATA
+	#define m68ki_use_program_space() m68ki_address_space = FUNCTION_CODE_USER_PROGRAM
+	#define m68ki_get_address_space() m68ki_address_space
+#else
+	#define m68ki_set_fc(A)
+	#define m68ki_use_data_space()
+	#define m68ki_use_program_space()
+	#define m68ki_get_address_space() FUNCTION_CODE_USER_DATA
+#endif /* M68K_EMULATE_FC */
+
+
+/* Enable or disable trace emulation */
+#if M68K_EMULATE_TRACE
+	/* Initiates trace checking before each instruction (t1) */
+	#define m68ki_trace_t1() m68ki_tracing = FLAG_T1
+	/* adds t0 to trace checking if we encounter change of flow */
+	#define m68ki_trace_t0() m68ki_tracing |= FLAG_T0
+	/* Clear all tracing */
+	#define m68ki_clear_trace() m68ki_tracing = 0
+	/* Cause a trace exception if we are tracing */
+	#define m68ki_exception_if_trace() if(m68ki_tracing) m68ki_exception_trace()
+#else
+	#define m68ki_trace_t1()
+	#define m68ki_trace_t0()
+	#define m68ki_clear_trace()
+	#define m68ki_exception_if_trace()
+#endif /* M68K_EMULATE_TRACE */
+
+
+
+/* Address error */
+#if M68K_EMULATE_ADDRESS_ERROR
+	#include <setjmp.h>
+	extern jmp_buf m68ki_aerr_trap;
+
+	#define m68ki_set_address_error_trap() \
+		if(setjmp(m68ki_aerr_trap) != 0) \
+		{ \
+			m68ki_exception_address_error(); \
+			if(CPU_STOPPED) \
+			{ \
+				SET_CYCLES(0); \
+				CPU_INT_CYCLES = 0; \
+				return m68ki_initial_cycles; \
+			} \
+		}
+
+	#define m68ki_check_address_error(ADDR, WRITE_MODE, FC) \
+		if((ADDR)&1) \
+		{ \
+			m68ki_aerr_address = ADDR; \
+			m68ki_aerr_write_mode = WRITE_MODE; \
+			m68ki_aerr_fc = FC; \
+			longjmp(m68ki_aerr_trap, 1); \
+		}
+#else
+	#define m68ki_set_address_error_trap()
+	#define m68ki_check_address_error(ADDR, WRITE_MODE, FC)
+#endif /* M68K_ADDRESS_ERROR */
+
+/* Logging */
+#if M68K_LOG_ENABLE
+	#include <stdio.h>
+	extern FILE* M68K_LOG_FILEHANDLE
+	extern char* m68ki_cpu_names[];
+
+	#define M68K_DO_LOG(A) if(M68K_LOG_FILEHANDLE) fprintf A
+	#if M68K_LOG_1010_1111
+		#define M68K_DO_LOG_EMU(A) if(M68K_LOG_FILEHANDLE) fprintf A
+	#else
+		#define M68K_DO_LOG_EMU(A)
+	#endif
+#else
+	#define M68K_DO_LOG(A)
+	#define M68K_DO_LOG_EMU(A)
+#endif
+
+
+
+/* -------------------------- EA / Operand Access ------------------------- */
+
+/*
+ * The general instruction format follows this pattern:
+ * .... XXX. .... .YYY
+ * where XXX is register X and YYY is register Y
+ */
+/* Data Register Isolation */
+#define DX (REG_D[(REG_IR >> 9) & 7])
+#define DY (REG_D[REG_IR & 7])
+/* Address Register Isolation */
+#define AX (REG_A[(REG_IR >> 9) & 7])
+#define AY (REG_A[REG_IR & 7])
+
+
+/* Effective Address Calculations */
+#define EA_AY_AI_8() AY /* address register indirect */
+#define EA_AY_AI_16() EA_AY_AI_8()
+#define EA_AY_AI_32() EA_AY_AI_8()
+#define EA_AY_PI_8() (AY++) /* postincrement (size = byte) */
+#define EA_AY_PI_16() ((AY+=2)-2) /* postincrement (size = word) */
+#define EA_AY_PI_32() ((AY+=4)-4) /* postincrement (size = long) */
+#define EA_AY_PD_8() (--AY) /* predecrement (size = byte) */
+#define EA_AY_PD_16() (AY-=2) /* predecrement (size = word) */
+#define EA_AY_PD_32() (AY-=4) /* predecrement (size = long) */
+#define EA_AY_DI_8() (AY+MAKE_INT_16(m68ki_read_imm_16(cpu))) /* displacement */
+#define EA_AY_DI_16() EA_AY_DI_8()
+#define EA_AY_DI_32() EA_AY_DI_8()
+#define EA_AY_IX_8() m68ki_get_ea_ix(cpu, AY) /* indirect + index */
+#define EA_AY_IX_16() EA_AY_IX_8()
+#define EA_AY_IX_32() EA_AY_IX_8()
+
+#define EA_AX_AI_8() AX
+#define EA_AX_AI_16() EA_AX_AI_8()
+#define EA_AX_AI_32() EA_AX_AI_8()
+#define EA_AX_PI_8() (AX++)
+#define EA_AX_PI_16() ((AX+=2)-2)
+#define EA_AX_PI_32() ((AX+=4)-4)
+#define EA_AX_PD_8() (--AX)
+#define EA_AX_PD_16() (AX-=2)
+#define EA_AX_PD_32() (AX-=4)
+#define EA_AX_DI_8() (AX+MAKE_INT_16(m68ki_read_imm_16(cpu)))
+#define EA_AX_DI_16() EA_AX_DI_8()
+#define EA_AX_DI_32() EA_AX_DI_8()
+#define EA_AX_IX_8() m68ki_get_ea_ix(cpu, AX)
+#define EA_AX_IX_16() EA_AX_IX_8()
+#define EA_AX_IX_32() EA_AX_IX_8()
+
+#define EA_A7_PI_8() ((REG_A[7]+=2)-2)
+#define EA_A7_PD_8() (REG_A[7]-=2)
+
+#define EA_AW_8() MAKE_INT_16(m68ki_read_imm_16(cpu)) /* absolute word */
+#define EA_AW_16() EA_AW_8()
+#define EA_AW_32() EA_AW_8()
+#define EA_AL_8() m68ki_read_imm_32(cpu) /* absolute long */
+#define EA_AL_16() EA_AL_8()
+#define EA_AL_32() EA_AL_8()
+#define EA_PCDI_8() m68ki_get_ea_pcdi(cpu) /* pc indirect + displacement */
+#define EA_PCDI_16() EA_PCDI_8()
+#define EA_PCDI_32() EA_PCDI_8()
+#define EA_PCIX_8() m68ki_get_ea_pcix(cpu) /* pc indirect + index */
+#define EA_PCIX_16() EA_PCIX_8()
+#define EA_PCIX_32() EA_PCIX_8()
+
+
+#define OPER_I_8() m68ki_read_imm_8()
+#define OPER_I_16() m68ki_read_imm_16(cpu)
+#define OPER_I_32() m68ki_read_imm_32(cpu)
+
+
+
+/* --------------------------- Status Register ---------------------------- */
+
+/* Flag Calculation Macros */
+#define CFLAG_8(A) (A)
+#define CFLAG_16(A) ((A)>>8)
+
+#if M68K_INT_GT_32_BIT
+	#define CFLAG_ADD_32(S, D, R) ((R)>>24)
+	#define CFLAG_SUB_32(S, D, R) ((R)>>24)
+#else
+	#define CFLAG_ADD_32(S, D, R) (((S & D) | (~R & (S | D)))>>23)
+	#define CFLAG_SUB_32(S, D, R) (((S & R) | (~D & (S | R)))>>23)
+#endif /* M68K_INT_GT_32_BIT */
+
+#define VFLAG_ADD_8(S, D, R) ((S^R) & (D^R))
+#define VFLAG_ADD_16(S, D, R) (((S^R) & (D^R))>>8)
+#define VFLAG_ADD_32(S, D, R) (((S^R) & (D^R))>>24)
+
+#define VFLAG_SUB_8(S, D, R) ((S^D) & (R^D))
+#define VFLAG_SUB_16(S, D, R) (((S^D) & (R^D))>>8)
+#define VFLAG_SUB_32(S, D, R) (((S^D) & (R^D))>>24)
+
+#define NFLAG_8(A) (A)
+#define NFLAG_16(A) ((A)>>8)
+#define NFLAG_32(A) ((A)>>24)
+#define NFLAG_64(A) ((A)>>56)
+
+#define ZFLAG_8(A) MASK_OUT_ABOVE_8(A)
+#define ZFLAG_16(A) MASK_OUT_ABOVE_16(A)
+#define ZFLAG_32(A) MASK_OUT_ABOVE_32(A)
+
+
+/* Flag values */
+#define NFLAG_SET 0x80
+#define NFLAG_CLEAR 0
+#define CFLAG_SET 0x100
+#define CFLAG_CLEAR 0
+#define XFLAG_SET 0x100
+#define XFLAG_CLEAR 0
+#define VFLAG_SET 0x80
+#define VFLAG_CLEAR 0
+#define ZFLAG_SET 0
+#define ZFLAG_CLEAR 0xffffffff
+
+#define SFLAG_SET 4
+#define SFLAG_CLEAR 0
+#define MFLAG_SET 2
+#define MFLAG_CLEAR 0
+
+/* Turn flag values into 1 or 0 */
+#define XFLAG_AS_1() ((FLAG_X>>8)&1)
+#define NFLAG_AS_1() ((FLAG_N>>7)&1)
+#define VFLAG_AS_1() ((FLAG_V>>7)&1)
+#define ZFLAG_AS_1() (!FLAG_Z)
+#define CFLAG_AS_1() ((FLAG_C>>8)&1)
+
+
+/* Conditions */
+#define COND_CS() (FLAG_C&0x100)
+#define COND_CC() (!COND_CS())
+#define COND_VS() (FLAG_V&0x80)
+#define COND_VC() (!COND_VS())
+#define COND_NE() FLAG_Z
+#define COND_EQ() (!COND_NE())
+#define COND_MI() (FLAG_N&0x80)
+#define COND_PL() (!COND_MI())
+#define COND_LT() ((FLAG_N^FLAG_V)&0x80)
+#define COND_GE() (!COND_LT())
+#define COND_HI() (COND_CC() && COND_NE())
+#define COND_LS() (COND_CS() || COND_EQ())
+#define COND_GT() (COND_GE() && COND_NE())
+#define COND_LE() (COND_LT() || COND_EQ())
+
+/* Reversed conditions */
+#define COND_NOT_CS() COND_CC()
+#define COND_NOT_CC() COND_CS()
+#define COND_NOT_VS() COND_VC()
+#define COND_NOT_VC() COND_VS()
+#define COND_NOT_NE() COND_EQ()
+#define COND_NOT_EQ() COND_NE()
+#define COND_NOT_MI() COND_PL()
+#define COND_NOT_PL() COND_MI()
+#define COND_NOT_LT() COND_GE()
+#define COND_NOT_GE() COND_LT()
+#define COND_NOT_HI() COND_LS()
+#define COND_NOT_LS() COND_HI()
+#define COND_NOT_GT() COND_LE()
+#define COND_NOT_LE() COND_GT()
+
+/* Not real conditions, but here for convenience */
+#define COND_XS() (FLAG_X&0x100)
+#define COND_XC() (!COND_XS)
+
+
+/* Get the condition code register */
+#define m68ki_get_ccr() ((COND_XS() >> 4) | \
+						 (COND_MI() >> 4) | \
+						 (COND_EQ() << 2) | \
+						 (COND_VS() >> 6) | \
+						 (COND_CS() >> 8))
+
+/* Get the status register */
+#define m68ki_get_sr() ( FLAG_T1 | \
+						 FLAG_T0 | \
+						(FLAG_S << 11) | \
+						(FLAG_M << 11) | \
+						 FLAG_INT_MASK | \
+						 m68ki_get_ccr())
+
+
+
+/* ---------------------------- Cycle Counting ---------------------------- */
+
+#define ADD_CYCLES(A) cpu->m68ki_remaining_cycles += (A)
+#define USE_CYCLES(A) cpu->m68ki_remaining_cycles -= (A)
+#define SET_CYCLES(A) cpu->m68ki_remaining_cycles = A
+#define GET_CYCLES() cpu->m68ki_remaining_cycles
+#define USE_ALL_CYCLES() cpu->m68ki_remaining_cycles = 0
+
+
+
+/* ----------------------------- Read / Write ----------------------------- */
+
+/* Read from the current address space */
+#define m68ki_read_8(A) m68ki_read_8_fc (cpu, A, FLAG_S | m68ki_get_address_space())
+#define m68ki_read_16(A) m68ki_read_16_fc(cpu, A, FLAG_S | m68ki_get_address_space())
+#define m68ki_read_32(A) m68ki_read_32_fc(cpu, A, FLAG_S | m68ki_get_address_space())
+
+/* Write to the current data space */
+#define m68ki_write_8(A, V) m68ki_write_8_fc (cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
+#define m68ki_write_16(A, V) m68ki_write_16_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
+#define m68ki_write_32(A, V) m68ki_write_32_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
+
+#if M68K_SIMULATE_PD_WRITES
+#define m68ki_write_32_pd(A, V) m68ki_write_32_pd_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
+#else
+#define m68ki_write_32_pd(A, V) m68ki_write_32_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA, V)
+#endif
+
+/* map read immediate 8 to read immediate 16 */
+#define m68ki_read_imm_8() MASK_OUT_ABOVE_8(m68ki_read_imm_16(cpu))
+
+/* Map PC-relative reads */
+#define m68ki_read_pcrel_8(A) m68k_read_pcrelative_8(A)
+#define m68ki_read_pcrel_16(A) m68k_read_pcrelative_16(A)
+#define m68ki_read_pcrel_32(A) m68k_read_pcrelative_32(A)
+
+/* Read from the program space */
+#define m68ki_read_program_8(A) 	m68ki_read_8_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
+#define m68ki_read_program_16(A) 	m68ki_read_16_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
+#define m68ki_read_program_32(A) 	m68ki_read_32_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_PROGRAM)
+
+/* Read from the data space */
+#define m68ki_read_data_8(A) 	m68ki_read_8_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA)
+#define m68ki_read_data_16(A) 	m68ki_read_16_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA)
+#define m68ki_read_data_32(A) 	m68ki_read_32_fc(cpu, A, FLAG_S | FUNCTION_CODE_USER_DATA)
+
+/* Read data immediately after the program counter */
+INLINE uint m68ki_read_imm_16(m68ki_cpu_core *cpu);
+INLINE uint m68ki_read_imm_32(m68ki_cpu_core *cpu);
+
+/* Read data with specific function code */
+INLINE uint m68ki_read_8_fc (m68ki_cpu_core *cpu, uint address, uint fc);
+INLINE uint m68ki_read_16_fc (m68ki_cpu_core *cpu, uint address, uint fc);
+INLINE uint m68ki_read_32_fc (m68ki_cpu_core *cpu, uint address, uint fc);
+
+/* Write data with specific function code */
+INLINE void m68ki_write_8_fc (m68ki_cpu_core *cpu, uint address, uint fc, uint value);
+INLINE void m68ki_write_16_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value);
+INLINE void m68ki_write_32_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value);
+#if M68K_SIMULATE_PD_WRITES
+INLINE void m68ki_write_32_pd_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value);
+#endif /* M68K_SIMULATE_PD_WRITES */
+
+/* Indexed and PC-relative ea fetching */
+INLINE uint m68ki_get_ea_pcdi(m68ki_cpu_core *cpu);
+INLINE uint m68ki_get_ea_pcix(m68ki_cpu_core *cpu);
+INLINE uint m68ki_get_ea_ix(m68ki_cpu_core *cpu, uint An);
+
+/* Operand fetching */
+INLINE uint OPER_AY_AI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_AI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_AI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PD_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PD_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_PD_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_DI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_DI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_DI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_IX_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_IX_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AY_IX_32(m68ki_cpu_core *cpu);
+
+INLINE uint OPER_AX_AI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_AI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_AI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PD_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PD_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_PD_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_DI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_DI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_DI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_IX_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_IX_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AX_IX_32(m68ki_cpu_core *cpu);
+
+INLINE uint OPER_A7_PI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_A7_PD_8(m68ki_cpu_core *cpu);
+
+INLINE uint OPER_AW_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AW_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AW_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_AL_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_AL_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_AL_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCDI_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCDI_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCDI_32(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCIX_8(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCIX_16(m68ki_cpu_core *cpu);
+INLINE uint OPER_PCIX_32(m68ki_cpu_core *cpu);
+
+/* Stack operations */
+INLINE void m68ki_push_16(m68ki_cpu_core *cpu, uint value);
+INLINE void m68ki_push_32(m68ki_cpu_core *cpu, uint value);
+INLINE uint m68ki_pull_16(m68ki_cpu_core *cpu);
+INLINE uint m68ki_pull_32(m68ki_cpu_core *cpu);
+
+/* Program flow operations */
+INLINE void m68ki_jump(m68ki_cpu_core *cpu, uint new_pc);
+INLINE void m68ki_jump_vector(m68ki_cpu_core *cpu, uint vector);
+INLINE void m68ki_branch_8(m68ki_cpu_core *cpu, uint offset);
+INLINE void m68ki_branch_16(m68ki_cpu_core *cpu, uint offset);
+INLINE void m68ki_branch_32(m68ki_cpu_core *cpu, uint offset);
+
+/* Status register operations. */
+INLINE void m68ki_set_s_flag(m68ki_cpu_core *cpu, uint value); /* Only bit 2 of value should be set (i.e. 4 or 0) */
+INLINE void m68ki_set_sm_flag(m68ki_cpu_core *cpu, uint value); /* only bits 1 and 2 of value should be set */
+INLINE void m68ki_set_ccr(m68ki_cpu_core *cpu, uint value); /* set the condition code register */
+INLINE void m68ki_set_sr(m68ki_cpu_core *cpu, uint value); /* set the status register */
+INLINE void m68ki_set_sr_noint(m68ki_cpu_core *cpu, uint value); /* set the status register */
+
+/* Exception processing */
+INLINE uint m68ki_init_exception(m68ki_cpu_core *cpu); /* Initial exception processing */
+
+INLINE void m68ki_stack_frame_3word(m68ki_cpu_core *cpu, uint pc, uint sr); /* Stack various frame types */
+INLINE void m68ki_stack_frame_buserr(m68ki_cpu_core *cpu, uint sr);
+
+INLINE void m68ki_stack_frame_0000(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector);
+INLINE void m68ki_stack_frame_0001(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector);
+INLINE void m68ki_stack_frame_0010(m68ki_cpu_core *cpu, uint sr, uint vector);
+INLINE void m68ki_stack_frame_1000(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector);
+INLINE void m68ki_stack_frame_1010(m68ki_cpu_core *cpu, uint sr, uint vector, uint pc);
+INLINE void m68ki_stack_frame_1011(m68ki_cpu_core *cpu, uint sr, uint vector, uint pc);
+
+INLINE void m68ki_exception_trap(m68ki_cpu_core *cpu, uint vector);
+INLINE void m68ki_exception_trapN(m68ki_cpu_core *cpu, uint vector);
+INLINE void m68ki_exception_trace(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_privilege_violation(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_1010(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_1111(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_illegal(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_format_error(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_address_error(m68ki_cpu_core *cpu);
+INLINE void m68ki_exception_interrupt(m68ki_cpu_core *cpu, uint int_level);
+INLINE void m68ki_check_interrupts(m68ki_cpu_core *cpu); /* ASG: check for interrupts */
+
+/* quick disassembly (used for logging) */
+char* m68ki_disassemble_quick(unsigned int pc, unsigned int cpu_type);
+
+
+/* ======================================================================== */
+/* =========================== UTILITY FUNCTIONS ========================== */
+/* ======================================================================== */
+
+
+/* ---------------------------- Read Immediate ---------------------------- */
+
+/* Handles all immediate reads, does address error check, function code setting,
+ * and prefetching if they are enabled in m68kconf.h
+ */
+INLINE uint m68ki_read_imm_16(m68ki_cpu_core *cpu)
+{
+	m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+#if M68K_EMULATE_PREFETCH
+	if(MASK_OUT_BELOW_2(REG_PC) != CPU_PREF_ADDR)
+	{
+		CPU_PREF_ADDR = MASK_OUT_BELOW_2(REG_PC);
+		CPU_PREF_DATA = m68k_read_immediate_32(ADDRESS_68K(CPU_PREF_ADDR));
+	}
+	REG_PC += 2;
+	return MASK_OUT_ABOVE_16(CPU_PREF_DATA >> ((2-((REG_PC-2)&2))<<3));
+#else
+	REG_PC += 2;
+	return m68k_read_immediate_16(ADDRESS_68K(REG_PC-2));
+#endif /* M68K_EMULATE_PREFETCH */
+}
+INLINE uint m68ki_read_imm_32(m68ki_cpu_core *cpu)
+{
+#if M68K_EMULATE_PREFETCH
+	uint temp_val;
+
+	m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+	if(MASK_OUT_BELOW_2(REG_PC) != CPU_PREF_ADDR)
+	{
+		CPU_PREF_ADDR = MASK_OUT_BELOW_2(REG_PC);
+		CPU_PREF_DATA = m68k_read_immediate_32(ADDRESS_68K(CPU_PREF_ADDR));
+	}
+	temp_val = CPU_PREF_DATA;
+	REG_PC += 2;
+	if(MASK_OUT_BELOW_2(REG_PC) != CPU_PREF_ADDR)
+	{
+		CPU_PREF_ADDR = MASK_OUT_BELOW_2(REG_PC);
+		CPU_PREF_DATA = m68k_read_immediate_32(ADDRESS_68K(CPU_PREF_ADDR));
+		temp_val = MASK_OUT_ABOVE_32((temp_val << 16) | (CPU_PREF_DATA >> 16));
+	}
+	REG_PC += 2;
+
+	return temp_val;
+#else
+	m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
+	REG_PC += 4;
+	return m68k_read_immediate_32(ADDRESS_68K(REG_PC-4));
+#endif /* M68K_EMULATE_PREFETCH */
+}
+
+
+
+/* ------------------------- Top level read/write ------------------------- */
+
+/* Handles all memory accesses (except for immediate reads if they are
+ * configured to use separate functions in m68kconf.h).
+ * All memory accesses must go through these top level functions.
+ * These functions will also check for address error and set the function
+ * code if they are enabled in m68kconf.h.
+ */
+INLINE uint m68ki_read_8_fc(m68ki_cpu_core *cpu, uint address, uint fc)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	return m68k_read_memory_8(cpu, ADDRESS_68K(address));
+}
+INLINE uint m68ki_read_16_fc(m68ki_cpu_core *cpu, uint address, uint fc)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
+	return m68k_read_memory_16(cpu, ADDRESS_68K(address));
+}
+INLINE uint m68ki_read_32_fc(m68ki_cpu_core *cpu, uint address, uint fc)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(address, MODE_READ, fc); /* auto-disable (see m68kcpu.h) */
+	return m68k_read_memory_32(cpu, ADDRESS_68K(address));
+}
+
+INLINE void m68ki_write_8_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68k_write_memory_8(cpu, ADDRESS_68K(address), value);
+}
+INLINE void m68ki_write_16_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
+	m68k_write_memory_16(cpu, ADDRESS_68K(address), value);
+}
+INLINE void m68ki_write_32_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
+	m68k_write_memory_32(cpu, ADDRESS_68K(address), value);
+}
+
+#if M68K_SIMULATE_PD_WRITES
+INLINE void m68ki_write_32_pd_fc(m68ki_cpu_core *cpu, uint address, uint fc, uint value)
+{
+	m68ki_set_fc(fc); /* auto-disable (see m68kcpu.h) */
+	m68ki_check_address_error(address, MODE_WRITE, fc); /* auto-disable (see m68kcpu.h) */
+	m68k_write_memory_32_pd(ADDRESS_68K(address), value);
+}
+#endif
+
+
+/* --------------------- Effective Address Calculation -------------------- */
+
+/* The program counter relative addressing modes cause operands to be
+ * retrieved from program space, not data space.
+ */
+INLINE uint m68ki_get_ea_pcdi(m68ki_cpu_core *cpu)
+{
+	uint old_pc = REG_PC;
+	m68ki_use_program_space(); /* auto-disable */
+	return old_pc + MAKE_INT_16(m68ki_read_imm_16(cpu));
+}
+
+
+INLINE uint m68ki_get_ea_pcix(m68ki_cpu_core *cpu)
+{
+	m68ki_use_program_space(); /* auto-disable */
+	return m68ki_get_ea_ix(cpu, REG_PC);
+}
+
+/* Indexed addressing modes are encoded as follows:
+ *
+ * Base instruction format:
+ * F E D C B A 9 8 7 6 | 5 4 3 | 2 1 0
+ * x x x x x x x x x x | 1 1 0 | BASE REGISTER (An)
+ *
+ * Base instruction format for destination EA in move instructions:
+ * F E D C | B A 9 | 8 7 6 | 5 4 3 2 1 0
+ * x x x x | BASE REG | 1 1 0 | X X X X X X (An)
+ *
+ * Brief extension format:
+ * F | E D C | B | A 9 | 8 | 7 6 5 4 3 2 1 0
+ * D/A | REGISTER | W/L | SCALE | 0 | DISPLACEMENT
+ *
+ * Full extension format:
+ * F E D C B A 9 8 7 6 5 4 3 2 1 0
+ * D/A | REGISTER | W/L | SCALE | 1 | BS | IS | BD SIZE | 0 | I/IS
+ * BASE DISPLACEMENT (0, 16, 32 bit) (bd)
+ * OUTER DISPLACEMENT (0, 16, 32 bit) (od)
+ *
+ * D/A: 0 = Dn, 1 = An (Xn)
+ * W/L: 0 = W (sign extend), 1 = L (.SIZE)
+ * SCALE: 00=1, 01=2, 10=4, 11=8 (*SCALE)
+ * BS: 0=add base reg, 1=suppress base reg (An suppressed)
+ * IS: 0=add index, 1=suppress index (Xn suppressed)
+ * BD SIZE: 00=reserved, 01=NULL, 10=Word, 11=Long (size of bd)
+ *
+ * IS I/IS Operation
+ * 0 000 No Memory Indirect
+ * 0 001 indir prex with null outer
+ * 0 010 indir prex with word outer
+ * 0 011 indir prex with long outer
+ * 0 100 reserved
+ * 0 101 indir postx with null outer
+ * 0 110 indir postx with word outer
+ * 0 111 indir postx with long outer
+ * 1 000 no memory indirect
+ * 1 001 mem indir with null outer
+ * 1 010 mem indir with word outer
+ * 1 011 mem indir with long outer
+ * 1 100-111 reserved
+ */
+INLINE uint m68ki_get_ea_ix(m68ki_cpu_core *cpu, uint An)
+{
+	/* An = base register */
+	uint extension = m68ki_read_imm_16(cpu);
+	uint Xn = 0; /* Index register */
+	uint bd = 0; /* Base Displacement */
+	uint od = 0; /* Outer Displacement */
+
+	if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
+	{
+		/* Calculate index */
+		Xn = REG_DA[extension>>12]; /* Xn */
+		if(!BIT_B(extension)) /* W/L */
+			Xn = MAKE_INT_16(Xn);
+
+		/* Add base register and displacement and return */
+		return An + Xn + MAKE_INT_8(extension);
+	}
+
+	/* Brief extension format */
+	if(!BIT_8(extension))
+	{
+		/* Calculate index */
+		Xn = REG_DA[extension>>12]; /* Xn */
+		if(!BIT_B(extension)) /* W/L */
+			Xn = MAKE_INT_16(Xn);
+		/* Add scale if proper CPU type */
+		if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+			Xn <<= (extension>>9) & 3; /* SCALE */
+
+		/* Add base register and displacement and return */
+		return An + Xn + MAKE_INT_8(extension);
+	}
+
+	/* Full extension format */
+
+	USE_CYCLES(m68ki_ea_idx_cycle_table[extension&0x3f]);
+
+	/* Check if base register is present */
+	if(BIT_7(extension)) /* BS */
+		An = 0; /* An */
+
+	/* Check if index is present */
+	if(!BIT_6(extension)) /* IS */
+	{
+		Xn = REG_DA[extension>>12]; /* Xn */
+		if(!BIT_B(extension)) /* W/L */
+			Xn = MAKE_INT_16(Xn);
+		Xn <<= (extension>>9) & 3; /* SCALE */
+	}
+
+	/* Check if base displacement is present */
+	if(BIT_5(extension)) /* BD SIZE */
+		bd = BIT_4(extension) ? m68ki_read_imm_32(cpu) : MAKE_INT_16(m68ki_read_imm_16(cpu));
+
+	/* If no indirect action, we are done */
+	if(!(extension&7)) /* No Memory Indirect */
+		return An + bd + Xn;
+
+	/* Check if outer displacement is present */
+	if(BIT_1(extension)) /* I/IS: od */
+		od = BIT_0(extension) ? m68ki_read_imm_32(cpu) : MAKE_INT_16(m68ki_read_imm_16(cpu));
+
+	/* Postindex */
+	if(BIT_2(extension)) /* I/IS: 0 = preindex, 1 = postindex */
+		return m68ki_read_32(An + bd) + Xn + od;
+
+	/* Preindex */
+	return m68ki_read_32(An + bd + Xn) + od;
+}
+
+
+/* Fetch operands */
+INLINE uint OPER_AY_AI_8(m68ki_cpu_core *cpu) {uint ea = EA_AY_AI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AY_AI_16(m68ki_cpu_core *cpu) {uint ea = EA_AY_AI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AY_AI_32(m68ki_cpu_core *cpu) {uint ea = EA_AY_AI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AY_PI_8(m68ki_cpu_core *cpu) {uint ea = EA_AY_PI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AY_PI_16(m68ki_cpu_core *cpu) {uint ea = EA_AY_PI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AY_PI_32(m68ki_cpu_core *cpu) {uint ea = EA_AY_PI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AY_PD_8(m68ki_cpu_core *cpu) {uint ea = EA_AY_PD_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AY_PD_16(m68ki_cpu_core *cpu) {uint ea = EA_AY_PD_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AY_PD_32(m68ki_cpu_core *cpu) {uint ea = EA_AY_PD_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AY_DI_8(m68ki_cpu_core *cpu) {uint ea = EA_AY_DI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AY_DI_16(m68ki_cpu_core *cpu) {uint ea = EA_AY_DI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AY_DI_32(m68ki_cpu_core *cpu) {uint ea = EA_AY_DI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AY_IX_8(m68ki_cpu_core *cpu) {uint ea = EA_AY_IX_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AY_IX_16(m68ki_cpu_core *cpu) {uint ea = EA_AY_IX_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AY_IX_32(m68ki_cpu_core *cpu) {uint ea = EA_AY_IX_32(); return m68ki_read_32(ea);}
+
+INLINE uint OPER_AX_AI_8(m68ki_cpu_core *cpu) {uint ea = EA_AX_AI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AX_AI_16(m68ki_cpu_core *cpu) {uint ea = EA_AX_AI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AX_AI_32(m68ki_cpu_core *cpu) {uint ea = EA_AX_AI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AX_PI_8(m68ki_cpu_core *cpu) {uint ea = EA_AX_PI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AX_PI_16(m68ki_cpu_core *cpu) {uint ea = EA_AX_PI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AX_PI_32(m68ki_cpu_core *cpu) {uint ea = EA_AX_PI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AX_PD_8(m68ki_cpu_core *cpu) {uint ea = EA_AX_PD_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AX_PD_16(m68ki_cpu_core *cpu) {uint ea = EA_AX_PD_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AX_PD_32(m68ki_cpu_core *cpu) {uint ea = EA_AX_PD_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AX_DI_8(m68ki_cpu_core *cpu) {uint ea = EA_AX_DI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AX_DI_16(m68ki_cpu_core *cpu) {uint ea = EA_AX_DI_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AX_DI_32(m68ki_cpu_core *cpu) {uint ea = EA_AX_DI_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AX_IX_8(m68ki_cpu_core *cpu) {uint ea = EA_AX_IX_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AX_IX_16(m68ki_cpu_core *cpu) {uint ea = EA_AX_IX_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AX_IX_32(m68ki_cpu_core *cpu) {uint ea = EA_AX_IX_32(); return m68ki_read_32(ea);}
+
+INLINE uint OPER_A7_PI_8(m68ki_cpu_core *cpu) {uint ea = EA_A7_PI_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_A7_PD_8(m68ki_cpu_core *cpu) {uint ea = EA_A7_PD_8(); return m68ki_read_8(ea); }
+
+INLINE uint OPER_AW_8(m68ki_cpu_core *cpu) {uint ea = EA_AW_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AW_16(m68ki_cpu_core *cpu) {uint ea = EA_AW_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AW_32(m68ki_cpu_core *cpu) {uint ea = EA_AW_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_AL_8(m68ki_cpu_core *cpu) {uint ea = EA_AL_8(); return m68ki_read_8(ea); }
+INLINE uint OPER_AL_16(m68ki_cpu_core *cpu) {uint ea = EA_AL_16(); return m68ki_read_16(ea);}
+INLINE uint OPER_AL_32(m68ki_cpu_core *cpu) {uint ea = EA_AL_32(); return m68ki_read_32(ea);}
+INLINE uint OPER_PCDI_8(m68ki_cpu_core *cpu) {uint ea = EA_PCDI_8(); return m68ki_read_pcrel_8(ea); }
+INLINE uint OPER_PCDI_16(m68ki_cpu_core *cpu) {uint ea = EA_PCDI_16(); return m68ki_read_pcrel_16(ea);}
+INLINE uint OPER_PCDI_32(m68ki_cpu_core *cpu) {uint ea = EA_PCDI_32(); return m68ki_read_pcrel_32(ea);}
+INLINE uint OPER_PCIX_8(m68ki_cpu_core *cpu) {uint ea = EA_PCIX_8(); return m68ki_read_pcrel_8(ea); }
+INLINE uint OPER_PCIX_16(m68ki_cpu_core *cpu) {uint ea = EA_PCIX_16(); return m68ki_read_pcrel_16(ea);}
+INLINE uint OPER_PCIX_32(m68ki_cpu_core *cpu) {uint ea = EA_PCIX_32(); return m68ki_read_pcrel_32(ea);}
+
+
+
+/* ---------------------------- Stack Functions --------------------------- */
+
+/* Push/pull data from the stack */
+INLINE void m68ki_push_16(m68ki_cpu_core *cpu, uint value)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
+	m68ki_write_16(REG_SP, value);
+}
+
+INLINE void m68ki_push_32(m68ki_cpu_core *cpu, uint value)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
+	m68ki_write_32(REG_SP, value);
+}
+
+INLINE uint m68ki_pull_16(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
+	return m68ki_read_16(REG_SP-2);
+}
+
+INLINE uint m68ki_pull_32(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
+	return m68ki_read_32(REG_SP-4);
+}
+
+
+/* Increment/decrement the stack as if doing a push/pull but
+ * don't do any memory access.
+ */
+INLINE void m68ki_fake_push_16(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP - 2);
+}
+
+INLINE void m68ki_fake_push_32(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP - 4);
+}
+
+INLINE void m68ki_fake_pull_16(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP + 2);
+}
+
+INLINE void m68ki_fake_pull_32(m68ki_cpu_core *cpu)
+{
+	REG_SP = MASK_OUT_ABOVE_32(REG_SP + 4);
+}
+
+
+/* ----------------------------- Program Flow ----------------------------- */
+
+/* Jump to a new program location or vector.
+ * These functions will also call the pc_changed callback if it was enabled
+ * in m68kconf.h.
+ */
+INLINE void m68ki_jump(m68ki_cpu_core *cpu, uint new_pc)
+{
+	REG_PC = new_pc;
+	m68ki_pc_changed(REG_PC);
+}
+
+INLINE void m68ki_jump_vector(m68ki_cpu_core *cpu, uint vector)
+{
+	REG_PC = (vector<<2) + REG_VBR;
+	REG_PC = m68ki_read_data_32(REG_PC);
+	m68ki_pc_changed(REG_PC);
+}
+
+
+/* Branch to a new memory location.
+ * The 32-bit branch will call pc_changed if it was enabled in m68kconf.h.
+ * So far I've found no problems with not calling pc_changed for 8 or 16
+ * bit branches.
+ */
+INLINE void m68ki_branch_8(m68ki_cpu_core *cpu, uint offset)
+{
+	REG_PC += MAKE_INT_8(offset);
+}
+
+INLINE void m68ki_branch_16(m68ki_cpu_core *cpu, uint offset)
+{
+	REG_PC += MAKE_INT_16(offset);
+}
+
+INLINE void m68ki_branch_32(m68ki_cpu_core *cpu, uint offset)
+{
+	REG_PC += offset;
+	m68ki_pc_changed(REG_PC);
+}
+
+
+
+/* ---------------------------- Status Register --------------------------- */
+
+/* Set the S flag and change the active stack pointer.
+ * Note that value MUST be 4 or 0.
+ */
+INLINE void m68ki_set_s_flag(m68ki_cpu_core *cpu, uint value)
+{
+	/* Backup the old stack pointer */
+	REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
+	/* Set the S flag */
+	FLAG_S = value;
+	/* Set the new stack pointer */
+	REG_SP = REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)];
+}
+
+/* Set the S and M flags and change the active stack pointer.
+ * Note that value MUST be 0, 2, 4, or 6 (bit2 = S, bit1 = M).
+ */
+INLINE void m68ki_set_sm_flag(m68ki_cpu_core *cpu, uint value)
+{
+	/* Backup the old stack pointer */
+	REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)] = REG_SP;
+	/* Set the S and M flags */
+	FLAG_S = value & SFLAG_SET;
+	FLAG_M = value & MFLAG_SET;
+	/* Set the new stack pointer */
+	REG_SP = REG_SP_BASE[FLAG_S | ((FLAG_S>>1) & FLAG_M)];
+}
+
+/* Set the S and M flags. Don't touch the stack pointer. */
+INLINE void m68ki_set_sm_flag_nosp(m68ki_cpu_core *cpu, uint value)
+{
+	/* Set the S and M flags */
+	FLAG_S = value & SFLAG_SET;
+	FLAG_M = value & MFLAG_SET;
+}
+
+
+/* Set the condition code register */
+INLINE void m68ki_set_ccr(m68ki_cpu_core *cpu, uint value)
+{
+	FLAG_X = BIT_4(value) << 4;
+	FLAG_N = BIT_3(value) << 4;
+	FLAG_Z = !BIT_2(value);
+	FLAG_V = BIT_1(value) << 6;
+	FLAG_C = BIT_0(value) << 8;
+}
+
+/* Set the status register but don't check for interrupts */
+INLINE void m68ki_set_sr_noint(m68ki_cpu_core *cpu, uint value)
+{
+	/* Mask out the "unimplemented" bits */
+	value &= CPU_SR_MASK;
+
+	/* Now set the status register */
+	FLAG_T1 = BIT_F(value);
+	FLAG_T0 = BIT_E(value);
+	FLAG_INT_MASK = value & 0x0700;
+	m68ki_set_ccr(cpu, value);
+	m68ki_set_sm_flag(cpu, (value >> 11) & 6);
+}
+
+/* Set the status register but don't check for interrupts nor
+ * change the stack pointer
+ */
+INLINE void m68ki_set_sr_noint_nosp(m68ki_cpu_core *cpu, uint value)
+{
+	/* Mask out the "unimplemented" bits */
+	value &= CPU_SR_MASK;
+
+	/* Now set the status register */
+	FLAG_T1 = BIT_F(value);
+	FLAG_T0 = BIT_E(value);
+	FLAG_INT_MASK = value & 0x0700;
+	m68ki_set_ccr(cpu, value);
+	m68ki_set_sm_flag_nosp(cpu, (value >> 11) & 6);
+}
+
+/* Set the status register and check for interrupts */
+INLINE void m68ki_set_sr(m68ki_cpu_core *cpu, uint value)
+{
+	m68ki_set_sr_noint(cpu, value);
+	m68ki_check_interrupts(cpu);
+}
+
+
+/* ------------------------- Exception Processing ------------------------- */
+
+/* Initiate exception processing */
+INLINE uint m68ki_init_exception(m68ki_cpu_core *cpu)
+{
+	/* Save the old status register */
+	uint sr = m68ki_get_sr();
+
+	/* Turn off trace flag, clear pending traces */
+	FLAG_T1 = FLAG_T0 = 0;
+	m68ki_clear_trace();
+	/* Enter supervisor mode */
+	m68ki_set_s_flag(cpu, SFLAG_SET);
+
+	return sr;
+}
+
+/* 3 word stack frame (68000 only) */
+INLINE void m68ki_stack_frame_3word(m68ki_cpu_core *cpu, uint pc, uint sr)
+{
+	m68ki_push_32(cpu, pc);
+	m68ki_push_16(cpu, sr);
+}
+
+/* Format 0 stack frame.
+ * This is the standard stack frame for 68010+.
+ */
+INLINE void m68ki_stack_frame_0000(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector)
+{
+	/* Stack a 3-word frame if we are 68000 */
+	if(CPU_TYPE == CPU_TYPE_000)
+	{
+		m68ki_stack_frame_3word(cpu, pc, sr);
+		return;
+	}
+	m68ki_push_16(cpu, vector<<2);
+	m68ki_push_32(cpu, pc);
+	m68ki_push_16(cpu, sr);
+}
+
+/* Format 1 stack frame (68020).
+ * For 68020, this is the 4 word throwaway frame.
+ */
+INLINE void m68ki_stack_frame_0001(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector)
+{
+	m68ki_push_16(cpu, 0x1000 | (vector<<2));
+	m68ki_push_32(cpu, pc);
+	m68ki_push_16(cpu, sr);
+}
+
+/* Format 2 stack frame.
+ * This is used only by 68020 for trap exceptions.
+ */
+INLINE void m68ki_stack_frame_0010(m68ki_cpu_core *cpu, uint sr, uint vector)
+{
+	m68ki_push_32(cpu, REG_PPC);
+	m68ki_push_16(cpu, 0x2000 | (vector<<2));
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_push_16(cpu, sr);
+}
+
+
+/* Bus error stack frame (68000 only).
+ */
+INLINE void m68ki_stack_frame_buserr(m68ki_cpu_core *cpu, uint sr)
+{
+	m68ki_push_32(cpu,REG_PC);
+	m68ki_push_16(cpu,sr);
+	m68ki_push_16(cpu,REG_IR);
+	m68ki_push_32(cpu,cpu->m68ki_aerr_address);	/* access address */
+	/* 0 0 0 0 0 0 0 0 0 0 0 R/W I/N FC
+	 * R/W 0 = write, 1 = read
+	 * I/N 0 = instruction, 1 = not
+	 * FC 3-bit function code
+	 */
+	m68ki_push_16(cpu,cpu->m68ki_aerr_write_mode | CPU_INSTR_MODE | cpu->m68ki_aerr_fc);
+}
+
+/* Format 8 stack frame (68010).
+ * 68010 only. This is the 29 word bus/address error frame.
+ */
+void m68ki_stack_frame_1000(m68ki_cpu_core *cpu, uint pc, uint sr, uint vector)
+{
+	/* VERSION
+	 * NUMBER
+	 * INTERNAL INFORMATION, 16 WORDS
+	 */
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+	m68ki_fake_push_32(cpu);
+
+	/* INSTRUCTION INPUT BUFFER */
+	m68ki_push_16(cpu,0);
+
+	/* UNUSED, RESERVED (not written) */
+	m68ki_fake_push_16(cpu);
+
+	/* DATA INPUT BUFFER */
+	m68ki_push_16(cpu,0);
+
+	/* UNUSED, RESERVED (not written) */
+	m68ki_fake_push_16(cpu);
+
+	/* DATA OUTPUT BUFFER */
+	m68ki_push_16(cpu,0);
+
+	/* UNUSED, RESERVED (not written) */
+	m68ki_fake_push_16(cpu);
+
+	/* FAULT ADDRESS */
+	m68ki_push_32(cpu,0);
+
+	/* SPECIAL STATUS WORD */
+	m68ki_push_16(cpu,0);
+
+	/* 1000, VECTOR OFFSET */
+	m68ki_push_16(cpu,0x8000 | (vector<<2));
+
+	/* PROGRAM COUNTER */
+	m68ki_push_32(cpu,pc);
+
+	/* STATUS REGISTER */
+	m68ki_push_16(cpu,sr);
+}
+
+/* Format A stack frame (short bus fault).
+ * This is used only by 68020 for bus fault and address error
+ * if the error happens at an instruction boundary.
+ * PC stacked is address of next instruction.
+ */
+void m68ki_stack_frame_1010(m68ki_cpu_core *cpu, uint sr, uint vector, uint pc)
+{
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* DATA OUTPUT BUFFER (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* DATA CYCLE FAULT ADDRESS (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INSTRUCTION PIPE STAGE B */
+	m68ki_push_16(cpu,0);
+
+	/* INSTRUCTION PIPE STAGE C */
+	m68ki_push_16(cpu,0);
+
+	/* SPECIAL STATUS REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* 1010, VECTOR OFFSET */
+	m68ki_push_16(cpu,0xa000 | (vector<<2));
+
+	/* PROGRAM COUNTER */
+	m68ki_push_32(cpu,pc);
+
+	/* STATUS REGISTER */
+	m68ki_push_16(cpu,sr);
+}
+
+/* Format B stack frame (long bus fault).
+ * This is used only by 68020 for bus fault and address error
+ * if the error happens during instruction execution.
+ * PC stacked is address of instruction in progress.
+ */
+void m68ki_stack_frame_1011(m68ki_cpu_core *cpu, uint sr, uint vector, uint pc)
+{
+	/* INTERNAL REGISTERS (18 words) */
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+
+	/* VERSION# (4 bits), INTERNAL INFORMATION */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTERS (3 words) */
+	m68ki_push_32(cpu,0);
+	m68ki_push_16(cpu,0);
+
+	/* DATA INTPUT BUFFER (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INTERNAL REGISTERS (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* STAGE B ADDRESS (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INTERNAL REGISTER (4 words) */
+	m68ki_push_32(cpu,0);
+	m68ki_push_32(cpu,0);
+
+	/* DATA OUTPUT BUFFER (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* DATA CYCLE FAULT ADDRESS (2 words) */
+	m68ki_push_32(cpu,0);
+
+	/* INSTRUCTION PIPE STAGE B */
+	m68ki_push_16(cpu,0);
+
+	/* INSTRUCTION PIPE STAGE C */
+	m68ki_push_16(cpu,0);
+
+	/* SPECIAL STATUS REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* INTERNAL REGISTER */
+	m68ki_push_16(cpu,0);
+
+	/* 1011, VECTOR OFFSET */
+	m68ki_push_16(cpu,0xb000 | (vector<<2));
+
+	/* PROGRAM COUNTER */
+	m68ki_push_32(cpu,pc);
+
+	/* STATUS REGISTER */
+	m68ki_push_16(cpu,sr);
+}
+
+
+/* Used for Group 2 exceptions.
+ * These stack a type 2 frame on the 020.
+ */
+INLINE void m68ki_exception_trap(m68ki_cpu_core *cpu, uint vector)
+{
+	uint sr = m68ki_init_exception(cpu);
+
+	if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
+		m68ki_stack_frame_0000(cpu, REG_PC, sr, vector);
+	else
+		m68ki_stack_frame_0010(cpu, sr, vector);
+
+	m68ki_jump_vector(cpu, vector);
+
+	/* Use up some clock cycles */
+	USE_CYCLES(CYC_EXCEPTION[vector]);
+}
+
+/* Trap#n stacks a 0 frame but behaves like group2 otherwise */
+INLINE void m68ki_exception_trapN(m68ki_cpu_core *cpu, uint vector)
+{
+	uint sr = m68ki_init_exception(cpu);
+	m68ki_stack_frame_0000(cpu, REG_PC, sr, vector);
+	m68ki_jump_vector(cpu, vector);
+
+	/* Use up some clock cycles */
+	USE_CYCLES(CYC_EXCEPTION[vector]);
+}
+
+/* Exception for trace mode */
+INLINE void m68ki_exception_trace(m68ki_cpu_core *cpu)
+{
+	uint sr = m68ki_init_exception(cpu);
+
+	if(CPU_TYPE_IS_010_LESS(CPU_TYPE))
+	{
+		#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
+		if(CPU_TYPE_IS_000(CPU_TYPE))
+		{
+			CPU_INSTR_MODE = INSTRUCTION_NO;
+		}
+		#endif /* M68K_EMULATE_ADDRESS_ERROR */
+		m68ki_stack_frame_0000(cpu, REG_PC, sr, EXCEPTION_TRACE);
+	}
+	else
+		m68ki_stack_frame_0010(cpu, sr, EXCEPTION_TRACE);
+
+	m68ki_jump_vector(cpu, EXCEPTION_TRACE);
+
+	/* Trace nullifies a STOP instruction */
+	CPU_STOPPED &= ~STOP_LEVEL_STOP;
+
+	/* Use up some clock cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_TRACE]);
+}
+
+/* Exception for privilege violation */
+INLINE void m68ki_exception_privilege_violation(m68ki_cpu_core *cpu)
+{
+	uint sr = m68ki_init_exception(cpu);
+
+	#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
+	if(CPU_TYPE_IS_000(CPU_TYPE))
+	{
+		CPU_INSTR_MODE = INSTRUCTION_NO;
+	}
+	#endif /* M68K_EMULATE_ADDRESS_ERROR */
+
+	m68ki_stack_frame_0000(cpu, REG_PPC, sr, EXCEPTION_PRIVILEGE_VIOLATION);
+	m68ki_jump_vector(cpu, EXCEPTION_PRIVILEGE_VIOLATION);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_PRIVILEGE_VIOLATION] - CYC_INSTRUCTION[REG_IR]);
+}
+
+/* Exception for A-Line instructions */
+INLINE void m68ki_exception_1010(m68ki_cpu_core *cpu)
+{
+	uint sr;
+#if M68K_LOG_1010_1111 == OPT_ON
+	M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1010 instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
+					 m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
+#endif
+
+	sr = m68ki_init_exception(cpu);
+	m68ki_stack_frame_0000(cpu, REG_PPC, sr, EXCEPTION_1010);
+	m68ki_jump_vector(cpu, EXCEPTION_1010);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_1010] - CYC_INSTRUCTION[REG_IR]);
+}
+
+/* Exception for F-Line instructions */
+INLINE void m68ki_exception_1111(m68ki_cpu_core *cpu)
+{
+	uint sr;
+
+#if M68K_LOG_1010_1111 == OPT_ON
+	M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: called 1111 instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
+					 m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
+#endif
+
+	sr = m68ki_init_exception(cpu);
+	m68ki_stack_frame_0000(cpu, REG_PPC, sr, EXCEPTION_1111);
+	m68ki_jump_vector(cpu, EXCEPTION_1111);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_1111] - CYC_INSTRUCTION[REG_IR]);
+}
+
+/* Exception for illegal instructions */
+INLINE void m68ki_exception_illegal(m68ki_cpu_core *cpu)
+{
+	uint sr;
+
+	M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: illegal instruction %04x (%s)\n",
+				 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PPC), REG_IR,
+				 m68ki_disassemble_quick(ADDRESS_68K(REG_PPC))));
+
+	sr = m68ki_init_exception(cpu);
+
+	#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
+	if(CPU_TYPE_IS_000(CPU_TYPE))
+	{
+		CPU_INSTR_MODE = INSTRUCTION_NO;
+	}
+	#endif /* M68K_EMULATE_ADDRESS_ERROR */
+
+	m68ki_stack_frame_0000(cpu, REG_PPC, sr, EXCEPTION_ILLEGAL_INSTRUCTION);
+	m68ki_jump_vector(cpu, EXCEPTION_ILLEGAL_INSTRUCTION);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_ILLEGAL_INSTRUCTION] - CYC_INSTRUCTION[REG_IR]);
+}
+
+/* Exception for format errror in RTE */
+INLINE void m68ki_exception_format_error(m68ki_cpu_core *cpu)
+{
+	uint sr = m68ki_init_exception(cpu);
+	m68ki_stack_frame_0000(cpu, REG_PC, sr, EXCEPTION_FORMAT_ERROR);
+	m68ki_jump_vector(cpu, EXCEPTION_FORMAT_ERROR);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_FORMAT_ERROR] - CYC_INSTRUCTION[REG_IR]);
+}
+
+/* Exception for address error */
+INLINE void m68ki_exception_address_error(m68ki_cpu_core *cpu)
+{
+	uint sr = m68ki_init_exception(cpu);
+
+	/* If we were processing a bus error, address error, or reset,
+	 * this is a catastrophic failure.
+	 * Halt the CPU
+	 */
+	if(CPU_RUN_MODE == RUN_MODE_BERR_AERR_RESET)
+	{
+ m68k_read_memory_8(cpu, 0x00ffff01);
+		CPU_STOPPED = STOP_LEVEL_HALT;
+		return;
+	}
+	CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET;
+
+	/* Note: This is implemented for 68000 only! */
+	m68ki_stack_frame_buserr(cpu, sr);
+
+	m68ki_jump_vector(cpu, EXCEPTION_ADDRESS_ERROR);
+
+	/* Use up some clock cycles and undo the instruction's cycles */
+	USE_CYCLES(CYC_EXCEPTION[EXCEPTION_ADDRESS_ERROR] - CYC_INSTRUCTION[REG_IR]);
+}
+
+
+/* Service an interrupt request and start exception processing */
+void m68ki_exception_interrupt(m68ki_cpu_core *cpu, uint int_level)
+{
+	uint vector;
+	uint sr;
+	uint new_pc;
+
+	#if M68K_EMULATE_ADDRESS_ERROR == OPT_ON
+	if(CPU_TYPE_IS_000(CPU_TYPE))
+	{
+		CPU_INSTR_MODE = INSTRUCTION_NO;
+	}
+	#endif /* M68K_EMULATE_ADDRESS_ERROR */
+
+	/* Turn off the stopped state */
+	CPU_STOPPED &= ~STOP_LEVEL_STOP;
+
+	/* If we are halted, don't do anything */
+	if(CPU_STOPPED)
+		return;
+
+	/* Acknowledge the interrupt */
+	vector = m68ki_int_ack(cpu, int_level);
+
+	/* Get the interrupt vector */
+	if(vector == M68K_INT_ACK_AUTOVECTOR)
+		/* Use the autovectors. This is the most commonly used implementation */
+		vector = EXCEPTION_INTERRUPT_AUTOVECTOR+int_level;
+	else if(vector == M68K_INT_ACK_SPURIOUS)
+		/* Called if no devices respond to the interrupt acknowledge */
+		vector = EXCEPTION_SPURIOUS_INTERRUPT;
+	else if(vector > 255)
+	{
+		M68K_DO_LOG_EMU((M68K_LOG_FILEHANDLE "%s at %08x: Interrupt acknowledge returned invalid vector $%x\n",
+				 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC), vector));
+		return;
+	}
+
+	/* Start exception processing */
+	sr = m68ki_init_exception(cpu);
+
+	/* Set the interrupt mask to the level of the one being serviced */
+	FLAG_INT_MASK = int_level<<8;
+
+	/* Get the new PC */
+	new_pc = m68ki_read_data_32((vector<<2) + REG_VBR);
+
+	/* If vector is uninitialized, call the uninitialized interrupt vector */
+	if(new_pc == 0)
+		new_pc = m68ki_read_data_32((EXCEPTION_UNINITIALIZED_INTERRUPT<<2) + REG_VBR);
+
+	/* Generate a stack frame */
+	m68ki_stack_frame_0000(cpu, REG_PC, sr, vector);
+	if(FLAG_M && CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Create throwaway frame */
+		m68ki_set_sm_flag(cpu, FLAG_S);	/* clear M */
+		sr |= 0x2000; /* Same as SR in master stack frame except S is forced high */
+		m68ki_stack_frame_0001(cpu, REG_PC, sr, vector);
+	}
+
+	m68ki_jump(cpu, new_pc);
+
+	/* Defer cycle counting until later */
+	CPU_INT_CYCLES += CYC_EXCEPTION[vector];
+
+#if !M68K_EMULATE_INT_ACK
+	/* Automatically clear IRQ if we are not using an acknowledge scheme */
+	CPU_INT_LEVEL = 0;
+#endif /* M68K_EMULATE_INT_ACK */
+}
+
+
+/* ASG: Check for interrupts */
+INLINE void m68ki_check_interrupts(m68ki_cpu_core *cpu)
+{
+	if(CPU_INT_LEVEL > FLAG_INT_MASK)
+		m68ki_exception_interrupt(cpu, CPU_INT_LEVEL>>8);
+}
+
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68KCPU__HEADER */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kmame.h Added

@@ -0,0 +1,172 @@
+#ifndef M68KMAME__HEADER
+#define M68KMAME__HEADER
+
+/* ======================================================================== */
+/* ============================== MAME STUFF ============================== */
+/* ======================================================================== */
+
+#include "cpuintrf.h"
+#include "memory.h"
+#include "mamedbg.h"
+#include "m68000.h"
+
+extern int m68ki_remaining_cycles;
+
+/* Configuration switches (see m68kconf.h for explanation) */
+#define M68K_SEPARATE_READS OPT_ON
+
+#define M68K_SIMULATE_PD_WRITES OPT_ON
+
+#define M68K_EMULATE_INT_ACK OPT_ON
+#define M68K_INT_ACK_CALLBACK(A)
+
+#define M68K_EMULATE_BKPT_ACK OPT_OFF
+#define M68K_BKPT_ACK_CALLBACK()
+
+#define M68K_EMULATE_TRACE OPT_OFF
+
+#define M68K_EMULATE_RESET OPT_ON
+#define M68K_RESET_CALLBACK()
+
+#define M68K_EMULATE_FC OPT_OFF
+#define M68K_SET_FC_CALLBACK(A)
+
+#define M68K_MONITOR_PC OPT_SPECIFY_HANDLER
+#define M68K_SET_PC_CALLBACK(A) (*m68k_memory_intf.changepc)(A)
+
+#define M68K_INSTRUCTION_HOOK OPT_SPECIFY_HANDLER
+#define M68K_INSTRUCTION_CALLBACK() CALL_MAME_DEBUG
+
+#define M68K_EMULATE_PREFETCH OPT_ON
+
+#define M68K_LOG_ENABLE OPT_OFF
+#define M68K_LOG_1010_1111 OPT_OFF
+#define M68K_LOG_FILEHANDLE errorlog
+
+#define M68K_EMULATE_ADDRESS_ERROR OPT_OFF
+
+#define M68K_USE_64_BIT OPT_OFF
+
+extern struct m68k_memory_interface m68k_memory_intf;
+
+#define m68k_read_memory_8(address) (*m68k_memory_intf.read8)(address)
+#define m68k_read_memory_16(address) (*m68k_memory_intf.read16)(address)
+#define m68k_read_memory_32(address) (*m68k_memory_intf.read32)(address)
+
+INLINE unsigned int m68k_read_immediate_16(unsigned int address)
+{
+	return cpu_readop16((address) ^ m68k_memory_intf.opcode_xor);
+}
+
+INLINE unsigned int m68k_read_immediate_32(unsigned int address)
+{
+	return ((m68k_read_immediate_16(address) << 16) | m68k_read_immediate_16((address)+2));
+}
+
+INLINE unsigned int m68k_read_pcrelative_8(unsigned int address)
+{
+	if (address >= encrypted_opcode_start[cpu_getactivecpu()] &&
+			address < encrypted_opcode_end[cpu_getactivecpu()])
+		return ((m68k_read_immediate_16(address&~1)>>(8*(1-(address & 1))))&0xff);
+	else
+		return m68k_read_memory_8(address);
+}
+
+INLINE unsigned int m68k_read_pcrelative_16(unsigned int address)
+{
+	if (address >= encrypted_opcode_start[cpu_getactivecpu()] &&
+			address < encrypted_opcode_end[cpu_getactivecpu()])
+		return m68k_read_immediate_16(address);
+	else
+		return m68k_read_memory_16(address);
+}
+
+INLINE unsigned int m68k_read_pcrelative_32(unsigned int address)
+{
+	if (address >= encrypted_opcode_start[cpu_getactivecpu()] &&
+			address < encrypted_opcode_end[cpu_getactivecpu()])
+		return m68k_read_immediate_32(address);
+	else
+		return m68k_read_memory_32(address);
+}
+
+#define m68k_read_disassembler_16(address) m68k_read_immediate_16(address)
+#define m68k_read_disassembler_32(address) m68k_read_immediate_32(address)
+
+
+#define m68k_write_memory_8(address, value) (*m68k_memory_intf.write8)(address, value)
+#define m68k_write_memory_16(address, value) (*m68k_memory_intf.write16)(address, value)
+#define m68k_write_memory_32(address, value) (*m68k_memory_intf.write32)(address, value)
+
+/* Special call to simulate undocumented 68k behavior when move.l with a
+ * predecrement destination mode is executed.
+ * A real 68k first writes the high word to [address+2], and then writes the
+ * low word to [address].
+ */
+INLINE void m68k_write_memory_32_pd(unsigned int address, unsigned int value)
+{
+	(*m68k_memory_intf.write16)(address+2, value>>16);
+	(*m68k_memory_intf.write16)(address, value&0xffff);
+}
+
+
+#ifdef A68K0
+#define M68K_EMULATE_010 OPT_OFF
+#else
+
+// The PPC 68k core defines A68K0 internal to itself to avoid recompiling
+// all of MAME when you want to disable it. The downside is that the C and x86
+// cores can't agree on the same name for the icount variable, so we force the
+// issue with a Mac-specific hack.
+#ifdef macintosh
+extern int m68k_ICount;
+#else
+#define m68ki_remaining_cycles m68k_ICount
+#endif
+
+/* M68K Variants */
+#if HAS_M68010
+#define M68K_EMULATE_010 OPT_ON
+#else
+#define M68K_EMULATE_010 OPT_OFF
+#endif
+
+#endif	// A68K0
+
+#ifdef A68K2
+#define M68K_EMULATE_EC020 OPT_OFF
+#define M68K_EMULATE_020 OPT_OFF
+#else
+
+// The PPC 68k core defines A68K2 internal to itself to avoid recompiling
+// all of MAME when you want to disable it. The downside is that the C and x86
+// cores can't agree on the same name for the icount variable, so we force the
+// issue with a Mac-specific hack.
+#ifdef macintosh
+extern int M68020_ICount;
+#else
+#define m68ki_remaining_cycles m68k_ICount
+#endif
+
+#undef M68K_EMULATE_010
+#define M68K_EMULATE_010 OPT_ON
+
+#if HAS_M68EC020
+#define M68K_EMULATE_EC020 OPT_ON
+#else
+#define M68K_EMULATE_EC020 OPT_OFF
+#endif
+
+#if HAS_M68020
+#define M68K_EMULATE_020 OPT_ON
+#else
+#define M68K_EMULATE_020 OPT_OFF
+#endif
+
+#endif // A68K2
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68KMAME__HEADER */

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kopac.c Added

@@ -0,0 +1,12043 @@
+#include "ao.h"
+#include "m68kcpu.h"
+
+/* ======================================================================== */
+/* ========================= INSTRUCTION HANDLERS ========================= */
+/* ======================================================================== */
+
+
+void m68k_op_1010(m68ki_cpu_core *cpu)
+{
+	m68ki_exception_1010(cpu);
+}
+
+
+void m68k_op_1111(m68ki_cpu_core *cpu)
+{
+	m68ki_exception_1111(cpu);
+}
+
+
+void m68k_op_abcd_8_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res += 6;
+	res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res -= 0xa0;
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+}
+
+
+void m68k_op_abcd_8_mm_ax7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res += 6;
+	res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res -= 0xa0;
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_abcd_8_mm_ay7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res += 6;
+	res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res -= 0xa0;
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_abcd_8_mm_axy7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res += 6;
+	res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res -= 0xa0;
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_abcd_8_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res += 6;
+	res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res -= 0xa0;
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_add_8_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_8(DY);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pi7(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_A7_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pd7(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_A7_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_8_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(DY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(AY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_16_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = AY;
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_32(cpu);
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_32_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_32();
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_add_8_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_8_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_16_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_add_32_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_adda_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(DY));
+}
+
+
+void m68k_op_adda_16_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(AY));
+}
+
+
+void m68k_op_adda_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AY_AI_16(cpu)));
+}
+
+
+void m68k_op_adda_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AY_PI_16(cpu)));
+}
+
+
+void m68k_op_adda_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AY_PD_16(cpu)));
+}
+
+
+void m68k_op_adda_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AY_DI_16(cpu)));
+}
+
+
+void m68k_op_adda_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AY_IX_16(cpu)));
+}
+
+
+void m68k_op_adda_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AW_16(cpu)));
+}
+
+
+void m68k_op_adda_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_AL_16(cpu)));
+}
+
+
+void m68k_op_adda_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_PCDI_16(cpu)));
+}
+
+
+void m68k_op_adda_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_PCIX_16(cpu)));
+}
+
+
+void m68k_op_adda_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + MAKE_INT_16(OPER_I_16()));
+}
+
+
+void m68k_op_adda_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + DY);
+}
+
+
+void m68k_op_adda_32_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + AY);
+}
+
+
+void m68k_op_adda_32_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AY_AI_32(cpu));
+}
+
+
+void m68k_op_adda_32_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AY_PI_32(cpu));
+}
+
+
+void m68k_op_adda_32_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AY_PD_32(cpu));
+}
+
+
+void m68k_op_adda_32_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AY_DI_32(cpu));
+}
+
+
+void m68k_op_adda_32_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AY_IX_32(cpu));
+}
+
+
+void m68k_op_adda_32_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AW_32(cpu));
+}
+
+
+void m68k_op_adda_32_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_AL_32(cpu));
+}
+
+
+void m68k_op_adda_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_PCDI_32(cpu));
+}
+
+
+void m68k_op_adda_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_PCIX_32(cpu));
+}
+
+
+void m68k_op_adda_32_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + OPER_I_32());
+}
+
+
+void m68k_op_addi_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_addi_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_addi_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_32();
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_addi_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_AI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_DI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_IX_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AW_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addi_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AL_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_addq_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_addq_16_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + (((REG_IR >> 9) - 1) & 7) + 1);
+}
+
+
+void m68k_op_addq_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = *r_dst;
+	uint res = src + dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_addq_32_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst + (((REG_IR >> 9) - 1) & 7) + 1);
+}
+
+
+void m68k_op_addq_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addq_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst;
+
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_addx_8_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_8(DY);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+}
+
+
+void m68k_op_addx_16_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(DY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+}
+
+
+void m68k_op_addx_32_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	*r_dst = res;
+}
+
+
+void m68k_op_addx_8_mm_ax7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_addx_8_mm_ay7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_addx_8_mm_axy7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_addx_8_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_V = VFLAG_ADD_8(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_addx_16_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_V = VFLAG_ADD_16(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_addx_32_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = src + dst + XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_ADD_32(src, dst, res);
+	FLAG_X = FLAG_C = CFLAG_ADD_32(src, dst, res);
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_8_er_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (DY | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_ai(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AY_AI_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AY_PI_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pi7(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_A7_PI_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pd(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AY_PD_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pd7(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_A7_PD_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_di(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AY_DI_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_ix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AY_IX_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_aw(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AW_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_al(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_AL_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pcdi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_PCDI_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_pcix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_PCIX_8(cpu) | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_er_i(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DX &= (OPER_I_8() | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (DY | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_ai(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AY_AI_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_pi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AY_PI_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_pd(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AY_PD_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_di(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AY_DI_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_ix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AY_IX_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_aw(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AW_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_al(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_AL_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_pcdi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_PCDI_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_pcix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_PCIX_16(cpu) | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_16_er_i(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DX &= (OPER_I_16() | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= DY;
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_ai(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AY_AI_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_pi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AY_PI_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_pd(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AY_PD_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_di(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AY_DI_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_ix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AY_IX_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_aw(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AW_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_al(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_AL_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_pcdi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_PCDI_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_pcix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_PCIX_32(cpu);
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_32_er_i(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DX &= OPER_I_32();
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_and_8_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_8_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint res = DX & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_16_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint res = DX & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_and_32_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_and_32_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint res = DX & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_8_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_8(DY &= (OPER_I_8() | 0xffffff00));
+
+	FLAG_N = NFLAG_8(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_andi_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_AI_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PI_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PD_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_DI_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_IX_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AW_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AL_8();
+	uint res = src & m68ki_read_8(ea);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_andi_16_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = MASK_OUT_ABOVE_16(DY &= (OPER_I_16() | 0xffff0000));
+
+	FLAG_N = NFLAG_16(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_andi_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PI_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PD_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint res = src & m68ki_read_16(ea);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_andi_32_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DY &= (OPER_I_32());
+
+	FLAG_N = NFLAG_32(FLAG_Z);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_andi_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_AI_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PI_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PD_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_DI_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_IX_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AW_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AL_32();
+	uint res = src & m68ki_read_32(ea);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_andi_16_toc(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, m68ki_get_ccr() & OPER_I_16());
+}
+
+
+void m68k_op_andi_16_tos(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint src = OPER_I_16();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, m68ki_get_sr() & src);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_asr_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src >> shift;
+
+	if(GET_MSB_8(src))
+		res |= m68ki_shift_8_table[shift];
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_X = FLAG_C = src << (9-shift);
+}
+
+
+void m68k_op_asr_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src >> shift;
+
+	if(GET_MSB_16(src))
+		res |= m68ki_shift_16_table[shift];
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_X = FLAG_C = src << (9-shift);
+}
+
+
+void m68k_op_asr_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = src >> shift;
+
+	if(GET_MSB_32(src))
+		res |= m68ki_shift_32_table[shift];
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_X = FLAG_C = src << (9-shift);
+}
+
+
+void m68k_op_asr_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 8)
+		{
+			if(GET_MSB_8(src))
+				res |= m68ki_shift_8_table[shift];
+
+			*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+			FLAG_X = FLAG_C = src << (9-shift);
+			FLAG_N = NFLAG_8(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		if(GET_MSB_8(src))
+		{
+			*r_dst |= 0xff;
+			FLAG_C = CFLAG_SET;
+			FLAG_X = XFLAG_SET;
+			FLAG_N = NFLAG_SET;
+			FLAG_Z = ZFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffffff00;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asr_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 16)
+		{
+			if(GET_MSB_16(src))
+				res |= m68ki_shift_16_table[shift];
+
+			*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+			FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
+			FLAG_N = NFLAG_16(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		if(GET_MSB_16(src))
+		{
+			*r_dst |= 0xffff;
+			FLAG_C = CFLAG_SET;
+			FLAG_X = XFLAG_SET;
+			FLAG_N = NFLAG_SET;
+			FLAG_Z = ZFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffff0000;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asr_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = *r_dst;
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 32)
+		{
+			if(GET_MSB_32(src))
+				res |= m68ki_shift_32_table[shift];
+
+			*r_dst = res;
+
+			FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
+			FLAG_N = NFLAG_32(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		if(GET_MSB_32(src))
+		{
+			*r_dst = 0xffffffff;
+			FLAG_C = CFLAG_SET;
+			FLAG_X = XFLAG_SET;
+			FLAG_N = NFLAG_SET;
+			FLAG_Z = ZFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst = 0;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asr_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asr_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	if(GET_MSB_16(src))
+		res |= 0x8000;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = FLAG_X = src << 8;
+}
+
+
+void m68k_op_asl_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = MASK_OUT_ABOVE_8(src << shift);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_X = FLAG_C = src << shift;
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	src &= m68ki_shift_8_table[shift + 1];
+	FLAG_V = (!(src == 0 || (src == m68ki_shift_8_table[shift + 1] && shift < 8)))<<7;
+}
+
+
+void m68k_op_asl_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = MASK_OUT_ABOVE_16(src << shift);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> (8-shift);
+	src &= m68ki_shift_16_table[shift + 1];
+	FLAG_V = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
+}
+
+
+void m68k_op_asl_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32(src << shift);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> (24-shift);
+	src &= m68ki_shift_32_table[shift + 1];
+	FLAG_V = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
+}
+
+
+void m68k_op_asl_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = MASK_OUT_ABOVE_8(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 8)
+		{
+			*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+			FLAG_X = FLAG_C = src << shift;
+			FLAG_N = NFLAG_8(res);
+			FLAG_Z = res;
+			src &= m68ki_shift_8_table[shift + 1];
+			FLAG_V = (!(src == 0 || src == m68ki_shift_8_table[shift + 1]))<<7;
+			return;
+		}
+
+		*r_dst &= 0xffffff00;
+		FLAG_X = FLAG_C = ((shift == 8 ? src & 1 : 0))<<8;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = (!(src == 0))<<7;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asl_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = MASK_OUT_ABOVE_16(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 16)
+		{
+			*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+			FLAG_X = FLAG_C = (src << shift) >> 8;
+			FLAG_N = NFLAG_16(res);
+			FLAG_Z = res;
+			src &= m68ki_shift_16_table[shift + 1];
+			FLAG_V = (!(src == 0 || src == m68ki_shift_16_table[shift + 1]))<<7;
+			return;
+		}
+
+		*r_dst &= 0xffff0000;
+		FLAG_X = FLAG_C = ((shift == 16 ? src & 1 : 0))<<8;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = (!(src == 0))<<7;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asl_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 32)
+		{
+			*r_dst = res;
+			FLAG_X = FLAG_C = (src >> (32 - shift)) << 8;
+			FLAG_N = NFLAG_32(res);
+			FLAG_Z = res;
+			src &= m68ki_shift_32_table[shift + 1];
+			FLAG_V = (!(src == 0 || src == m68ki_shift_32_table[shift + 1]))<<7;
+			return;
+		}
+
+		*r_dst = 0;
+		FLAG_X = FLAG_C = ((shift == 32 ? src & 1 : 0))<<8;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = (!(src == 0))<<7;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_asl_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_asl_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	src &= 0xc000;
+	FLAG_V = (!(src == 0 || src == 0xc000))<<7;
+}
+
+
+void m68k_op_bhi_8(m68ki_cpu_core *cpu)
+{
+	if(COND_HI())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bls_8(m68ki_cpu_core *cpu)
+{
+	if(COND_LS())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bcc_8(m68ki_cpu_core *cpu)
+{
+	if(COND_CC())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bcs_8(m68ki_cpu_core *cpu)
+{
+	if(COND_CS())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bne_8(m68ki_cpu_core *cpu)
+{
+	if(COND_NE())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_beq_8(m68ki_cpu_core *cpu)
+{
+	if(COND_EQ())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bvc_8(m68ki_cpu_core *cpu)
+{
+	if(COND_VC())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bvs_8(m68ki_cpu_core *cpu)
+{
+	if(COND_VS())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bpl_8(m68ki_cpu_core *cpu)
+{
+	if(COND_PL())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bmi_8(m68ki_cpu_core *cpu)
+{
+	if(COND_MI())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bge_8(m68ki_cpu_core *cpu)
+{
+	if(COND_GE())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_blt_8(m68ki_cpu_core *cpu)
+{
+	if(COND_LT())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bgt_8(m68ki_cpu_core *cpu)
+{
+	if(COND_GT())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_ble_8(m68ki_cpu_core *cpu)
+{
+	if(COND_LE())
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+		return;
+	}
+	USE_CYCLES(CYC_BCC_NOTAKE_B);
+}
+
+
+void m68k_op_bhi_16(m68ki_cpu_core *cpu)
+{
+	if(COND_HI())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bls_16(m68ki_cpu_core *cpu)
+{
+	if(COND_LS())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bcc_16(m68ki_cpu_core *cpu)
+{
+	if(COND_CC())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bcs_16(m68ki_cpu_core *cpu)
+{
+	if(COND_CS())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bne_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NE())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_beq_16(m68ki_cpu_core *cpu)
+{
+	if(COND_EQ())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bvc_16(m68ki_cpu_core *cpu)
+{
+	if(COND_VC())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bvs_16(m68ki_cpu_core *cpu)
+{
+	if(COND_VS())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bpl_16(m68ki_cpu_core *cpu)
+{
+	if(COND_PL())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bmi_16(m68ki_cpu_core *cpu)
+{
+	if(COND_MI())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bge_16(m68ki_cpu_core *cpu)
+{
+	if(COND_GE())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_blt_16(m68ki_cpu_core *cpu)
+{
+	if(COND_LT())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bgt_16(m68ki_cpu_core *cpu)
+{
+	if(COND_GT())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_ble_16(m68ki_cpu_core *cpu)
+{
+	if(COND_LE())
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+	USE_CYCLES(CYC_BCC_NOTAKE_W);
+}
+
+
+void m68k_op_bhi_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_HI())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bls_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LS())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bcc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CC())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bcs_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CS())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bne_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_NE())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_beq_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_EQ())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bvc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VC())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bvs_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VS())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bpl_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_PL())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bmi_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_MI())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bge_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GE())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_blt_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LT())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bgt_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GT())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_ble_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LE())
+		{
+			uint offset = OPER_I_32();
+			REG_PC -= 4;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_32(cpu, offset);
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bchg_32_r_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (DX & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst ^= mask;
+}
+
+
+void m68k_op_bchg_8_r_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_r_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_32_s_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (OPER_I_8() & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst ^= mask;
+}
+
+
+void m68k_op_bchg_8_s_ai(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_pi(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_pi7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_pd(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_pd7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_di(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_ix(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_aw(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bchg_8_s_al(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src ^ mask);
+}
+
+
+void m68k_op_bclr_32_r_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (DX & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst &= ~mask;
+}
+
+
+void m68k_op_bclr_8_r_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_r_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_32_s_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (OPER_I_8() & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst &= ~mask;
+}
+
+
+void m68k_op_bclr_8_s_ai(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_pi(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_pi7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_pd(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_pd7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_di(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_ix(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_aw(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bclr_8_s_al(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src & ~mask);
+}
+
+
+void m68k_op_bfchg_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint* data = &DY;
+		uint64 mask;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+		mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask = ROR_32(mask, offset);
+
+		FLAG_N = NFLAG_32(*data<<offset);
+		FLAG_Z = *data & mask;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		*data ^= mask;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfchg_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long ^ mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte ^ mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfchg_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long ^ mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte ^ mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfchg_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long ^ mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte ^ mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfchg_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long ^ mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte ^ mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfchg_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long ^ mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte ^ mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint* data = &DY;
+		uint64 mask;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+
+		mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask = ROR_32(mask, offset);
+
+		FLAG_N = NFLAG_32(*data<<offset);
+		FLAG_Z = *data & mask;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		*data &= ~mask;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long & ~mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte & ~mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long & ~mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte & ~mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long & ~mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte & ~mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long & ~mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte & ~mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfclr_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long & ~mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte & ~mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint64 data = DY;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+		data = ROL_32(data, offset);
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2>>12)&7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_PCDI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfexts_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_PCIX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data = MAKE_INT_32(data) >> (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint64 data = DY;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+		data = ROL_32(data, offset);
+		FLAG_N = NFLAG_32(data);
+		data >>= 32 - width;
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2>>12)&7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_PCDI_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfextu_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint data;
+		uint ea = EA_PCIX_8();
+
+
+		if(BIT_B(word2))
+		offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<offset);
+
+		if((offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		REG_D[(word2 >> 12) & 7] = data;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint64 data = DY;
+		uint bit;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+		data = ROL_32(data, offset);
+		FLAG_N = NFLAG_32(data);
+		data >>= 32 - width;
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_PCDI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfffo_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		sint local_offset;
+		uint width = word2;
+		uint data;
+		uint bit;
+		uint ea = EA_PCIX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		local_offset = offset % 8;
+		if(local_offset < 0)
+		{
+			local_offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		data = m68ki_read_32(ea);
+		data = MASK_OUT_ABOVE_32(data<<local_offset);
+
+		if((local_offset+width) > 32)
+			data |= (m68ki_read_8(ea+4) << local_offset) >> 8;
+
+		FLAG_N = NFLAG_32(data);
+		data >>= (32 - width);
+
+		FLAG_Z = data;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		for(bit = 1<<(width-1);bit && !(data & bit);bit>>= 1)
+			offset++;
+
+		REG_D[(word2>>12)&7] = offset;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint* data = &DY;
+		uint64 mask;
+		uint64 insert = REG_D[(word2>>12)&7];
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+
+		mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask = ROR_32(mask, offset);
+
+		insert = MASK_OUT_ABOVE_32(insert << (32 - width));
+		FLAG_N = NFLAG_32(insert);
+		FLAG_Z = insert;
+		insert = ROR_32(insert, offset);
+
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		*data &= ~mask;
+		*data |= insert;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint insert_base = REG_D[(word2>>12)&7];
+		uint insert_long;
+		uint insert_byte;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
+		FLAG_N = NFLAG_32(insert_base);
+		FLAG_Z = insert_base;
+		insert_long = insert_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			insert_byte = MASK_OUT_ABOVE_8(insert_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint insert_base = REG_D[(word2>>12)&7];
+		uint insert_long;
+		uint insert_byte;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
+		FLAG_N = NFLAG_32(insert_base);
+		FLAG_Z = insert_base;
+		insert_long = insert_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			insert_byte = MASK_OUT_ABOVE_8(insert_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint insert_base = REG_D[(word2>>12)&7];
+		uint insert_long;
+		uint insert_byte;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
+		FLAG_N = NFLAG_32(insert_base);
+		FLAG_Z = insert_base;
+		insert_long = insert_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			insert_byte = MASK_OUT_ABOVE_8(insert_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint insert_base = REG_D[(word2>>12)&7];
+		uint insert_long;
+		uint insert_byte;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
+		FLAG_N = NFLAG_32(insert_base);
+		FLAG_Z = insert_base;
+		insert_long = insert_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			insert_byte = MASK_OUT_ABOVE_8(insert_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfins_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint insert_base = REG_D[(word2>>12)&7];
+		uint insert_long;
+		uint insert_byte;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		insert_base = MASK_OUT_ABOVE_32(insert_base << (32 - width));
+		FLAG_N = NFLAG_32(insert_base);
+		FLAG_Z = insert_base;
+		insert_long = insert_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, (data_long & ~mask_long) | insert_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			insert_byte = MASK_OUT_ABOVE_8(insert_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, (data_byte & ~mask_byte) | insert_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint* data = &DY;
+		uint64 mask;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+
+		mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask = ROR_32(mask, offset);
+
+		FLAG_N = NFLAG_32(*data<<offset);
+		FLAG_Z = *data & mask;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		*data |= mask;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_AI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long | mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte | mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_DI_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long | mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte | mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_IX_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long | mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte | mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AW_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long | mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte | mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bfset_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AL_8();
+
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = NFLAG_32(data_long << offset);
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		m68ki_write_32(ea, data_long | mask_long);
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+			m68ki_write_8(ea+4, data_byte | mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint offset = (word2>>6)&31;
+		uint width = word2;
+		uint* data = &DY;
+		uint64 mask;
+
+
+		if(BIT_B(word2))
+			offset = REG_D[offset&7];
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+
+		offset &= 31;
+		width = ((width-1) & 31) + 1;
+
+
+		mask = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask = ROR_32(mask, offset);
+
+		FLAG_N = NFLAG_32(*data<<offset);
+		FLAG_Z = *data & mask;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_AI_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_DI_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AY_IX_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AW_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_AL_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_PCDI_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bftst_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		sint offset = (word2>>6)&31;
+		uint width = word2;
+		uint mask_base;
+		uint data_long;
+		uint mask_long;
+		uint data_byte = 0;
+		uint mask_byte = 0;
+		uint ea = EA_PCIX_8();
+
+		if(BIT_B(word2))
+			offset = MAKE_INT_32(REG_D[offset&7]);
+		if(BIT_5(word2))
+			width = REG_D[width&7];
+
+		/* Offset is signed so we have to use ugly math =( */
+		ea += offset / 8;
+		offset %= 8;
+		if(offset < 0)
+		{
+			offset += 8;
+			ea--;
+		}
+		width = ((width-1) & 31) + 1;
+
+
+		mask_base = MASK_OUT_ABOVE_32(0xffffffff << (32 - width));
+		mask_long = mask_base >> offset;
+
+		data_long = m68ki_read_32(ea);
+		FLAG_N = ((data_long & (0x80000000 >> offset))<<offset)>>24;
+		FLAG_Z = data_long & mask_long;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+
+		if((width + offset) > 32)
+		{
+			mask_byte = MASK_OUT_ABOVE_8(mask_base);
+			data_byte = m68ki_read_8(ea+4);
+			FLAG_Z |= (data_byte & mask_byte);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bkpt(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_bkpt_ack(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE) ? REG_IR & 7 : 0);	/* auto-disable (see m68kcpu.h) */
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bra_8(m68ki_cpu_core *cpu)
+{
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_bra_16(m68ki_cpu_core *cpu)
+{
+	uint offset = OPER_I_16();
+	REG_PC -= 2;
+	m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+	m68ki_branch_16(cpu, offset);
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_bra_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint offset = OPER_I_32();
+		REG_PC -= 4;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_32(cpu, offset);
+		if(REG_PC == REG_PPC)
+			USE_ALL_CYCLES();
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_bset_32_r_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (DX & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst |= mask;
+}
+
+
+void m68k_op_bset_8_r_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_r_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+	uint mask = 1 << (DX & 7);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_32_s_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint mask = 1 << (OPER_I_8() & 0x1f);
+
+	FLAG_Z = *r_dst & mask;
+	*r_dst |= mask;
+}
+
+
+void m68k_op_bset_8_s_ai(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_pi(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_pi7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_pd(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_pd7(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_di(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_ix(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_aw(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bset_8_s_al(m68ki_cpu_core *cpu)
+{
+	uint mask = 1 << (OPER_I_8() & 7);
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+
+	FLAG_Z = src & mask;
+	m68ki_write_8(ea, src | mask);
+}
+
+
+void m68k_op_bsr_8(m68ki_cpu_core *cpu)
+{
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_branch_8(cpu, MASK_OUT_ABOVE_8(REG_IR));
+}
+
+
+void m68k_op_bsr_16(m68ki_cpu_core *cpu)
+{
+	uint offset = OPER_I_16();
+	m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	REG_PC -= 2;
+	m68ki_branch_16(cpu, offset);
+}
+
+
+void m68k_op_bsr_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint offset = OPER_I_32();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_push_32(cpu, REG_PC);
+		REG_PC -= 4;
+		m68ki_branch_32(cpu, offset);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_btst_32_r_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DY & (1 << (DX & 0x1f));
+}
+
+
+void m68k_op_btst_8_r_ai(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AY_AI_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AY_PI_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pi7(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_A7_PI_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pd(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AY_PD_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pd7(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_A7_PD_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_di(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AY_DI_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_ix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AY_IX_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_aw(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AW_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_al(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_AL_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pcdi(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_PCDI_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_pcix(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_PCIX_8(cpu) & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_8_r_i(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = OPER_I_8() & (1 << (DX & 7));
+}
+
+
+void m68k_op_btst_32_s_d(m68ki_cpu_core *cpu)
+{
+	FLAG_Z = DY & (1 << (OPER_I_8() & 0x1f));
+}
+
+
+void m68k_op_btst_8_s_ai(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AY_AI_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pi(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AY_PI_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pi7(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_A7_PI_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pd(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AY_PD_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pd7(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_A7_PD_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_di(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AY_DI_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_ix(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AY_IX_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_aw(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AW_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_al(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_AL_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pcdi(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_PCDI_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_btst_8_s_pcix(m68ki_cpu_core *cpu)
+{
+	uint bit = OPER_I_8() & 7;
+
+	FLAG_Z = OPER_PCIX_8(cpu) & (1 << bit);
+}
+
+
+void m68k_op_callm_32_ai(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_AY_AI_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_di(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_AY_DI_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_ix(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_AY_IX_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_aw(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_AW_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_al(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_AL_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_pcdi(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_PCDI_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_callm_32_pcix(m68ki_cpu_core *cpu)
+{
+	/* note: watch out for pcrelative modes */
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		uint ea = EA_PCIX_32();
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_PC += 2;
+ (uint)ea;	/* just to avoid an 'unused variable' warning */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_AI_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PI_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_pi7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_A7_PI_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PD_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_pd7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_A7_PD_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_DI_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_IX_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AW_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_8_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AL_8();
+		uint dest = m68ki_read_8(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_8(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(*compare, dest, res);
+		FLAG_C = CFLAG_8(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_8(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_AI_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PI_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PD_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_DI_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_IX_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AW_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_16_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AL_16();
+		uint dest = m68ki_read_16(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - MASK_OUT_ABOVE_16(*compare);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(*compare, dest, res);
+		FLAG_C = CFLAG_16(res);
+
+		if(COND_NE())
+			*compare = MASK_OUT_BELOW_16(*compare) | dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D[(word2 >> 6) & 7]));
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_AI_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PI_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_PD_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_DI_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AY_IX_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AW_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint ea = EA_AL_32();
+		uint dest = m68ki_read_32(ea);
+		uint* compare = &REG_D[word2 & 7];
+		uint res = dest - *compare;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(*compare, dest, res);
+		FLAG_C = CFLAG_SUB_32(*compare, dest, res);
+
+		if(COND_NE())
+			*compare = dest;
+		else
+		{
+			USE_CYCLES(3);
+			m68ki_write_32(ea, REG_D[(word2 >> 6) & 7]);
+		}
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas2_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_32();
+		uint* compare1 = &REG_D[(word2 >> 16) & 7];
+		uint ea1 = REG_DA[(word2 >> 28) & 15];
+		uint dest1 = m68ki_read_16(ea1);
+		uint res1 = dest1 - MASK_OUT_ABOVE_16(*compare1);
+		uint* compare2 = &REG_D[word2 & 7];
+		uint ea2 = REG_DA[(word2 >> 12) & 15];
+		uint dest2 = m68ki_read_16(ea2);
+		uint res2;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_16(res1);
+		FLAG_Z = MASK_OUT_ABOVE_16(res1);
+		FLAG_V = VFLAG_SUB_16(*compare1, dest1, res1);
+		FLAG_C = CFLAG_16(res1);
+
+		if(COND_EQ())
+		{
+			res2 = dest2 - MASK_OUT_ABOVE_16(*compare2);
+
+			FLAG_N = NFLAG_16(res2);
+			FLAG_Z = MASK_OUT_ABOVE_16(res2);
+			FLAG_V = VFLAG_SUB_16(*compare2, dest2, res2);
+			FLAG_C = CFLAG_16(res2);
+
+			if(COND_EQ())
+			{
+				USE_CYCLES(3);
+				m68ki_write_16(ea1, REG_D[(word2 >> 22) & 7]);
+				m68ki_write_16(ea2, REG_D[(word2 >> 6) & 7]);
+				return;
+			}
+		}
+		*compare1 = BIT_1F(word2) ? MAKE_INT_16(dest1) : MASK_OUT_BELOW_16(*compare1) | dest1;
+		*compare2 = BIT_F(word2) ? MAKE_INT_16(dest2) : MASK_OUT_BELOW_16(*compare2) | dest2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cas2_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_32();
+		uint* compare1 = &REG_D[(word2 >> 16) & 7];
+		uint ea1 = REG_DA[(word2 >> 28) & 15];
+		uint dest1 = m68ki_read_32(ea1);
+		uint res1 = dest1 - *compare1;
+		uint* compare2 = &REG_D[word2 & 7];
+		uint ea2 = REG_DA[(word2 >> 12) & 15];
+		uint dest2 = m68ki_read_32(ea2);
+		uint res2;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		FLAG_N = NFLAG_32(res1);
+		FLAG_Z = MASK_OUT_ABOVE_32(res1);
+		FLAG_V = VFLAG_SUB_32(*compare1, dest1, res1);
+		FLAG_C = CFLAG_SUB_32(*compare1, dest1, res1);
+
+		if(COND_EQ())
+		{
+			res2 = dest2 - *compare2;
+
+			FLAG_N = NFLAG_32(res2);
+			FLAG_Z = MASK_OUT_ABOVE_32(res2);
+			FLAG_V = VFLAG_SUB_32(*compare2, dest2, res2);
+			FLAG_C = CFLAG_SUB_32(*compare2, dest2, res2);
+
+			if(COND_EQ())
+			{
+				USE_CYCLES(3);
+				m68ki_write_32(ea1, REG_D[(word2 >> 22) & 7]);
+				m68ki_write_32(ea2, REG_D[(word2 >> 6) & 7]);
+				return;
+			}
+		}
+		*compare1 = dest1;
+		*compare2 = dest2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_16_d(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(DY);
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_ai(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AY_AI_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_pi(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AY_PI_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_pd(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AY_PD_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_di(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AY_DI_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_ix(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AY_IX_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_aw(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AW_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_al(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_AL_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_pcdi(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_PCDI_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_pcix(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_PCIX_16(cpu));
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_16_i(m68ki_cpu_core *cpu)
+{
+	sint src = MAKE_INT_16(DX);
+	sint bound = MAKE_INT_16(OPER_I_16());
+
+	FLAG_Z = ZFLAG_16(src); /* Undocumented */
+	FLAG_V = VFLAG_CLEAR; /* Undocumented */
+	FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+	if(src >= 0 && src <= bound)
+	{
+		return;
+	}
+	FLAG_N = (src < 0)<<7;
+	m68ki_exception_trap(cpu, EXCEPTION_CHK);
+}
+
+
+void m68k_op_chk_32_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(DY);
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AY_AI_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AY_PI_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AY_PD_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AY_DI_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AY_IX_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AW_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_AL_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_PCDI_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_PCIX_32(cpu));
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk_32_i(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		sint src = MAKE_INT_32(DX);
+		sint bound = MAKE_INT_32(OPER_I_32());
+
+		FLAG_Z = ZFLAG_32(src); /* Undocumented */
+		FLAG_V = VFLAG_CLEAR; /* Undocumented */
+		FLAG_C = CFLAG_CLEAR; /* Undocumented */
+
+		if(src >= 0 && src <= bound)
+		{
+			return;
+		}
+		FLAG_N = (src < 0)<<7;
+		m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_PCDI_8();
+		uint lower_bound = m68ki_read_pcrel_8(ea);
+		uint upper_bound = m68ki_read_pcrel_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_PCIX_8();
+		uint lower_bound = m68ki_read_pcrel_8(ea);
+		uint upper_bound = m68ki_read_pcrel_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_AY_AI_8();
+		uint lower_bound = m68ki_read_8(ea);
+		uint upper_bound = m68ki_read_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_AY_DI_8();
+		uint lower_bound = m68ki_read_8(ea);
+		uint upper_bound = m68ki_read_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_AY_IX_8();
+		uint lower_bound = m68ki_read_8(ea);
+		uint upper_bound = m68ki_read_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_AW_8();
+		uint lower_bound = m68ki_read_8(ea);
+		uint upper_bound = m68ki_read_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_8_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xff;
+		uint ea = EA_AL_8();
+		uint lower_bound = m68ki_read_8(ea);
+		uint upper_bound = m68ki_read_8(ea + 1);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_8(compare) - MAKE_INT_8(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_PCDI_16();
+		uint lower_bound = m68ki_read_pcrel_16(ea);
+		uint upper_bound = m68ki_read_pcrel_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_PCIX_16();
+		uint lower_bound = m68ki_read_pcrel_16(ea);
+		uint upper_bound = m68ki_read_pcrel_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_AY_AI_16();
+		uint lower_bound = m68ki_read_16(ea);
+		uint upper_bound = m68ki_read_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_AY_DI_16();
+		uint lower_bound = m68ki_read_16(ea);
+		uint upper_bound = m68ki_read_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_AY_IX_16();
+		uint lower_bound = m68ki_read_16(ea);
+		uint upper_bound = m68ki_read_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_AW_16();
+		uint lower_bound = m68ki_read_16(ea);
+		uint upper_bound = m68ki_read_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_16_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15]&0xffff;
+		uint ea = EA_AL_16();
+		uint lower_bound = m68ki_read_16(ea);
+		uint upper_bound = m68ki_read_16(ea + 2);
+
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(compare) - MAKE_INT_16(lower_bound);
+		else
+			FLAG_C = compare - lower_bound;
+
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+		if(!BIT_F(word2))
+			FLAG_C = MAKE_INT_16(upper_bound) - MAKE_INT_16(compare);
+		else
+			FLAG_C = upper_bound - compare;
+
+		FLAG_C = CFLAG_16(FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_PCDI_32();
+		uint lower_bound = m68ki_read_pcrel_32(ea);
+		uint upper_bound = m68ki_read_pcrel_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_PCIX_32();
+		uint lower_bound = m68ki_read_pcrel_32(ea);
+		uint upper_bound = m68ki_read_pcrel_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_AY_AI_32();
+		uint lower_bound = m68ki_read_32(ea);
+		uint upper_bound = m68ki_read_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_AY_DI_32();
+		uint lower_bound = m68ki_read_32(ea);
+		uint upper_bound = m68ki_read_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_AY_IX_32();
+		uint lower_bound = m68ki_read_32(ea);
+		uint upper_bound = m68ki_read_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_AW_32();
+		uint lower_bound = m68ki_read_32(ea);
+		uint upper_bound = m68ki_read_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_chk2cmp2_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint compare = REG_DA[(word2 >> 12) & 15];
+		uint ea = EA_AL_32();
+		uint lower_bound = m68ki_read_32(ea);
+		uint upper_bound = m68ki_read_32(ea + 4);
+
+		FLAG_C = compare - lower_bound;
+		FLAG_Z = !((upper_bound==compare) | (lower_bound==compare));
+		FLAG_C = CFLAG_SUB_32(lower_bound, compare, FLAG_C);
+		if(COND_CS())
+		{
+			if(BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+			return;
+		}
+
+		FLAG_C = upper_bound - compare;
+		FLAG_C = CFLAG_SUB_32(compare, upper_bound, FLAG_C);
+		if(COND_CS() && BIT_B(word2))
+				m68ki_exception_trap(cpu, EXCEPTION_CHK);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_clr_8_d(m68ki_cpu_core *cpu)
+{
+	DY &= 0xffffff00;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_d(m68ki_cpu_core *cpu)
+{
+	DY &= 0xffff0000;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AY_AI_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AY_PI_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AY_PD_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AY_DI_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AY_IX_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AW_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_16_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_16(EA_AL_16(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_d(m68ki_cpu_core *cpu)
+{
+	DY = 0;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AY_AI_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AY_PI_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AY_PD_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AY_DI_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AY_IX_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AW_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_clr_32_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_32(EA_AL_32(), 0);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_Z = ZFLAG_SET;
+}
+
+
+void m68k_op_cmp_8_d(m68ki_cpu_core *cpu)
+{
+	uint src = MASK_OUT_ABOVE_8(DY);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_AI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_DI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_IX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AW_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AL_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pcdi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCDI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_pcix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCIX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_8_i(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmp_16_d(m68ki_cpu_core *cpu)
+{
+	uint src = MASK_OUT_ABOVE_16(DY);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_a(m68ki_cpu_core *cpu)
+{
+	uint src = MASK_OUT_ABOVE_16(AY);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_AI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_DI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_IX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AW_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AL_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCDI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCIX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_16_i(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(DX);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmp_32_d(m68ki_cpu_core *cpu)
+{
+	uint src = DY;
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_a(m68ki_cpu_core *cpu)
+{
+	uint src = AY;
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_AI_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_DI_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_IX_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AW_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AL_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCDI_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCIX_32(cpu);
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmp_32_i(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = DX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_d(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(DY);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_a(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(AY);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AY_AI_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AY_PI_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AY_PD_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AY_DI_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AY_IX_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AW_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_AL_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_PCDI_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_PCIX_16(cpu));
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_16_i(m68ki_cpu_core *cpu)
+{
+	uint src = MAKE_INT_16(OPER_I_16());
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_d(m68ki_cpu_core *cpu)
+{
+	uint src = DY;
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_a(m68ki_cpu_core *cpu)
+{
+	uint src = AY;
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_AI_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_DI_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_IX_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AW_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AL_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCDI_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_PCIX_32(cpu);
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpa_32_i(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = AX;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_8_d(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(DY);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AY_AI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AY_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_A7_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AY_PD_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_A7_PD_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AY_DI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AY_IX_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AW_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint dst = OPER_AL_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpi_8_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_8();
+		uint dst = OPER_PCDI_8(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(src, dst, res);
+		FLAG_C = CFLAG_8(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpi_8_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_8();
+		uint dst = OPER_PCIX_8(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = MASK_OUT_ABOVE_8(res);
+		FLAG_V = VFLAG_SUB_8(src, dst, res);
+		FLAG_C = CFLAG_8(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpi_16_d(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(DY);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AY_AI_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AY_PI_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AY_PD_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AY_DI_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AY_IX_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AW_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint dst = OPER_AL_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpi_16_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_16();
+		uint dst = OPER_PCDI_16(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(src, dst, res);
+		FLAG_C = CFLAG_16(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpi_16_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_16();
+		uint dst = OPER_PCIX_16(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = MASK_OUT_ABOVE_16(res);
+		FLAG_V = VFLAG_SUB_16(src, dst, res);
+		FLAG_C = CFLAG_16(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpi_32_d(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = DY;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AY_AI_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AY_PI_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AY_PD_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AY_DI_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AY_IX_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AW_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint dst = OPER_AL_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cmpi_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_32();
+		uint dst = OPER_PCDI_32(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(src, dst, res);
+		FLAG_C = CFLAG_SUB_32(src, dst, res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpi_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_I_32();
+		uint dst = OPER_PCIX_32(cpu);
+		uint res = dst - src;
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = MASK_OUT_ABOVE_32(res);
+		FLAG_V = VFLAG_SUB_32(src, dst, res);
+		FLAG_C = CFLAG_SUB_32(src, dst, res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_cmpm_8_ax7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_8(cpu);
+	uint dst = OPER_A7_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpm_8_ay7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PI_8(cpu);
+	uint dst = OPER_AX_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpm_8_axy7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PI_8(cpu);
+	uint dst = OPER_A7_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpm_8(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_8(cpu);
+	uint dst = OPER_AX_PI_8(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_C = CFLAG_8(res);
+}
+
+
+void m68k_op_cmpm_16(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_16(cpu);
+	uint dst = OPER_AX_PI_16(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_C = CFLAG_16(res);
+}
+
+
+void m68k_op_cmpm_32(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PI_32(cpu);
+	uint dst = OPER_AX_PI_32(cpu);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_C = CFLAG_SUB_32(src, dst, res);
+}
+
+
+void m68k_op_cpbcc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_1111(cpu);
+}
+
+
+void m68k_op_cpdbcc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_1111(cpu);
+}
+
+
+void m68k_op_cpgen_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_1111(cpu);
+}
+
+
+void m68k_op_cpscc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_1111(cpu);
+}
+
+
+void m68k_op_cptrapcc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_1111(cpu);
+}
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kopdm.c Added

@@ -0,0 +1,13221 @@
+#include "m68kcpu.h"
+
+/* ======================================================================== */
+/* ========================= INSTRUCTION HANDLERS ========================= */
+/* ======================================================================== */
+
+
+void m68k_op_dbt_16(m68ki_cpu_core *cpu)
+{
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbf_16(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+	if(res != 0xffff)
+	{
+		uint offset = OPER_I_16();
+		REG_PC -= 2;
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_branch_16(cpu, offset);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbhi_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_HI())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbls_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_LS())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbcc_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_CC())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbcs_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_CS())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbne_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_NE())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbeq_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_EQ())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbvc_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_VC())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbvs_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_VS())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbpl_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_PL())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbmi_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_MI())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbge_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_GE())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dblt_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_LT())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dbgt_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_GT())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_dble_16(m68ki_cpu_core *cpu)
+{
+	if(COND_NOT_LE())
+	{
+		uint* r_dst = &DY;
+		uint res = MASK_OUT_ABOVE_16(*r_dst - 1);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		if(res != 0xffff)
+		{
+			uint offset = OPER_I_16();
+			REG_PC -= 2;
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			m68ki_branch_16(cpu, offset);
+			USE_CYCLES(CYC_DBCC_F_NOEXP);
+			return;
+		}
+		REG_PC += 2;
+		USE_CYCLES(CYC_DBCC_F_EXP);
+		return;
+	}
+	REG_PC += 2;
+}
+
+
+void m68k_op_divs_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(DY);
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AY_AI_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AY_PI_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AY_PD_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AY_DI_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AY_IX_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AW_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_AL_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_PCDI_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_PCIX_16(cpu));
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divs_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	sint src = MAKE_INT_16(OPER_I_16());
+	sint quotient;
+	sint remainder;
+
+	if(src != 0)
+	{
+		if((uint32)*r_dst == 0x80000000 && src == -1)
+		{
+			FLAG_Z = 0;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = 0;
+			return;
+		}
+
+		quotient = MAKE_INT_32(*r_dst) / src;
+		remainder = MAKE_INT_32(*r_dst) % src;
+
+		if(quotient == MAKE_INT_16(quotient))
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(DY);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_16(cpu);
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divu_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_16();
+
+	if(src != 0)
+	{
+		uint quotient = *r_dst / src;
+		uint remainder = *r_dst % src;
+
+		if(quotient < 0x10000)
+		{
+			FLAG_Z = quotient;
+			FLAG_N = NFLAG_16(quotient);
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			*r_dst = MASK_OUT_ABOVE_32(MASK_OUT_ABOVE_16(quotient) | (remainder << 16));
+			return;
+		}
+		FLAG_V = VFLAG_SET;
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+}
+
+
+void m68k_op_divl_32_d(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = DY;
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = DY;
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_ai(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AY_AI_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AY_AI_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_pi(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AY_PI_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AY_PI_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_pd(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AY_PD_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AY_PD_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_di(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AY_DI_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AY_DI_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_ix(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AY_IX_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AY_IX_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_aw(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AW_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AW_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_al(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_AL_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_AL_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_pcdi(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_PCDI_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_PCDI_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_pcix(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_PCIX_32(cpu);
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_PCIX_32(cpu);
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_divl_32_i(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 divisor = OPER_I_32();
+		uint64 dividend = 0;
+		uint64 quotient = 0;
+		uint64 remainder = 0;
+
+		if(divisor != 0)
+		{
+			if(BIT_A(word2))	/* 64 bit */
+			{
+				dividend = REG_D[word2 & 7];
+				dividend <<= 32;
+				dividend |= REG_D[(word2 >> 12) & 7];
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)dividend / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)dividend % (sint64)((sint32)divisor));
+					if((sint64)quotient != (sint64)((sint32)quotient))
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					if(quotient > 0xffffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					remainder = dividend % divisor;
+				}
+			}
+			else	/* 32 bit */
+			{
+				dividend = REG_D[(word2 >> 12) & 7];
+				if(BIT_B(word2))	 /* signed */
+				{
+					quotient = (uint64)((sint64)((sint32)dividend) / (sint64)((sint32)divisor));
+					remainder = (uint64)((sint64)((sint32)dividend) % (sint64)((sint32)divisor));
+				}
+				else					/* unsigned */
+				{
+					quotient = dividend / divisor;
+					remainder = dividend % divisor;
+				}
+			}
+
+			REG_D[word2 & 7] = remainder;
+			REG_D[(word2 >> 12) & 7] = quotient;
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint divisor = OPER_I_32();
+		uint dividend_hi = REG_D[word2 & 7];
+		uint dividend_lo = REG_D[(word2 >> 12) & 7];
+		uint quotient = 0;
+		uint remainder = 0;
+		uint dividend_neg = 0;
+		uint divisor_neg = 0;
+		sint i;
+		uint overflow;
+
+		if(divisor != 0)
+		{
+			/* quad / long : long quotient, long remainder */
+			if(BIT_A(word2))
+			{
+				if(BIT_B(word2))	 /* signed */
+				{
+					/* special case in signed divide */
+					if(dividend_hi == 0 && dividend_lo == 0x80000000 && divisor == 0xffffffff)
+					{
+						REG_D[word2 & 7] = 0;
+						REG_D[(word2 >> 12) & 7] = 0x80000000;
+
+						FLAG_N = NFLAG_SET;
+						FLAG_Z = ZFLAG_CLEAR;
+						FLAG_V = VFLAG_CLEAR;
+						FLAG_C = CFLAG_CLEAR;
+						return;
+					}
+					if(GET_MSB_32(dividend_hi))
+					{
+						dividend_neg = 1;
+						dividend_hi = (uint)MASK_OUT_ABOVE_32((-(sint)dividend_hi) - (dividend_lo != 0));
+						dividend_lo = (uint)MASK_OUT_ABOVE_32(-(sint)dividend_lo);
+					}
+					if(GET_MSB_32(divisor))
+					{
+						divisor_neg = 1;
+						divisor = (uint)MASK_OUT_ABOVE_32(-(sint)divisor);
+
+					}
+				}
+
+				/* if the upper long is greater than the divisor, we're overflowing. */
+				if(dividend_hi >= divisor)
+				{
+					FLAG_V = VFLAG_SET;
+					return;
+				}
+
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					remainder = (remainder << 1) + ((dividend_hi >> i) & 1);
+					if(remainder >= divisor)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+				for(i = 31; i >= 0; i--)
+				{
+					quotient <<= 1;
+					overflow = GET_MSB_32(remainder);
+					remainder = (remainder << 1) + ((dividend_lo >> i) & 1);
+					if(remainder >= divisor || overflow)
+					{
+						remainder -= divisor;
+						quotient++;
+					}
+				}
+
+				if(BIT_B(word2))	 /* signed */
+				{
+					if(quotient > 0x7fffffff)
+					{
+						FLAG_V = VFLAG_SET;
+						return;
+					}
+					if(dividend_neg)
+					{
+						remainder = (uint)MASK_OUT_ABOVE_32(-(sint)remainder);
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+					}
+					if(divisor_neg)
+						quotient = (uint)MASK_OUT_ABOVE_32(-(sint)quotient);
+				}
+
+				REG_D[word2 & 7] = remainder;
+				REG_D[(word2 >> 12) & 7] = quotient;
+
+				FLAG_N = NFLAG_32(quotient);
+				FLAG_Z = quotient;
+				FLAG_V = VFLAG_CLEAR;
+				FLAG_C = CFLAG_CLEAR;
+				return;
+			}
+
+			/* long / long: long quotient, maybe long remainder */
+			if(BIT_B(word2))	 /* signed */
+			{
+				/* Special case in divide */
+				if(dividend_lo == 0x80000000 && divisor == 0xffffffff)
+				{
+					FLAG_N = NFLAG_SET;
+					FLAG_Z = ZFLAG_CLEAR;
+					FLAG_V = VFLAG_CLEAR;
+					FLAG_C = CFLAG_CLEAR;
+					REG_D[(word2 >> 12) & 7] = 0x80000000;
+					REG_D[word2 & 7] = 0;
+					return;
+				}
+				REG_D[word2 & 7] = MAKE_INT_32(dividend_lo) % MAKE_INT_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MAKE_INT_32(dividend_lo) / MAKE_INT_32(divisor);
+			}
+			else
+			{
+				REG_D[word2 & 7] = MASK_OUT_ABOVE_32(dividend_lo) % MASK_OUT_ABOVE_32(divisor);
+				quotient = REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(dividend_lo) / MASK_OUT_ABOVE_32(divisor);
+			}
+
+			FLAG_N = NFLAG_32(quotient);
+			FLAG_Z = quotient;
+			FLAG_V = VFLAG_CLEAR;
+			FLAG_C = CFLAG_CLEAR;
+			return;
+		}
+		m68ki_exception_trap(cpu, EXCEPTION_ZERO_DIVIDE);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_eor_8_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY ^= MASK_OUT_ABOVE_8(DX));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint res = MASK_OUT_ABOVE_8(DX ^ m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY ^= MASK_OUT_ABOVE_16(DX));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint res = MASK_OUT_ABOVE_16(DX ^ m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY ^= DX;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eor_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint res = DX ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY ^= OPER_I_8());
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_AI_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PI_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PD_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_DI_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_IX_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AW_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AL_8();
+	uint res = src ^ m68ki_read_8(ea);
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY ^= OPER_I_16());
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PI_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PD_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint res = src ^ m68ki_read_16(ea);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY ^= OPER_I_32();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_AI_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PI_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PD_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_DI_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_IX_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AW_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AL_32();
+	uint res = src ^ m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_eori_16_toc(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, m68ki_get_ccr() ^ OPER_I_16());
+}
+
+
+void m68k_op_eori_16_tos(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint src = OPER_I_16();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, m68ki_get_sr() ^ src);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_exg_32_dd(m68ki_cpu_core *cpu)
+{
+	uint* reg_a = &DX;
+	uint* reg_b = &DY;
+	uint tmp = *reg_a;
+	*reg_a = *reg_b;
+	*reg_b = tmp;
+}
+
+
+void m68k_op_exg_32_aa(m68ki_cpu_core *cpu)
+{
+	uint* reg_a = &AX;
+	uint* reg_b = &AY;
+	uint tmp = *reg_a;
+	*reg_a = *reg_b;
+	*reg_b = tmp;
+}
+
+
+void m68k_op_exg_32_da(m68ki_cpu_core *cpu)
+{
+	uint* reg_a = &DX;
+	uint* reg_b = &AY;
+	uint tmp = *reg_a;
+	*reg_a = *reg_b;
+	*reg_b = tmp;
+}
+
+
+void m68k_op_ext_16(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xff00 : 0);
+
+	FLAG_N = NFLAG_16(*r_dst);
+	FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_ext_32(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+
+	*r_dst = MASK_OUT_ABOVE_16(*r_dst) | (GET_MSB_16(*r_dst) ? 0xffff0000 : 0);
+
+	FLAG_N = NFLAG_32(*r_dst);
+	FLAG_Z = *r_dst;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_extb_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint* r_dst = &DY;
+
+		*r_dst = MASK_OUT_ABOVE_8(*r_dst) | (GET_MSB_8(*r_dst) ? 0xffffff00 : 0);
+
+		FLAG_N = NFLAG_32(*r_dst);
+		FLAG_Z = *r_dst;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_illegal(m68ki_cpu_core *cpu)
+{
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_jmp_32_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_AY_AI_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_di(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_AY_DI_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_AY_IX_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_AW_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_al(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_AL_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_pcdi(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_PCDI_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jmp_32_pcix(m68ki_cpu_core *cpu)
+{
+	m68ki_jump(cpu, EA_PCIX_32());
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	if(REG_PC == REG_PPC)
+		USE_ALL_CYCLES();
+}
+
+
+void m68k_op_jsr_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_PCDI_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_jsr_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_PCIX_32();
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_push_32(cpu, REG_PC);
+	m68ki_jump(cpu, ea);
+}
+
+
+void m68k_op_lea_32_ai(m68ki_cpu_core *cpu)
+{
+	AX = EA_AY_AI_32();
+}
+
+
+void m68k_op_lea_32_di(m68ki_cpu_core *cpu)
+{
+	AX = EA_AY_DI_32();
+}
+
+
+void m68k_op_lea_32_ix(m68ki_cpu_core *cpu)
+{
+	AX = EA_AY_IX_32();
+}
+
+
+void m68k_op_lea_32_aw(m68ki_cpu_core *cpu)
+{
+	AX = EA_AW_32();
+}
+
+
+void m68k_op_lea_32_al(m68ki_cpu_core *cpu)
+{
+	AX = EA_AL_32();
+}
+
+
+void m68k_op_lea_32_pcdi(m68ki_cpu_core *cpu)
+{
+	AX = EA_PCDI_32();
+}
+
+
+void m68k_op_lea_32_pcix(m68ki_cpu_core *cpu)
+{
+	AX = EA_PCIX_32();
+}
+
+
+void m68k_op_link_16_a7(m68ki_cpu_core *cpu)
+{
+	REG_A[7] -= 4;
+	m68ki_write_32(REG_A[7], REG_A[7]);
+	REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
+}
+
+
+void m68k_op_link_16(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	m68ki_push_32(cpu, *r_dst);
+	*r_dst = REG_A[7];
+	REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
+}
+
+
+void m68k_op_link_32_a7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		REG_A[7] -= 4;
+		m68ki_write_32(REG_A[7], REG_A[7]);
+		REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_link_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint* r_dst = &AY;
+
+		m68ki_push_32(cpu, *r_dst);
+		*r_dst = REG_A[7];
+		REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + OPER_I_32());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_lsr_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src >> shift;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src << (9-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src >> shift;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src << (9-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = src >> shift;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src << (9-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift <= 8)
+		{
+			*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+			FLAG_X = FLAG_C = src << (9-shift);
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffffff00;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift <= 16)
+		{
+			*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+			FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffff0000;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = *r_dst;
+	uint res = src >> shift;
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 32)
+		{
+			*r_dst = res;
+			FLAG_C = FLAG_X = (src >> (shift - 1))<<8;
+			FLAG_N = NFLAG_CLEAR;
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst = 0;
+		FLAG_X = FLAG_C = (shift == 32 ? GET_MSB_32(src)>>23 : 0);
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsr_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = src >> 1;
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_CLEAR;
+	FLAG_Z = res;
+	FLAG_C = FLAG_X = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = MASK_OUT_ABOVE_8(src << shift);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src << shift;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = MASK_OUT_ABOVE_16(src << shift);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> (8-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32(src << shift);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> (24-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = MASK_OUT_ABOVE_8(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift <= 8)
+		{
+			*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+			FLAG_X = FLAG_C = src << shift;
+			FLAG_N = NFLAG_8(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffffff00;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = MASK_OUT_ABOVE_16(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift <= 16)
+		{
+			*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+			FLAG_X = FLAG_C = (src << shift) >> 8;
+			FLAG_N = NFLAG_16(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst &= 0xffff0000;
+		FLAG_X = XFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = DX & 0x3f;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32(src << shift);
+
+	if(shift != 0)
+	{
+		USE_CYCLES(shift<<CYC_SHIFT);
+
+		if(shift < 32)
+		{
+			*r_dst = res;
+			FLAG_X = FLAG_C = (src >> (32 - shift)) << 8;
+			FLAG_N = NFLAG_32(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		*r_dst = 0;
+		FLAG_X = FLAG_C = ((shift == 32 ? src & 1 : 0))<<8;
+		FLAG_N = NFLAG_CLEAR;
+		FLAG_Z = ZFLAG_SET;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_lsl_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(src << 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_X = FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_d_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ai_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AX_AI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi7_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pi_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AX_PI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd7_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_pd_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AX_PD_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_di_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AX_DI_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_ix_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AX_IX_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_aw_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AW_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_8(cpu);
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_8_al_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_8();
+	uint ea = EA_AL_8();
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_d_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ai_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AX_AI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pi_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AX_PI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_pd_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AX_PD_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_di_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AX_DI_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_ix_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AX_IX_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_aw_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AW_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_a(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(AY);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_16(cpu);
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_16_al_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_16();
+	uint ea = EA_AL_16();
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_d_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint* r_dst = &DX;
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ai_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AX_AI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pi_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AX_PI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_pd_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AX_PD_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_di_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AX_DI_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_ix_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AX_IX_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_aw_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AW_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_a(m68ki_cpu_core *cpu)
+{
+	uint res = AY;
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCDI_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_PCIX_32(cpu);
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_move_32_al_i(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_I_32();
+	uint ea = EA_AL_32();
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_movea_16_d(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(DY);
+}
+
+
+void m68k_op_movea_16_a(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(AY);
+}
+
+
+void m68k_op_movea_16_ai(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AY_AI_16(cpu));
+}
+
+
+void m68k_op_movea_16_pi(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AY_PI_16(cpu));
+}
+
+
+void m68k_op_movea_16_pd(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AY_PD_16(cpu));
+}
+
+
+void m68k_op_movea_16_di(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AY_DI_16(cpu));
+}
+
+
+void m68k_op_movea_16_ix(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AY_IX_16(cpu));
+}
+
+
+void m68k_op_movea_16_aw(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AW_16(cpu));
+}
+
+
+void m68k_op_movea_16_al(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_AL_16(cpu));
+}
+
+
+void m68k_op_movea_16_pcdi(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_PCDI_16(cpu));
+}
+
+
+void m68k_op_movea_16_pcix(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_PCIX_16(cpu));
+}
+
+
+void m68k_op_movea_16_i(m68ki_cpu_core *cpu)
+{
+	AX = MAKE_INT_16(OPER_I_16());
+}
+
+
+void m68k_op_movea_32_d(m68ki_cpu_core *cpu)
+{
+	AX = DY;
+}
+
+
+void m68k_op_movea_32_a(m68ki_cpu_core *cpu)
+{
+	AX = AY;
+}
+
+
+void m68k_op_movea_32_ai(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AY_AI_32(cpu);
+}
+
+
+void m68k_op_movea_32_pi(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AY_PI_32(cpu);
+}
+
+
+void m68k_op_movea_32_pd(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AY_PD_32(cpu);
+}
+
+
+void m68k_op_movea_32_di(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AY_DI_32(cpu);
+}
+
+
+void m68k_op_movea_32_ix(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AY_IX_32(cpu);
+}
+
+
+void m68k_op_movea_32_aw(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AW_32(cpu);
+}
+
+
+void m68k_op_movea_32_al(m68ki_cpu_core *cpu)
+{
+	AX = OPER_AL_32(cpu);
+}
+
+
+void m68k_op_movea_32_pcdi(m68ki_cpu_core *cpu)
+{
+	AX = OPER_PCDI_32(cpu);
+}
+
+
+void m68k_op_movea_32_pcix(m68ki_cpu_core *cpu)
+{
+	AX = OPER_PCIX_32(cpu);
+}
+
+
+void m68k_op_movea_32_i(m68ki_cpu_core *cpu)
+{
+	AX = OPER_I_32();
+}
+
+
+void m68k_op_move_16_frc_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		DY = MASK_OUT_BELOW_16(DY) | m68ki_get_ccr();
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AY_AI_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AY_PI_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AY_PD_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AY_DI_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AY_IX_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AW_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_frc_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		m68ki_write_16(EA_AL_16(), m68ki_get_ccr());
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_move_16_toc_d(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, DY);
+}
+
+
+void m68k_op_move_16_toc_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AY_AI_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AY_PI_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AY_PD_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_di(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AY_DI_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AY_IX_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AW_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_al(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_AL_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_pcdi(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_PCDI_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_pcix(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_PCIX_16(cpu));
+}
+
+
+void m68k_op_move_16_toc_i(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, OPER_I_16());
+}
+
+
+void m68k_op_move_16_frs_d(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		DY = MASK_OUT_BELOW_16(DY) | m68ki_get_sr();
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AY_AI_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AY_PI_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AY_PD_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AY_DI_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AY_IX_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AW_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_frs_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_000(CPU_TYPE) || FLAG_S)	/* NS990408 */
+	{
+		uint ea = EA_AL_16();
+		m68ki_write_16(ea, m68ki_get_sr());
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_d(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		m68ki_set_sr(cpu, DY);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_ai(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AY_AI_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_pi(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AY_PI_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_pd(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AY_PD_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_di(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AY_DI_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_ix(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AY_IX_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_aw(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AW_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_al(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_AL_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_pcdi(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_PCDI_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_pcix(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_PCIX_16(cpu);
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_16_tos_i(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_I_16();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, new_sr);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_32_fru(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		AY = REG_USP;
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_move_32_tou(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_USP = AY;
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_movec_32_cr(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+
+			m68ki_trace_t0();		 /* auto-disable (see m68kcpu.h) */
+			switch (word2 & 0xfff)
+			{
+			case 0x000:			 /* SFC */
+				REG_DA[(word2 >> 12) & 15] = REG_SFC;
+				return;
+			case 0x001:			 /* DFC */
+				REG_DA[(word2 >> 12) & 15] = REG_DFC;
+				return;
+			case 0x002:			 /* CACR */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_DA[(word2 >> 12) & 15] = REG_CACR;
+					return;
+				}
+				return;
+			case 0x800:			 /* USP */
+				REG_DA[(word2 >> 12) & 15] = REG_USP;
+				return;
+			case 0x801:			 /* VBR */
+				REG_DA[(word2 >> 12) & 15] = REG_VBR;
+				return;
+			case 0x802:			 /* CAAR */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_DA[(word2 >> 12) & 15] = REG_CAAR;
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				break;
+			case 0x803:			 /* MSP */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_DA[(word2 >> 12) & 15] = FLAG_M ? REG_SP : REG_MSP;
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			case 0x804:			 /* ISP */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_DA[(word2 >> 12) & 15] = FLAG_M ? REG_ISP : REG_SP;
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			default:
+				m68ki_exception_illegal(cpu);
+				return;
+			}
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_movec_32_rc(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+
+			m68ki_trace_t0();		 /* auto-disable (see m68kcpu.h) */
+			switch (word2 & 0xfff)
+			{
+			case 0x000:			 /* SFC */
+				REG_SFC = REG_DA[(word2 >> 12) & 15] & 7;
+				return;
+			case 0x001:			 /* DFC */
+				REG_DFC = REG_DA[(word2 >> 12) & 15] & 7;
+				return;
+			case 0x002:			 /* CACR */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_CACR = REG_DA[(word2 >> 12) & 15];
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			case 0x800:			 /* USP */
+				REG_USP = REG_DA[(word2 >> 12) & 15];
+				return;
+			case 0x801:			 /* VBR */
+				REG_VBR = REG_DA[(word2 >> 12) & 15];
+				return;
+			case 0x802:			 /* CAAR */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					REG_CAAR = REG_DA[(word2 >> 12) & 15];
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			case 0x803:			 /* MSP */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					/* we are in supervisor mode so just check for M flag */
+					if(!FLAG_M)
+					{
+						REG_MSP = REG_DA[(word2 >> 12) & 15];
+						return;
+					}
+					REG_SP = REG_DA[(word2 >> 12) & 15];
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			case 0x804:			 /* ISP */
+				if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+				{
+					if(!FLAG_M)
+					{
+						REG_SP = REG_DA[(word2 >> 12) & 15];
+						return;
+					}
+					REG_ISP = REG_DA[(word2 >> 12) & 15];
+					return;
+				}
+				m68ki_exception_illegal(cpu);
+				return;
+			default:
+				m68ki_exception_illegal(cpu);
+				return;
+			}
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_movem_16_re_pd(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = AY;
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			ea -= 2;
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[15-i]));
+			count++;
+		}
+	AY = ea;
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_re_ai(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_re_di(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_re_ix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_re_aw(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_re_al(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_DA[i]));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_32_re_pd(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = AY;
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			ea -= 4;
+			m68ki_write_32(ea, REG_DA[15-i]);
+			count++;
+		}
+	AY = ea;
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_re_ai(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_AI_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_32(ea, REG_DA[i]);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_re_di(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_DI_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_32(ea, REG_DA[i]);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_re_ix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_IX_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_32(ea, REG_DA[i]);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_re_aw(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AW_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_32(ea, REG_DA[i]);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_re_al(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AL_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			m68ki_write_32(ea, REG_DA[i]);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_16_er_pi(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = AY;
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+	AY = ea;
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_PCDI_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_PCIX_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_pcrel_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_ai(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_di(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_ix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_aw(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_16_er_al(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = MAKE_INT_16(MASK_OUT_ABOVE_16(m68ki_read_16(ea)));
+			ea += 2;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_W);
+}
+
+
+void m68k_op_movem_32_er_pi(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = AY;
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+	AY = ea;
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_PCDI_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_pcrel_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_PCIX_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_pcrel_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_ai(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_AI_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_di(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_DI_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_ix(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AY_IX_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_aw(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AW_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movem_32_er_al(m68ki_cpu_core *cpu)
+{
+	uint i = 0;
+	uint register_list = OPER_I_16();
+	uint ea = EA_AL_32();
+	uint count = 0;
+
+	for(; i < 16; i++)
+		if(register_list & (1 << i))
+		{
+			REG_DA[i] = m68ki_read_32(ea);
+			ea += 4;
+			count++;
+		}
+
+	USE_CYCLES(count<<CYC_MOVEM_L);
+}
+
+
+void m68k_op_movep_16_re(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = DX;
+
+	m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 8));
+	m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src));
+}
+
+
+void m68k_op_movep_32_re(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint src = DX;
+
+	m68ki_write_8(ea, MASK_OUT_ABOVE_8(src >> 24));
+	m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 16));
+	m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src >> 8));
+	m68ki_write_8(ea += 2, MASK_OUT_ABOVE_8(src));
+}
+
+
+void m68k_op_movep_16_er(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint* r_dst = &DX;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | ((m68ki_read_8(ea) << 8) + m68ki_read_8(ea + 2));
+}
+
+
+void m68k_op_movep_32_er(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+
+	DX = (m68ki_read_8(ea) << 24) + (m68ki_read_8(ea + 2) << 16)
+		+ (m68ki_read_8(ea + 4) << 8) + m68ki_read_8(ea + 6);
+}
+
+
+void m68k_op_moves_8_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_AI_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PI_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_pi7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_A7_PI_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PD_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_pd7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_A7_PD_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_DI_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_IX_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AW_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_8_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AL_8();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_8_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_8(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D[(word2 >> 12) & 7]) | m68ki_read_8_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_AI_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PI_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PD_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_DI_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_IX_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AW_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_16_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AL_16();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_16_fc(cpu, ea, REG_DFC, MASK_OUT_ABOVE_16(REG_DA[(word2 >> 12) & 15]));
+				return;
+			}
+			if(BIT_F(word2))		 /* Memory to address register */
+			{
+				REG_A[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(cpu, ea, REG_SFC));
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to data register */
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D[(word2 >> 12) & 7]) | m68ki_read_16_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_ai(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_AI_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_pi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PI_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_pd(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_PD_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_di(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_DI_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_ix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AY_IX_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_aw(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AW_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moves_32_al(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		if(FLAG_S)
+		{
+			uint word2 = OPER_I_16();
+			uint ea = EA_AL_32();
+
+			m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+			if(BIT_B(word2))		 /* Register to memory */
+			{
+				m68ki_write_32_fc(cpu, ea, REG_DFC, REG_DA[(word2 >> 12) & 15]);
+				if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+					USE_CYCLES(2);
+				return;
+			}
+			/* Memory to register */
+			REG_DA[(word2 >> 12) & 15] = m68ki_read_32_fc(cpu, ea, REG_SFC);
+			if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+				USE_CYCLES(2);
+			return;
+		}
+		m68ki_exception_privilege_violation(cpu);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_moveq_32(m68ki_cpu_core *cpu)
+{
+	uint res = DX = MAKE_INT_8(MASK_OUT_ABOVE_8(REG_IR));
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(DY) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_AI_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PI_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_PD_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_DI_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AY_IX_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AW_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_AL_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCDI_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_PCIX_16(cpu)) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_muls_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_32(MAKE_INT_16(OPER_I_16()) * MAKE_INT_16(MASK_OUT_ABOVE_16(*r_dst)));
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = MASK_OUT_ABOVE_16(DY) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AY_AI_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AY_PI_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AY_PD_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AY_DI_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AY_IX_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AW_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_AL_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_PCDI_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_PCIX_16(cpu) * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mulu_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint res = OPER_I_16() * MASK_OUT_ABOVE_16(*r_dst);
+
+	*r_dst = res;
+
+	FLAG_Z = res;
+	FLAG_N = NFLAG_32(res);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_mull_32_d(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = DY;
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = DY;
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_ai(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AY_AI_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AY_AI_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_pi(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AY_PI_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AY_PI_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_pd(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AY_PD_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AY_PD_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_di(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AY_DI_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AY_DI_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_ix(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AY_IX_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AY_IX_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_aw(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AW_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AW_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_al(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_AL_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_AL_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_pcdi(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_PCDI_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_PCDI_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_pcix(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_PCIX_32(cpu);
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_PCIX_32(cpu);
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+void m68k_op_mull_32_i(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint64 src = OPER_I_32();
+		uint64 dst = REG_D[(word2 >> 12) & 7];
+		uint64 res;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			res = (sint64)((sint32)src) * (sint64)((sint32)dst);
+			if(!BIT_A(word2))
+			{
+				FLAG_Z = MASK_OUT_ABOVE_32(res);
+				FLAG_N = NFLAG_32(res);
+				FLAG_V = ((sint64)res != (sint32)res)<<7;
+				REG_D[(word2 >> 12) & 7] = FLAG_Z;
+				return;
+			}
+			FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+			FLAG_N = NFLAG_64(res);
+			FLAG_V = VFLAG_CLEAR;
+			REG_D[word2 & 7] = (res >> 32);
+			REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+			return;
+		}
+
+		res = src * dst;
+		if(!BIT_A(word2))
+		{
+			FLAG_Z = MASK_OUT_ABOVE_32(res);
+			FLAG_N = NFLAG_32(res);
+			FLAG_V = (res > 0xffffffff)<<7;
+			REG_D[(word2 >> 12) & 7] = FLAG_Z;
+			return;
+		}
+		FLAG_Z = MASK_OUT_ABOVE_32(res) | (res>>32);
+		FLAG_N = NFLAG_64(res);
+		FLAG_V = VFLAG_CLEAR;
+		REG_D[word2 & 7] = (res >> 32);
+		REG_D[(word2 >> 12) & 7] = MASK_OUT_ABOVE_32(res);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#else
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint word2 = OPER_I_16();
+		uint src = OPER_I_32();
+		uint dst = REG_D[(word2 >> 12) & 7];
+		uint neg = GET_MSB_32(src ^ dst);
+		uint src1;
+		uint src2;
+		uint dst1;
+		uint dst2;
+		uint r1;
+		uint r2;
+		uint r3;
+		uint r4;
+		uint lo;
+		uint hi;
+
+		FLAG_C = CFLAG_CLEAR;
+
+		if(BIT_B(word2))			 /* signed */
+		{
+			if(GET_MSB_32(src))
+				src = (uint)MASK_OUT_ABOVE_32(-(sint)src);
+			if(GET_MSB_32(dst))
+				dst = (uint)MASK_OUT_ABOVE_32(-(sint)dst);
+		}
+
+		src1 = MASK_OUT_ABOVE_16(src);
+		src2 = src>>16;
+		dst1 = MASK_OUT_ABOVE_16(dst);
+		dst2 = dst>>16;
+
+
+		r1 = src1 * dst1;
+		r2 = src1 * dst2;
+		r3 = src2 * dst1;
+		r4 = src2 * dst2;
+
+		lo = r1 + (MASK_OUT_ABOVE_16(r2)<<16) + (MASK_OUT_ABOVE_16(r3)<<16);
+		hi = r4 + (r2>>16) + (r3>>16) + (((r1>>16) + MASK_OUT_ABOVE_16(r2) + MASK_OUT_ABOVE_16(r3)) >> 16);
+
+		if(BIT_B(word2) && neg)
+		{
+			hi = (uint)MASK_OUT_ABOVE_32((-(sint)hi) - (lo != 0));
+			lo = (uint)MASK_OUT_ABOVE_32(-(sint)lo);
+		}
+
+		if(BIT_A(word2))
+		{
+			REG_D[word2 & 7] = hi;
+			REG_D[(word2 >> 12) & 7] = lo;
+			FLAG_N = NFLAG_32(hi);
+			FLAG_Z = hi | lo;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+
+		REG_D[(word2 >> 12) & 7] = lo;
+		FLAG_N = NFLAG_32(lo);
+		FLAG_Z = lo;
+		if(BIT_B(word2))
+			FLAG_V = (!((GET_MSB_32(lo) && hi == 0xffffffff) || (!GET_MSB_32(lo) && !hi)))<<7;
+		else
+			FLAG_V = (hi != 0) << 7;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+
+#endif
+}
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kopnz.c Added

@@ -0,0 +1,8781 @@
+#include "ao.h"
+#include "m68kcpu.h"
+
+/* ======================================================================== */
+/* ========================= INSTRUCTION HANDLERS ========================= */
+/* ======================================================================== */
+
+
+void m68k_op_nbcd_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint dst = *r_dst;
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_nbcd_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1());
+
+	if(res != 0x9a)
+	{
+		FLAG_V = ~res; /* Undefined V behavior */
+
+		if((res & 0x0f) == 0xa)
+			res = (res & 0xf0) + 0x10;
+
+		res = MASK_OUT_ABOVE_8(res);
+
+		FLAG_V &= res; /* Undefined V behavior part II */
+
+		m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
+
+		FLAG_Z |= res;
+		FLAG_C = CFLAG_SET;
+		FLAG_X = XFLAG_SET;
+	}
+	else
+	{
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		FLAG_X = XFLAG_CLEAR;
+	}
+	FLAG_N = NFLAG_8(res);	/* Undefined N behavior */
+}
+
+
+void m68k_op_neg_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - MASK_OUT_ABOVE_8(*r_dst);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = *r_dst & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_neg_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_C = FLAG_X = CFLAG_8(res);
+	FLAG_V = src & res;
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - MASK_OUT_ABOVE_16(*r_dst);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (*r_dst & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_neg_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_C = FLAG_X = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - *r_dst;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(*r_dst, 0, res);
+	FLAG_V = (*r_dst & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_neg_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_neg_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_C = FLAG_X = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_negx_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - MASK_OUT_ABOVE_8(*r_dst) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = *r_dst & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+}
+
+
+void m68k_op_negx_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = m68ki_read_8(ea);
+	uint res = 0 - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = src & res;
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_negx_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - MASK_OUT_ABOVE_16(*r_dst) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (*r_dst & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+}
+
+
+void m68k_op_negx_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = 0 - MASK_OUT_ABOVE_16(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = (src & res)>>8;
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_negx_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = 0 - MASK_OUT_ABOVE_32(*r_dst) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(*r_dst, 0, res);
+	FLAG_V = (*r_dst & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	*r_dst = res;
+}
+
+
+void m68k_op_negx_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_negx_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint src = m68ki_read_32(ea);
+	uint res = 0 - MASK_OUT_ABOVE_32(src) - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, 0, res);
+	FLAG_V = (src & res)>>24;
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_nop(m68ki_cpu_core *cpu)
+{
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+}
+
+
+void m68k_op_not_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = MASK_OUT_ABOVE_8(~*r_dst);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint res = MASK_OUT_ABOVE_8(~m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = MASK_OUT_ABOVE_16(~*r_dst);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint res = MASK_OUT_ABOVE_16(~m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint res = *r_dst = MASK_OUT_ABOVE_32(~*r_dst);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_not_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint res = MASK_OUT_ABOVE_32(~m68ki_read_32(ea));
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= MASK_OUT_ABOVE_8(DY)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_ai(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AY_AI_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pi(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AY_PI_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_A7_PI_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pd(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AY_PD_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_A7_PD_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_di(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AY_DI_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_ix(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AY_IX_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_aw(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AW_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_al(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_AL_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_PCDI_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_PCIX_8(cpu)));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_er_i(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DX |= OPER_I_8()));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= MASK_OUT_ABOVE_16(DY)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_ai(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AY_AI_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_pi(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AY_PI_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_pd(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AY_PD_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_di(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AY_DI_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_ix(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AY_IX_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_aw(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AW_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_al(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_AL_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_PCDI_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_PCIX_16(cpu)));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_er_i(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16((DX |= OPER_I_16()));
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_d(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= DY;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_ai(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AY_AI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_pi(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AY_PI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_pd(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AY_PD_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_di(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AY_DI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_ix(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AY_IX_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_aw(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AW_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_al(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_AL_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_PCDI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_PCIX_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_er_i(m68ki_cpu_core *cpu)
+{
+	uint res = DX |= OPER_I_32();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_8_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint res = MASK_OUT_ABOVE_8(DX | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_16_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint res = MASK_OUT_ABOVE_16(DX | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_or_32_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint res = DX | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8((DY |= OPER_I_8()));
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_AI_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PI_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PD_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_DI_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_IX_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AW_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AL_8();
+	uint res = MASK_OUT_ABOVE_8(src | m68ki_read_8(ea));
+
+	m68ki_write_8(ea, res);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY |= OPER_I_16());
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PI_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PD_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint res = MASK_OUT_ABOVE_16(src | m68ki_read_16(ea));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY |= OPER_I_32();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_AI_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PI_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PD_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_DI_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_IX_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AW_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AL_32();
+	uint res = src | m68ki_read_32(ea);
+
+	m68ki_write_32(ea, res);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ori_16_toc(m68ki_cpu_core *cpu)
+{
+	m68ki_set_ccr(cpu, m68ki_get_ccr() | OPER_I_16());
+}
+
+
+void m68k_op_ori_16_tos(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint src = OPER_I_16();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		m68ki_set_sr(cpu, m68ki_get_sr() | src);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_pack_16_rr(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: DX and DY are reversed in Motorola's docs */
+		uint src = DY + OPER_I_16();
+		uint* r_dst = &DX;
+
+		*r_dst = MASK_OUT_BELOW_8(*r_dst) | ((src >> 4) & 0x00f0) | (src & 0x000f);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_pack_16_mm_ax7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint ea_src = EA_AY_PD_8();
+		uint src = m68ki_read_8(ea_src);
+		ea_src = EA_AY_PD_8();
+		src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
+
+		m68ki_write_8(EA_A7_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_pack_16_mm_ay7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint ea_src = EA_A7_PD_8();
+		uint src = m68ki_read_8(ea_src);
+		ea_src = EA_A7_PD_8();
+		src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
+
+		m68ki_write_8(EA_AX_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_pack_16_mm_axy7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint ea_src = EA_A7_PD_8();
+		uint src = m68ki_read_8(ea_src);
+		ea_src = EA_A7_PD_8();
+		src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
+
+		m68ki_write_8(EA_A7_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_pack_16_mm(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint ea_src = EA_AY_PD_8();
+		uint src = m68ki_read_8(ea_src);
+		ea_src = EA_AY_PD_8();
+		src = ((src << 8) | m68ki_read_8(ea_src)) + OPER_I_16();
+
+		m68ki_write_8(EA_AX_PD_8(), ((src >> 4) & 0x00f0) | (src & 0x000f));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_pea_32_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_PCDI_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_pea_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_PCIX_32();
+
+	m68ki_push_32(cpu, ea);
+}
+
+
+void m68k_op_reset(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		m68ki_output_reset();		 /* auto-disable (see m68kcpu.h) */
+		USE_CYCLES(CYC_RESET);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_ror_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint shift = orig_shift & 7;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROR_8(src, shift);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = src << (9-orig_shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = ROR_16(src, shift);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << (9-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint64 src = *r_dst;
+	uint res = ROR_32(src, shift);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = src << (9-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 7;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROR_8(src, shift);
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+		FLAG_C = src << (8-((shift-1)&7));
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 15;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = ROR_16(src, shift);
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		FLAG_C = (src >> ((shift - 1) & 15)) << 8;
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 31;
+	uint64 src = *r_dst;
+	uint res = ROR_32(src, shift);
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		*r_dst = res;
+		FLAG_C = (src >> ((shift - 1) & 31)) << 8;
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_ror_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_16(src, 1);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src << 8;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint shift = orig_shift & 7;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROL_8(src, shift);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_C = src << orig_shift;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = ROL_16(src, shift);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> (8-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_32_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint64 src = *r_dst;
+	uint res = ROL_32(src, shift);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_C = src >> (24-shift);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 7;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROL_8(src, shift);
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		if(shift != 0)
+		{
+			*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+			FLAG_C = src << shift;
+			FLAG_N = NFLAG_8(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+		FLAG_C = (src & 1)<<8;
+		FLAG_N = NFLAG_8(src);
+		FLAG_Z = src;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_8(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 15;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, shift));
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		if(shift != 0)
+		{
+			*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+			FLAG_C = (src << shift) >> 8;
+			FLAG_N = NFLAG_16(res);
+			FLAG_Z = res;
+			FLAG_V = VFLAG_CLEAR;
+			return;
+		}
+		FLAG_C = (src & 1)<<8;
+		FLAG_N = NFLAG_16(src);
+		FLAG_Z = src;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_16(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_32_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift & 31;
+	uint64 src = *r_dst;
+	uint res = ROL_32(src, shift);
+
+	if(orig_shift != 0)
+	{
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		*r_dst = res;
+
+		FLAG_C = (src >> (32 - shift)) << 8;
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_N = NFLAG_32(src);
+	FLAG_Z = src;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rol_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = MASK_OUT_ABOVE_16(ROL_16(src, 1));
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_C = src >> 7;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROR_9(src | (XFLAG_AS_1() << 8), shift);
+
+	FLAG_C = FLAG_X = res;
+	res = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), shift);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_32_s(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint64 src = *r_dst;
+	uint64 res = src | (((uint64)XFLAG_AS_1()) << 32);
+
+	res = ROR_33_64(res, shift);
+
+	FLAG_C = FLAG_X = res >> 24;
+	res = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#else
+
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1() << (32 - shift)));
+	uint new_x_flag = src & (1 << (shift - 1));
+
+	*r_dst = res;
+
+	FLAG_C = FLAG_X = (new_x_flag != 0)<<8;
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#endif
+}
+
+
+void m68k_op_roxr_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 9;
+		uint src = MASK_OUT_ABOVE_8(*r_dst);
+		uint res = ROR_9(src | (XFLAG_AS_1() << 8), shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res;
+		res = MASK_OUT_ABOVE_8(res);
+
+		*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_8(*r_dst);
+	FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 17;
+		uint src = MASK_OUT_ABOVE_16(*r_dst);
+		uint res = ROR_17(src | (XFLAG_AS_1() << 16), shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res >> 8;
+		res = MASK_OUT_ABOVE_16(res);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_16(*r_dst);
+	FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_32_r(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 33;
+		uint64 src = *r_dst;
+		uint64 res = src | (((uint64)XFLAG_AS_1()) << 32);
+
+		res = ROR_33_64(res, shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res >> 24;
+		res = MASK_OUT_ABOVE_32(res);
+
+		*r_dst = res;
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_32(*r_dst);
+	FLAG_Z = *r_dst;
+	FLAG_V = VFLAG_CLEAR;
+
+#else
+
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift % 33;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32((ROR_33(src, shift) & ~(1 << (32 - shift))) | (XFLAG_AS_1() << (32 - shift)));
+	uint new_x_flag = src & (1 << (shift - 1));
+
+	if(orig_shift != 0)
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+	if(shift != 0)
+	{
+		*r_dst = res;
+		FLAG_X = (new_x_flag != 0)<<8;
+	}
+	else
+		res = src;
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#endif
+}
+
+
+void m68k_op_roxr_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxr_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROR_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_8_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = ROL_9(src | (XFLAG_AS_1() << 8), shift);
+
+	FLAG_C = FLAG_X = res;
+	res = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_s(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), shift);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_32_s(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint64 src = *r_dst;
+	uint64 res = src | (((uint64)XFLAG_AS_1()) << 32);
+
+	res = ROL_33_64(res, shift);
+
+	FLAG_C = FLAG_X = res >> 24;
+	res = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = res;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#else
+
+	uint* r_dst = &DY;
+	uint shift = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1() << (shift - 1)));
+	uint new_x_flag = src & (1 << (32 - shift));
+
+	*r_dst = res;
+
+	FLAG_C = FLAG_X = (new_x_flag != 0)<<8;
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#endif
+}
+
+
+void m68k_op_roxl_8_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 9;
+		uint src = MASK_OUT_ABOVE_8(*r_dst);
+		uint res = ROL_9(src | (XFLAG_AS_1() << 8), shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res;
+		res = MASK_OUT_ABOVE_8(res);
+
+		*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_8(*r_dst);
+	FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_r(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 17;
+		uint src = MASK_OUT_ABOVE_16(*r_dst);
+		uint res = ROL_17(src | (XFLAG_AS_1() << 16), shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res >> 8;
+		res = MASK_OUT_ABOVE_16(res);
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_16(*r_dst);
+	FLAG_Z = MASK_OUT_ABOVE_16(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_32_r(m68ki_cpu_core *cpu)
+{
+#if M68K_USE_64_BIT
+
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+
+	if(orig_shift != 0)
+	{
+		uint shift = orig_shift % 33;
+		uint64 src = *r_dst;
+		uint64 res = src | (((uint64)XFLAG_AS_1()) << 32);
+
+		res = ROL_33_64(res, shift);
+
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+		FLAG_C = FLAG_X = res >> 24;
+		res = MASK_OUT_ABOVE_32(res);
+
+		*r_dst = res;
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		return;
+	}
+
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_32(*r_dst);
+	FLAG_Z = *r_dst;
+	FLAG_V = VFLAG_CLEAR;
+
+#else
+
+	uint* r_dst = &DY;
+	uint orig_shift = DX & 0x3f;
+	uint shift = orig_shift % 33;
+	uint src = *r_dst;
+	uint res = MASK_OUT_ABOVE_32((ROL_33(src, shift) & ~(1 << (shift - 1))) | (XFLAG_AS_1() << (shift - 1)));
+	uint new_x_flag = src & (1 << (32 - shift));
+
+	if(orig_shift != 0)
+		USE_CYCLES(orig_shift<<CYC_SHIFT);
+
+	if(shift != 0)
+	{
+		*r_dst = res;
+		FLAG_X = (new_x_flag != 0)<<8;
+	}
+	else
+		res = src;
+	FLAG_C = FLAG_X;
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+
+#endif
+}
+
+
+void m68k_op_roxl_16_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_roxl_16_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = m68ki_read_16(ea);
+	uint res = ROL_17(src | (XFLAG_AS_1() << 16), 1);
+
+	FLAG_C = FLAG_X = res >> 8;
+	res = MASK_OUT_ABOVE_16(res);
+
+	m68ki_write_16(ea, res);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_rtd_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_010_PLUS(CPU_TYPE))
+	{
+		uint new_pc = m68ki_pull_32(cpu);
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		REG_A[7] = MASK_OUT_ABOVE_32(REG_A[7] + MAKE_INT_16(OPER_I_16()));
+		m68ki_jump(cpu, new_pc);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_rte_32(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr;
+		uint new_pc;
+		uint format_word;
+
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+
+		if(CPU_TYPE_IS_000(CPU_TYPE))
+		{
+			new_sr = m68ki_pull_16(cpu);
+			new_pc = m68ki_pull_32(cpu);
+			m68ki_jump(cpu, new_pc);
+			m68ki_set_sr(cpu, new_sr);
+
+			CPU_INSTR_MODE = INSTRUCTION_YES;
+			CPU_RUN_MODE = RUN_MODE_NORMAL;
+
+			return;
+		}
+
+		if(CPU_TYPE_IS_010(CPU_TYPE))
+		{
+			format_word = m68ki_read_16(REG_A[7]+6) >> 12;
+			if(format_word == 0)
+			{
+				new_sr = m68ki_pull_16(cpu);
+				new_pc = m68ki_pull_32(cpu);
+				m68ki_fake_pull_16(cpu);	/* format word */
+				m68ki_jump(cpu, new_pc);
+				m68ki_set_sr(cpu, new_sr);
+				CPU_INSTR_MODE = INSTRUCTION_YES;
+				CPU_RUN_MODE = RUN_MODE_NORMAL;
+				return;
+			}
+			CPU_INSTR_MODE = INSTRUCTION_YES;
+			CPU_RUN_MODE = RUN_MODE_NORMAL;
+			/* Not handling bus fault (9) */
+			m68ki_exception_format_error(cpu);
+			return;
+		}
+
+		/* Otherwise it's 020 */
+rte_loop:
+		format_word = m68ki_read_16(REG_A[7]+6) >> 12;
+		switch(format_word)
+		{
+			case 0: /* Normal */
+				new_sr = m68ki_pull_16(cpu);
+				new_pc = m68ki_pull_32(cpu);
+				m68ki_fake_pull_16(cpu);	/* format word */
+				m68ki_jump(cpu, new_pc);
+				m68ki_set_sr(cpu, new_sr);
+				CPU_INSTR_MODE = INSTRUCTION_YES;
+				CPU_RUN_MODE = RUN_MODE_NORMAL;
+				return;
+			case 1: /* Throwaway */
+				new_sr = m68ki_pull_16(cpu);
+				m68ki_fake_pull_32(cpu);	/* program counter */
+				m68ki_fake_pull_16(cpu);	/* format word */
+				m68ki_set_sr_noint(cpu, new_sr);
+				goto rte_loop;
+			case 2: /* Trap */
+				new_sr = m68ki_pull_16(cpu);
+				new_pc = m68ki_pull_32(cpu);
+				m68ki_fake_pull_16(cpu);	/* format word */
+				m68ki_fake_pull_32(cpu);	/* address */
+				m68ki_jump(cpu, new_pc);
+				m68ki_set_sr(cpu, new_sr);
+				CPU_INSTR_MODE = INSTRUCTION_YES;
+				CPU_RUN_MODE = RUN_MODE_NORMAL;
+				return;
+		}
+		/* Not handling long or short bus fault */
+		CPU_INSTR_MODE = INSTRUCTION_YES;
+		CPU_RUN_MODE = RUN_MODE_NORMAL;
+		m68ki_exception_format_error(cpu);
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_rtm_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_020_VARIANT(CPU_TYPE))
+	{
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		M68K_DO_LOG((M68K_LOG_FILEHANDLE "%s at %08x: called unimplemented instruction %04x (%s)\n",
+					 m68ki_cpu_names[CPU_TYPE], ADDRESS_68K(REG_PC - 2), REG_IR,
+					 m68k_disassemble_quick(ADDRESS_68K(REG_PC - 2))));
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_rtr_32(m68ki_cpu_core *cpu)
+{
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_set_ccr(cpu, m68ki_pull_16(cpu));
+	m68ki_jump(cpu, m68ki_pull_32(cpu));
+}
+
+
+void m68k_op_rts_32(m68ki_cpu_core *cpu)
+{
+	m68ki_trace_t0();				 /* auto-disable (see m68kcpu.h) */
+	m68ki_jump(cpu, m68ki_pull_32(cpu));
+}
+
+
+void m68k_op_sbcd_8_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res -= 6;
+	res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res += 0xa0;
+
+	res = MASK_OUT_ABOVE_8(res);
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+}
+
+
+void m68k_op_sbcd_8_mm_ax7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res -= 6;
+	res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res += 0xa0;
+
+	res = MASK_OUT_ABOVE_8(res);
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_sbcd_8_mm_ay7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res -= 6;
+	res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res += 0xa0;
+
+	res = MASK_OUT_ABOVE_8(res);
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_sbcd_8_mm_axy7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res -= 6;
+	res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res += 0xa0;
+
+	res = MASK_OUT_ABOVE_8(res);
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_sbcd_8_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
+
+	FLAG_V = ~res; /* Undefined V behavior */
+
+	if(res > 9)
+		res -= 6;
+	res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
+	FLAG_X = FLAG_C = (res > 0x99) << 8;
+	if(FLAG_C)
+		res += 0xa0;
+
+	res = MASK_OUT_ABOVE_8(res);
+
+	FLAG_V &= res; /* Undefined V behavior part II */
+	FLAG_N = NFLAG_8(res); /* Undefined N behavior */
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_st_8_d(m68ki_cpu_core *cpu)
+{
+	DY |= 0xff;
+}
+
+
+void m68k_op_st_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), 0xff);
+}
+
+
+void m68k_op_st_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), 0xff);
+}
+
+
+void m68k_op_st_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), 0xff);
+}
+
+
+void m68k_op_st_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), 0xff);
+}
+
+
+void m68k_op_st_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), 0xff);
+}
+
+
+void m68k_op_st_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), 0xff);
+}
+
+
+void m68k_op_st_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), 0xff);
+}
+
+
+void m68k_op_st_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), 0xff);
+}
+
+
+void m68k_op_st_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), 0xff);
+}
+
+
+void m68k_op_sf_8_d(m68ki_cpu_core *cpu)
+{
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sf_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), 0);
+}
+
+
+void m68k_op_sf_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), 0);
+}
+
+
+void m68k_op_sf_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), 0);
+}
+
+
+void m68k_op_sf_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), 0);
+}
+
+
+void m68k_op_sf_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), 0);
+}
+
+
+void m68k_op_sf_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), 0);
+}
+
+
+void m68k_op_sf_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), 0);
+}
+
+
+void m68k_op_sf_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), 0);
+}
+
+
+void m68k_op_sf_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), 0);
+}
+
+
+void m68k_op_shi_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_HI())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sls_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_LS())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_scc_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_CC())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_scs_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_CS())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sne_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_NE())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_seq_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_EQ())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_svc_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_VC())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_svs_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_VS())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_spl_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_PL())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_smi_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_MI())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sge_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_GE())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_slt_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_LT())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sgt_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_GT())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_sle_8_d(m68ki_cpu_core *cpu)
+{
+	if(COND_LE())
+	{
+		DY |= 0xff;
+		return;
+	}
+	DY &= 0xffffff00;
+}
+
+
+void m68k_op_shi_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_shi_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_HI() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_sls_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_LS() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scc_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_CC() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_scs_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_CS() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_sne_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_NE() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_seq_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_EQ() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svc_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_VC() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_svs_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_VS() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_spl_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_PL() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_smi_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_MI() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_sge_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_GE() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_slt_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_LT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sgt_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_GT() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_ai(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_AI_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_pi(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PI_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_pi7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PI_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_pd(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_PD_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_pd7(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_A7_PD_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_di(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_DI_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_ix(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AY_IX_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_aw(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AW_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_sle_8_al(m68ki_cpu_core *cpu)
+{
+	m68ki_write_8(EA_AL_8(), COND_LE() ? 0xff : 0);
+}
+
+
+void m68k_op_stop(m68ki_cpu_core *cpu)
+{
+	if(FLAG_S)
+	{
+		uint new_sr = OPER_I_16();
+		m68ki_trace_t0();			 /* auto-disable (see m68kcpu.h) */
+		CPU_STOPPED |= STOP_LEVEL_STOP;
+		m68ki_set_sr(cpu, new_sr);
+		cpu->m68ki_remaining_cycles = 0;
+		return;
+	}
+	m68ki_exception_privilege_violation(cpu);
+}
+
+
+void m68k_op_sub_8_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_8(DY);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pi7(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_A7_PI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pd7(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_A7_PD_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_8(cpu);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_8_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(DY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(AY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_16(cpu);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_16_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = AY;
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_AI_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PI_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_PD_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_DI_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AY_IX_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AW_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_AL_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCDI_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_PCIX_32(cpu);
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_32_er_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = OPER_I_32();
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_sub_8_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_8_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint src = MASK_OUT_ABOVE_8(DX);
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_16_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_16();
+	uint src = MASK_OUT_ABOVE_16(DX);
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_sub_32_re_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_32();
+	uint src = DX;
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_suba_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(DY));
+}
+
+
+void m68k_op_suba_16_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(AY));
+}
+
+
+void m68k_op_suba_16_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AY_AI_16(cpu)));
+}
+
+
+void m68k_op_suba_16_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AY_PI_16(cpu)));
+}
+
+
+void m68k_op_suba_16_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AY_PD_16(cpu)));
+}
+
+
+void m68k_op_suba_16_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AY_DI_16(cpu)));
+}
+
+
+void m68k_op_suba_16_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AY_IX_16(cpu)));
+}
+
+
+void m68k_op_suba_16_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AW_16(cpu)));
+}
+
+
+void m68k_op_suba_16_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_AL_16(cpu)));
+}
+
+
+void m68k_op_suba_16_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_PCDI_16(cpu)));
+}
+
+
+void m68k_op_suba_16_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_PCIX_16(cpu)));
+}
+
+
+void m68k_op_suba_16_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - MAKE_INT_16(OPER_I_16()));
+}
+
+
+void m68k_op_suba_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - DY);
+}
+
+
+void m68k_op_suba_32_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - AY);
+}
+
+
+void m68k_op_suba_32_ai(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AY_AI_32(cpu));
+}
+
+
+void m68k_op_suba_32_pi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AY_PI_32(cpu));
+}
+
+
+void m68k_op_suba_32_pd(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AY_PD_32(cpu));
+}
+
+
+void m68k_op_suba_32_di(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AY_DI_32(cpu));
+}
+
+
+void m68k_op_suba_32_ix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AY_IX_32(cpu));
+}
+
+
+void m68k_op_suba_32_aw(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AW_32(cpu));
+}
+
+
+void m68k_op_suba_32_al(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_AL_32(cpu));
+}
+
+
+void m68k_op_suba_32_pcdi(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_PCDI_32(cpu));
+}
+
+
+void m68k_op_suba_32_pcix(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_PCIX_32(cpu));
+}
+
+
+void m68k_op_suba_32_i(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AX;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - OPER_I_32());
+}
+
+
+void m68k_op_subi_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_8();
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_subi_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_8();
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_16();
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_subi_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_AI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_DI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AY_IX_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AW_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_16();
+	uint ea = EA_AL_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = OPER_I_32();
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_subi_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_AI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_DI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AY_IX_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AW_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subi_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_I_32();
+	uint ea = EA_AL_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_subq_8_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_8_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = MASK_OUT_ABOVE_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	m68ki_write_8(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | FLAG_Z;
+}
+
+
+void m68k_op_subq_16_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((REG_IR >> 9) - 1) & 7) + 1));
+}
+
+
+void m68k_op_subq_16_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_16_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = MASK_OUT_ABOVE_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	m68ki_write_16(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint dst = *r_dst;
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	*r_dst = FLAG_Z;
+}
+
+
+void m68k_op_subq_32_a(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	*r_dst = MASK_OUT_ABOVE_32(*r_dst - ((((REG_IR >> 9) - 1) & 7) + 1));
+}
+
+
+void m68k_op_subq_32_ai(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_AI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_pi(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_pd(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_di(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_DI_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_ix(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AY_IX_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_aw(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AW_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subq_32_al(m68ki_cpu_core *cpu)
+{
+	uint src = (((REG_IR >> 9) - 1) & 7) + 1;
+	uint ea = EA_AL_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = MASK_OUT_ABOVE_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	m68ki_write_32(ea, FLAG_Z);
+}
+
+
+void m68k_op_subx_8_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_8(DY);
+	uint dst = MASK_OUT_ABOVE_8(*r_dst);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
+}
+
+
+void m68k_op_subx_16_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = MASK_OUT_ABOVE_16(DY);
+	uint dst = MASK_OUT_ABOVE_16(*r_dst);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	*r_dst = MASK_OUT_BELOW_16(*r_dst) | res;
+}
+
+
+void m68k_op_subx_32_rr(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DX;
+	uint src = DY;
+	uint dst = *r_dst;
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	*r_dst = res;
+}
+
+
+void m68k_op_subx_8_mm_ax7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_subx_8_mm_ay7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_subx_8_mm_axy7(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_A7_PD_8(cpu);
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_subx_8_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_8(cpu);
+	uint ea = EA_AX_PD_8();
+	uint dst = m68ki_read_8(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_X = FLAG_C = CFLAG_8(res);
+	FLAG_V = VFLAG_SUB_8(src, dst, res);
+
+	res = MASK_OUT_ABOVE_8(res);
+	FLAG_Z |= res;
+
+	m68ki_write_8(ea, res);
+}
+
+
+void m68k_op_subx_16_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_16(cpu);
+	uint ea = EA_AX_PD_16();
+	uint dst = m68ki_read_16(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_X = FLAG_C = CFLAG_16(res);
+	FLAG_V = VFLAG_SUB_16(src, dst, res);
+
+	res = MASK_OUT_ABOVE_16(res);
+	FLAG_Z |= res;
+
+	m68ki_write_16(ea, res);
+}
+
+
+void m68k_op_subx_32_mm(m68ki_cpu_core *cpu)
+{
+	uint src = OPER_AY_PD_32(cpu);
+	uint ea = EA_AX_PD_32();
+	uint dst = m68ki_read_32(ea);
+	uint res = dst - src - XFLAG_AS_1();
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_X = FLAG_C = CFLAG_SUB_32(src, dst, res);
+	FLAG_V = VFLAG_SUB_32(src, dst, res);
+
+	res = MASK_OUT_ABOVE_32(res);
+	FLAG_Z |= res;
+
+	m68ki_write_32(ea, res);
+}
+
+
+void m68k_op_swap_32(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+
+	FLAG_Z = MASK_OUT_ABOVE_32(*r_dst<<16);
+	*r_dst = (*r_dst>>16) | FLAG_Z;
+
+	FLAG_Z = *r_dst;
+	FLAG_N = NFLAG_32(*r_dst);
+	FLAG_C = CFLAG_CLEAR;
+	FLAG_V = VFLAG_CLEAR;
+}
+
+
+void m68k_op_tas_8_d(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &DY;
+
+	FLAG_Z = MASK_OUT_ABOVE_8(*r_dst);
+	FLAG_N = NFLAG_8(*r_dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	*r_dst |= 0x80;
+}
+
+
+void m68k_op_tas_8_ai(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_AI_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_pi(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PI_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PI_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_pd(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_PD_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_A7_PD_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_di(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_DI_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_ix(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AY_IX_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_aw(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AW_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_tas_8_al(m68ki_cpu_core *cpu)
+{
+	uint ea = EA_AL_8();
+	uint dst = m68ki_read_8(ea);
+
+	FLAG_Z = dst;
+	FLAG_N = NFLAG_8(dst);
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+	m68ki_write_8(ea, dst | 0x80);
+}
+
+
+void m68k_op_trap(m68ki_cpu_core *cpu)
+{
+	/* Trap#n stacks exception frame type 0 */
+	m68ki_exception_trapN(cpu, EXCEPTION_TRAP_BASE + (REG_IR & 0xf));	/* HJB 990403 */
+}
+
+
+void m68k_op_trapt(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapt_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapt_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapf(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapf_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapf_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traphi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_HI())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapls(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LS())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcc(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CC())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcs(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CS())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapne(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_NE())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapeq(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_EQ())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvc(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VC())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvs(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VS())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trappl(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_PL())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapmi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_MI())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapge(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GE())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traplt(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LT())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapgt(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GT())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traple(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LE())
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traphi_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_HI())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapls_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcc_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CC())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcs_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapne_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_NE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapeq_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_EQ())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvc_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VC())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvs_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trappl_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_PL())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapmi_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_MI())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapge_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traplt_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LT())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapgt_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GT())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traple_16(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 2;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traphi_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_HI())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapls_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CC())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapcs_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_CS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapne_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_NE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapeq_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_EQ())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvc_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VC())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapvs_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_VS())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trappl_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_PL())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapmi_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_MI())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapge_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traplt_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LT())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapgt_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_GT())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_traple_32(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		if(COND_LE())
+		{
+			m68ki_exception_trap(cpu, EXCEPTION_TRAPV);	/* HJB 990403 */
+			return;
+		}
+		REG_PC += 4;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_trapv(m68ki_cpu_core *cpu)
+{
+	if(COND_VC())
+	{
+		return;
+	}
+	m68ki_exception_trap(cpu, EXCEPTION_TRAPV); /* HJB 990403 */
+}
+
+
+void m68k_op_tst_8_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_8(DY);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_pi7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PI_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_pd7(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_A7_PD_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_8(cpu);
+
+	FLAG_N = NFLAG_8(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_8_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCDI_8(cpu);
+
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_8_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCIX_8(cpu);
+
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_8_i(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_I_8();
+
+		FLAG_N = NFLAG_8(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_16_d(m68ki_cpu_core *cpu)
+{
+	uint res = MASK_OUT_ABOVE_16(DY);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_a(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = MAKE_INT_16(AY);
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_16_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_16(cpu);
+
+	FLAG_N = NFLAG_16(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_16_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCDI_16(cpu);
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_16_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCIX_16(cpu);
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_16_i(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_I_16();
+
+		FLAG_N = NFLAG_16(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_32_d(m68ki_cpu_core *cpu)
+{
+	uint res = DY;
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_a(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = AY;
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_32_ai(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_AI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_pi(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_pd(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_PD_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_di(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_DI_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_ix(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AY_IX_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_aw(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AW_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_al(m68ki_cpu_core *cpu)
+{
+	uint res = OPER_AL_32(cpu);
+
+	FLAG_N = NFLAG_32(res);
+	FLAG_Z = res;
+	FLAG_V = VFLAG_CLEAR;
+	FLAG_C = CFLAG_CLEAR;
+}
+
+
+void m68k_op_tst_32_pcdi(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCDI_32(cpu);
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_32_pcix(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_PCIX_32(cpu);
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_tst_32_i(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint res = OPER_I_32();
+
+		FLAG_N = NFLAG_32(res);
+		FLAG_Z = res;
+		FLAG_V = VFLAG_CLEAR;
+		FLAG_C = CFLAG_CLEAR;
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_unlk_32_a7(m68ki_cpu_core *cpu)
+{
+	REG_A[7] = m68ki_read_32(REG_A[7]);
+}
+
+
+void m68k_op_unlk_32(m68ki_cpu_core *cpu)
+{
+	uint* r_dst = &AY;
+
+	REG_A[7] = *r_dst;
+	*r_dst = m68ki_pull_32(cpu);
+}
+
+
+void m68k_op_unpk_16_rr(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: DX and DY are reversed in Motorola's docs */
+		uint src = DY;
+		uint* r_dst = &DX;
+
+		*r_dst = MASK_OUT_BELOW_16(*r_dst) | (((((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16()) & 0xffff);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_unpk_16_mm_ax7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint src = OPER_AY_PD_8(cpu);
+		uint ea_dst;
+
+		src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
+		ea_dst = EA_A7_PD_8();
+		m68ki_write_8(ea_dst, (src >> 8) & 0xff);
+		ea_dst = EA_A7_PD_8();
+		m68ki_write_8(ea_dst, src & 0xff);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_unpk_16_mm_ay7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint src = OPER_A7_PD_8(cpu);
+		uint ea_dst;
+
+		src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
+		ea_dst = EA_AX_PD_8();
+		m68ki_write_8(ea_dst, (src >> 8) & 0xff);
+		ea_dst = EA_AX_PD_8();
+		m68ki_write_8(ea_dst, src & 0xff);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_unpk_16_mm_axy7(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		uint src = OPER_A7_PD_8(cpu);
+		uint ea_dst;
+
+		src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
+		ea_dst = EA_A7_PD_8();
+		m68ki_write_8(ea_dst, (src >> 8) & 0xff);
+		ea_dst = EA_A7_PD_8();
+		m68ki_write_8(ea_dst, src & 0xff);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+void m68k_op_unpk_16_mm(m68ki_cpu_core *cpu)
+{
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		/* Note: AX and AY are reversed in Motorola's docs */
+		uint src = OPER_AY_PD_8(cpu);
+		uint ea_dst;
+
+		src = (((src << 4) & 0x0f00) | (src & 0x000f)) + OPER_I_16();
+		ea_dst = EA_AX_PD_8();
+		m68ki_write_8(ea_dst, (src >> 8) & 0xff);
+		ea_dst = EA_AX_PD_8();
+		m68ki_write_8(ea_dst, src & 0xff);
+		return;
+	}
+	m68ki_exception_illegal(cpu);
+}
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kops.c Added

@@ -0,0 +1,2093 @@
+/* ======================================================================== */
+/* ========================= OPCODE TABLE BUILDER ========================= */
+/* ======================================================================== */
+
+#include "m68kops.h"
+
+#define NUM_CPU_TYPES 3
+
+void (*m68ki_instruction_jump_table[0x10000])(m68ki_cpu_core *cpu); /* opcode handler jump table */
+unsigned char m68ki_cycles[NUM_CPU_TYPES][0x10000]; /* Cycles used by CPU type */
+
+/* This is used to generate the opcode handler jump table */
+typedef struct
+{
+	void (*opcode_handler)(m68ki_cpu_core *cpu); /* handler function */
+	unsigned int mask; /* mask on opcode */
+	unsigned int match; /* what to match after masking */
+	unsigned char cycles[NUM_CPU_TYPES]; /* cycles each cpu type takes */
+} opcode_handler_struct;
+
+
+/* Opcode handler table */
+static opcode_handler_struct m68k_opcode_handler_table[] =
+{
+/* function mask match 000 010 020 */
+	{m68k_op_1010 , 0xf000, 0xa000, { 4, 4, 4}},
+	{m68k_op_1111 , 0xf000, 0xf000, { 4, 4, 4}},
+	{m68k_op_moveq_32 , 0xf100, 0x7000, { 4, 4, 2}},
+	{m68k_op_cpbcc_32 , 0xf180, 0xf080, { 0, 0, 4}},
+	{m68k_op_cpgen_32 , 0xf1c0, 0xf000, { 0, 0, 4}},
+	{m68k_op_cpscc_32 , 0xf1c0, 0xf040, { 0, 0, 4}},
+	{m68k_op_bra_8 , 0xff00, 0x6000, { 10, 10, 10}},
+	{m68k_op_bsr_8 , 0xff00, 0x6100, { 18, 18, 7}},
+	{m68k_op_bhi_8 , 0xff00, 0x6200, { 8, 8, 6}},
+	{m68k_op_bls_8 , 0xff00, 0x6300, { 8, 8, 6}},
+	{m68k_op_bcc_8 , 0xff00, 0x6400, { 8, 8, 6}},
+	{m68k_op_bcs_8 , 0xff00, 0x6500, { 8, 8, 6}},
+	{m68k_op_bne_8 , 0xff00, 0x6600, { 8, 8, 6}},
+	{m68k_op_beq_8 , 0xff00, 0x6700, { 8, 8, 6}},
+	{m68k_op_bvc_8 , 0xff00, 0x6800, { 8, 8, 6}},
+	{m68k_op_bvs_8 , 0xff00, 0x6900, { 8, 8, 6}},
+	{m68k_op_bpl_8 , 0xff00, 0x6a00, { 8, 8, 6}},
+	{m68k_op_bmi_8 , 0xff00, 0x6b00, { 8, 8, 6}},
+	{m68k_op_bge_8 , 0xff00, 0x6c00, { 8, 8, 6}},
+	{m68k_op_blt_8 , 0xff00, 0x6d00, { 8, 8, 6}},
+	{m68k_op_bgt_8 , 0xff00, 0x6e00, { 8, 8, 6}},
+	{m68k_op_ble_8 , 0xff00, 0x6f00, { 8, 8, 6}},
+	{m68k_op_btst_32_r_d , 0xf1f8, 0x0100, { 6, 6, 4}},
+	{m68k_op_movep_16_er , 0xf1f8, 0x0108, { 16, 16, 12}},
+	{m68k_op_btst_8_r_ai , 0xf1f8, 0x0110, { 8, 8, 8}},
+	{m68k_op_btst_8_r_pi , 0xf1f8, 0x0118, { 8, 8, 8}},
+	{m68k_op_btst_8_r_pd , 0xf1f8, 0x0120, { 10, 10, 9}},
+	{m68k_op_btst_8_r_di , 0xf1f8, 0x0128, { 12, 12, 9}},
+	{m68k_op_btst_8_r_ix , 0xf1f8, 0x0130, { 14, 14, 11}},
+	{m68k_op_bchg_32_r_d , 0xf1f8, 0x0140, { 8, 8, 4}},
+	{m68k_op_movep_32_er , 0xf1f8, 0x0148, { 24, 24, 18}},
+	{m68k_op_bchg_8_r_ai , 0xf1f8, 0x0150, { 12, 12, 8}},
+	{m68k_op_bchg_8_r_pi , 0xf1f8, 0x0158, { 12, 12, 8}},
+	{m68k_op_bchg_8_r_pd , 0xf1f8, 0x0160, { 14, 14, 9}},
+	{m68k_op_bchg_8_r_di , 0xf1f8, 0x0168, { 16, 16, 9}},
+	{m68k_op_bchg_8_r_ix , 0xf1f8, 0x0170, { 18, 18, 11}},
+	{m68k_op_bclr_32_r_d , 0xf1f8, 0x0180, { 10, 10, 4}},
+	{m68k_op_movep_16_re , 0xf1f8, 0x0188, { 16, 16, 11}},
+	{m68k_op_bclr_8_r_ai , 0xf1f8, 0x0190, { 12, 14, 8}},
+	{m68k_op_bclr_8_r_pi , 0xf1f8, 0x0198, { 12, 14, 8}},
+	{m68k_op_bclr_8_r_pd , 0xf1f8, 0x01a0, { 14, 16, 9}},
+	{m68k_op_bclr_8_r_di , 0xf1f8, 0x01a8, { 16, 18, 9}},
+	{m68k_op_bclr_8_r_ix , 0xf1f8, 0x01b0, { 18, 20, 11}},
+	{m68k_op_bset_32_r_d , 0xf1f8, 0x01c0, { 8, 8, 4}},
+	{m68k_op_movep_32_re , 0xf1f8, 0x01c8, { 24, 24, 17}},
+	{m68k_op_bset_8_r_ai , 0xf1f8, 0x01d0, { 12, 12, 8}},
+	{m68k_op_bset_8_r_pi , 0xf1f8, 0x01d8, { 12, 12, 8}},
+	{m68k_op_bset_8_r_pd , 0xf1f8, 0x01e0, { 14, 14, 9}},
+	{m68k_op_bset_8_r_di , 0xf1f8, 0x01e8, { 16, 16, 9}},
+	{m68k_op_bset_8_r_ix , 0xf1f8, 0x01f0, { 18, 18, 11}},
+	{m68k_op_move_8_d_d , 0xf1f8, 0x1000, { 4, 4, 2}},
+	{m68k_op_move_8_d_ai , 0xf1f8, 0x1010, { 8, 8, 6}},
+	{m68k_op_move_8_d_pi , 0xf1f8, 0x1018, { 8, 8, 6}},
+	{m68k_op_move_8_d_pd , 0xf1f8, 0x1020, { 10, 10, 7}},
+	{m68k_op_move_8_d_di , 0xf1f8, 0x1028, { 12, 12, 7}},
+	{m68k_op_move_8_d_ix , 0xf1f8, 0x1030, { 14, 14, 9}},
+	{m68k_op_move_8_ai_d , 0xf1f8, 0x1080, { 8, 8, 4}},
+	{m68k_op_move_8_ai_ai , 0xf1f8, 0x1090, { 12, 12, 8}},
+	{m68k_op_move_8_ai_pi , 0xf1f8, 0x1098, { 12, 12, 8}},
+	{m68k_op_move_8_ai_pd , 0xf1f8, 0x10a0, { 14, 14, 9}},
+	{m68k_op_move_8_ai_di , 0xf1f8, 0x10a8, { 16, 16, 9}},
+	{m68k_op_move_8_ai_ix , 0xf1f8, 0x10b0, { 18, 18, 11}},
+	{m68k_op_move_8_pi_d , 0xf1f8, 0x10c0, { 8, 8, 4}},
+	{m68k_op_move_8_pi_ai , 0xf1f8, 0x10d0, { 12, 12, 8}},
+	{m68k_op_move_8_pi_pi , 0xf1f8, 0x10d8, { 12, 12, 8}},
+	{m68k_op_move_8_pi_pd , 0xf1f8, 0x10e0, { 14, 14, 9}},
+	{m68k_op_move_8_pi_di , 0xf1f8, 0x10e8, { 16, 16, 9}},
+	{m68k_op_move_8_pi_ix , 0xf1f8, 0x10f0, { 18, 18, 11}},
+	{m68k_op_move_8_pd_d , 0xf1f8, 0x1100, { 8, 8, 5}},
+	{m68k_op_move_8_pd_ai , 0xf1f8, 0x1110, { 12, 12, 9}},
+	{m68k_op_move_8_pd_pi , 0xf1f8, 0x1118, { 12, 12, 9}},
+	{m68k_op_move_8_pd_pd , 0xf1f8, 0x1120, { 14, 14, 10}},
+	{m68k_op_move_8_pd_di , 0xf1f8, 0x1128, { 16, 16, 10}},
+	{m68k_op_move_8_pd_ix , 0xf1f8, 0x1130, { 18, 18, 12}},
+	{m68k_op_move_8_di_d , 0xf1f8, 0x1140, { 12, 12, 5}},
+	{m68k_op_move_8_di_ai , 0xf1f8, 0x1150, { 16, 16, 9}},
+	{m68k_op_move_8_di_pi , 0xf1f8, 0x1158, { 16, 16, 9}},
+	{m68k_op_move_8_di_pd , 0xf1f8, 0x1160, { 18, 18, 10}},
+	{m68k_op_move_8_di_di , 0xf1f8, 0x1168, { 20, 20, 10}},
+	{m68k_op_move_8_di_ix , 0xf1f8, 0x1170, { 22, 22, 12}},
+	{m68k_op_move_8_ix_d , 0xf1f8, 0x1180, { 14, 14, 7}},
+	{m68k_op_move_8_ix_ai , 0xf1f8, 0x1190, { 18, 18, 11}},
+	{m68k_op_move_8_ix_pi , 0xf1f8, 0x1198, { 18, 18, 11}},
+	{m68k_op_move_8_ix_pd , 0xf1f8, 0x11a0, { 20, 20, 12}},
+	{m68k_op_move_8_ix_di , 0xf1f8, 0x11a8, { 22, 22, 12}},
+	{m68k_op_move_8_ix_ix , 0xf1f8, 0x11b0, { 24, 24, 14}},
+	{m68k_op_move_32_d_d , 0xf1f8, 0x2000, { 4, 4, 2}},
+	{m68k_op_move_32_d_a , 0xf1f8, 0x2008, { 4, 4, 2}},
+	{m68k_op_move_32_d_ai , 0xf1f8, 0x2010, { 12, 12, 6}},
+	{m68k_op_move_32_d_pi , 0xf1f8, 0x2018, { 12, 12, 6}},
+	{m68k_op_move_32_d_pd , 0xf1f8, 0x2020, { 14, 14, 7}},
+	{m68k_op_move_32_d_di , 0xf1f8, 0x2028, { 16, 16, 7}},
+	{m68k_op_move_32_d_ix , 0xf1f8, 0x2030, { 18, 18, 9}},
+	{m68k_op_movea_32_d , 0xf1f8, 0x2040, { 4, 4, 2}},
+	{m68k_op_movea_32_a , 0xf1f8, 0x2048, { 4, 4, 2}},
+	{m68k_op_movea_32_ai , 0xf1f8, 0x2050, { 12, 12, 6}},
+	{m68k_op_movea_32_pi , 0xf1f8, 0x2058, { 12, 12, 6}},
+	{m68k_op_movea_32_pd , 0xf1f8, 0x2060, { 14, 14, 7}},
+	{m68k_op_movea_32_di , 0xf1f8, 0x2068, { 16, 16, 7}},
+	{m68k_op_movea_32_ix , 0xf1f8, 0x2070, { 18, 18, 9}},
+	{m68k_op_move_32_ai_d , 0xf1f8, 0x2080, { 12, 12, 4}},
+	{m68k_op_move_32_ai_a , 0xf1f8, 0x2088, { 12, 12, 4}},
+	{m68k_op_move_32_ai_ai , 0xf1f8, 0x2090, { 20, 20, 8}},
+	{m68k_op_move_32_ai_pi , 0xf1f8, 0x2098, { 20, 20, 8}},
+	{m68k_op_move_32_ai_pd , 0xf1f8, 0x20a0, { 22, 22, 9}},
+	{m68k_op_move_32_ai_di , 0xf1f8, 0x20a8, { 24, 24, 9}},
+	{m68k_op_move_32_ai_ix , 0xf1f8, 0x20b0, { 26, 26, 11}},
+	{m68k_op_move_32_pi_d , 0xf1f8, 0x20c0, { 12, 12, 4}},
+	{m68k_op_move_32_pi_a , 0xf1f8, 0x20c8, { 12, 12, 4}},
+	{m68k_op_move_32_pi_ai , 0xf1f8, 0x20d0, { 20, 20, 8}},
+	{m68k_op_move_32_pi_pi , 0xf1f8, 0x20d8, { 20, 20, 8}},
+	{m68k_op_move_32_pi_pd , 0xf1f8, 0x20e0, { 22, 22, 9}},
+	{m68k_op_move_32_pi_di , 0xf1f8, 0x20e8, { 24, 24, 9}},
+	{m68k_op_move_32_pi_ix , 0xf1f8, 0x20f0, { 26, 26, 11}},
+	{m68k_op_move_32_pd_d , 0xf1f8, 0x2100, { 12, 14, 5}},
+	{m68k_op_move_32_pd_a , 0xf1f8, 0x2108, { 12, 14, 5}},
+	{m68k_op_move_32_pd_ai , 0xf1f8, 0x2110, { 20, 22, 9}},
+	{m68k_op_move_32_pd_pi , 0xf1f8, 0x2118, { 20, 22, 9}},
+	{m68k_op_move_32_pd_pd , 0xf1f8, 0x2120, { 22, 24, 10}},
+	{m68k_op_move_32_pd_di , 0xf1f8, 0x2128, { 24, 26, 10}},
+	{m68k_op_move_32_pd_ix , 0xf1f8, 0x2130, { 26, 28, 12}},
+	{m68k_op_move_32_di_d , 0xf1f8, 0x2140, { 16, 16, 5}},
+	{m68k_op_move_32_di_a , 0xf1f8, 0x2148, { 16, 16, 5}},
+	{m68k_op_move_32_di_ai , 0xf1f8, 0x2150, { 24, 24, 9}},
+	{m68k_op_move_32_di_pi , 0xf1f8, 0x2158, { 24, 24, 9}},
+	{m68k_op_move_32_di_pd , 0xf1f8, 0x2160, { 26, 26, 10}},
+	{m68k_op_move_32_di_di , 0xf1f8, 0x2168, { 28, 28, 10}},
+	{m68k_op_move_32_di_ix , 0xf1f8, 0x2170, { 30, 30, 12}},
+	{m68k_op_move_32_ix_d , 0xf1f8, 0x2180, { 18, 18, 7}},
+	{m68k_op_move_32_ix_a , 0xf1f8, 0x2188, { 18, 18, 7}},
+	{m68k_op_move_32_ix_ai , 0xf1f8, 0x2190, { 26, 26, 11}},
+	{m68k_op_move_32_ix_pi , 0xf1f8, 0x2198, { 26, 26, 11}},
+	{m68k_op_move_32_ix_pd , 0xf1f8, 0x21a0, { 28, 28, 12}},
+	{m68k_op_move_32_ix_di , 0xf1f8, 0x21a8, { 30, 30, 12}},
+	{m68k_op_move_32_ix_ix , 0xf1f8, 0x21b0, { 32, 32, 14}},
+	{m68k_op_move_16_d_d , 0xf1f8, 0x3000, { 4, 4, 2}},
+	{m68k_op_move_16_d_a , 0xf1f8, 0x3008, { 4, 4, 2}},
+	{m68k_op_move_16_d_ai , 0xf1f8, 0x3010, { 8, 8, 6}},
+	{m68k_op_move_16_d_pi , 0xf1f8, 0x3018, { 8, 8, 6}},
+	{m68k_op_move_16_d_pd , 0xf1f8, 0x3020, { 10, 10, 7}},
+	{m68k_op_move_16_d_di , 0xf1f8, 0x3028, { 12, 12, 7}},
+	{m68k_op_move_16_d_ix , 0xf1f8, 0x3030, { 14, 14, 9}},
+	{m68k_op_movea_16_d , 0xf1f8, 0x3040, { 4, 4, 2}},
+	{m68k_op_movea_16_a , 0xf1f8, 0x3048, { 4, 4, 2}},
+	{m68k_op_movea_16_ai , 0xf1f8, 0x3050, { 8, 8, 6}},
+	{m68k_op_movea_16_pi , 0xf1f8, 0x3058, { 8, 8, 6}},
+	{m68k_op_movea_16_pd , 0xf1f8, 0x3060, { 10, 10, 7}},
+	{m68k_op_movea_16_di , 0xf1f8, 0x3068, { 12, 12, 7}},
+	{m68k_op_movea_16_ix , 0xf1f8, 0x3070, { 14, 14, 9}},
+	{m68k_op_move_16_ai_d , 0xf1f8, 0x3080, { 8, 8, 4}},
+	{m68k_op_move_16_ai_a , 0xf1f8, 0x3088, { 8, 8, 4}},
+	{m68k_op_move_16_ai_ai , 0xf1f8, 0x3090, { 12, 12, 8}},
+	{m68k_op_move_16_ai_pi , 0xf1f8, 0x3098, { 12, 12, 8}},
+	{m68k_op_move_16_ai_pd , 0xf1f8, 0x30a0, { 14, 14, 9}},
+	{m68k_op_move_16_ai_di , 0xf1f8, 0x30a8, { 16, 16, 9}},
+	{m68k_op_move_16_ai_ix , 0xf1f8, 0x30b0, { 18, 18, 11}},
+	{m68k_op_move_16_pi_d , 0xf1f8, 0x30c0, { 8, 8, 4}},
+	{m68k_op_move_16_pi_a , 0xf1f8, 0x30c8, { 8, 8, 4}},
+	{m68k_op_move_16_pi_ai , 0xf1f8, 0x30d0, { 12, 12, 8}},
+	{m68k_op_move_16_pi_pi , 0xf1f8, 0x30d8, { 12, 12, 8}},
+	{m68k_op_move_16_pi_pd , 0xf1f8, 0x30e0, { 14, 14, 9}},
+	{m68k_op_move_16_pi_di , 0xf1f8, 0x30e8, { 16, 16, 9}},
+	{m68k_op_move_16_pi_ix , 0xf1f8, 0x30f0, { 18, 18, 11}},
+	{m68k_op_move_16_pd_d , 0xf1f8, 0x3100, { 8, 8, 5}},
+	{m68k_op_move_16_pd_a , 0xf1f8, 0x3108, { 8, 8, 5}},
+	{m68k_op_move_16_pd_ai , 0xf1f8, 0x3110, { 12, 12, 9}},
+	{m68k_op_move_16_pd_pi , 0xf1f8, 0x3118, { 12, 12, 9}},
+	{m68k_op_move_16_pd_pd , 0xf1f8, 0x3120, { 14, 14, 10}},
+	{m68k_op_move_16_pd_di , 0xf1f8, 0x3128, { 16, 16, 10}},
+	{m68k_op_move_16_pd_ix , 0xf1f8, 0x3130, { 18, 18, 12}},
+	{m68k_op_move_16_di_d , 0xf1f8, 0x3140, { 12, 12, 5}},
+	{m68k_op_move_16_di_a , 0xf1f8, 0x3148, { 12, 12, 5}},
+	{m68k_op_move_16_di_ai , 0xf1f8, 0x3150, { 16, 16, 9}},
+	{m68k_op_move_16_di_pi , 0xf1f8, 0x3158, { 16, 16, 9}},
+	{m68k_op_move_16_di_pd , 0xf1f8, 0x3160, { 18, 18, 10}},
+	{m68k_op_move_16_di_di , 0xf1f8, 0x3168, { 20, 20, 10}},
+	{m68k_op_move_16_di_ix , 0xf1f8, 0x3170, { 22, 22, 12}},
+	{m68k_op_move_16_ix_d , 0xf1f8, 0x3180, { 14, 14, 7}},
+	{m68k_op_move_16_ix_a , 0xf1f8, 0x3188, { 14, 14, 7}},
+	{m68k_op_move_16_ix_ai , 0xf1f8, 0x3190, { 18, 18, 11}},
+	{m68k_op_move_16_ix_pi , 0xf1f8, 0x3198, { 18, 18, 11}},
+	{m68k_op_move_16_ix_pd , 0xf1f8, 0x31a0, { 20, 20, 12}},
+	{m68k_op_move_16_ix_di , 0xf1f8, 0x31a8, { 22, 22, 12}},
+	{m68k_op_move_16_ix_ix , 0xf1f8, 0x31b0, { 24, 24, 14}},
+	{m68k_op_chk_32_d , 0xf1f8, 0x4100, { 0, 0, 8}},
+	{m68k_op_chk_32_ai , 0xf1f8, 0x4110, { 0, 0, 12}},
+	{m68k_op_chk_32_pi , 0xf1f8, 0x4118, { 0, 0, 12}},
+	{m68k_op_chk_32_pd , 0xf1f8, 0x4120, { 0, 0, 13}},
+	{m68k_op_chk_32_di , 0xf1f8, 0x4128, { 0, 0, 13}},
+	{m68k_op_chk_32_ix , 0xf1f8, 0x4130, { 0, 0, 15}},
+	{m68k_op_chk_16_d , 0xf1f8, 0x4180, { 10, 8, 8}},
+	{m68k_op_chk_16_ai , 0xf1f8, 0x4190, { 14, 12, 12}},
+	{m68k_op_chk_16_pi , 0xf1f8, 0x4198, { 14, 12, 12}},
+	{m68k_op_chk_16_pd , 0xf1f8, 0x41a0, { 16, 14, 13}},
+	{m68k_op_chk_16_di , 0xf1f8, 0x41a8, { 18, 16, 13}},
+	{m68k_op_chk_16_ix , 0xf1f8, 0x41b0, { 20, 18, 15}},
+	{m68k_op_lea_32_ai , 0xf1f8, 0x41d0, { 4, 4, 6}},
+	{m68k_op_lea_32_di , 0xf1f8, 0x41e8, { 8, 8, 7}},
+	{m68k_op_lea_32_ix , 0xf1f8, 0x41f0, { 12, 12, 9}},
+	{m68k_op_addq_8_d , 0xf1f8, 0x5000, { 4, 4, 2}},
+	{m68k_op_addq_8_ai , 0xf1f8, 0x5010, { 12, 12, 8}},
+	{m68k_op_addq_8_pi , 0xf1f8, 0x5018, { 12, 12, 8}},
+	{m68k_op_addq_8_pd , 0xf1f8, 0x5020, { 14, 14, 9}},
+	{m68k_op_addq_8_di , 0xf1f8, 0x5028, { 16, 16, 9}},
+	{m68k_op_addq_8_ix , 0xf1f8, 0x5030, { 18, 18, 11}},
+	{m68k_op_addq_16_d , 0xf1f8, 0x5040, { 4, 4, 2}},
+	{m68k_op_addq_16_a , 0xf1f8, 0x5048, { 4, 4, 2}},
+	{m68k_op_addq_16_ai , 0xf1f8, 0x5050, { 12, 12, 8}},
+	{m68k_op_addq_16_pi , 0xf1f8, 0x5058, { 12, 12, 8}},
+	{m68k_op_addq_16_pd , 0xf1f8, 0x5060, { 14, 14, 9}},
+	{m68k_op_addq_16_di , 0xf1f8, 0x5068, { 16, 16, 9}},
+	{m68k_op_addq_16_ix , 0xf1f8, 0x5070, { 18, 18, 11}},
+	{m68k_op_addq_32_d , 0xf1f8, 0x5080, { 8, 8, 2}},
+	{m68k_op_addq_32_a , 0xf1f8, 0x5088, { 8, 8, 2}},
+	{m68k_op_addq_32_ai , 0xf1f8, 0x5090, { 20, 20, 8}},
+	{m68k_op_addq_32_pi , 0xf1f8, 0x5098, { 20, 20, 8}},
+	{m68k_op_addq_32_pd , 0xf1f8, 0x50a0, { 22, 22, 9}},
+	{m68k_op_addq_32_di , 0xf1f8, 0x50a8, { 24, 24, 9}},
+	{m68k_op_addq_32_ix , 0xf1f8, 0x50b0, { 26, 26, 11}},
+	{m68k_op_subq_8_d , 0xf1f8, 0x5100, { 4, 4, 2}},
+	{m68k_op_subq_8_ai , 0xf1f8, 0x5110, { 12, 12, 8}},
+	{m68k_op_subq_8_pi , 0xf1f8, 0x5118, { 12, 12, 8}},
+	{m68k_op_subq_8_pd , 0xf1f8, 0x5120, { 14, 14, 9}},
+	{m68k_op_subq_8_di , 0xf1f8, 0x5128, { 16, 16, 9}},
+	{m68k_op_subq_8_ix , 0xf1f8, 0x5130, { 18, 18, 11}},
+	{m68k_op_subq_16_d , 0xf1f8, 0x5140, { 4, 4, 2}},
+	{m68k_op_subq_16_a , 0xf1f8, 0x5148, { 8, 4, 2}},
+	{m68k_op_subq_16_ai , 0xf1f8, 0x5150, { 12, 12, 8}},
+	{m68k_op_subq_16_pi , 0xf1f8, 0x5158, { 12, 12, 8}},
+	{m68k_op_subq_16_pd , 0xf1f8, 0x5160, { 14, 14, 9}},
+	{m68k_op_subq_16_di , 0xf1f8, 0x5168, { 16, 16, 9}},
+	{m68k_op_subq_16_ix , 0xf1f8, 0x5170, { 18, 18, 11}},
+	{m68k_op_subq_32_d , 0xf1f8, 0x5180, { 8, 8, 2}},
+	{m68k_op_subq_32_a , 0xf1f8, 0x5188, { 8, 8, 2}},
+	{m68k_op_subq_32_ai , 0xf1f8, 0x5190, { 20, 20, 8}},
+	{m68k_op_subq_32_pi , 0xf1f8, 0x5198, { 20, 20, 8}},
+	{m68k_op_subq_32_pd , 0xf1f8, 0x51a0, { 22, 22, 9}},
+	{m68k_op_subq_32_di , 0xf1f8, 0x51a8, { 24, 24, 9}},
+	{m68k_op_subq_32_ix , 0xf1f8, 0x51b0, { 26, 26, 11}},
+	{m68k_op_or_8_er_d , 0xf1f8, 0x8000, { 4, 4, 2}},
+	{m68k_op_or_8_er_ai , 0xf1f8, 0x8010, { 8, 8, 6}},
+	{m68k_op_or_8_er_pi , 0xf1f8, 0x8018, { 8, 8, 6}},
+	{m68k_op_or_8_er_pd , 0xf1f8, 0x8020, { 10, 10, 7}},
+	{m68k_op_or_8_er_di , 0xf1f8, 0x8028, { 12, 12, 7}},
+	{m68k_op_or_8_er_ix , 0xf1f8, 0x8030, { 14, 14, 9}},
+	{m68k_op_or_16_er_d , 0xf1f8, 0x8040, { 4, 4, 2}},
+	{m68k_op_or_16_er_ai , 0xf1f8, 0x8050, { 8, 8, 6}},
+	{m68k_op_or_16_er_pi , 0xf1f8, 0x8058, { 8, 8, 6}},
+	{m68k_op_or_16_er_pd , 0xf1f8, 0x8060, { 10, 10, 7}},
+	{m68k_op_or_16_er_di , 0xf1f8, 0x8068, { 12, 12, 7}},
+	{m68k_op_or_16_er_ix , 0xf1f8, 0x8070, { 14, 14, 9}},
+	{m68k_op_or_32_er_d , 0xf1f8, 0x8080, { 6, 6, 2}},
+	{m68k_op_or_32_er_ai , 0xf1f8, 0x8090, { 14, 14, 6}},
+	{m68k_op_or_32_er_pi , 0xf1f8, 0x8098, { 14, 14, 6}},
+	{m68k_op_or_32_er_pd , 0xf1f8, 0x80a0, { 16, 16, 7}},
+	{m68k_op_or_32_er_di , 0xf1f8, 0x80a8, { 18, 18, 7}},
+	{m68k_op_or_32_er_ix , 0xf1f8, 0x80b0, { 20, 20, 9}},
+	{m68k_op_divu_16_d , 0xf1f8, 0x80c0, {140, 108, 44}},
+	{m68k_op_divu_16_ai , 0xf1f8, 0x80d0, {144, 112, 48}},
+	{m68k_op_divu_16_pi , 0xf1f8, 0x80d8, {144, 112, 48}},
+	{m68k_op_divu_16_pd , 0xf1f8, 0x80e0, {146, 114, 49}},
+	{m68k_op_divu_16_di , 0xf1f8, 0x80e8, {148, 116, 49}},
+	{m68k_op_divu_16_ix , 0xf1f8, 0x80f0, {150, 118, 51}},
+	{m68k_op_sbcd_8_rr , 0xf1f8, 0x8100, { 6, 6, 4}},
+	{m68k_op_sbcd_8_mm , 0xf1f8, 0x8108, { 18, 18, 16}},
+	{m68k_op_or_8_re_ai , 0xf1f8, 0x8110, { 12, 12, 8}},
+	{m68k_op_or_8_re_pi , 0xf1f8, 0x8118, { 12, 12, 8}},
+	{m68k_op_or_8_re_pd , 0xf1f8, 0x8120, { 14, 14, 9}},
+	{m68k_op_or_8_re_di , 0xf1f8, 0x8128, { 16, 16, 9}},
+	{m68k_op_or_8_re_ix , 0xf1f8, 0x8130, { 18, 18, 11}},
+	{m68k_op_pack_16_rr , 0xf1f8, 0x8140, { 0, 0, 6}},
+	{m68k_op_pack_16_mm , 0xf1f8, 0x8148, { 0, 0, 13}},
+	{m68k_op_or_16_re_ai , 0xf1f8, 0x8150, { 12, 12, 8}},
+	{m68k_op_or_16_re_pi , 0xf1f8, 0x8158, { 12, 12, 8}},
+	{m68k_op_or_16_re_pd , 0xf1f8, 0x8160, { 14, 14, 9}},
+	{m68k_op_or_16_re_di , 0xf1f8, 0x8168, { 16, 16, 9}},
+	{m68k_op_or_16_re_ix , 0xf1f8, 0x8170, { 18, 18, 11}},
+	{m68k_op_unpk_16_rr , 0xf1f8, 0x8180, { 0, 0, 8}},
+	{m68k_op_unpk_16_mm , 0xf1f8, 0x8188, { 0, 0, 13}},
+	{m68k_op_or_32_re_ai , 0xf1f8, 0x8190, { 20, 20, 8}},
+	{m68k_op_or_32_re_pi , 0xf1f8, 0x8198, { 20, 20, 8}},
+	{m68k_op_or_32_re_pd , 0xf1f8, 0x81a0, { 22, 22, 9}},
+	{m68k_op_or_32_re_di , 0xf1f8, 0x81a8, { 24, 24, 9}},
+	{m68k_op_or_32_re_ix , 0xf1f8, 0x81b0, { 26, 26, 11}},
+	{m68k_op_divs_16_d , 0xf1f8, 0x81c0, {158, 122, 56}},
+	{m68k_op_divs_16_ai , 0xf1f8, 0x81d0, {162, 126, 60}},
+	{m68k_op_divs_16_pi , 0xf1f8, 0x81d8, {162, 126, 60}},
+	{m68k_op_divs_16_pd , 0xf1f8, 0x81e0, {164, 128, 61}},
+	{m68k_op_divs_16_di , 0xf1f8, 0x81e8, {166, 130, 61}},
+	{m68k_op_divs_16_ix , 0xf1f8, 0x81f0, {168, 132, 63}},
+	{m68k_op_sub_8_er_d , 0xf1f8, 0x9000, { 4, 4, 2}},
+	{m68k_op_sub_8_er_ai , 0xf1f8, 0x9010, { 8, 8, 6}},
+	{m68k_op_sub_8_er_pi , 0xf1f8, 0x9018, { 8, 8, 6}},
+	{m68k_op_sub_8_er_pd , 0xf1f8, 0x9020, { 10, 10, 7}},
+	{m68k_op_sub_8_er_di , 0xf1f8, 0x9028, { 12, 12, 7}},
+	{m68k_op_sub_8_er_ix , 0xf1f8, 0x9030, { 14, 14, 9}},
+	{m68k_op_sub_16_er_d , 0xf1f8, 0x9040, { 4, 4, 2}},
+	{m68k_op_sub_16_er_a , 0xf1f8, 0x9048, { 4, 4, 2}},
+	{m68k_op_sub_16_er_ai , 0xf1f8, 0x9050, { 8, 8, 6}},
+	{m68k_op_sub_16_er_pi , 0xf1f8, 0x9058, { 8, 8, 6}},
+	{m68k_op_sub_16_er_pd , 0xf1f8, 0x9060, { 10, 10, 7}},
+	{m68k_op_sub_16_er_di , 0xf1f8, 0x9068, { 12, 12, 7}},
+	{m68k_op_sub_16_er_ix , 0xf1f8, 0x9070, { 14, 14, 9}},
+	{m68k_op_sub_32_er_d , 0xf1f8, 0x9080, { 6, 6, 2}},
+	{m68k_op_sub_32_er_a , 0xf1f8, 0x9088, { 6, 6, 2}},
+	{m68k_op_sub_32_er_ai , 0xf1f8, 0x9090, { 14, 14, 6}},
+	{m68k_op_sub_32_er_pi , 0xf1f8, 0x9098, { 14, 14, 6}},
+	{m68k_op_sub_32_er_pd , 0xf1f8, 0x90a0, { 16, 16, 7}},
+	{m68k_op_sub_32_er_di , 0xf1f8, 0x90a8, { 18, 18, 7}},
+	{m68k_op_sub_32_er_ix , 0xf1f8, 0x90b0, { 20, 20, 9}},
+	{m68k_op_suba_16_d , 0xf1f8, 0x90c0, { 8, 8, 2}},
+	{m68k_op_suba_16_a , 0xf1f8, 0x90c8, { 8, 8, 2}},
+	{m68k_op_suba_16_ai , 0xf1f8, 0x90d0, { 12, 12, 6}},
+	{m68k_op_suba_16_pi , 0xf1f8, 0x90d8, { 12, 12, 6}},
+	{m68k_op_suba_16_pd , 0xf1f8, 0x90e0, { 14, 14, 7}},
+	{m68k_op_suba_16_di , 0xf1f8, 0x90e8, { 16, 16, 7}},
+	{m68k_op_suba_16_ix , 0xf1f8, 0x90f0, { 18, 18, 9}},
+	{m68k_op_subx_8_rr , 0xf1f8, 0x9100, { 4, 4, 2}},
+	{m68k_op_subx_8_mm , 0xf1f8, 0x9108, { 18, 18, 12}},
+	{m68k_op_sub_8_re_ai , 0xf1f8, 0x9110, { 12, 12, 8}},
+	{m68k_op_sub_8_re_pi , 0xf1f8, 0x9118, { 12, 12, 8}},
+	{m68k_op_sub_8_re_pd , 0xf1f8, 0x9120, { 14, 14, 9}},
+	{m68k_op_sub_8_re_di , 0xf1f8, 0x9128, { 16, 16, 9}},
+	{m68k_op_sub_8_re_ix , 0xf1f8, 0x9130, { 18, 18, 11}},
+	{m68k_op_subx_16_rr , 0xf1f8, 0x9140, { 4, 4, 2}},
+	{m68k_op_subx_16_mm , 0xf1f8, 0x9148, { 18, 18, 12}},
+	{m68k_op_sub_16_re_ai , 0xf1f8, 0x9150, { 12, 12, 8}},
+	{m68k_op_sub_16_re_pi , 0xf1f8, 0x9158, { 12, 12, 8}},
+	{m68k_op_sub_16_re_pd , 0xf1f8, 0x9160, { 14, 14, 9}},
+	{m68k_op_sub_16_re_di , 0xf1f8, 0x9168, { 16, 16, 9}},
+	{m68k_op_sub_16_re_ix , 0xf1f8, 0x9170, { 18, 18, 11}},
+	{m68k_op_subx_32_rr , 0xf1f8, 0x9180, { 8, 6, 2}},
+	{m68k_op_subx_32_mm , 0xf1f8, 0x9188, { 30, 30, 12}},
+	{m68k_op_sub_32_re_ai , 0xf1f8, 0x9190, { 20, 20, 8}},
+	{m68k_op_sub_32_re_pi , 0xf1f8, 0x9198, { 20, 20, 8}},
+	{m68k_op_sub_32_re_pd , 0xf1f8, 0x91a0, { 22, 22, 9}},
+	{m68k_op_sub_32_re_di , 0xf1f8, 0x91a8, { 24, 24, 9}},
+	{m68k_op_sub_32_re_ix , 0xf1f8, 0x91b0, { 26, 26, 11}},
+	{m68k_op_suba_32_d , 0xf1f8, 0x91c0, { 6, 6, 2}},
+	{m68k_op_suba_32_a , 0xf1f8, 0x91c8, { 6, 6, 2}},
+	{m68k_op_suba_32_ai , 0xf1f8, 0x91d0, { 14, 14, 6}},
+	{m68k_op_suba_32_pi , 0xf1f8, 0x91d8, { 14, 14, 6}},
+	{m68k_op_suba_32_pd , 0xf1f8, 0x91e0, { 16, 16, 7}},
+	{m68k_op_suba_32_di , 0xf1f8, 0x91e8, { 18, 18, 7}},
+	{m68k_op_suba_32_ix , 0xf1f8, 0x91f0, { 20, 20, 9}},
+	{m68k_op_cmp_8_d , 0xf1f8, 0xb000, { 4, 4, 2}},
+	{m68k_op_cmp_8_ai , 0xf1f8, 0xb010, { 8, 8, 6}},
+	{m68k_op_cmp_8_pi , 0xf1f8, 0xb018, { 8, 8, 6}},
+	{m68k_op_cmp_8_pd , 0xf1f8, 0xb020, { 10, 10, 7}},
+	{m68k_op_cmp_8_di , 0xf1f8, 0xb028, { 12, 12, 7}},
+	{m68k_op_cmp_8_ix , 0xf1f8, 0xb030, { 14, 14, 9}},
+	{m68k_op_cmp_16_d , 0xf1f8, 0xb040, { 4, 4, 2}},
+	{m68k_op_cmp_16_a , 0xf1f8, 0xb048, { 4, 4, 2}},
+	{m68k_op_cmp_16_ai , 0xf1f8, 0xb050, { 8, 8, 6}},
+	{m68k_op_cmp_16_pi , 0xf1f8, 0xb058, { 8, 8, 6}},
+	{m68k_op_cmp_16_pd , 0xf1f8, 0xb060, { 10, 10, 7}},
+	{m68k_op_cmp_16_di , 0xf1f8, 0xb068, { 12, 12, 7}},
+	{m68k_op_cmp_16_ix , 0xf1f8, 0xb070, { 14, 14, 9}},
+	{m68k_op_cmp_32_d , 0xf1f8, 0xb080, { 6, 6, 2}},
+	{m68k_op_cmp_32_a , 0xf1f8, 0xb088, { 6, 6, 2}},
+	{m68k_op_cmp_32_ai , 0xf1f8, 0xb090, { 14, 14, 6}},
+	{m68k_op_cmp_32_pi , 0xf1f8, 0xb098, { 14, 14, 6}},
+	{m68k_op_cmp_32_pd , 0xf1f8, 0xb0a0, { 16, 16, 7}},
+	{m68k_op_cmp_32_di , 0xf1f8, 0xb0a8, { 18, 18, 7}},
+	{m68k_op_cmp_32_ix , 0xf1f8, 0xb0b0, { 20, 20, 9}},
+	{m68k_op_cmpa_16_d , 0xf1f8, 0xb0c0, { 6, 6, 4}},
+	{m68k_op_cmpa_16_a , 0xf1f8, 0xb0c8, { 6, 6, 4}},
+	{m68k_op_cmpa_16_ai , 0xf1f8, 0xb0d0, { 10, 10, 8}},
+	{m68k_op_cmpa_16_pi , 0xf1f8, 0xb0d8, { 10, 10, 8}},
+	{m68k_op_cmpa_16_pd , 0xf1f8, 0xb0e0, { 12, 12, 9}},
+	{m68k_op_cmpa_16_di , 0xf1f8, 0xb0e8, { 14, 14, 9}},
+	{m68k_op_cmpa_16_ix , 0xf1f8, 0xb0f0, { 16, 16, 11}},
+	{m68k_op_eor_8_d , 0xf1f8, 0xb100, { 4, 4, 2}},
+	{m68k_op_cmpm_8 , 0xf1f8, 0xb108, { 12, 12, 9}},
+	{m68k_op_eor_8_ai , 0xf1f8, 0xb110, { 12, 12, 8}},
+	{m68k_op_eor_8_pi , 0xf1f8, 0xb118, { 12, 12, 8}},
+	{m68k_op_eor_8_pd , 0xf1f8, 0xb120, { 14, 14, 9}},
+	{m68k_op_eor_8_di , 0xf1f8, 0xb128, { 16, 16, 9}},
+	{m68k_op_eor_8_ix , 0xf1f8, 0xb130, { 18, 18, 11}},
+	{m68k_op_eor_16_d , 0xf1f8, 0xb140, { 4, 4, 2}},
+	{m68k_op_cmpm_16 , 0xf1f8, 0xb148, { 12, 12, 9}},
+	{m68k_op_eor_16_ai , 0xf1f8, 0xb150, { 12, 12, 8}},
+	{m68k_op_eor_16_pi , 0xf1f8, 0xb158, { 12, 12, 8}},
+	{m68k_op_eor_16_pd , 0xf1f8, 0xb160, { 14, 14, 9}},
+	{m68k_op_eor_16_di , 0xf1f8, 0xb168, { 16, 16, 9}},
+	{m68k_op_eor_16_ix , 0xf1f8, 0xb170, { 18, 18, 11}},
+	{m68k_op_eor_32_d , 0xf1f8, 0xb180, { 8, 6, 2}},
+	{m68k_op_cmpm_32 , 0xf1f8, 0xb188, { 20, 20, 9}},
+	{m68k_op_eor_32_ai , 0xf1f8, 0xb190, { 20, 20, 8}},
+	{m68k_op_eor_32_pi , 0xf1f8, 0xb198, { 20, 20, 8}},
+	{m68k_op_eor_32_pd , 0xf1f8, 0xb1a0, { 22, 22, 9}},
+	{m68k_op_eor_32_di , 0xf1f8, 0xb1a8, { 24, 24, 9}},
+	{m68k_op_eor_32_ix , 0xf1f8, 0xb1b0, { 26, 26, 11}},
+	{m68k_op_cmpa_32_d , 0xf1f8, 0xb1c0, { 6, 6, 4}},
+	{m68k_op_cmpa_32_a , 0xf1f8, 0xb1c8, { 6, 6, 4}},
+	{m68k_op_cmpa_32_ai , 0xf1f8, 0xb1d0, { 14, 14, 8}},
+	{m68k_op_cmpa_32_pi , 0xf1f8, 0xb1d8, { 14, 14, 8}},
+	{m68k_op_cmpa_32_pd , 0xf1f8, 0xb1e0, { 16, 16, 9}},
+	{m68k_op_cmpa_32_di , 0xf1f8, 0xb1e8, { 18, 18, 9}},
+	{m68k_op_cmpa_32_ix , 0xf1f8, 0xb1f0, { 20, 20, 11}},
+	{m68k_op_and_8_er_d , 0xf1f8, 0xc000, { 4, 4, 2}},
+	{m68k_op_and_8_er_ai , 0xf1f8, 0xc010, { 8, 8, 6}},
+	{m68k_op_and_8_er_pi , 0xf1f8, 0xc018, { 8, 8, 6}},
+	{m68k_op_and_8_er_pd , 0xf1f8, 0xc020, { 10, 10, 7}},
+	{m68k_op_and_8_er_di , 0xf1f8, 0xc028, { 12, 12, 7}},
+	{m68k_op_and_8_er_ix , 0xf1f8, 0xc030, { 14, 14, 9}},
+	{m68k_op_and_16_er_d , 0xf1f8, 0xc040, { 4, 4, 2}},
+	{m68k_op_and_16_er_ai , 0xf1f8, 0xc050, { 8, 8, 6}},
+	{m68k_op_and_16_er_pi , 0xf1f8, 0xc058, { 8, 8, 6}},
+	{m68k_op_and_16_er_pd , 0xf1f8, 0xc060, { 10, 10, 7}},
+	{m68k_op_and_16_er_di , 0xf1f8, 0xc068, { 12, 12, 7}},
+	{m68k_op_and_16_er_ix , 0xf1f8, 0xc070, { 14, 14, 9}},
+	{m68k_op_and_32_er_d , 0xf1f8, 0xc080, { 6, 6, 2}},
+	{m68k_op_and_32_er_ai , 0xf1f8, 0xc090, { 14, 14, 6}},
+	{m68k_op_and_32_er_pi , 0xf1f8, 0xc098, { 14, 14, 6}},
+	{m68k_op_and_32_er_pd , 0xf1f8, 0xc0a0, { 16, 16, 7}},
+	{m68k_op_and_32_er_di , 0xf1f8, 0xc0a8, { 18, 18, 7}},
+	{m68k_op_and_32_er_ix , 0xf1f8, 0xc0b0, { 20, 20, 9}},
+	{m68k_op_mulu_16_d , 0xf1f8, 0xc0c0, { 54, 30, 27}},
+	{m68k_op_mulu_16_ai , 0xf1f8, 0xc0d0, { 58, 34, 31}},
+	{m68k_op_mulu_16_pi , 0xf1f8, 0xc0d8, { 58, 34, 31}},
+	{m68k_op_mulu_16_pd , 0xf1f8, 0xc0e0, { 60, 36, 32}},
+	{m68k_op_mulu_16_di , 0xf1f8, 0xc0e8, { 62, 38, 32}},
+	{m68k_op_mulu_16_ix , 0xf1f8, 0xc0f0, { 64, 40, 34}},
+	{m68k_op_abcd_8_rr , 0xf1f8, 0xc100, { 6, 6, 4}},
+	{m68k_op_abcd_8_mm , 0xf1f8, 0xc108, { 18, 18, 16}},
+	{m68k_op_and_8_re_ai , 0xf1f8, 0xc110, { 12, 12, 8}},
+	{m68k_op_and_8_re_pi , 0xf1f8, 0xc118, { 12, 12, 8}},
+	{m68k_op_and_8_re_pd , 0xf1f8, 0xc120, { 14, 14, 9}},
+	{m68k_op_and_8_re_di , 0xf1f8, 0xc128, { 16, 16, 9}},
+	{m68k_op_and_8_re_ix , 0xf1f8, 0xc130, { 18, 18, 11}},
+	{m68k_op_exg_32_dd , 0xf1f8, 0xc140, { 6, 6, 2}},
+	{m68k_op_exg_32_aa , 0xf1f8, 0xc148, { 6, 6, 2}},
+	{m68k_op_and_16_re_ai , 0xf1f8, 0xc150, { 12, 12, 8}},
+	{m68k_op_and_16_re_pi , 0xf1f8, 0xc158, { 12, 12, 8}},
+	{m68k_op_and_16_re_pd , 0xf1f8, 0xc160, { 14, 14, 9}},
+	{m68k_op_and_16_re_di , 0xf1f8, 0xc168, { 16, 16, 9}},
+	{m68k_op_and_16_re_ix , 0xf1f8, 0xc170, { 18, 18, 11}},
+	{m68k_op_exg_32_da , 0xf1f8, 0xc188, { 6, 6, 2}},
+	{m68k_op_and_32_re_ai , 0xf1f8, 0xc190, { 20, 20, 8}},
+	{m68k_op_and_32_re_pi , 0xf1f8, 0xc198, { 20, 20, 8}},
+	{m68k_op_and_32_re_pd , 0xf1f8, 0xc1a0, { 22, 22, 9}},
+	{m68k_op_and_32_re_di , 0xf1f8, 0xc1a8, { 24, 24, 9}},
+	{m68k_op_and_32_re_ix , 0xf1f8, 0xc1b0, { 26, 26, 11}},
+	{m68k_op_muls_16_d , 0xf1f8, 0xc1c0, { 54, 32, 27}},
+	{m68k_op_muls_16_ai , 0xf1f8, 0xc1d0, { 58, 36, 31}},
+	{m68k_op_muls_16_pi , 0xf1f8, 0xc1d8, { 58, 36, 31}},
+	{m68k_op_muls_16_pd , 0xf1f8, 0xc1e0, { 60, 38, 32}},
+	{m68k_op_muls_16_di , 0xf1f8, 0xc1e8, { 62, 40, 32}},
+	{m68k_op_muls_16_ix , 0xf1f8, 0xc1f0, { 64, 42, 34}},
+	{m68k_op_add_8_er_d , 0xf1f8, 0xd000, { 4, 4, 2}},
+	{m68k_op_add_8_er_ai , 0xf1f8, 0xd010, { 8, 8, 6}},
+	{m68k_op_add_8_er_pi , 0xf1f8, 0xd018, { 8, 8, 6}},
+	{m68k_op_add_8_er_pd , 0xf1f8, 0xd020, { 10, 10, 7}},
+	{m68k_op_add_8_er_di , 0xf1f8, 0xd028, { 12, 12, 7}},
+	{m68k_op_add_8_er_ix , 0xf1f8, 0xd030, { 14, 14, 9}},
+	{m68k_op_add_16_er_d , 0xf1f8, 0xd040, { 4, 4, 2}},
+	{m68k_op_add_16_er_a , 0xf1f8, 0xd048, { 4, 4, 2}},
+	{m68k_op_add_16_er_ai , 0xf1f8, 0xd050, { 8, 8, 6}},
+	{m68k_op_add_16_er_pi , 0xf1f8, 0xd058, { 8, 8, 6}},
+	{m68k_op_add_16_er_pd , 0xf1f8, 0xd060, { 10, 10, 7}},
+	{m68k_op_add_16_er_di , 0xf1f8, 0xd068, { 12, 12, 7}},
+	{m68k_op_add_16_er_ix , 0xf1f8, 0xd070, { 14, 14, 9}},
+	{m68k_op_add_32_er_d , 0xf1f8, 0xd080, { 6, 6, 2}},
+	{m68k_op_add_32_er_a , 0xf1f8, 0xd088, { 6, 6, 2}},
+	{m68k_op_add_32_er_ai , 0xf1f8, 0xd090, { 14, 14, 6}},
+	{m68k_op_add_32_er_pi , 0xf1f8, 0xd098, { 14, 14, 6}},
+	{m68k_op_add_32_er_pd , 0xf1f8, 0xd0a0, { 16, 16, 7}},
+	{m68k_op_add_32_er_di , 0xf1f8, 0xd0a8, { 18, 18, 7}},
+	{m68k_op_add_32_er_ix , 0xf1f8, 0xd0b0, { 20, 20, 9}},
+	{m68k_op_adda_16_d , 0xf1f8, 0xd0c0, { 8, 8, 2}},
+	{m68k_op_adda_16_a , 0xf1f8, 0xd0c8, { 8, 8, 2}},
+	{m68k_op_adda_16_ai , 0xf1f8, 0xd0d0, { 12, 12, 6}},
+	{m68k_op_adda_16_pi , 0xf1f8, 0xd0d8, { 12, 12, 6}},
+	{m68k_op_adda_16_pd , 0xf1f8, 0xd0e0, { 14, 14, 7}},
+	{m68k_op_adda_16_di , 0xf1f8, 0xd0e8, { 16, 16, 7}},
+	{m68k_op_adda_16_ix , 0xf1f8, 0xd0f0, { 18, 18, 9}},
+	{m68k_op_addx_8_rr , 0xf1f8, 0xd100, { 4, 4, 2}},
+	{m68k_op_addx_8_mm , 0xf1f8, 0xd108, { 18, 18, 12}},
+	{m68k_op_add_8_re_ai , 0xf1f8, 0xd110, { 12, 12, 8}},
+	{m68k_op_add_8_re_pi , 0xf1f8, 0xd118, { 12, 12, 8}},
+	{m68k_op_add_8_re_pd , 0xf1f8, 0xd120, { 14, 14, 9}},
+	{m68k_op_add_8_re_di , 0xf1f8, 0xd128, { 16, 16, 9}},
+	{m68k_op_add_8_re_ix , 0xf1f8, 0xd130, { 18, 18, 11}},
+	{m68k_op_addx_16_rr , 0xf1f8, 0xd140, { 4, 4, 2}},
+	{m68k_op_addx_16_mm , 0xf1f8, 0xd148, { 18, 18, 12}},
+	{m68k_op_add_16_re_ai , 0xf1f8, 0xd150, { 12, 12, 8}},
+	{m68k_op_add_16_re_pi , 0xf1f8, 0xd158, { 12, 12, 8}},
+	{m68k_op_add_16_re_pd , 0xf1f8, 0xd160, { 14, 14, 9}},
+	{m68k_op_add_16_re_di , 0xf1f8, 0xd168, { 16, 16, 9}},
+	{m68k_op_add_16_re_ix , 0xf1f8, 0xd170, { 18, 18, 11}},
+	{m68k_op_addx_32_rr , 0xf1f8, 0xd180, { 8, 6, 2}},
+	{m68k_op_addx_32_mm , 0xf1f8, 0xd188, { 30, 30, 12}},
+	{m68k_op_add_32_re_ai , 0xf1f8, 0xd190, { 20, 20, 8}},
+	{m68k_op_add_32_re_pi , 0xf1f8, 0xd198, { 20, 20, 8}},
+	{m68k_op_add_32_re_pd , 0xf1f8, 0xd1a0, { 22, 22, 9}},
+	{m68k_op_add_32_re_di , 0xf1f8, 0xd1a8, { 24, 24, 9}},
+	{m68k_op_add_32_re_ix , 0xf1f8, 0xd1b0, { 26, 26, 11}},
+	{m68k_op_adda_32_d , 0xf1f8, 0xd1c0, { 6, 6, 2}},
+	{m68k_op_adda_32_a , 0xf1f8, 0xd1c8, { 6, 6, 2}},
+	{m68k_op_adda_32_ai , 0xf1f8, 0xd1d0, { 14, 14, 6}},
+	{m68k_op_adda_32_pi , 0xf1f8, 0xd1d8, { 14, 14, 6}},
+	{m68k_op_adda_32_pd , 0xf1f8, 0xd1e0, { 16, 16, 7}},
+	{m68k_op_adda_32_di , 0xf1f8, 0xd1e8, { 18, 18, 7}},
+	{m68k_op_adda_32_ix , 0xf1f8, 0xd1f0, { 20, 20, 9}},
+	{m68k_op_asr_8_s , 0xf1f8, 0xe000, { 6, 6, 6}},
+	{m68k_op_lsr_8_s , 0xf1f8, 0xe008, { 6, 6, 4}},
+	{m68k_op_roxr_8_s , 0xf1f8, 0xe010, { 6, 6, 12}},
+	{m68k_op_ror_8_s , 0xf1f8, 0xe018, { 6, 6, 8}},
+	{m68k_op_asr_8_r , 0xf1f8, 0xe020, { 6, 6, 6}},
+	{m68k_op_lsr_8_r , 0xf1f8, 0xe028, { 6, 6, 6}},
+	{m68k_op_roxr_8_r , 0xf1f8, 0xe030, { 6, 6, 12}},
+	{m68k_op_ror_8_r , 0xf1f8, 0xe038, { 6, 6, 8}},
+	{m68k_op_asr_16_s , 0xf1f8, 0xe040, { 6, 6, 6}},
+	{m68k_op_lsr_16_s , 0xf1f8, 0xe048, { 6, 6, 4}},
+	{m68k_op_roxr_16_s , 0xf1f8, 0xe050, { 6, 6, 12}},
+	{m68k_op_ror_16_s , 0xf1f8, 0xe058, { 6, 6, 8}},
+	{m68k_op_asr_16_r , 0xf1f8, 0xe060, { 6, 6, 6}},
+	{m68k_op_lsr_16_r , 0xf1f8, 0xe068, { 6, 6, 6}},
+	{m68k_op_roxr_16_r , 0xf1f8, 0xe070, { 6, 6, 12}},
+	{m68k_op_ror_16_r , 0xf1f8, 0xe078, { 6, 6, 8}},
+	{m68k_op_asr_32_s , 0xf1f8, 0xe080, { 8, 8, 6}},
+	{m68k_op_lsr_32_s , 0xf1f8, 0xe088, { 8, 8, 4}},
+	{m68k_op_roxr_32_s , 0xf1f8, 0xe090, { 8, 8, 12}},
+	{m68k_op_ror_32_s , 0xf1f8, 0xe098, { 8, 8, 8}},
+	{m68k_op_asr_32_r , 0xf1f8, 0xe0a0, { 8, 8, 6}},
+	{m68k_op_lsr_32_r , 0xf1f8, 0xe0a8, { 8, 8, 6}},
+	{m68k_op_roxr_32_r , 0xf1f8, 0xe0b0, { 8, 8, 12}},
+	{m68k_op_ror_32_r , 0xf1f8, 0xe0b8, { 8, 8, 8}},
+	{m68k_op_asl_8_s , 0xf1f8, 0xe100, { 6, 6, 8}},
+	{m68k_op_lsl_8_s , 0xf1f8, 0xe108, { 6, 6, 4}},
+	{m68k_op_roxl_8_s , 0xf1f8, 0xe110, { 6, 6, 12}},
+	{m68k_op_rol_8_s , 0xf1f8, 0xe118, { 6, 6, 8}},
+	{m68k_op_asl_8_r , 0xf1f8, 0xe120, { 6, 6, 8}},
+	{m68k_op_lsl_8_r , 0xf1f8, 0xe128, { 6, 6, 6}},
+	{m68k_op_roxl_8_r , 0xf1f8, 0xe130, { 6, 6, 12}},
+	{m68k_op_rol_8_r , 0xf1f8, 0xe138, { 6, 6, 8}},
+	{m68k_op_asl_16_s , 0xf1f8, 0xe140, { 6, 6, 8}},
+	{m68k_op_lsl_16_s , 0xf1f8, 0xe148, { 6, 6, 4}},
+	{m68k_op_roxl_16_s , 0xf1f8, 0xe150, { 6, 6, 12}},
+	{m68k_op_rol_16_s , 0xf1f8, 0xe158, { 6, 6, 8}},
+	{m68k_op_asl_16_r , 0xf1f8, 0xe160, { 6, 6, 8}},
+	{m68k_op_lsl_16_r , 0xf1f8, 0xe168, { 6, 6, 6}},
+	{m68k_op_roxl_16_r , 0xf1f8, 0xe170, { 6, 6, 12}},
+	{m68k_op_rol_16_r , 0xf1f8, 0xe178, { 6, 6, 8}},
+	{m68k_op_asl_32_s , 0xf1f8, 0xe180, { 8, 8, 8}},
+	{m68k_op_lsl_32_s , 0xf1f8, 0xe188, { 8, 8, 4}},
+	{m68k_op_roxl_32_s , 0xf1f8, 0xe190, { 8, 8, 12}},
+	{m68k_op_rol_32_s , 0xf1f8, 0xe198, { 8, 8, 8}},
+	{m68k_op_asl_32_r , 0xf1f8, 0xe1a0, { 8, 8, 8}},
+	{m68k_op_lsl_32_r , 0xf1f8, 0xe1a8, { 8, 8, 6}},
+	{m68k_op_roxl_32_r , 0xf1f8, 0xe1b0, { 8, 8, 12}},
+	{m68k_op_rol_32_r , 0xf1f8, 0xe1b8, { 8, 8, 8}},
+	{m68k_op_cpdbcc_32 , 0xf1f8, 0xf048, { 0, 0, 4}},
+	{m68k_op_cptrapcc_32 , 0xf1f8, 0xf078, { 0, 0, 4}},
+	{m68k_op_rtm_32 , 0xfff0, 0x06c0, { 0, 0, 19}},
+	{m68k_op_trap , 0xfff0, 0x4e40, { 4, 4, 4}},
+	{m68k_op_btst_8_r_pi7 , 0xf1ff, 0x011f, { 8, 8, 8}},
+	{m68k_op_btst_8_r_pd7 , 0xf1ff, 0x0127, { 10, 10, 9}},
+	{m68k_op_btst_8_r_aw , 0xf1ff, 0x0138, { 12, 12, 8}},
+	{m68k_op_btst_8_r_al , 0xf1ff, 0x0139, { 16, 16, 8}},
+	{m68k_op_btst_8_r_pcdi , 0xf1ff, 0x013a, { 12, 12, 9}},
+	{m68k_op_btst_8_r_pcix , 0xf1ff, 0x013b, { 14, 14, 11}},
+	{m68k_op_btst_8_r_i , 0xf1ff, 0x013c, { 8, 8, 6}},
+	{m68k_op_bchg_8_r_pi7 , 0xf1ff, 0x015f, { 12, 12, 8}},
+	{m68k_op_bchg_8_r_pd7 , 0xf1ff, 0x0167, { 14, 14, 9}},
+	{m68k_op_bchg_8_r_aw , 0xf1ff, 0x0178, { 16, 16, 8}},
+	{m68k_op_bchg_8_r_al , 0xf1ff, 0x0179, { 20, 20, 8}},
+	{m68k_op_bclr_8_r_pi7 , 0xf1ff, 0x019f, { 12, 14, 8}},
+	{m68k_op_bclr_8_r_pd7 , 0xf1ff, 0x01a7, { 14, 16, 9}},
+	{m68k_op_bclr_8_r_aw , 0xf1ff, 0x01b8, { 16, 18, 8}},
+	{m68k_op_bclr_8_r_al , 0xf1ff, 0x01b9, { 20, 22, 8}},
+	{m68k_op_bset_8_r_pi7 , 0xf1ff, 0x01df, { 12, 12, 8}},
+	{m68k_op_bset_8_r_pd7 , 0xf1ff, 0x01e7, { 14, 14, 9}},
+	{m68k_op_bset_8_r_aw , 0xf1ff, 0x01f8, { 16, 16, 8}},
+	{m68k_op_bset_8_r_al , 0xf1ff, 0x01f9, { 20, 20, 8}},
+	{m68k_op_move_8_d_pi7 , 0xf1ff, 0x101f, { 8, 8, 6}},
+	{m68k_op_move_8_d_pd7 , 0xf1ff, 0x1027, { 10, 10, 7}},
+	{m68k_op_move_8_d_aw , 0xf1ff, 0x1038, { 12, 12, 6}},
+	{m68k_op_move_8_d_al , 0xf1ff, 0x1039, { 16, 16, 6}},
+	{m68k_op_move_8_d_pcdi , 0xf1ff, 0x103a, { 12, 12, 7}},
+	{m68k_op_move_8_d_pcix , 0xf1ff, 0x103b, { 14, 14, 9}},
+	{m68k_op_move_8_d_i , 0xf1ff, 0x103c, { 8, 8, 4}},
+	{m68k_op_move_8_ai_pi7 , 0xf1ff, 0x109f, { 12, 12, 8}},
+	{m68k_op_move_8_ai_pd7 , 0xf1ff, 0x10a7, { 14, 14, 9}},
+	{m68k_op_move_8_ai_aw , 0xf1ff, 0x10b8, { 16, 16, 8}},
+	{m68k_op_move_8_ai_al , 0xf1ff, 0x10b9, { 20, 20, 8}},
+	{m68k_op_move_8_ai_pcdi , 0xf1ff, 0x10ba, { 16, 16, 9}},
+	{m68k_op_move_8_ai_pcix , 0xf1ff, 0x10bb, { 18, 18, 11}},
+	{m68k_op_move_8_ai_i , 0xf1ff, 0x10bc, { 12, 12, 6}},
+	{m68k_op_move_8_pi_pi7 , 0xf1ff, 0x10df, { 12, 12, 8}},
+	{m68k_op_move_8_pi_pd7 , 0xf1ff, 0x10e7, { 14, 14, 9}},
+	{m68k_op_move_8_pi_aw , 0xf1ff, 0x10f8, { 16, 16, 8}},
+	{m68k_op_move_8_pi_al , 0xf1ff, 0x10f9, { 20, 20, 8}},
+	{m68k_op_move_8_pi_pcdi , 0xf1ff, 0x10fa, { 16, 16, 9}},
+	{m68k_op_move_8_pi_pcix , 0xf1ff, 0x10fb, { 18, 18, 11}},
+	{m68k_op_move_8_pi_i , 0xf1ff, 0x10fc, { 12, 12, 6}},
+	{m68k_op_move_8_pd_pi7 , 0xf1ff, 0x111f, { 12, 12, 9}},
+	{m68k_op_move_8_pd_pd7 , 0xf1ff, 0x1127, { 14, 14, 10}},
+	{m68k_op_move_8_pd_aw , 0xf1ff, 0x1138, { 16, 16, 9}},
+	{m68k_op_move_8_pd_al , 0xf1ff, 0x1139, { 20, 20, 9}},
+	{m68k_op_move_8_pd_pcdi , 0xf1ff, 0x113a, { 16, 16, 10}},
+	{m68k_op_move_8_pd_pcix , 0xf1ff, 0x113b, { 18, 18, 12}},
+	{m68k_op_move_8_pd_i , 0xf1ff, 0x113c, { 12, 12, 7}},
+	{m68k_op_move_8_di_pi7 , 0xf1ff, 0x115f, { 16, 16, 9}},
+	{m68k_op_move_8_di_pd7 , 0xf1ff, 0x1167, { 18, 18, 10}},
+	{m68k_op_move_8_di_aw , 0xf1ff, 0x1178, { 20, 20, 9}},
+	{m68k_op_move_8_di_al , 0xf1ff, 0x1179, { 24, 24, 9}},
+	{m68k_op_move_8_di_pcdi , 0xf1ff, 0x117a, { 20, 20, 10}},
+	{m68k_op_move_8_di_pcix , 0xf1ff, 0x117b, { 22, 22, 12}},
+	{m68k_op_move_8_di_i , 0xf1ff, 0x117c, { 16, 16, 7}},
+	{m68k_op_move_8_ix_pi7 , 0xf1ff, 0x119f, { 18, 18, 11}},
+	{m68k_op_move_8_ix_pd7 , 0xf1ff, 0x11a7, { 20, 20, 12}},
+	{m68k_op_move_8_ix_aw , 0xf1ff, 0x11b8, { 22, 22, 11}},
+	{m68k_op_move_8_ix_al , 0xf1ff, 0x11b9, { 26, 26, 11}},
+	{m68k_op_move_8_ix_pcdi , 0xf1ff, 0x11ba, { 22, 22, 12}},
+	{m68k_op_move_8_ix_pcix , 0xf1ff, 0x11bb, { 24, 24, 14}},
+	{m68k_op_move_8_ix_i , 0xf1ff, 0x11bc, { 18, 18, 9}},
+	{m68k_op_move_32_d_aw , 0xf1ff, 0x2038, { 16, 16, 6}},
+	{m68k_op_move_32_d_al , 0xf1ff, 0x2039, { 20, 20, 6}},
+	{m68k_op_move_32_d_pcdi , 0xf1ff, 0x203a, { 16, 16, 7}},
+	{m68k_op_move_32_d_pcix , 0xf1ff, 0x203b, { 18, 18, 9}},
+	{m68k_op_move_32_d_i , 0xf1ff, 0x203c, { 12, 12, 6}},
+	{m68k_op_movea_32_aw , 0xf1ff, 0x2078, { 16, 16, 6}},
+	{m68k_op_movea_32_al , 0xf1ff, 0x2079, { 20, 20, 6}},
+	{m68k_op_movea_32_pcdi , 0xf1ff, 0x207a, { 16, 16, 7}},
+	{m68k_op_movea_32_pcix , 0xf1ff, 0x207b, { 18, 18, 9}},
+	{m68k_op_movea_32_i , 0xf1ff, 0x207c, { 12, 12, 6}},
+	{m68k_op_move_32_ai_aw , 0xf1ff, 0x20b8, { 24, 24, 8}},
+	{m68k_op_move_32_ai_al , 0xf1ff, 0x20b9, { 28, 28, 8}},
+	{m68k_op_move_32_ai_pcdi , 0xf1ff, 0x20ba, { 24, 24, 9}},
+	{m68k_op_move_32_ai_pcix , 0xf1ff, 0x20bb, { 26, 26, 11}},
+	{m68k_op_move_32_ai_i , 0xf1ff, 0x20bc, { 20, 20, 8}},
+	{m68k_op_move_32_pi_aw , 0xf1ff, 0x20f8, { 24, 24, 8}},
+	{m68k_op_move_32_pi_al , 0xf1ff, 0x20f9, { 28, 28, 8}},
+	{m68k_op_move_32_pi_pcdi , 0xf1ff, 0x20fa, { 24, 24, 9}},
+	{m68k_op_move_32_pi_pcix , 0xf1ff, 0x20fb, { 26, 26, 11}},
+	{m68k_op_move_32_pi_i , 0xf1ff, 0x20fc, { 20, 20, 8}},
+	{m68k_op_move_32_pd_aw , 0xf1ff, 0x2138, { 24, 26, 9}},
+	{m68k_op_move_32_pd_al , 0xf1ff, 0x2139, { 28, 30, 9}},
+	{m68k_op_move_32_pd_pcdi , 0xf1ff, 0x213a, { 24, 26, 10}},
+	{m68k_op_move_32_pd_pcix , 0xf1ff, 0x213b, { 26, 28, 12}},
+	{m68k_op_move_32_pd_i , 0xf1ff, 0x213c, { 20, 22, 9}},
+	{m68k_op_move_32_di_aw , 0xf1ff, 0x2178, { 28, 28, 9}},
+	{m68k_op_move_32_di_al , 0xf1ff, 0x2179, { 32, 32, 9}},
+	{m68k_op_move_32_di_pcdi , 0xf1ff, 0x217a, { 28, 28, 10}},
+	{m68k_op_move_32_di_pcix , 0xf1ff, 0x217b, { 30, 30, 12}},
+	{m68k_op_move_32_di_i , 0xf1ff, 0x217c, { 24, 24, 9}},
+	{m68k_op_move_32_ix_aw , 0xf1ff, 0x21b8, { 30, 30, 11}},
+	{m68k_op_move_32_ix_al , 0xf1ff, 0x21b9, { 34, 34, 11}},
+	{m68k_op_move_32_ix_pcdi , 0xf1ff, 0x21ba, { 30, 30, 12}},
+	{m68k_op_move_32_ix_pcix , 0xf1ff, 0x21bb, { 32, 32, 14}},
+	{m68k_op_move_32_ix_i , 0xf1ff, 0x21bc, { 26, 26, 11}},
+	{m68k_op_move_16_d_aw , 0xf1ff, 0x3038, { 12, 12, 6}},
+	{m68k_op_move_16_d_al , 0xf1ff, 0x3039, { 16, 16, 6}},
+	{m68k_op_move_16_d_pcdi , 0xf1ff, 0x303a, { 12, 12, 7}},
+	{m68k_op_move_16_d_pcix , 0xf1ff, 0x303b, { 14, 14, 9}},
+	{m68k_op_move_16_d_i , 0xf1ff, 0x303c, { 8, 8, 4}},
+	{m68k_op_movea_16_aw , 0xf1ff, 0x3078, { 12, 12, 6}},
+	{m68k_op_movea_16_al , 0xf1ff, 0x3079, { 16, 16, 6}},
+	{m68k_op_movea_16_pcdi , 0xf1ff, 0x307a, { 12, 12, 7}},
+	{m68k_op_movea_16_pcix , 0xf1ff, 0x307b, { 14, 14, 9}},
+	{m68k_op_movea_16_i , 0xf1ff, 0x307c, { 8, 8, 4}},
+	{m68k_op_move_16_ai_aw , 0xf1ff, 0x30b8, { 16, 16, 8}},
+	{m68k_op_move_16_ai_al , 0xf1ff, 0x30b9, { 20, 20, 8}},
+	{m68k_op_move_16_ai_pcdi , 0xf1ff, 0x30ba, { 16, 16, 9}},
+	{m68k_op_move_16_ai_pcix , 0xf1ff, 0x30bb, { 18, 18, 11}},
+	{m68k_op_move_16_ai_i , 0xf1ff, 0x30bc, { 12, 12, 6}},
+	{m68k_op_move_16_pi_aw , 0xf1ff, 0x30f8, { 16, 16, 8}},
+	{m68k_op_move_16_pi_al , 0xf1ff, 0x30f9, { 20, 20, 8}},
+	{m68k_op_move_16_pi_pcdi , 0xf1ff, 0x30fa, { 16, 16, 9}},
+	{m68k_op_move_16_pi_pcix , 0xf1ff, 0x30fb, { 18, 18, 11}},
+	{m68k_op_move_16_pi_i , 0xf1ff, 0x30fc, { 12, 12, 6}},
+	{m68k_op_move_16_pd_aw , 0xf1ff, 0x3138, { 16, 16, 9}},
+	{m68k_op_move_16_pd_al , 0xf1ff, 0x3139, { 20, 20, 9}},
+	{m68k_op_move_16_pd_pcdi , 0xf1ff, 0x313a, { 16, 16, 10}},
+	{m68k_op_move_16_pd_pcix , 0xf1ff, 0x313b, { 18, 18, 12}},
+	{m68k_op_move_16_pd_i , 0xf1ff, 0x313c, { 12, 12, 7}},
+	{m68k_op_move_16_di_aw , 0xf1ff, 0x3178, { 20, 20, 9}},
+	{m68k_op_move_16_di_al , 0xf1ff, 0x3179, { 24, 24, 9}},
+	{m68k_op_move_16_di_pcdi , 0xf1ff, 0x317a, { 20, 20, 10}},
+	{m68k_op_move_16_di_pcix , 0xf1ff, 0x317b, { 22, 22, 12}},
+	{m68k_op_move_16_di_i , 0xf1ff, 0x317c, { 16, 16, 7}},
+	{m68k_op_move_16_ix_aw , 0xf1ff, 0x31b8, { 22, 22, 11}},
+	{m68k_op_move_16_ix_al , 0xf1ff, 0x31b9, { 26, 26, 11}},
+	{m68k_op_move_16_ix_pcdi , 0xf1ff, 0x31ba, { 22, 22, 12}},
+	{m68k_op_move_16_ix_pcix , 0xf1ff, 0x31bb, { 24, 24, 14}},
+	{m68k_op_move_16_ix_i , 0xf1ff, 0x31bc, { 18, 18, 9}},
+	{m68k_op_chk_32_aw , 0xf1ff, 0x4138, { 0, 0, 12}},
+	{m68k_op_chk_32_al , 0xf1ff, 0x4139, { 0, 0, 12}},
+	{m68k_op_chk_32_pcdi , 0xf1ff, 0x413a, { 0, 0, 13}},
+	{m68k_op_chk_32_pcix , 0xf1ff, 0x413b, { 0, 0, 15}},
+	{m68k_op_chk_32_i , 0xf1ff, 0x413c, { 0, 0, 12}},
+	{m68k_op_chk_16_aw , 0xf1ff, 0x41b8, { 18, 16, 12}},
+	{m68k_op_chk_16_al , 0xf1ff, 0x41b9, { 22, 20, 12}},
+	{m68k_op_chk_16_pcdi , 0xf1ff, 0x41ba, { 18, 16, 13}},
+	{m68k_op_chk_16_pcix , 0xf1ff, 0x41bb, { 20, 18, 15}},
+	{m68k_op_chk_16_i , 0xf1ff, 0x41bc, { 14, 12, 10}},
+	{m68k_op_lea_32_aw , 0xf1ff, 0x41f8, { 8, 8, 6}},
+	{m68k_op_lea_32_al , 0xf1ff, 0x41f9, { 12, 12, 6}},
+	{m68k_op_lea_32_pcdi , 0xf1ff, 0x41fa, { 8, 8, 7}},
+	{m68k_op_lea_32_pcix , 0xf1ff, 0x41fb, { 12, 12, 9}},
+	{m68k_op_addq_8_pi7 , 0xf1ff, 0x501f, { 12, 12, 8}},
+	{m68k_op_addq_8_pd7 , 0xf1ff, 0x5027, { 14, 14, 9}},
+	{m68k_op_addq_8_aw , 0xf1ff, 0x5038, { 16, 16, 8}},
+	{m68k_op_addq_8_al , 0xf1ff, 0x5039, { 20, 20, 8}},
+	{m68k_op_addq_16_aw , 0xf1ff, 0x5078, { 16, 16, 8}},
+	{m68k_op_addq_16_al , 0xf1ff, 0x5079, { 20, 20, 8}},
+	{m68k_op_addq_32_aw , 0xf1ff, 0x50b8, { 24, 24, 8}},
+	{m68k_op_addq_32_al , 0xf1ff, 0x50b9, { 28, 28, 8}},
+	{m68k_op_subq_8_pi7 , 0xf1ff, 0x511f, { 12, 12, 8}},
+	{m68k_op_subq_8_pd7 , 0xf1ff, 0x5127, { 14, 14, 9}},
+	{m68k_op_subq_8_aw , 0xf1ff, 0x5138, { 16, 16, 8}},
+	{m68k_op_subq_8_al , 0xf1ff, 0x5139, { 20, 20, 8}},
+	{m68k_op_subq_16_aw , 0xf1ff, 0x5178, { 16, 16, 8}},
+	{m68k_op_subq_16_al , 0xf1ff, 0x5179, { 20, 20, 8}},
+	{m68k_op_subq_32_aw , 0xf1ff, 0x51b8, { 24, 24, 8}},
+	{m68k_op_subq_32_al , 0xf1ff, 0x51b9, { 28, 28, 8}},
+	{m68k_op_or_8_er_pi7 , 0xf1ff, 0x801f, { 8, 8, 6}},
+	{m68k_op_or_8_er_pd7 , 0xf1ff, 0x8027, { 10, 10, 7}},
+	{m68k_op_or_8_er_aw , 0xf1ff, 0x8038, { 12, 12, 6}},
+	{m68k_op_or_8_er_al , 0xf1ff, 0x8039, { 16, 16, 6}},
+	{m68k_op_or_8_er_pcdi , 0xf1ff, 0x803a, { 12, 12, 7}},
+	{m68k_op_or_8_er_pcix , 0xf1ff, 0x803b, { 14, 14, 9}},
+	{m68k_op_or_8_er_i , 0xf1ff, 0x803c, { 10, 8, 4}},
+	{m68k_op_or_16_er_aw , 0xf1ff, 0x8078, { 12, 12, 6}},
+	{m68k_op_or_16_er_al , 0xf1ff, 0x8079, { 16, 16, 6}},
+	{m68k_op_or_16_er_pcdi , 0xf1ff, 0x807a, { 12, 12, 7}},
+	{m68k_op_or_16_er_pcix , 0xf1ff, 0x807b, { 14, 14, 9}},
+	{m68k_op_or_16_er_i , 0xf1ff, 0x807c, { 10, 8, 4}},
+	{m68k_op_or_32_er_aw , 0xf1ff, 0x80b8, { 18, 18, 6}},
+	{m68k_op_or_32_er_al , 0xf1ff, 0x80b9, { 22, 22, 6}},
+	{m68k_op_or_32_er_pcdi , 0xf1ff, 0x80ba, { 18, 18, 7}},
+	{m68k_op_or_32_er_pcix , 0xf1ff, 0x80bb, { 20, 20, 9}},
+	{m68k_op_or_32_er_i , 0xf1ff, 0x80bc, { 16, 14, 6}},
+	{m68k_op_divu_16_aw , 0xf1ff, 0x80f8, {148, 116, 48}},
+	{m68k_op_divu_16_al , 0xf1ff, 0x80f9, {152, 120, 48}},
+	{m68k_op_divu_16_pcdi , 0xf1ff, 0x80fa, {148, 116, 49}},
+	{m68k_op_divu_16_pcix , 0xf1ff, 0x80fb, {150, 118, 51}},
+	{m68k_op_divu_16_i , 0xf1ff, 0x80fc, {144, 112, 46}},
+	{m68k_op_sbcd_8_mm_ay7 , 0xf1ff, 0x810f, { 18, 18, 16}},
+	{m68k_op_or_8_re_pi7 , 0xf1ff, 0x811f, { 12, 12, 8}},
+	{m68k_op_or_8_re_pd7 , 0xf1ff, 0x8127, { 14, 14, 9}},
+	{m68k_op_or_8_re_aw , 0xf1ff, 0x8138, { 16, 16, 8}},
+	{m68k_op_or_8_re_al , 0xf1ff, 0x8139, { 20, 20, 8}},
+	{m68k_op_pack_16_mm_ay7 , 0xf1ff, 0x814f, { 0, 0, 13}},
+	{m68k_op_or_16_re_aw , 0xf1ff, 0x8178, { 16, 16, 8}},
+	{m68k_op_or_16_re_al , 0xf1ff, 0x8179, { 20, 20, 8}},
+	{m68k_op_unpk_16_mm_ay7 , 0xf1ff, 0x818f, { 0, 0, 13}},
+	{m68k_op_or_32_re_aw , 0xf1ff, 0x81b8, { 24, 24, 8}},
+	{m68k_op_or_32_re_al , 0xf1ff, 0x81b9, { 28, 28, 8}},
+	{m68k_op_divs_16_aw , 0xf1ff, 0x81f8, {166, 130, 60}},
+	{m68k_op_divs_16_al , 0xf1ff, 0x81f9, {170, 134, 60}},
+	{m68k_op_divs_16_pcdi , 0xf1ff, 0x81fa, {166, 130, 61}},
+	{m68k_op_divs_16_pcix , 0xf1ff, 0x81fb, {168, 132, 63}},
+	{m68k_op_divs_16_i , 0xf1ff, 0x81fc, {162, 126, 58}},
+	{m68k_op_sub_8_er_pi7 , 0xf1ff, 0x901f, { 8, 8, 6}},
+	{m68k_op_sub_8_er_pd7 , 0xf1ff, 0x9027, { 10, 10, 7}},
+	{m68k_op_sub_8_er_aw , 0xf1ff, 0x9038, { 12, 12, 6}},
+	{m68k_op_sub_8_er_al , 0xf1ff, 0x9039, { 16, 16, 6}},
+	{m68k_op_sub_8_er_pcdi , 0xf1ff, 0x903a, { 12, 12, 7}},
+	{m68k_op_sub_8_er_pcix , 0xf1ff, 0x903b, { 14, 14, 9}},
+	{m68k_op_sub_8_er_i , 0xf1ff, 0x903c, { 10, 8, 4}},
+	{m68k_op_sub_16_er_aw , 0xf1ff, 0x9078, { 12, 12, 6}},
+	{m68k_op_sub_16_er_al , 0xf1ff, 0x9079, { 16, 16, 6}},
+	{m68k_op_sub_16_er_pcdi , 0xf1ff, 0x907a, { 12, 12, 7}},
+	{m68k_op_sub_16_er_pcix , 0xf1ff, 0x907b, { 14, 14, 9}},
+	{m68k_op_sub_16_er_i , 0xf1ff, 0x907c, { 10, 8, 4}},
+	{m68k_op_sub_32_er_aw , 0xf1ff, 0x90b8, { 18, 18, 6}},
+	{m68k_op_sub_32_er_al , 0xf1ff, 0x90b9, { 22, 22, 6}},
+	{m68k_op_sub_32_er_pcdi , 0xf1ff, 0x90ba, { 18, 18, 7}},
+	{m68k_op_sub_32_er_pcix , 0xf1ff, 0x90bb, { 20, 20, 9}},
+	{m68k_op_sub_32_er_i , 0xf1ff, 0x90bc, { 16, 14, 6}},
+	{m68k_op_suba_16_aw , 0xf1ff, 0x90f8, { 16, 16, 6}},
+	{m68k_op_suba_16_al , 0xf1ff, 0x90f9, { 20, 20, 6}},
+	{m68k_op_suba_16_pcdi , 0xf1ff, 0x90fa, { 16, 16, 7}},
+	{m68k_op_suba_16_pcix , 0xf1ff, 0x90fb, { 18, 18, 9}},
+	{m68k_op_suba_16_i , 0xf1ff, 0x90fc, { 14, 12, 4}},
+	{m68k_op_subx_8_mm_ay7 , 0xf1ff, 0x910f, { 18, 18, 12}},
+	{m68k_op_sub_8_re_pi7 , 0xf1ff, 0x911f, { 12, 12, 8}},
+	{m68k_op_sub_8_re_pd7 , 0xf1ff, 0x9127, { 14, 14, 9}},
+	{m68k_op_sub_8_re_aw , 0xf1ff, 0x9138, { 16, 16, 8}},
+	{m68k_op_sub_8_re_al , 0xf1ff, 0x9139, { 20, 20, 8}},
+	{m68k_op_sub_16_re_aw , 0xf1ff, 0x9178, { 16, 16, 8}},
+	{m68k_op_sub_16_re_al , 0xf1ff, 0x9179, { 20, 20, 8}},
+	{m68k_op_sub_32_re_aw , 0xf1ff, 0x91b8, { 24, 24, 8}},
+	{m68k_op_sub_32_re_al , 0xf1ff, 0x91b9, { 28, 28, 8}},
+	{m68k_op_suba_32_aw , 0xf1ff, 0x91f8, { 18, 18, 6}},
+	{m68k_op_suba_32_al , 0xf1ff, 0x91f9, { 22, 22, 6}},
+	{m68k_op_suba_32_pcdi , 0xf1ff, 0x91fa, { 18, 18, 7}},
+	{m68k_op_suba_32_pcix , 0xf1ff, 0x91fb, { 20, 20, 9}},
+	{m68k_op_suba_32_i , 0xf1ff, 0x91fc, { 16, 14, 6}},
+	{m68k_op_cmp_8_pi7 , 0xf1ff, 0xb01f, { 8, 8, 6}},
+	{m68k_op_cmp_8_pd7 , 0xf1ff, 0xb027, { 10, 10, 7}},
+	{m68k_op_cmp_8_aw , 0xf1ff, 0xb038, { 12, 12, 6}},
+	{m68k_op_cmp_8_al , 0xf1ff, 0xb039, { 16, 16, 6}},
+	{m68k_op_cmp_8_pcdi , 0xf1ff, 0xb03a, { 12, 12, 7}},
+	{m68k_op_cmp_8_pcix , 0xf1ff, 0xb03b, { 14, 14, 9}},
+	{m68k_op_cmp_8_i , 0xf1ff, 0xb03c, { 8, 8, 4}},
+	{m68k_op_cmp_16_aw , 0xf1ff, 0xb078, { 12, 12, 6}},
+	{m68k_op_cmp_16_al , 0xf1ff, 0xb079, { 16, 16, 6}},
+	{m68k_op_cmp_16_pcdi , 0xf1ff, 0xb07a, { 12, 12, 7}},
+	{m68k_op_cmp_16_pcix , 0xf1ff, 0xb07b, { 14, 14, 9}},
+	{m68k_op_cmp_16_i , 0xf1ff, 0xb07c, { 8, 8, 4}},
+	{m68k_op_cmp_32_aw , 0xf1ff, 0xb0b8, { 18, 18, 6}},
+	{m68k_op_cmp_32_al , 0xf1ff, 0xb0b9, { 22, 22, 6}},
+	{m68k_op_cmp_32_pcdi , 0xf1ff, 0xb0ba, { 18, 18, 7}},
+	{m68k_op_cmp_32_pcix , 0xf1ff, 0xb0bb, { 20, 20, 9}},
+	{m68k_op_cmp_32_i , 0xf1ff, 0xb0bc, { 14, 14, 6}},
+	{m68k_op_cmpa_16_aw , 0xf1ff, 0xb0f8, { 14, 14, 8}},
+	{m68k_op_cmpa_16_al , 0xf1ff, 0xb0f9, { 18, 18, 8}},
+	{m68k_op_cmpa_16_pcdi , 0xf1ff, 0xb0fa, { 14, 14, 9}},
+	{m68k_op_cmpa_16_pcix , 0xf1ff, 0xb0fb, { 16, 16, 11}},
+	{m68k_op_cmpa_16_i , 0xf1ff, 0xb0fc, { 10, 10, 6}},
+	{m68k_op_cmpm_8_ay7 , 0xf1ff, 0xb10f, { 12, 12, 9}},
+	{m68k_op_eor_8_pi7 , 0xf1ff, 0xb11f, { 12, 12, 8}},
+	{m68k_op_eor_8_pd7 , 0xf1ff, 0xb127, { 14, 14, 9}},
+	{m68k_op_eor_8_aw , 0xf1ff, 0xb138, { 16, 16, 8}},
+	{m68k_op_eor_8_al , 0xf1ff, 0xb139, { 20, 20, 8}},
+	{m68k_op_eor_16_aw , 0xf1ff, 0xb178, { 16, 16, 8}},
+	{m68k_op_eor_16_al , 0xf1ff, 0xb179, { 20, 20, 8}},
+	{m68k_op_eor_32_aw , 0xf1ff, 0xb1b8, { 24, 24, 8}},
+	{m68k_op_eor_32_al , 0xf1ff, 0xb1b9, { 28, 28, 8}},
+	{m68k_op_cmpa_32_aw , 0xf1ff, 0xb1f8, { 18, 18, 8}},
+	{m68k_op_cmpa_32_al , 0xf1ff, 0xb1f9, { 22, 22, 8}},
+	{m68k_op_cmpa_32_pcdi , 0xf1ff, 0xb1fa, { 18, 18, 9}},
+	{m68k_op_cmpa_32_pcix , 0xf1ff, 0xb1fb, { 20, 20, 11}},
+	{m68k_op_cmpa_32_i , 0xf1ff, 0xb1fc, { 14, 14, 8}},
+	{m68k_op_and_8_er_pi7 , 0xf1ff, 0xc01f, { 8, 8, 6}},
+	{m68k_op_and_8_er_pd7 , 0xf1ff, 0xc027, { 10, 10, 7}},
+	{m68k_op_and_8_er_aw , 0xf1ff, 0xc038, { 12, 12, 6}},
+	{m68k_op_and_8_er_al , 0xf1ff, 0xc039, { 16, 16, 6}},
+	{m68k_op_and_8_er_pcdi , 0xf1ff, 0xc03a, { 12, 12, 7}},
+	{m68k_op_and_8_er_pcix , 0xf1ff, 0xc03b, { 14, 14, 9}},
+	{m68k_op_and_8_er_i , 0xf1ff, 0xc03c, { 10, 8, 4}},
+	{m68k_op_and_16_er_aw , 0xf1ff, 0xc078, { 12, 12, 6}},
+	{m68k_op_and_16_er_al , 0xf1ff, 0xc079, { 16, 16, 6}},
+	{m68k_op_and_16_er_pcdi , 0xf1ff, 0xc07a, { 12, 12, 7}},
+	{m68k_op_and_16_er_pcix , 0xf1ff, 0xc07b, { 14, 14, 9}},
+	{m68k_op_and_16_er_i , 0xf1ff, 0xc07c, { 10, 8, 4}},
+	{m68k_op_and_32_er_aw , 0xf1ff, 0xc0b8, { 18, 18, 6}},
+	{m68k_op_and_32_er_al , 0xf1ff, 0xc0b9, { 22, 22, 6}},
+	{m68k_op_and_32_er_pcdi , 0xf1ff, 0xc0ba, { 18, 18, 7}},
+	{m68k_op_and_32_er_pcix , 0xf1ff, 0xc0bb, { 20, 20, 9}},
+	{m68k_op_and_32_er_i , 0xf1ff, 0xc0bc, { 16, 14, 6}},
+	{m68k_op_mulu_16_aw , 0xf1ff, 0xc0f8, { 62, 38, 31}},
+	{m68k_op_mulu_16_al , 0xf1ff, 0xc0f9, { 66, 42, 31}},
+	{m68k_op_mulu_16_pcdi , 0xf1ff, 0xc0fa, { 62, 38, 32}},
+	{m68k_op_mulu_16_pcix , 0xf1ff, 0xc0fb, { 64, 40, 34}},
+	{m68k_op_mulu_16_i , 0xf1ff, 0xc0fc, { 58, 34, 29}},
+	{m68k_op_abcd_8_mm_ay7 , 0xf1ff, 0xc10f, { 18, 18, 16}},
+	{m68k_op_and_8_re_pi7 , 0xf1ff, 0xc11f, { 12, 12, 8}},
+	{m68k_op_and_8_re_pd7 , 0xf1ff, 0xc127, { 14, 14, 9}},
+	{m68k_op_and_8_re_aw , 0xf1ff, 0xc138, { 16, 16, 8}},
+	{m68k_op_and_8_re_al , 0xf1ff, 0xc139, { 20, 20, 8}},
+	{m68k_op_and_16_re_aw , 0xf1ff, 0xc178, { 16, 16, 8}},
+	{m68k_op_and_16_re_al , 0xf1ff, 0xc179, { 20, 20, 8}},
+	{m68k_op_and_32_re_aw , 0xf1ff, 0xc1b8, { 24, 24, 8}},
+	{m68k_op_and_32_re_al , 0xf1ff, 0xc1b9, { 28, 28, 8}},
+	{m68k_op_muls_16_aw , 0xf1ff, 0xc1f8, { 62, 40, 31}},
+	{m68k_op_muls_16_al , 0xf1ff, 0xc1f9, { 66, 44, 31}},
+	{m68k_op_muls_16_pcdi , 0xf1ff, 0xc1fa, { 62, 40, 32}},
+	{m68k_op_muls_16_pcix , 0xf1ff, 0xc1fb, { 64, 42, 34}},
+	{m68k_op_muls_16_i , 0xf1ff, 0xc1fc, { 58, 36, 29}},
+	{m68k_op_add_8_er_pi7 , 0xf1ff, 0xd01f, { 8, 8, 6}},
+	{m68k_op_add_8_er_pd7 , 0xf1ff, 0xd027, { 10, 10, 7}},
+	{m68k_op_add_8_er_aw , 0xf1ff, 0xd038, { 12, 12, 6}},
+	{m68k_op_add_8_er_al , 0xf1ff, 0xd039, { 16, 16, 6}},
+	{m68k_op_add_8_er_pcdi , 0xf1ff, 0xd03a, { 12, 12, 7}},
+	{m68k_op_add_8_er_pcix , 0xf1ff, 0xd03b, { 14, 14, 9}},
+	{m68k_op_add_8_er_i , 0xf1ff, 0xd03c, { 10, 8, 4}},
+	{m68k_op_add_16_er_aw , 0xf1ff, 0xd078, { 12, 12, 6}},
+	{m68k_op_add_16_er_al , 0xf1ff, 0xd079, { 16, 16, 6}},
+	{m68k_op_add_16_er_pcdi , 0xf1ff, 0xd07a, { 12, 12, 7}},
+	{m68k_op_add_16_er_pcix , 0xf1ff, 0xd07b, { 14, 14, 9}},
+	{m68k_op_add_16_er_i , 0xf1ff, 0xd07c, { 10, 8, 4}},
+	{m68k_op_add_32_er_aw , 0xf1ff, 0xd0b8, { 18, 18, 6}},
+	{m68k_op_add_32_er_al , 0xf1ff, 0xd0b9, { 22, 22, 6}},
+	{m68k_op_add_32_er_pcdi , 0xf1ff, 0xd0ba, { 18, 18, 7}},
+	{m68k_op_add_32_er_pcix , 0xf1ff, 0xd0bb, { 20, 20, 9}},
+	{m68k_op_add_32_er_i , 0xf1ff, 0xd0bc, { 16, 14, 6}},
+	{m68k_op_adda_16_aw , 0xf1ff, 0xd0f8, { 16, 16, 6}},
+	{m68k_op_adda_16_al , 0xf1ff, 0xd0f9, { 20, 20, 6}},
+	{m68k_op_adda_16_pcdi , 0xf1ff, 0xd0fa, { 16, 16, 7}},
+	{m68k_op_adda_16_pcix , 0xf1ff, 0xd0fb, { 18, 18, 9}},
+	{m68k_op_adda_16_i , 0xf1ff, 0xd0fc, { 14, 12, 4}},
+	{m68k_op_addx_8_mm_ay7 , 0xf1ff, 0xd10f, { 18, 18, 12}},
+	{m68k_op_add_8_re_pi7 , 0xf1ff, 0xd11f, { 12, 12, 8}},
+	{m68k_op_add_8_re_pd7 , 0xf1ff, 0xd127, { 14, 14, 9}},
+	{m68k_op_add_8_re_aw , 0xf1ff, 0xd138, { 16, 16, 8}},
+	{m68k_op_add_8_re_al , 0xf1ff, 0xd139, { 20, 20, 8}},
+	{m68k_op_add_16_re_aw , 0xf1ff, 0xd178, { 16, 16, 8}},
+	{m68k_op_add_16_re_al , 0xf1ff, 0xd179, { 20, 20, 8}},
+	{m68k_op_add_32_re_aw , 0xf1ff, 0xd1b8, { 24, 24, 8}},
+	{m68k_op_add_32_re_al , 0xf1ff, 0xd1b9, { 28, 28, 8}},
+	{m68k_op_adda_32_aw , 0xf1ff, 0xd1f8, { 18, 18, 6}},
+	{m68k_op_adda_32_al , 0xf1ff, 0xd1f9, { 22, 22, 6}},
+	{m68k_op_adda_32_pcdi , 0xf1ff, 0xd1fa, { 18, 18, 7}},
+	{m68k_op_adda_32_pcix , 0xf1ff, 0xd1fb, { 20, 20, 9}},
+	{m68k_op_adda_32_i , 0xf1ff, 0xd1fc, { 16, 14, 6}},
+	{m68k_op_ori_8_d , 0xfff8, 0x0000, { 8, 8, 2}},
+	{m68k_op_ori_8_ai , 0xfff8, 0x0010, { 16, 16, 8}},
+	{m68k_op_ori_8_pi , 0xfff8, 0x0018, { 16, 16, 8}},
+	{m68k_op_ori_8_pd , 0xfff8, 0x0020, { 18, 18, 9}},
+	{m68k_op_ori_8_di , 0xfff8, 0x0028, { 20, 20, 9}},
+	{m68k_op_ori_8_ix , 0xfff8, 0x0030, { 22, 22, 11}},
+	{m68k_op_ori_16_d , 0xfff8, 0x0040, { 8, 8, 2}},
+	{m68k_op_ori_16_ai , 0xfff8, 0x0050, { 16, 16, 8}},
+	{m68k_op_ori_16_pi , 0xfff8, 0x0058, { 16, 16, 8}},
+	{m68k_op_ori_16_pd , 0xfff8, 0x0060, { 18, 18, 9}},
+	{m68k_op_ori_16_di , 0xfff8, 0x0068, { 20, 20, 9}},
+	{m68k_op_ori_16_ix , 0xfff8, 0x0070, { 22, 22, 11}},
+	{m68k_op_ori_32_d , 0xfff8, 0x0080, { 16, 14, 2}},
+	{m68k_op_ori_32_ai , 0xfff8, 0x0090, { 28, 28, 8}},
+	{m68k_op_ori_32_pi , 0xfff8, 0x0098, { 28, 28, 8}},
+	{m68k_op_ori_32_pd , 0xfff8, 0x00a0, { 30, 30, 9}},
+	{m68k_op_ori_32_di , 0xfff8, 0x00a8, { 32, 32, 9}},
+	{m68k_op_ori_32_ix , 0xfff8, 0x00b0, { 34, 34, 11}},
+	{m68k_op_chk2cmp2_8_ai , 0xfff8, 0x00d0, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_8_di , 0xfff8, 0x00e8, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_8_ix , 0xfff8, 0x00f0, { 0, 0, 25}},
+	{m68k_op_andi_8_d , 0xfff8, 0x0200, { 8, 8, 2}},
+	{m68k_op_andi_8_ai , 0xfff8, 0x0210, { 16, 16, 8}},
+	{m68k_op_andi_8_pi , 0xfff8, 0x0218, { 16, 16, 8}},
+	{m68k_op_andi_8_pd , 0xfff8, 0x0220, { 18, 18, 9}},
+	{m68k_op_andi_8_di , 0xfff8, 0x0228, { 20, 20, 9}},
+	{m68k_op_andi_8_ix , 0xfff8, 0x0230, { 22, 22, 11}},
+	{m68k_op_andi_16_d , 0xfff8, 0x0240, { 8, 8, 2}},
+	{m68k_op_andi_16_ai , 0xfff8, 0x0250, { 16, 16, 8}},
+	{m68k_op_andi_16_pi , 0xfff8, 0x0258, { 16, 16, 8}},
+	{m68k_op_andi_16_pd , 0xfff8, 0x0260, { 18, 18, 9}},
+	{m68k_op_andi_16_di , 0xfff8, 0x0268, { 20, 20, 9}},
+	{m68k_op_andi_16_ix , 0xfff8, 0x0270, { 22, 22, 11}},
+	{m68k_op_andi_32_d , 0xfff8, 0x0280, { 14, 14, 2}},
+	{m68k_op_andi_32_ai , 0xfff8, 0x0290, { 28, 28, 8}},
+	{m68k_op_andi_32_pi , 0xfff8, 0x0298, { 28, 28, 8}},
+	{m68k_op_andi_32_pd , 0xfff8, 0x02a0, { 30, 30, 9}},
+	{m68k_op_andi_32_di , 0xfff8, 0x02a8, { 32, 32, 9}},
+	{m68k_op_andi_32_ix , 0xfff8, 0x02b0, { 34, 34, 11}},
+	{m68k_op_chk2cmp2_16_ai , 0xfff8, 0x02d0, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_16_di , 0xfff8, 0x02e8, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_16_ix , 0xfff8, 0x02f0, { 0, 0, 25}},
+	{m68k_op_subi_8_d , 0xfff8, 0x0400, { 8, 8, 2}},
+	{m68k_op_subi_8_ai , 0xfff8, 0x0410, { 16, 16, 8}},
+	{m68k_op_subi_8_pi , 0xfff8, 0x0418, { 16, 16, 8}},
+	{m68k_op_subi_8_pd , 0xfff8, 0x0420, { 18, 18, 9}},
+	{m68k_op_subi_8_di , 0xfff8, 0x0428, { 20, 20, 9}},
+	{m68k_op_subi_8_ix , 0xfff8, 0x0430, { 22, 22, 11}},
+	{m68k_op_subi_16_d , 0xfff8, 0x0440, { 8, 8, 2}},
+	{m68k_op_subi_16_ai , 0xfff8, 0x0450, { 16, 16, 8}},
+	{m68k_op_subi_16_pi , 0xfff8, 0x0458, { 16, 16, 8}},
+	{m68k_op_subi_16_pd , 0xfff8, 0x0460, { 18, 18, 9}},
+	{m68k_op_subi_16_di , 0xfff8, 0x0468, { 20, 20, 9}},
+	{m68k_op_subi_16_ix , 0xfff8, 0x0470, { 22, 22, 11}},
+	{m68k_op_subi_32_d , 0xfff8, 0x0480, { 16, 14, 2}},
+	{m68k_op_subi_32_ai , 0xfff8, 0x0490, { 28, 28, 8}},
+	{m68k_op_subi_32_pi , 0xfff8, 0x0498, { 28, 28, 8}},
+	{m68k_op_subi_32_pd , 0xfff8, 0x04a0, { 30, 30, 9}},
+	{m68k_op_subi_32_di , 0xfff8, 0x04a8, { 32, 32, 9}},
+	{m68k_op_subi_32_ix , 0xfff8, 0x04b0, { 34, 34, 11}},
+	{m68k_op_chk2cmp2_32_ai , 0xfff8, 0x04d0, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_32_di , 0xfff8, 0x04e8, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_32_ix , 0xfff8, 0x04f0, { 0, 0, 25}},
+	{m68k_op_addi_8_d , 0xfff8, 0x0600, { 8, 8, 2}},
+	{m68k_op_addi_8_ai , 0xfff8, 0x0610, { 16, 16, 8}},
+	{m68k_op_addi_8_pi , 0xfff8, 0x0618, { 16, 16, 8}},
+	{m68k_op_addi_8_pd , 0xfff8, 0x0620, { 18, 18, 9}},
+	{m68k_op_addi_8_di , 0xfff8, 0x0628, { 20, 20, 9}},
+	{m68k_op_addi_8_ix , 0xfff8, 0x0630, { 22, 22, 11}},
+	{m68k_op_addi_16_d , 0xfff8, 0x0640, { 8, 8, 2}},
+	{m68k_op_addi_16_ai , 0xfff8, 0x0650, { 16, 16, 8}},
+	{m68k_op_addi_16_pi , 0xfff8, 0x0658, { 16, 16, 8}},
+	{m68k_op_addi_16_pd , 0xfff8, 0x0660, { 18, 18, 9}},
+	{m68k_op_addi_16_di , 0xfff8, 0x0668, { 20, 20, 9}},
+	{m68k_op_addi_16_ix , 0xfff8, 0x0670, { 22, 22, 11}},
+	{m68k_op_addi_32_d , 0xfff8, 0x0680, { 16, 14, 2}},
+	{m68k_op_addi_32_ai , 0xfff8, 0x0690, { 28, 28, 8}},
+	{m68k_op_addi_32_pi , 0xfff8, 0x0698, { 28, 28, 8}},
+	{m68k_op_addi_32_pd , 0xfff8, 0x06a0, { 30, 30, 9}},
+	{m68k_op_addi_32_di , 0xfff8, 0x06a8, { 32, 32, 9}},
+	{m68k_op_addi_32_ix , 0xfff8, 0x06b0, { 34, 34, 11}},
+	{m68k_op_callm_32_ai , 0xfff8, 0x06d0, { 0, 0, 64}},
+	{m68k_op_callm_32_di , 0xfff8, 0x06e8, { 0, 0, 65}},
+	{m68k_op_callm_32_ix , 0xfff8, 0x06f0, { 0, 0, 67}},
+	{m68k_op_btst_32_s_d , 0xfff8, 0x0800, { 10, 10, 4}},
+	{m68k_op_btst_8_s_ai , 0xfff8, 0x0810, { 12, 12, 8}},
+	{m68k_op_btst_8_s_pi , 0xfff8, 0x0818, { 12, 12, 8}},
+	{m68k_op_btst_8_s_pd , 0xfff8, 0x0820, { 14, 14, 9}},
+	{m68k_op_btst_8_s_di , 0xfff8, 0x0828, { 16, 16, 9}},
+	{m68k_op_btst_8_s_ix , 0xfff8, 0x0830, { 18, 18, 11}},
+	{m68k_op_bchg_32_s_d , 0xfff8, 0x0840, { 12, 12, 4}},
+	{m68k_op_bchg_8_s_ai , 0xfff8, 0x0850, { 16, 16, 8}},
+	{m68k_op_bchg_8_s_pi , 0xfff8, 0x0858, { 16, 16, 8}},
+	{m68k_op_bchg_8_s_pd , 0xfff8, 0x0860, { 18, 18, 9}},
+	{m68k_op_bchg_8_s_di , 0xfff8, 0x0868, { 20, 20, 9}},
+	{m68k_op_bchg_8_s_ix , 0xfff8, 0x0870, { 22, 22, 11}},
+	{m68k_op_bclr_32_s_d , 0xfff8, 0x0880, { 14, 14, 4}},
+	{m68k_op_bclr_8_s_ai , 0xfff8, 0x0890, { 16, 16, 8}},
+	{m68k_op_bclr_8_s_pi , 0xfff8, 0x0898, { 16, 16, 8}},
+	{m68k_op_bclr_8_s_pd , 0xfff8, 0x08a0, { 18, 18, 9}},
+	{m68k_op_bclr_8_s_di , 0xfff8, 0x08a8, { 20, 20, 9}},
+	{m68k_op_bclr_8_s_ix , 0xfff8, 0x08b0, { 22, 22, 11}},
+	{m68k_op_bset_32_s_d , 0xfff8, 0x08c0, { 12, 12, 4}},
+	{m68k_op_bset_8_s_ai , 0xfff8, 0x08d0, { 16, 16, 8}},
+	{m68k_op_bset_8_s_pi , 0xfff8, 0x08d8, { 16, 16, 8}},
+	{m68k_op_bset_8_s_pd , 0xfff8, 0x08e0, { 18, 18, 9}},
+	{m68k_op_bset_8_s_di , 0xfff8, 0x08e8, { 20, 20, 9}},
+	{m68k_op_bset_8_s_ix , 0xfff8, 0x08f0, { 22, 22, 11}},
+	{m68k_op_eori_8_d , 0xfff8, 0x0a00, { 8, 8, 2}},
+	{m68k_op_eori_8_ai , 0xfff8, 0x0a10, { 16, 16, 8}},
+	{m68k_op_eori_8_pi , 0xfff8, 0x0a18, { 16, 16, 8}},
+	{m68k_op_eori_8_pd , 0xfff8, 0x0a20, { 18, 18, 9}},
+	{m68k_op_eori_8_di , 0xfff8, 0x0a28, { 20, 20, 9}},
+	{m68k_op_eori_8_ix , 0xfff8, 0x0a30, { 22, 22, 11}},
+	{m68k_op_eori_16_d , 0xfff8, 0x0a40, { 8, 8, 2}},
+	{m68k_op_eori_16_ai , 0xfff8, 0x0a50, { 16, 16, 8}},
+	{m68k_op_eori_16_pi , 0xfff8, 0x0a58, { 16, 16, 8}},
+	{m68k_op_eori_16_pd , 0xfff8, 0x0a60, { 18, 18, 9}},
+	{m68k_op_eori_16_di , 0xfff8, 0x0a68, { 20, 20, 9}},
+	{m68k_op_eori_16_ix , 0xfff8, 0x0a70, { 22, 22, 11}},
+	{m68k_op_eori_32_d , 0xfff8, 0x0a80, { 16, 14, 2}},
+	{m68k_op_eori_32_ai , 0xfff8, 0x0a90, { 28, 28, 8}},
+	{m68k_op_eori_32_pi , 0xfff8, 0x0a98, { 28, 28, 8}},
+	{m68k_op_eori_32_pd , 0xfff8, 0x0aa0, { 30, 30, 9}},
+	{m68k_op_eori_32_di , 0xfff8, 0x0aa8, { 32, 32, 9}},
+	{m68k_op_eori_32_ix , 0xfff8, 0x0ab0, { 34, 34, 11}},
+	{m68k_op_cas_8_ai , 0xfff8, 0x0ad0, { 0, 0, 16}},
+	{m68k_op_cas_8_pi , 0xfff8, 0x0ad8, { 0, 0, 16}},
+	{m68k_op_cas_8_pd , 0xfff8, 0x0ae0, { 0, 0, 17}},
+	{m68k_op_cas_8_di , 0xfff8, 0x0ae8, { 0, 0, 17}},
+	{m68k_op_cas_8_ix , 0xfff8, 0x0af0, { 0, 0, 19}},
+	{m68k_op_cmpi_8_d , 0xfff8, 0x0c00, { 8, 8, 2}},
+	{m68k_op_cmpi_8_ai , 0xfff8, 0x0c10, { 12, 12, 6}},
+	{m68k_op_cmpi_8_pi , 0xfff8, 0x0c18, { 12, 12, 6}},
+	{m68k_op_cmpi_8_pd , 0xfff8, 0x0c20, { 14, 14, 7}},
+	{m68k_op_cmpi_8_di , 0xfff8, 0x0c28, { 16, 16, 7}},
+	{m68k_op_cmpi_8_ix , 0xfff8, 0x0c30, { 18, 18, 9}},
+	{m68k_op_cmpi_16_d , 0xfff8, 0x0c40, { 8, 8, 2}},
+	{m68k_op_cmpi_16_ai , 0xfff8, 0x0c50, { 12, 12, 6}},
+	{m68k_op_cmpi_16_pi , 0xfff8, 0x0c58, { 12, 12, 6}},
+	{m68k_op_cmpi_16_pd , 0xfff8, 0x0c60, { 14, 14, 7}},
+	{m68k_op_cmpi_16_di , 0xfff8, 0x0c68, { 16, 16, 7}},
+	{m68k_op_cmpi_16_ix , 0xfff8, 0x0c70, { 18, 18, 9}},
+	{m68k_op_cmpi_32_d , 0xfff8, 0x0c80, { 14, 12, 2}},
+	{m68k_op_cmpi_32_ai , 0xfff8, 0x0c90, { 20, 20, 6}},
+	{m68k_op_cmpi_32_pi , 0xfff8, 0x0c98, { 20, 20, 6}},
+	{m68k_op_cmpi_32_pd , 0xfff8, 0x0ca0, { 22, 22, 7}},
+	{m68k_op_cmpi_32_di , 0xfff8, 0x0ca8, { 24, 24, 7}},
+	{m68k_op_cmpi_32_ix , 0xfff8, 0x0cb0, { 26, 26, 9}},
+	{m68k_op_cas_16_ai , 0xfff8, 0x0cd0, { 0, 0, 16}},
+	{m68k_op_cas_16_pi , 0xfff8, 0x0cd8, { 0, 0, 16}},
+	{m68k_op_cas_16_pd , 0xfff8, 0x0ce0, { 0, 0, 17}},
+	{m68k_op_cas_16_di , 0xfff8, 0x0ce8, { 0, 0, 17}},
+	{m68k_op_cas_16_ix , 0xfff8, 0x0cf0, { 0, 0, 19}},
+	{m68k_op_moves_8_ai , 0xfff8, 0x0e10, { 0, 18, 9}},
+	{m68k_op_moves_8_pi , 0xfff8, 0x0e18, { 0, 18, 9}},
+	{m68k_op_moves_8_pd , 0xfff8, 0x0e20, { 0, 20, 10}},
+	{m68k_op_moves_8_di , 0xfff8, 0x0e28, { 0, 26, 10}},
+	{m68k_op_moves_8_ix , 0xfff8, 0x0e30, { 0, 30, 12}},
+	{m68k_op_moves_16_ai , 0xfff8, 0x0e50, { 0, 18, 9}},
+	{m68k_op_moves_16_pi , 0xfff8, 0x0e58, { 0, 18, 9}},
+	{m68k_op_moves_16_pd , 0xfff8, 0x0e60, { 0, 20, 10}},
+	{m68k_op_moves_16_di , 0xfff8, 0x0e68, { 0, 26, 10}},
+	{m68k_op_moves_16_ix , 0xfff8, 0x0e70, { 0, 30, 12}},
+	{m68k_op_moves_32_ai , 0xfff8, 0x0e90, { 0, 22, 9}},
+	{m68k_op_moves_32_pi , 0xfff8, 0x0e98, { 0, 22, 9}},
+	{m68k_op_moves_32_pd , 0xfff8, 0x0ea0, { 0, 28, 10}},
+	{m68k_op_moves_32_di , 0xfff8, 0x0ea8, { 0, 32, 10}},
+	{m68k_op_moves_32_ix , 0xfff8, 0x0eb0, { 0, 36, 12}},
+	{m68k_op_cas_32_ai , 0xfff8, 0x0ed0, { 0, 0, 16}},
+	{m68k_op_cas_32_pi , 0xfff8, 0x0ed8, { 0, 0, 16}},
+	{m68k_op_cas_32_pd , 0xfff8, 0x0ee0, { 0, 0, 17}},
+	{m68k_op_cas_32_di , 0xfff8, 0x0ee8, { 0, 0, 17}},
+	{m68k_op_cas_32_ix , 0xfff8, 0x0ef0, { 0, 0, 19}},
+	{m68k_op_move_8_aw_d , 0xfff8, 0x11c0, { 12, 12, 4}},
+	{m68k_op_move_8_aw_ai , 0xfff8, 0x11d0, { 16, 16, 8}},
+	{m68k_op_move_8_aw_pi , 0xfff8, 0x11d8, { 16, 16, 8}},
+	{m68k_op_move_8_aw_pd , 0xfff8, 0x11e0, { 18, 18, 9}},
+	{m68k_op_move_8_aw_di , 0xfff8, 0x11e8, { 20, 20, 9}},
+	{m68k_op_move_8_aw_ix , 0xfff8, 0x11f0, { 22, 22, 11}},
+	{m68k_op_move_8_al_d , 0xfff8, 0x13c0, { 16, 16, 6}},
+	{m68k_op_move_8_al_ai , 0xfff8, 0x13d0, { 20, 20, 10}},
+	{m68k_op_move_8_al_pi , 0xfff8, 0x13d8, { 20, 20, 10}},
+	{m68k_op_move_8_al_pd , 0xfff8, 0x13e0, { 22, 22, 11}},
+	{m68k_op_move_8_al_di , 0xfff8, 0x13e8, { 24, 24, 11}},
+	{m68k_op_move_8_al_ix , 0xfff8, 0x13f0, { 26, 26, 13}},
+	{m68k_op_move_8_pi7_d , 0xfff8, 0x1ec0, { 8, 8, 4}},
+	{m68k_op_move_8_pi7_ai , 0xfff8, 0x1ed0, { 12, 12, 8}},
+	{m68k_op_move_8_pi7_pi , 0xfff8, 0x1ed8, { 12, 12, 8}},
+	{m68k_op_move_8_pi7_pd , 0xfff8, 0x1ee0, { 14, 14, 9}},
+	{m68k_op_move_8_pi7_di , 0xfff8, 0x1ee8, { 16, 16, 9}},
+	{m68k_op_move_8_pi7_ix , 0xfff8, 0x1ef0, { 18, 18, 11}},
+	{m68k_op_move_8_pd7_d , 0xfff8, 0x1f00, { 8, 8, 5}},
+	{m68k_op_move_8_pd7_ai , 0xfff8, 0x1f10, { 12, 12, 9}},
+	{m68k_op_move_8_pd7_pi , 0xfff8, 0x1f18, { 12, 12, 9}},
+	{m68k_op_move_8_pd7_pd , 0xfff8, 0x1f20, { 14, 14, 10}},
+	{m68k_op_move_8_pd7_di , 0xfff8, 0x1f28, { 16, 16, 10}},
+	{m68k_op_move_8_pd7_ix , 0xfff8, 0x1f30, { 18, 18, 12}},
+	{m68k_op_move_32_aw_d , 0xfff8, 0x21c0, { 16, 16, 4}},
+	{m68k_op_move_32_aw_a , 0xfff8, 0x21c8, { 16, 16, 4}},
+	{m68k_op_move_32_aw_ai , 0xfff8, 0x21d0, { 24, 24, 8}},
+	{m68k_op_move_32_aw_pi , 0xfff8, 0x21d8, { 24, 24, 8}},
+	{m68k_op_move_32_aw_pd , 0xfff8, 0x21e0, { 26, 26, 9}},
+	{m68k_op_move_32_aw_di , 0xfff8, 0x21e8, { 28, 28, 9}},
+	{m68k_op_move_32_aw_ix , 0xfff8, 0x21f0, { 30, 30, 11}},
+	{m68k_op_move_32_al_d , 0xfff8, 0x23c0, { 20, 20, 6}},
+	{m68k_op_move_32_al_a , 0xfff8, 0x23c8, { 20, 20, 6}},
+	{m68k_op_move_32_al_ai , 0xfff8, 0x23d0, { 28, 28, 10}},
+	{m68k_op_move_32_al_pi , 0xfff8, 0x23d8, { 28, 28, 10}},
+	{m68k_op_move_32_al_pd , 0xfff8, 0x23e0, { 30, 30, 11}},
+	{m68k_op_move_32_al_di , 0xfff8, 0x23e8, { 32, 32, 11}},
+	{m68k_op_move_32_al_ix , 0xfff8, 0x23f0, { 34, 34, 13}},
+	{m68k_op_move_16_aw_d , 0xfff8, 0x31c0, { 12, 12, 4}},
+	{m68k_op_move_16_aw_a , 0xfff8, 0x31c8, { 12, 12, 4}},
+	{m68k_op_move_16_aw_ai , 0xfff8, 0x31d0, { 16, 16, 8}},
+	{m68k_op_move_16_aw_pi , 0xfff8, 0x31d8, { 16, 16, 8}},
+	{m68k_op_move_16_aw_pd , 0xfff8, 0x31e0, { 18, 18, 9}},
+	{m68k_op_move_16_aw_di , 0xfff8, 0x31e8, { 20, 20, 9}},
+	{m68k_op_move_16_aw_ix , 0xfff8, 0x31f0, { 22, 22, 11}},
+	{m68k_op_move_16_al_d , 0xfff8, 0x33c0, { 16, 16, 6}},
+	{m68k_op_move_16_al_a , 0xfff8, 0x33c8, { 16, 16, 6}},
+	{m68k_op_move_16_al_ai , 0xfff8, 0x33d0, { 20, 20, 10}},
+	{m68k_op_move_16_al_pi , 0xfff8, 0x33d8, { 20, 20, 10}},
+	{m68k_op_move_16_al_pd , 0xfff8, 0x33e0, { 22, 22, 11}},
+	{m68k_op_move_16_al_di , 0xfff8, 0x33e8, { 24, 24, 11}},
+	{m68k_op_move_16_al_ix , 0xfff8, 0x33f0, { 26, 26, 13}},
+	{m68k_op_negx_8_d , 0xfff8, 0x4000, { 4, 4, 2}},
+	{m68k_op_negx_8_ai , 0xfff8, 0x4010, { 12, 12, 8}},
+	{m68k_op_negx_8_pi , 0xfff8, 0x4018, { 12, 12, 8}},
+	{m68k_op_negx_8_pd , 0xfff8, 0x4020, { 14, 14, 9}},
+	{m68k_op_negx_8_di , 0xfff8, 0x4028, { 16, 16, 9}},
+	{m68k_op_negx_8_ix , 0xfff8, 0x4030, { 18, 18, 11}},
+	{m68k_op_negx_16_d , 0xfff8, 0x4040, { 4, 4, 2}},
+	{m68k_op_negx_16_ai , 0xfff8, 0x4050, { 12, 12, 8}},
+	{m68k_op_negx_16_pi , 0xfff8, 0x4058, { 12, 12, 8}},
+	{m68k_op_negx_16_pd , 0xfff8, 0x4060, { 14, 14, 9}},
+	{m68k_op_negx_16_di , 0xfff8, 0x4068, { 16, 16, 9}},
+	{m68k_op_negx_16_ix , 0xfff8, 0x4070, { 18, 18, 11}},
+	{m68k_op_negx_32_d , 0xfff8, 0x4080, { 6, 6, 2}},
+	{m68k_op_negx_32_ai , 0xfff8, 0x4090, { 20, 20, 8}},
+	{m68k_op_negx_32_pi , 0xfff8, 0x4098, { 20, 20, 8}},
+	{m68k_op_negx_32_pd , 0xfff8, 0x40a0, { 22, 22, 9}},
+	{m68k_op_negx_32_di , 0xfff8, 0x40a8, { 24, 24, 9}},
+	{m68k_op_negx_32_ix , 0xfff8, 0x40b0, { 26, 26, 11}},
+	{m68k_op_move_16_frs_d , 0xfff8, 0x40c0, { 6, 4, 8}},
+	{m68k_op_move_16_frs_ai , 0xfff8, 0x40d0, { 12, 12, 12}},
+	{m68k_op_move_16_frs_pi , 0xfff8, 0x40d8, { 12, 12, 12}},
+	{m68k_op_move_16_frs_pd , 0xfff8, 0x40e0, { 14, 14, 13}},
+	{m68k_op_move_16_frs_di , 0xfff8, 0x40e8, { 16, 16, 13}},
+	{m68k_op_move_16_frs_ix , 0xfff8, 0x40f0, { 18, 18, 15}},
+	{m68k_op_clr_8_d , 0xfff8, 0x4200, { 4, 4, 2}},
+	{m68k_op_clr_8_ai , 0xfff8, 0x4210, { 12, 8, 8}},
+	{m68k_op_clr_8_pi , 0xfff8, 0x4218, { 12, 8, 8}},
+	{m68k_op_clr_8_pd , 0xfff8, 0x4220, { 14, 10, 9}},
+	{m68k_op_clr_8_di , 0xfff8, 0x4228, { 16, 12, 9}},
+	{m68k_op_clr_8_ix , 0xfff8, 0x4230, { 18, 14, 11}},
+	{m68k_op_clr_16_d , 0xfff8, 0x4240, { 4, 4, 2}},
+	{m68k_op_clr_16_ai , 0xfff8, 0x4250, { 12, 8, 8}},
+	{m68k_op_clr_16_pi , 0xfff8, 0x4258, { 12, 8, 8}},
+	{m68k_op_clr_16_pd , 0xfff8, 0x4260, { 14, 10, 9}},
+	{m68k_op_clr_16_di , 0xfff8, 0x4268, { 16, 12, 9}},
+	{m68k_op_clr_16_ix , 0xfff8, 0x4270, { 18, 14, 11}},
+	{m68k_op_clr_32_d , 0xfff8, 0x4280, { 6, 6, 2}},
+	{m68k_op_clr_32_ai , 0xfff8, 0x4290, { 20, 12, 8}},
+	{m68k_op_clr_32_pi , 0xfff8, 0x4298, { 20, 12, 8}},
+	{m68k_op_clr_32_pd , 0xfff8, 0x42a0, { 22, 14, 9}},
+	{m68k_op_clr_32_di , 0xfff8, 0x42a8, { 24, 16, 9}},
+	{m68k_op_clr_32_ix , 0xfff8, 0x42b0, { 26, 20, 11}},
+	{m68k_op_move_16_frc_d , 0xfff8, 0x42c0, { 0, 4, 4}},
+	{m68k_op_move_16_frc_ai , 0xfff8, 0x42d0, { 0, 12, 8}},
+	{m68k_op_move_16_frc_pi , 0xfff8, 0x42d8, { 0, 12, 8}},
+	{m68k_op_move_16_frc_pd , 0xfff8, 0x42e0, { 0, 14, 9}},
+	{m68k_op_move_16_frc_di , 0xfff8, 0x42e8, { 0, 16, 9}},
+	{m68k_op_move_16_frc_ix , 0xfff8, 0x42f0, { 0, 18, 11}},
+	{m68k_op_neg_8_d , 0xfff8, 0x4400, { 4, 4, 2}},
+	{m68k_op_neg_8_ai , 0xfff8, 0x4410, { 12, 12, 8}},
+	{m68k_op_neg_8_pi , 0xfff8, 0x4418, { 12, 12, 8}},
+	{m68k_op_neg_8_pd , 0xfff8, 0x4420, { 14, 14, 9}},
+	{m68k_op_neg_8_di , 0xfff8, 0x4428, { 16, 16, 9}},
+	{m68k_op_neg_8_ix , 0xfff8, 0x4430, { 18, 18, 11}},
+	{m68k_op_neg_16_d , 0xfff8, 0x4440, { 4, 4, 2}},
+	{m68k_op_neg_16_ai , 0xfff8, 0x4450, { 12, 12, 8}},
+	{m68k_op_neg_16_pi , 0xfff8, 0x4458, { 12, 12, 8}},
+	{m68k_op_neg_16_pd , 0xfff8, 0x4460, { 14, 14, 9}},
+	{m68k_op_neg_16_di , 0xfff8, 0x4468, { 16, 16, 9}},
+	{m68k_op_neg_16_ix , 0xfff8, 0x4470, { 18, 18, 11}},
+	{m68k_op_neg_32_d , 0xfff8, 0x4480, { 6, 6, 2}},
+	{m68k_op_neg_32_ai , 0xfff8, 0x4490, { 20, 20, 8}},
+	{m68k_op_neg_32_pi , 0xfff8, 0x4498, { 20, 20, 8}},
+	{m68k_op_neg_32_pd , 0xfff8, 0x44a0, { 22, 22, 9}},
+	{m68k_op_neg_32_di , 0xfff8, 0x44a8, { 24, 24, 9}},
+	{m68k_op_neg_32_ix , 0xfff8, 0x44b0, { 26, 26, 11}},
+	{m68k_op_move_16_toc_d , 0xfff8, 0x44c0, { 12, 12, 4}},
+	{m68k_op_move_16_toc_ai , 0xfff8, 0x44d0, { 16, 16, 8}},
+	{m68k_op_move_16_toc_pi , 0xfff8, 0x44d8, { 16, 16, 8}},
+	{m68k_op_move_16_toc_pd , 0xfff8, 0x44e0, { 18, 18, 9}},
+	{m68k_op_move_16_toc_di , 0xfff8, 0x44e8, { 20, 20, 9}},
+	{m68k_op_move_16_toc_ix , 0xfff8, 0x44f0, { 22, 22, 11}},
+	{m68k_op_not_8_d , 0xfff8, 0x4600, { 4, 4, 2}},
+	{m68k_op_not_8_ai , 0xfff8, 0x4610, { 12, 12, 8}},
+	{m68k_op_not_8_pi , 0xfff8, 0x4618, { 12, 12, 8}},
+	{m68k_op_not_8_pd , 0xfff8, 0x4620, { 14, 14, 9}},
+	{m68k_op_not_8_di , 0xfff8, 0x4628, { 16, 16, 9}},
+	{m68k_op_not_8_ix , 0xfff8, 0x4630, { 18, 18, 11}},
+	{m68k_op_not_16_d , 0xfff8, 0x4640, { 4, 4, 2}},
+	{m68k_op_not_16_ai , 0xfff8, 0x4650, { 12, 12, 8}},
+	{m68k_op_not_16_pi , 0xfff8, 0x4658, { 12, 12, 8}},
+	{m68k_op_not_16_pd , 0xfff8, 0x4660, { 14, 14, 9}},
+	{m68k_op_not_16_di , 0xfff8, 0x4668, { 16, 16, 9}},
+	{m68k_op_not_16_ix , 0xfff8, 0x4670, { 18, 18, 11}},
+	{m68k_op_not_32_d , 0xfff8, 0x4680, { 6, 6, 2}},
+	{m68k_op_not_32_ai , 0xfff8, 0x4690, { 20, 20, 8}},
+	{m68k_op_not_32_pi , 0xfff8, 0x4698, { 20, 20, 8}},
+	{m68k_op_not_32_pd , 0xfff8, 0x46a0, { 22, 22, 9}},
+	{m68k_op_not_32_di , 0xfff8, 0x46a8, { 24, 24, 9}},
+	{m68k_op_not_32_ix , 0xfff8, 0x46b0, { 26, 26, 11}},
+	{m68k_op_move_16_tos_d , 0xfff8, 0x46c0, { 12, 12, 8}},
+	{m68k_op_move_16_tos_ai , 0xfff8, 0x46d0, { 16, 16, 12}},
+	{m68k_op_move_16_tos_pi , 0xfff8, 0x46d8, { 16, 16, 12}},
+	{m68k_op_move_16_tos_pd , 0xfff8, 0x46e0, { 18, 18, 13}},
+	{m68k_op_move_16_tos_di , 0xfff8, 0x46e8, { 20, 20, 13}},
+	{m68k_op_move_16_tos_ix , 0xfff8, 0x46f0, { 22, 22, 15}},
+	{m68k_op_nbcd_8_d , 0xfff8, 0x4800, { 6, 6, 6}},
+	{m68k_op_link_32 , 0xfff8, 0x4808, { 0, 0, 6}},
+	{m68k_op_nbcd_8_ai , 0xfff8, 0x4810, { 12, 12, 10}},
+	{m68k_op_nbcd_8_pi , 0xfff8, 0x4818, { 12, 12, 10}},
+	{m68k_op_nbcd_8_pd , 0xfff8, 0x4820, { 14, 14, 11}},
+	{m68k_op_nbcd_8_di , 0xfff8, 0x4828, { 16, 16, 11}},
+	{m68k_op_nbcd_8_ix , 0xfff8, 0x4830, { 18, 18, 13}},
+	{m68k_op_swap_32 , 0xfff8, 0x4840, { 4, 4, 4}},
+	{m68k_op_bkpt , 0xfff8, 0x4848, { 0, 10, 10}},
+	{m68k_op_pea_32_ai , 0xfff8, 0x4850, { 10, 10, 9}},
+	{m68k_op_pea_32_di , 0xfff8, 0x4868, { 16, 16, 10}},
+	{m68k_op_pea_32_ix , 0xfff8, 0x4870, { 20, 20, 12}},
+	{m68k_op_ext_16 , 0xfff8, 0x4880, { 4, 4, 4}},
+	{m68k_op_movem_16_re_ai , 0xfff8, 0x4890, { 12, 12, 8}},
+	{m68k_op_movem_16_re_pd , 0xfff8, 0x48a0, { 8, 8, 4}},
+	{m68k_op_movem_16_re_di , 0xfff8, 0x48a8, { 16, 16, 9}},
+	{m68k_op_movem_16_re_ix , 0xfff8, 0x48b0, { 18, 18, 11}},
+	{m68k_op_ext_32 , 0xfff8, 0x48c0, { 4, 4, 4}},
+	{m68k_op_movem_32_re_ai , 0xfff8, 0x48d0, { 16, 16, 8}},
+	{m68k_op_movem_32_re_pd , 0xfff8, 0x48e0, { 8, 8, 4}},
+	{m68k_op_movem_32_re_di , 0xfff8, 0x48e8, { 20, 20, 9}},
+	{m68k_op_movem_32_re_ix , 0xfff8, 0x48f0, { 22, 22, 11}},
+	{m68k_op_extb_32 , 0xfff8, 0x49c0, { 0, 0, 4}},
+	{m68k_op_tst_8_d , 0xfff8, 0x4a00, { 4, 4, 2}},
+	{m68k_op_tst_8_ai , 0xfff8, 0x4a10, { 8, 8, 6}},
+	{m68k_op_tst_8_pi , 0xfff8, 0x4a18, { 8, 8, 6}},
+	{m68k_op_tst_8_pd , 0xfff8, 0x4a20, { 10, 10, 7}},
+	{m68k_op_tst_8_di , 0xfff8, 0x4a28, { 12, 12, 7}},
+	{m68k_op_tst_8_ix , 0xfff8, 0x4a30, { 14, 14, 9}},
+	{m68k_op_tst_16_d , 0xfff8, 0x4a40, { 4, 4, 2}},
+	{m68k_op_tst_16_a , 0xfff8, 0x4a48, { 0, 0, 2}},
+	{m68k_op_tst_16_ai , 0xfff8, 0x4a50, { 8, 8, 6}},
+	{m68k_op_tst_16_pi , 0xfff8, 0x4a58, { 8, 8, 6}},
+	{m68k_op_tst_16_pd , 0xfff8, 0x4a60, { 10, 10, 7}},
+	{m68k_op_tst_16_di , 0xfff8, 0x4a68, { 12, 12, 7}},
+	{m68k_op_tst_16_ix , 0xfff8, 0x4a70, { 14, 14, 9}},
+	{m68k_op_tst_32_d , 0xfff8, 0x4a80, { 4, 4, 2}},
+	{m68k_op_tst_32_a , 0xfff8, 0x4a88, { 0, 0, 2}},
+	{m68k_op_tst_32_ai , 0xfff8, 0x4a90, { 12, 12, 6}},
+	{m68k_op_tst_32_pi , 0xfff8, 0x4a98, { 12, 12, 6}},
+	{m68k_op_tst_32_pd , 0xfff8, 0x4aa0, { 14, 14, 7}},
+	{m68k_op_tst_32_di , 0xfff8, 0x4aa8, { 16, 16, 7}},
+	{m68k_op_tst_32_ix , 0xfff8, 0x4ab0, { 18, 18, 9}},
+	{m68k_op_tas_8_d , 0xfff8, 0x4ac0, { 4, 4, 4}},
+	{m68k_op_tas_8_ai , 0xfff8, 0x4ad0, { 18, 18, 16}},
+	{m68k_op_tas_8_pi , 0xfff8, 0x4ad8, { 18, 18, 16}},
+	{m68k_op_tas_8_pd , 0xfff8, 0x4ae0, { 20, 20, 17}},
+	{m68k_op_tas_8_di , 0xfff8, 0x4ae8, { 22, 22, 17}},
+	{m68k_op_tas_8_ix , 0xfff8, 0x4af0, { 24, 24, 19}},
+	{m68k_op_mull_32_d , 0xfff8, 0x4c00, { 0, 0, 43}},
+	{m68k_op_mull_32_ai , 0xfff8, 0x4c10, { 0, 0, 47}},
+	{m68k_op_mull_32_pi , 0xfff8, 0x4c18, { 0, 0, 47}},
+	{m68k_op_mull_32_pd , 0xfff8, 0x4c20, { 0, 0, 48}},
+	{m68k_op_mull_32_di , 0xfff8, 0x4c28, { 0, 0, 48}},
+	{m68k_op_mull_32_ix , 0xfff8, 0x4c30, { 0, 0, 50}},
+	{m68k_op_divl_32_d , 0xfff8, 0x4c40, { 0, 0, 84}},
+	{m68k_op_divl_32_ai , 0xfff8, 0x4c50, { 0, 0, 88}},
+	{m68k_op_divl_32_pi , 0xfff8, 0x4c58, { 0, 0, 88}},
+	{m68k_op_divl_32_pd , 0xfff8, 0x4c60, { 0, 0, 89}},
+	{m68k_op_divl_32_di , 0xfff8, 0x4c68, { 0, 0, 89}},
+	{m68k_op_divl_32_ix , 0xfff8, 0x4c70, { 0, 0, 91}},
+	{m68k_op_movem_16_er_ai , 0xfff8, 0x4c90, { 16, 16, 12}},
+	{m68k_op_movem_16_er_pi , 0xfff8, 0x4c98, { 12, 12, 8}},
+	{m68k_op_movem_16_er_di , 0xfff8, 0x4ca8, { 20, 20, 13}},
+	{m68k_op_movem_16_er_ix , 0xfff8, 0x4cb0, { 22, 22, 15}},
+	{m68k_op_movem_32_er_ai , 0xfff8, 0x4cd0, { 20, 20, 12}},
+	{m68k_op_movem_32_er_pi , 0xfff8, 0x4cd8, { 12, 12, 8}},
+	{m68k_op_movem_32_er_di , 0xfff8, 0x4ce8, { 24, 24, 13}},
+	{m68k_op_movem_32_er_ix , 0xfff8, 0x4cf0, { 26, 26, 15}},
+	{m68k_op_link_16 , 0xfff8, 0x4e50, { 16, 16, 5}},
+	{m68k_op_unlk_32 , 0xfff8, 0x4e58, { 12, 12, 6}},
+	{m68k_op_move_32_tou , 0xfff8, 0x4e60, { 4, 6, 2}},
+	{m68k_op_move_32_fru , 0xfff8, 0x4e68, { 4, 6, 2}},
+	{m68k_op_jsr_32_ai , 0xfff8, 0x4e90, { 16, 16, 4}},
+	{m68k_op_jsr_32_di , 0xfff8, 0x4ea8, { 18, 18, 5}},
+	{m68k_op_jsr_32_ix , 0xfff8, 0x4eb0, { 22, 22, 7}},
+	{m68k_op_jmp_32_ai , 0xfff8, 0x4ed0, { 8, 8, 4}},
+	{m68k_op_jmp_32_di , 0xfff8, 0x4ee8, { 10, 10, 5}},
+	{m68k_op_jmp_32_ix , 0xfff8, 0x4ef0, { 12, 12, 7}},
+	{m68k_op_st_8_d , 0xfff8, 0x50c0, { 6, 4, 4}},
+	{m68k_op_dbt_16 , 0xfff8, 0x50c8, { 12, 12, 6}},
+	{m68k_op_st_8_ai , 0xfff8, 0x50d0, { 12, 12, 10}},
+	{m68k_op_st_8_pi , 0xfff8, 0x50d8, { 12, 12, 10}},
+	{m68k_op_st_8_pd , 0xfff8, 0x50e0, { 14, 14, 11}},
+	{m68k_op_st_8_di , 0xfff8, 0x50e8, { 16, 16, 11}},
+	{m68k_op_st_8_ix , 0xfff8, 0x50f0, { 18, 18, 13}},
+	{m68k_op_sf_8_d , 0xfff8, 0x51c0, { 4, 4, 4}},
+	{m68k_op_dbf_16 , 0xfff8, 0x51c8, { 14, 14, 6}},
+	{m68k_op_sf_8_ai , 0xfff8, 0x51d0, { 12, 12, 10}},
+	{m68k_op_sf_8_pi , 0xfff8, 0x51d8, { 12, 12, 10}},
+	{m68k_op_sf_8_pd , 0xfff8, 0x51e0, { 14, 14, 11}},
+	{m68k_op_sf_8_di , 0xfff8, 0x51e8, { 16, 16, 11}},
+	{m68k_op_sf_8_ix , 0xfff8, 0x51f0, { 18, 18, 13}},
+	{m68k_op_shi_8_d , 0xfff8, 0x52c0, { 4, 4, 4}},
+	{m68k_op_dbhi_16 , 0xfff8, 0x52c8, { 12, 12, 6}},
+	{m68k_op_shi_8_ai , 0xfff8, 0x52d0, { 12, 12, 10}},
+	{m68k_op_shi_8_pi , 0xfff8, 0x52d8, { 12, 12, 10}},
+	{m68k_op_shi_8_pd , 0xfff8, 0x52e0, { 14, 14, 11}},
+	{m68k_op_shi_8_di , 0xfff8, 0x52e8, { 16, 16, 11}},
+	{m68k_op_shi_8_ix , 0xfff8, 0x52f0, { 18, 18, 13}},
+	{m68k_op_sls_8_d , 0xfff8, 0x53c0, { 4, 4, 4}},
+	{m68k_op_dbls_16 , 0xfff8, 0x53c8, { 12, 12, 6}},
+	{m68k_op_sls_8_ai , 0xfff8, 0x53d0, { 12, 12, 10}},
+	{m68k_op_sls_8_pi , 0xfff8, 0x53d8, { 12, 12, 10}},
+	{m68k_op_sls_8_pd , 0xfff8, 0x53e0, { 14, 14, 11}},
+	{m68k_op_sls_8_di , 0xfff8, 0x53e8, { 16, 16, 11}},
+	{m68k_op_sls_8_ix , 0xfff8, 0x53f0, { 18, 18, 13}},
+	{m68k_op_scc_8_d , 0xfff8, 0x54c0, { 4, 4, 4}},
+	{m68k_op_dbcc_16 , 0xfff8, 0x54c8, { 12, 12, 6}},
+	{m68k_op_scc_8_ai , 0xfff8, 0x54d0, { 12, 12, 10}},
+	{m68k_op_scc_8_pi , 0xfff8, 0x54d8, { 12, 12, 10}},
+	{m68k_op_scc_8_pd , 0xfff8, 0x54e0, { 14, 14, 11}},
+	{m68k_op_scc_8_di , 0xfff8, 0x54e8, { 16, 16, 11}},
+	{m68k_op_scc_8_ix , 0xfff8, 0x54f0, { 18, 18, 13}},
+	{m68k_op_scs_8_d , 0xfff8, 0x55c0, { 4, 4, 4}},
+	{m68k_op_dbcs_16 , 0xfff8, 0x55c8, { 12, 12, 6}},
+	{m68k_op_scs_8_ai , 0xfff8, 0x55d0, { 12, 12, 10}},
+	{m68k_op_scs_8_pi , 0xfff8, 0x55d8, { 12, 12, 10}},
+	{m68k_op_scs_8_pd , 0xfff8, 0x55e0, { 14, 14, 11}},
+	{m68k_op_scs_8_di , 0xfff8, 0x55e8, { 16, 16, 11}},
+	{m68k_op_scs_8_ix , 0xfff8, 0x55f0, { 18, 18, 13}},
+	{m68k_op_sne_8_d , 0xfff8, 0x56c0, { 4, 4, 4}},
+	{m68k_op_dbne_16 , 0xfff8, 0x56c8, { 12, 12, 6}},
+	{m68k_op_sne_8_ai , 0xfff8, 0x56d0, { 12, 12, 10}},
+	{m68k_op_sne_8_pi , 0xfff8, 0x56d8, { 12, 12, 10}},
+	{m68k_op_sne_8_pd , 0xfff8, 0x56e0, { 14, 14, 11}},
+	{m68k_op_sne_8_di , 0xfff8, 0x56e8, { 16, 16, 11}},
+	{m68k_op_sne_8_ix , 0xfff8, 0x56f0, { 18, 18, 13}},
+	{m68k_op_seq_8_d , 0xfff8, 0x57c0, { 4, 4, 4}},
+	{m68k_op_dbeq_16 , 0xfff8, 0x57c8, { 12, 12, 6}},
+	{m68k_op_seq_8_ai , 0xfff8, 0x57d0, { 12, 12, 10}},
+	{m68k_op_seq_8_pi , 0xfff8, 0x57d8, { 12, 12, 10}},
+	{m68k_op_seq_8_pd , 0xfff8, 0x57e0, { 14, 14, 11}},
+	{m68k_op_seq_8_di , 0xfff8, 0x57e8, { 16, 16, 11}},
+	{m68k_op_seq_8_ix , 0xfff8, 0x57f0, { 18, 18, 13}},
+	{m68k_op_svc_8_d , 0xfff8, 0x58c0, { 4, 4, 4}},
+	{m68k_op_dbvc_16 , 0xfff8, 0x58c8, { 12, 12, 6}},
+	{m68k_op_svc_8_ai , 0xfff8, 0x58d0, { 12, 12, 10}},
+	{m68k_op_svc_8_pi , 0xfff8, 0x58d8, { 12, 12, 10}},
+	{m68k_op_svc_8_pd , 0xfff8, 0x58e0, { 14, 14, 11}},
+	{m68k_op_svc_8_di , 0xfff8, 0x58e8, { 16, 16, 11}},
+	{m68k_op_svc_8_ix , 0xfff8, 0x58f0, { 18, 18, 13}},
+	{m68k_op_svs_8_d , 0xfff8, 0x59c0, { 4, 4, 4}},
+	{m68k_op_dbvs_16 , 0xfff8, 0x59c8, { 12, 12, 6}},
+	{m68k_op_svs_8_ai , 0xfff8, 0x59d0, { 12, 12, 10}},
+	{m68k_op_svs_8_pi , 0xfff8, 0x59d8, { 12, 12, 10}},
+	{m68k_op_svs_8_pd , 0xfff8, 0x59e0, { 14, 14, 11}},
+	{m68k_op_svs_8_di , 0xfff8, 0x59e8, { 16, 16, 11}},
+	{m68k_op_svs_8_ix , 0xfff8, 0x59f0, { 18, 18, 13}},
+	{m68k_op_spl_8_d , 0xfff8, 0x5ac0, { 4, 4, 4}},
+	{m68k_op_dbpl_16 , 0xfff8, 0x5ac8, { 12, 12, 6}},
+	{m68k_op_spl_8_ai , 0xfff8, 0x5ad0, { 12, 12, 10}},
+	{m68k_op_spl_8_pi , 0xfff8, 0x5ad8, { 12, 12, 10}},
+	{m68k_op_spl_8_pd , 0xfff8, 0x5ae0, { 14, 14, 11}},
+	{m68k_op_spl_8_di , 0xfff8, 0x5ae8, { 16, 16, 11}},
+	{m68k_op_spl_8_ix , 0xfff8, 0x5af0, { 18, 18, 13}},
+	{m68k_op_smi_8_d , 0xfff8, 0x5bc0, { 4, 4, 4}},
+	{m68k_op_dbmi_16 , 0xfff8, 0x5bc8, { 12, 12, 6}},
+	{m68k_op_smi_8_ai , 0xfff8, 0x5bd0, { 12, 12, 10}},
+	{m68k_op_smi_8_pi , 0xfff8, 0x5bd8, { 12, 12, 10}},
+	{m68k_op_smi_8_pd , 0xfff8, 0x5be0, { 14, 14, 11}},
+	{m68k_op_smi_8_di , 0xfff8, 0x5be8, { 16, 16, 11}},
+	{m68k_op_smi_8_ix , 0xfff8, 0x5bf0, { 18, 18, 13}},
+	{m68k_op_sge_8_d , 0xfff8, 0x5cc0, { 4, 4, 4}},
+	{m68k_op_dbge_16 , 0xfff8, 0x5cc8, { 12, 12, 6}},
+	{m68k_op_sge_8_ai , 0xfff8, 0x5cd0, { 12, 12, 10}},
+	{m68k_op_sge_8_pi , 0xfff8, 0x5cd8, { 12, 12, 10}},
+	{m68k_op_sge_8_pd , 0xfff8, 0x5ce0, { 14, 14, 11}},
+	{m68k_op_sge_8_di , 0xfff8, 0x5ce8, { 16, 16, 11}},
+	{m68k_op_sge_8_ix , 0xfff8, 0x5cf0, { 18, 18, 13}},
+	{m68k_op_slt_8_d , 0xfff8, 0x5dc0, { 4, 4, 4}},
+	{m68k_op_dblt_16 , 0xfff8, 0x5dc8, { 12, 12, 6}},
+	{m68k_op_slt_8_ai , 0xfff8, 0x5dd0, { 12, 12, 10}},
+	{m68k_op_slt_8_pi , 0xfff8, 0x5dd8, { 12, 12, 10}},
+	{m68k_op_slt_8_pd , 0xfff8, 0x5de0, { 14, 14, 11}},
+	{m68k_op_slt_8_di , 0xfff8, 0x5de8, { 16, 16, 11}},
+	{m68k_op_slt_8_ix , 0xfff8, 0x5df0, { 18, 18, 13}},
+	{m68k_op_sgt_8_d , 0xfff8, 0x5ec0, { 4, 4, 4}},
+	{m68k_op_dbgt_16 , 0xfff8, 0x5ec8, { 12, 12, 6}},
+	{m68k_op_sgt_8_ai , 0xfff8, 0x5ed0, { 12, 12, 10}},
+	{m68k_op_sgt_8_pi , 0xfff8, 0x5ed8, { 12, 12, 10}},
+	{m68k_op_sgt_8_pd , 0xfff8, 0x5ee0, { 14, 14, 11}},
+	{m68k_op_sgt_8_di , 0xfff8, 0x5ee8, { 16, 16, 11}},
+	{m68k_op_sgt_8_ix , 0xfff8, 0x5ef0, { 18, 18, 13}},
+	{m68k_op_sle_8_d , 0xfff8, 0x5fc0, { 4, 4, 4}},
+	{m68k_op_dble_16 , 0xfff8, 0x5fc8, { 12, 12, 6}},
+	{m68k_op_sle_8_ai , 0xfff8, 0x5fd0, { 12, 12, 10}},
+	{m68k_op_sle_8_pi , 0xfff8, 0x5fd8, { 12, 12, 10}},
+	{m68k_op_sle_8_pd , 0xfff8, 0x5fe0, { 14, 14, 11}},
+	{m68k_op_sle_8_di , 0xfff8, 0x5fe8, { 16, 16, 11}},
+	{m68k_op_sle_8_ix , 0xfff8, 0x5ff0, { 18, 18, 13}},
+	{m68k_op_sbcd_8_mm_ax7 , 0xfff8, 0x8f08, { 18, 18, 16}},
+	{m68k_op_pack_16_mm_ax7 , 0xfff8, 0x8f48, { 0, 0, 13}},
+	{m68k_op_unpk_16_mm_ax7 , 0xfff8, 0x8f88, { 0, 0, 13}},
+	{m68k_op_subx_8_mm_ax7 , 0xfff8, 0x9f08, { 18, 18, 12}},
+	{m68k_op_cmpm_8_ax7 , 0xfff8, 0xbf08, { 12, 12, 9}},
+	{m68k_op_abcd_8_mm_ax7 , 0xfff8, 0xcf08, { 18, 18, 16}},
+	{m68k_op_addx_8_mm_ax7 , 0xfff8, 0xdf08, { 18, 18, 12}},
+	{m68k_op_asr_16_ai , 0xfff8, 0xe0d0, { 12, 12, 9}},
+	{m68k_op_asr_16_pi , 0xfff8, 0xe0d8, { 12, 12, 9}},
+	{m68k_op_asr_16_pd , 0xfff8, 0xe0e0, { 14, 14, 10}},
+	{m68k_op_asr_16_di , 0xfff8, 0xe0e8, { 16, 16, 10}},
+	{m68k_op_asr_16_ix , 0xfff8, 0xe0f0, { 18, 18, 12}},
+	{m68k_op_asl_16_ai , 0xfff8, 0xe1d0, { 12, 12, 10}},
+	{m68k_op_asl_16_pi , 0xfff8, 0xe1d8, { 12, 12, 10}},
+	{m68k_op_asl_16_pd , 0xfff8, 0xe1e0, { 14, 14, 11}},
+	{m68k_op_asl_16_di , 0xfff8, 0xe1e8, { 16, 16, 11}},
+	{m68k_op_asl_16_ix , 0xfff8, 0xe1f0, { 18, 18, 13}},
+	{m68k_op_lsr_16_ai , 0xfff8, 0xe2d0, { 12, 12, 9}},
+	{m68k_op_lsr_16_pi , 0xfff8, 0xe2d8, { 12, 12, 9}},
+	{m68k_op_lsr_16_pd , 0xfff8, 0xe2e0, { 14, 14, 10}},
+	{m68k_op_lsr_16_di , 0xfff8, 0xe2e8, { 16, 16, 10}},
+	{m68k_op_lsr_16_ix , 0xfff8, 0xe2f0, { 18, 18, 12}},
+	{m68k_op_lsl_16_ai , 0xfff8, 0xe3d0, { 12, 12, 9}},
+	{m68k_op_lsl_16_pi , 0xfff8, 0xe3d8, { 12, 12, 9}},
+	{m68k_op_lsl_16_pd , 0xfff8, 0xe3e0, { 14, 14, 10}},
+	{m68k_op_lsl_16_di , 0xfff8, 0xe3e8, { 16, 16, 10}},
+	{m68k_op_lsl_16_ix , 0xfff8, 0xe3f0, { 18, 18, 12}},
+	{m68k_op_roxr_16_ai , 0xfff8, 0xe4d0, { 12, 12, 9}},
+	{m68k_op_roxr_16_pi , 0xfff8, 0xe4d8, { 12, 12, 9}},
+	{m68k_op_roxr_16_pd , 0xfff8, 0xe4e0, { 14, 14, 10}},
+	{m68k_op_roxr_16_di , 0xfff8, 0xe4e8, { 16, 16, 10}},
+	{m68k_op_roxr_16_ix , 0xfff8, 0xe4f0, { 18, 18, 12}},
+	{m68k_op_roxl_16_ai , 0xfff8, 0xe5d0, { 12, 12, 9}},
+	{m68k_op_roxl_16_pi , 0xfff8, 0xe5d8, { 12, 12, 9}},
+	{m68k_op_roxl_16_pd , 0xfff8, 0xe5e0, { 14, 14, 10}},
+	{m68k_op_roxl_16_di , 0xfff8, 0xe5e8, { 16, 16, 10}},
+	{m68k_op_roxl_16_ix , 0xfff8, 0xe5f0, { 18, 18, 12}},
+	{m68k_op_ror_16_ai , 0xfff8, 0xe6d0, { 12, 12, 11}},
+	{m68k_op_ror_16_pi , 0xfff8, 0xe6d8, { 12, 12, 11}},
+	{m68k_op_ror_16_pd , 0xfff8, 0xe6e0, { 14, 14, 12}},
+	{m68k_op_ror_16_di , 0xfff8, 0xe6e8, { 16, 16, 12}},
+	{m68k_op_ror_16_ix , 0xfff8, 0xe6f0, { 18, 18, 14}},
+	{m68k_op_rol_16_ai , 0xfff8, 0xe7d0, { 12, 12, 11}},
+	{m68k_op_rol_16_pi , 0xfff8, 0xe7d8, { 12, 12, 11}},
+	{m68k_op_rol_16_pd , 0xfff8, 0xe7e0, { 14, 14, 12}},
+	{m68k_op_rol_16_di , 0xfff8, 0xe7e8, { 16, 16, 12}},
+	{m68k_op_rol_16_ix , 0xfff8, 0xe7f0, { 18, 18, 14}},
+	{m68k_op_bftst_32_d , 0xfff8, 0xe8c0, { 0, 0, 6}},
+	{m68k_op_bftst_32_ai , 0xfff8, 0xe8d0, { 0, 0, 17}},
+	{m68k_op_bftst_32_di , 0xfff8, 0xe8e8, { 0, 0, 18}},
+	{m68k_op_bftst_32_ix , 0xfff8, 0xe8f0, { 0, 0, 20}},
+	{m68k_op_bfextu_32_d , 0xfff8, 0xe9c0, { 0, 0, 8}},
+	{m68k_op_bfextu_32_ai , 0xfff8, 0xe9d0, { 0, 0, 19}},
+	{m68k_op_bfextu_32_di , 0xfff8, 0xe9e8, { 0, 0, 20}},
+	{m68k_op_bfextu_32_ix , 0xfff8, 0xe9f0, { 0, 0, 22}},
+	{m68k_op_bfchg_32_d , 0xfff8, 0xeac0, { 0, 0, 12}},
+	{m68k_op_bfchg_32_ai , 0xfff8, 0xead0, { 0, 0, 24}},
+	{m68k_op_bfchg_32_di , 0xfff8, 0xeae8, { 0, 0, 25}},
+	{m68k_op_bfchg_32_ix , 0xfff8, 0xeaf0, { 0, 0, 27}},
+	{m68k_op_bfexts_32_d , 0xfff8, 0xebc0, { 0, 0, 8}},
+	{m68k_op_bfexts_32_ai , 0xfff8, 0xebd0, { 0, 0, 19}},
+	{m68k_op_bfexts_32_di , 0xfff8, 0xebe8, { 0, 0, 20}},
+	{m68k_op_bfexts_32_ix , 0xfff8, 0xebf0, { 0, 0, 22}},
+	{m68k_op_bfclr_32_d , 0xfff8, 0xecc0, { 0, 0, 12}},
+	{m68k_op_bfclr_32_ai , 0xfff8, 0xecd0, { 0, 0, 24}},
+	{m68k_op_bfclr_32_di , 0xfff8, 0xece8, { 0, 0, 25}},
+	{m68k_op_bfclr_32_ix , 0xfff8, 0xecf0, { 0, 0, 27}},
+	{m68k_op_bfffo_32_d , 0xfff8, 0xedc0, { 0, 0, 18}},
+	{m68k_op_bfffo_32_ai , 0xfff8, 0xedd0, { 0, 0, 32}},
+	{m68k_op_bfffo_32_di , 0xfff8, 0xede8, { 0, 0, 33}},
+	{m68k_op_bfffo_32_ix , 0xfff8, 0xedf0, { 0, 0, 35}},
+	{m68k_op_bfset_32_d , 0xfff8, 0xeec0, { 0, 0, 12}},
+	{m68k_op_bfset_32_ai , 0xfff8, 0xeed0, { 0, 0, 24}},
+	{m68k_op_bfset_32_di , 0xfff8, 0xeee8, { 0, 0, 25}},
+	{m68k_op_bfset_32_ix , 0xfff8, 0xeef0, { 0, 0, 27}},
+	{m68k_op_bfins_32_d , 0xfff8, 0xefc0, { 0, 0, 10}},
+	{m68k_op_bfins_32_ai , 0xfff8, 0xefd0, { 0, 0, 21}},
+	{m68k_op_bfins_32_di , 0xfff8, 0xefe8, { 0, 0, 22}},
+	{m68k_op_bfins_32_ix , 0xfff8, 0xeff0, { 0, 0, 24}},
+	{m68k_op_ori_8_pi7 , 0xffff, 0x001f, { 16, 16, 8}},
+	{m68k_op_ori_8_pd7 , 0xffff, 0x0027, { 18, 18, 9}},
+	{m68k_op_ori_8_aw , 0xffff, 0x0038, { 20, 20, 8}},
+	{m68k_op_ori_8_al , 0xffff, 0x0039, { 24, 24, 8}},
+	{m68k_op_ori_16_toc , 0xffff, 0x003c, { 20, 16, 12}},
+	{m68k_op_ori_16_aw , 0xffff, 0x0078, { 20, 20, 8}},
+	{m68k_op_ori_16_al , 0xffff, 0x0079, { 24, 24, 8}},
+	{m68k_op_ori_16_tos , 0xffff, 0x007c, { 20, 16, 12}},
+	{m68k_op_ori_32_aw , 0xffff, 0x00b8, { 32, 32, 8}},
+	{m68k_op_ori_32_al , 0xffff, 0x00b9, { 36, 36, 8}},
+	{m68k_op_chk2cmp2_8_aw , 0xffff, 0x00f8, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_8_al , 0xffff, 0x00f9, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_8_pcdi , 0xffff, 0x00fa, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_8_pcix , 0xffff, 0x00fb, { 0, 0, 23}},
+	{m68k_op_andi_8_pi7 , 0xffff, 0x021f, { 16, 16, 8}},
+	{m68k_op_andi_8_pd7 , 0xffff, 0x0227, { 18, 18, 9}},
+	{m68k_op_andi_8_aw , 0xffff, 0x0238, { 20, 20, 8}},
+	{m68k_op_andi_8_al , 0xffff, 0x0239, { 24, 24, 8}},
+	{m68k_op_andi_16_toc , 0xffff, 0x023c, { 20, 16, 12}},
+	{m68k_op_andi_16_aw , 0xffff, 0x0278, { 20, 20, 8}},
+	{m68k_op_andi_16_al , 0xffff, 0x0279, { 24, 24, 8}},
+	{m68k_op_andi_16_tos , 0xffff, 0x027c, { 20, 16, 12}},
+	{m68k_op_andi_32_aw , 0xffff, 0x02b8, { 32, 32, 8}},
+	{m68k_op_andi_32_al , 0xffff, 0x02b9, { 36, 36, 8}},
+	{m68k_op_chk2cmp2_16_aw , 0xffff, 0x02f8, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_16_al , 0xffff, 0x02f9, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_16_pcdi , 0xffff, 0x02fa, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_16_pcix , 0xffff, 0x02fb, { 0, 0, 23}},
+	{m68k_op_subi_8_pi7 , 0xffff, 0x041f, { 16, 16, 8}},
+	{m68k_op_subi_8_pd7 , 0xffff, 0x0427, { 18, 18, 9}},
+	{m68k_op_subi_8_aw , 0xffff, 0x0438, { 20, 20, 8}},
+	{m68k_op_subi_8_al , 0xffff, 0x0439, { 24, 24, 8}},
+	{m68k_op_subi_16_aw , 0xffff, 0x0478, { 20, 20, 8}},
+	{m68k_op_subi_16_al , 0xffff, 0x0479, { 24, 24, 8}},
+	{m68k_op_subi_32_aw , 0xffff, 0x04b8, { 32, 32, 8}},
+	{m68k_op_subi_32_al , 0xffff, 0x04b9, { 36, 36, 8}},
+	{m68k_op_chk2cmp2_32_aw , 0xffff, 0x04f8, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_32_al , 0xffff, 0x04f9, { 0, 0, 22}},
+	{m68k_op_chk2cmp2_32_pcdi , 0xffff, 0x04fa, { 0, 0, 23}},
+	{m68k_op_chk2cmp2_32_pcix , 0xffff, 0x04fb, { 0, 0, 23}},
+	{m68k_op_addi_8_pi7 , 0xffff, 0x061f, { 16, 16, 8}},
+	{m68k_op_addi_8_pd7 , 0xffff, 0x0627, { 18, 18, 9}},
+	{m68k_op_addi_8_aw , 0xffff, 0x0638, { 20, 20, 8}},
+	{m68k_op_addi_8_al , 0xffff, 0x0639, { 24, 24, 8}},
+	{m68k_op_addi_16_aw , 0xffff, 0x0678, { 20, 20, 8}},
+	{m68k_op_addi_16_al , 0xffff, 0x0679, { 24, 24, 8}},
+	{m68k_op_addi_32_aw , 0xffff, 0x06b8, { 32, 32, 8}},
+	{m68k_op_addi_32_al , 0xffff, 0x06b9, { 36, 36, 8}},
+	{m68k_op_callm_32_aw , 0xffff, 0x06f8, { 0, 0, 64}},
+	{m68k_op_callm_32_al , 0xffff, 0x06f9, { 0, 0, 64}},
+	{m68k_op_callm_32_pcdi , 0xffff, 0x06fa, { 0, 0, 65}},
+	{m68k_op_callm_32_pcix , 0xffff, 0x06fb, { 0, 0, 67}},
+	{m68k_op_btst_8_s_pi7 , 0xffff, 0x081f, { 12, 12, 8}},
+	{m68k_op_btst_8_s_pd7 , 0xffff, 0x0827, { 14, 14, 9}},
+	{m68k_op_btst_8_s_aw , 0xffff, 0x0838, { 16, 16, 8}},
+	{m68k_op_btst_8_s_al , 0xffff, 0x0839, { 20, 20, 8}},
+	{m68k_op_btst_8_s_pcdi , 0xffff, 0x083a, { 16, 16, 9}},
+	{m68k_op_btst_8_s_pcix , 0xffff, 0x083b, { 18, 18, 11}},
+	{m68k_op_bchg_8_s_pi7 , 0xffff, 0x085f, { 16, 16, 8}},
+	{m68k_op_bchg_8_s_pd7 , 0xffff, 0x0867, { 18, 18, 9}},
+	{m68k_op_bchg_8_s_aw , 0xffff, 0x0878, { 20, 20, 8}},
+	{m68k_op_bchg_8_s_al , 0xffff, 0x0879, { 24, 24, 8}},
+	{m68k_op_bclr_8_s_pi7 , 0xffff, 0x089f, { 16, 16, 8}},
+	{m68k_op_bclr_8_s_pd7 , 0xffff, 0x08a7, { 18, 18, 9}},
+	{m68k_op_bclr_8_s_aw , 0xffff, 0x08b8, { 20, 20, 8}},
+	{m68k_op_bclr_8_s_al , 0xffff, 0x08b9, { 24, 24, 8}},
+	{m68k_op_bset_8_s_pi7 , 0xffff, 0x08df, { 16, 16, 8}},
+	{m68k_op_bset_8_s_pd7 , 0xffff, 0x08e7, { 18, 18, 9}},
+	{m68k_op_bset_8_s_aw , 0xffff, 0x08f8, { 20, 20, 8}},
+	{m68k_op_bset_8_s_al , 0xffff, 0x08f9, { 24, 24, 8}},
+	{m68k_op_eori_8_pi7 , 0xffff, 0x0a1f, { 16, 16, 8}},
+	{m68k_op_eori_8_pd7 , 0xffff, 0x0a27, { 18, 18, 9}},
+	{m68k_op_eori_8_aw , 0xffff, 0x0a38, { 20, 20, 8}},
+	{m68k_op_eori_8_al , 0xffff, 0x0a39, { 24, 24, 8}},
+	{m68k_op_eori_16_toc , 0xffff, 0x0a3c, { 20, 16, 12}},
+	{m68k_op_eori_16_aw , 0xffff, 0x0a78, { 20, 20, 8}},
+	{m68k_op_eori_16_al , 0xffff, 0x0a79, { 24, 24, 8}},
+	{m68k_op_eori_16_tos , 0xffff, 0x0a7c, { 20, 16, 12}},
+	{m68k_op_eori_32_aw , 0xffff, 0x0ab8, { 32, 32, 8}},
+	{m68k_op_eori_32_al , 0xffff, 0x0ab9, { 36, 36, 8}},
+	{m68k_op_cas_8_pi7 , 0xffff, 0x0adf, { 0, 0, 16}},
+	{m68k_op_cas_8_pd7 , 0xffff, 0x0ae7, { 0, 0, 17}},
+	{m68k_op_cas_8_aw , 0xffff, 0x0af8, { 0, 0, 16}},
+	{m68k_op_cas_8_al , 0xffff, 0x0af9, { 0, 0, 16}},
+	{m68k_op_cmpi_8_pi7 , 0xffff, 0x0c1f, { 12, 12, 6}},
+	{m68k_op_cmpi_8_pd7 , 0xffff, 0x0c27, { 14, 14, 7}},
+	{m68k_op_cmpi_8_aw , 0xffff, 0x0c38, { 16, 16, 6}},
+	{m68k_op_cmpi_8_al , 0xffff, 0x0c39, { 20, 20, 6}},
+	{m68k_op_cmpi_8_pcdi , 0xffff, 0x0c3a, { 0, 0, 7}},
+	{m68k_op_cmpi_8_pcix , 0xffff, 0x0c3b, { 0, 0, 9}},
+	{m68k_op_cmpi_16_aw , 0xffff, 0x0c78, { 16, 16, 6}},
+	{m68k_op_cmpi_16_al , 0xffff, 0x0c79, { 20, 20, 6}},
+	{m68k_op_cmpi_16_pcdi , 0xffff, 0x0c7a, { 0, 0, 7}},
+	{m68k_op_cmpi_16_pcix , 0xffff, 0x0c7b, { 0, 0, 9}},
+	{m68k_op_cmpi_32_aw , 0xffff, 0x0cb8, { 24, 24, 6}},
+	{m68k_op_cmpi_32_al , 0xffff, 0x0cb9, { 28, 28, 6}},
+	{m68k_op_cmpi_32_pcdi , 0xffff, 0x0cba, { 0, 0, 7}},
+	{m68k_op_cmpi_32_pcix , 0xffff, 0x0cbb, { 0, 0, 9}},
+	{m68k_op_cas_16_aw , 0xffff, 0x0cf8, { 0, 0, 16}},
+	{m68k_op_cas_16_al , 0xffff, 0x0cf9, { 0, 0, 16}},
+	{m68k_op_cas2_16 , 0xffff, 0x0cfc, { 0, 0, 12}},
+	{m68k_op_moves_8_pi7 , 0xffff, 0x0e1f, { 0, 18, 9}},
+	{m68k_op_moves_8_pd7 , 0xffff, 0x0e27, { 0, 20, 10}},
+	{m68k_op_moves_8_aw , 0xffff, 0x0e38, { 0, 26, 9}},
+	{m68k_op_moves_8_al , 0xffff, 0x0e39, { 0, 30, 9}},
+	{m68k_op_moves_16_aw , 0xffff, 0x0e78, { 0, 26, 9}},
+	{m68k_op_moves_16_al , 0xffff, 0x0e79, { 0, 30, 9}},
+	{m68k_op_moves_32_aw , 0xffff, 0x0eb8, { 0, 32, 9}},
+	{m68k_op_moves_32_al , 0xffff, 0x0eb9, { 0, 36, 9}},
+	{m68k_op_cas_32_aw , 0xffff, 0x0ef8, { 0, 0, 16}},
+	{m68k_op_cas_32_al , 0xffff, 0x0ef9, { 0, 0, 16}},
+	{m68k_op_cas2_32 , 0xffff, 0x0efc, { 0, 0, 12}},
+	{m68k_op_move_8_aw_pi7 , 0xffff, 0x11df, { 16, 16, 8}},
+	{m68k_op_move_8_aw_pd7 , 0xffff, 0x11e7, { 18, 18, 9}},
+	{m68k_op_move_8_aw_aw , 0xffff, 0x11f8, { 20, 20, 8}},
+	{m68k_op_move_8_aw_al , 0xffff, 0x11f9, { 24, 24, 8}},
+	{m68k_op_move_8_aw_pcdi , 0xffff, 0x11fa, { 20, 20, 9}},
+	{m68k_op_move_8_aw_pcix , 0xffff, 0x11fb, { 22, 22, 11}},
+	{m68k_op_move_8_aw_i , 0xffff, 0x11fc, { 16, 16, 6}},
+	{m68k_op_move_8_al_pi7 , 0xffff, 0x13df, { 20, 20, 10}},
+	{m68k_op_move_8_al_pd7 , 0xffff, 0x13e7, { 22, 22, 11}},
+	{m68k_op_move_8_al_aw , 0xffff, 0x13f8, { 24, 24, 10}},
+	{m68k_op_move_8_al_al , 0xffff, 0x13f9, { 28, 28, 10}},
+	{m68k_op_move_8_al_pcdi , 0xffff, 0x13fa, { 24, 24, 11}},
+	{m68k_op_move_8_al_pcix , 0xffff, 0x13fb, { 26, 26, 13}},
+	{m68k_op_move_8_al_i , 0xffff, 0x13fc, { 20, 20, 8}},
+	{m68k_op_move_8_pi7_pi7 , 0xffff, 0x1edf, { 12, 12, 8}},
+	{m68k_op_move_8_pi7_pd7 , 0xffff, 0x1ee7, { 14, 14, 9}},
+	{m68k_op_move_8_pi7_aw , 0xffff, 0x1ef8, { 16, 16, 8}},
+	{m68k_op_move_8_pi7_al , 0xffff, 0x1ef9, { 20, 20, 8}},
+	{m68k_op_move_8_pi7_pcdi , 0xffff, 0x1efa, { 16, 16, 9}},
+	{m68k_op_move_8_pi7_pcix , 0xffff, 0x1efb, { 18, 18, 11}},
+	{m68k_op_move_8_pi7_i , 0xffff, 0x1efc, { 12, 12, 6}},
+	{m68k_op_move_8_pd7_pi7 , 0xffff, 0x1f1f, { 12, 12, 9}},
+	{m68k_op_move_8_pd7_pd7 , 0xffff, 0x1f27, { 14, 14, 10}},
+	{m68k_op_move_8_pd7_aw , 0xffff, 0x1f38, { 16, 16, 9}},
+	{m68k_op_move_8_pd7_al , 0xffff, 0x1f39, { 20, 20, 9}},
+	{m68k_op_move_8_pd7_pcdi , 0xffff, 0x1f3a, { 16, 16, 10}},
+	{m68k_op_move_8_pd7_pcix , 0xffff, 0x1f3b, { 18, 18, 12}},
+	{m68k_op_move_8_pd7_i , 0xffff, 0x1f3c, { 12, 12, 7}},
+	{m68k_op_move_32_aw_aw , 0xffff, 0x21f8, { 28, 28, 8}},
+	{m68k_op_move_32_aw_al , 0xffff, 0x21f9, { 32, 32, 8}},
+	{m68k_op_move_32_aw_pcdi , 0xffff, 0x21fa, { 28, 28, 9}},
+	{m68k_op_move_32_aw_pcix , 0xffff, 0x21fb, { 30, 30, 11}},
+	{m68k_op_move_32_aw_i , 0xffff, 0x21fc, { 24, 24, 8}},
+	{m68k_op_move_32_al_aw , 0xffff, 0x23f8, { 32, 32, 10}},
+	{m68k_op_move_32_al_al , 0xffff, 0x23f9, { 36, 36, 10}},
+	{m68k_op_move_32_al_pcdi , 0xffff, 0x23fa, { 32, 32, 11}},
+	{m68k_op_move_32_al_pcix , 0xffff, 0x23fb, { 34, 34, 13}},
+	{m68k_op_move_32_al_i , 0xffff, 0x23fc, { 28, 28, 10}},
+	{m68k_op_move_16_aw_aw , 0xffff, 0x31f8, { 20, 20, 8}},
+	{m68k_op_move_16_aw_al , 0xffff, 0x31f9, { 24, 24, 8}},
+	{m68k_op_move_16_aw_pcdi , 0xffff, 0x31fa, { 20, 20, 9}},
+	{m68k_op_move_16_aw_pcix , 0xffff, 0x31fb, { 22, 22, 11}},
+	{m68k_op_move_16_aw_i , 0xffff, 0x31fc, { 16, 16, 6}},
+	{m68k_op_move_16_al_aw , 0xffff, 0x33f8, { 24, 24, 10}},
+	{m68k_op_move_16_al_al , 0xffff, 0x33f9, { 28, 28, 10}},
+	{m68k_op_move_16_al_pcdi , 0xffff, 0x33fa, { 24, 24, 11}},
+	{m68k_op_move_16_al_pcix , 0xffff, 0x33fb, { 26, 26, 13}},
+	{m68k_op_move_16_al_i , 0xffff, 0x33fc, { 20, 20, 8}},
+	{m68k_op_negx_8_pi7 , 0xffff, 0x401f, { 12, 12, 8}},
+	{m68k_op_negx_8_pd7 , 0xffff, 0x4027, { 14, 14, 9}},
+	{m68k_op_negx_8_aw , 0xffff, 0x4038, { 16, 16, 8}},
+	{m68k_op_negx_8_al , 0xffff, 0x4039, { 20, 20, 8}},
+	{m68k_op_negx_16_aw , 0xffff, 0x4078, { 16, 16, 8}},
+	{m68k_op_negx_16_al , 0xffff, 0x4079, { 20, 20, 8}},
+	{m68k_op_negx_32_aw , 0xffff, 0x40b8, { 24, 24, 8}},
+	{m68k_op_negx_32_al , 0xffff, 0x40b9, { 28, 28, 8}},
+	{m68k_op_move_16_frs_aw , 0xffff, 0x40f8, { 16, 16, 12}},
+	{m68k_op_move_16_frs_al , 0xffff, 0x40f9, { 20, 20, 12}},
+	{m68k_op_clr_8_pi7 , 0xffff, 0x421f, { 12, 8, 8}},
+	{m68k_op_clr_8_pd7 , 0xffff, 0x4227, { 14, 10, 9}},
+	{m68k_op_clr_8_aw , 0xffff, 0x4238, { 16, 12, 8}},
+	{m68k_op_clr_8_al , 0xffff, 0x4239, { 20, 14, 8}},
+	{m68k_op_clr_16_aw , 0xffff, 0x4278, { 16, 12, 8}},
+	{m68k_op_clr_16_al , 0xffff, 0x4279, { 20, 14, 8}},
+	{m68k_op_clr_32_aw , 0xffff, 0x42b8, { 24, 16, 8}},
+	{m68k_op_clr_32_al , 0xffff, 0x42b9, { 28, 20, 8}},
+	{m68k_op_move_16_frc_aw , 0xffff, 0x42f8, { 0, 16, 8}},
+	{m68k_op_move_16_frc_al , 0xffff, 0x42f9, { 0, 20, 8}},
+	{m68k_op_neg_8_pi7 , 0xffff, 0x441f, { 12, 12, 8}},
+	{m68k_op_neg_8_pd7 , 0xffff, 0x4427, { 14, 14, 9}},
+	{m68k_op_neg_8_aw , 0xffff, 0x4438, { 16, 16, 8}},
+	{m68k_op_neg_8_al , 0xffff, 0x4439, { 20, 20, 8}},
+	{m68k_op_neg_16_aw , 0xffff, 0x4478, { 16, 16, 8}},
+	{m68k_op_neg_16_al , 0xffff, 0x4479, { 20, 20, 8}},
+	{m68k_op_neg_32_aw , 0xffff, 0x44b8, { 24, 24, 8}},
+	{m68k_op_neg_32_al , 0xffff, 0x44b9, { 28, 28, 8}},
+	{m68k_op_move_16_toc_aw , 0xffff, 0x44f8, { 20, 20, 8}},
+	{m68k_op_move_16_toc_al , 0xffff, 0x44f9, { 24, 24, 8}},
+	{m68k_op_move_16_toc_pcdi , 0xffff, 0x44fa, { 20, 20, 9}},
+	{m68k_op_move_16_toc_pcix , 0xffff, 0x44fb, { 22, 22, 11}},
+	{m68k_op_move_16_toc_i , 0xffff, 0x44fc, { 16, 16, 6}},
+	{m68k_op_not_8_pi7 , 0xffff, 0x461f, { 12, 12, 8}},
+	{m68k_op_not_8_pd7 , 0xffff, 0x4627, { 14, 14, 9}},
+	{m68k_op_not_8_aw , 0xffff, 0x4638, { 16, 16, 8}},
+	{m68k_op_not_8_al , 0xffff, 0x4639, { 20, 20, 8}},
+	{m68k_op_not_16_aw , 0xffff, 0x4678, { 16, 16, 8}},
+	{m68k_op_not_16_al , 0xffff, 0x4679, { 20, 20, 8}},
+	{m68k_op_not_32_aw , 0xffff, 0x46b8, { 24, 24, 8}},
+	{m68k_op_not_32_al , 0xffff, 0x46b9, { 28, 28, 8}},
+	{m68k_op_move_16_tos_aw , 0xffff, 0x46f8, { 20, 20, 12}},
+	{m68k_op_move_16_tos_al , 0xffff, 0x46f9, { 24, 24, 12}},
+	{m68k_op_move_16_tos_pcdi , 0xffff, 0x46fa, { 20, 20, 13}},
+	{m68k_op_move_16_tos_pcix , 0xffff, 0x46fb, { 22, 22, 15}},
+	{m68k_op_move_16_tos_i , 0xffff, 0x46fc, { 16, 16, 10}},
+	{m68k_op_link_32_a7 , 0xffff, 0x480f, { 0, 0, 6}},
+	{m68k_op_nbcd_8_pi7 , 0xffff, 0x481f, { 12, 12, 10}},
+	{m68k_op_nbcd_8_pd7 , 0xffff, 0x4827, { 14, 14, 11}},
+	{m68k_op_nbcd_8_aw , 0xffff, 0x4838, { 16, 16, 10}},
+	{m68k_op_nbcd_8_al , 0xffff, 0x4839, { 20, 20, 10}},
+	{m68k_op_pea_32_aw , 0xffff, 0x4878, { 16, 16, 9}},
+	{m68k_op_pea_32_al , 0xffff, 0x4879, { 20, 20, 9}},
+	{m68k_op_pea_32_pcdi , 0xffff, 0x487a, { 16, 16, 10}},
+	{m68k_op_pea_32_pcix , 0xffff, 0x487b, { 20, 20, 12}},
+	{m68k_op_movem_16_re_aw , 0xffff, 0x48b8, { 16, 16, 8}},
+	{m68k_op_movem_16_re_al , 0xffff, 0x48b9, { 20, 20, 8}},
+	{m68k_op_movem_32_re_aw , 0xffff, 0x48f8, { 20, 20, 8}},
+	{m68k_op_movem_32_re_al , 0xffff, 0x48f9, { 24, 24, 8}},
+	{m68k_op_tst_8_pi7 , 0xffff, 0x4a1f, { 8, 8, 6}},
+	{m68k_op_tst_8_pd7 , 0xffff, 0x4a27, { 10, 10, 7}},
+	{m68k_op_tst_8_aw , 0xffff, 0x4a38, { 12, 12, 6}},
+	{m68k_op_tst_8_al , 0xffff, 0x4a39, { 16, 16, 6}},
+	{m68k_op_tst_8_pcdi , 0xffff, 0x4a3a, { 0, 0, 7}},
+	{m68k_op_tst_8_pcix , 0xffff, 0x4a3b, { 0, 0, 9}},
+	{m68k_op_tst_8_i , 0xffff, 0x4a3c, { 0, 0, 6}},
+	{m68k_op_tst_16_aw , 0xffff, 0x4a78, { 12, 12, 6}},
+	{m68k_op_tst_16_al , 0xffff, 0x4a79, { 16, 16, 6}},
+	{m68k_op_tst_16_pcdi , 0xffff, 0x4a7a, { 0, 0, 7}},
+	{m68k_op_tst_16_pcix , 0xffff, 0x4a7b, { 0, 0, 9}},
+	{m68k_op_tst_16_i , 0xffff, 0x4a7c, { 0, 0, 6}},
+	{m68k_op_tst_32_aw , 0xffff, 0x4ab8, { 16, 16, 6}},
+	{m68k_op_tst_32_al , 0xffff, 0x4ab9, { 20, 20, 6}},
+	{m68k_op_tst_32_pcdi , 0xffff, 0x4aba, { 0, 0, 7}},
+	{m68k_op_tst_32_pcix , 0xffff, 0x4abb, { 0, 0, 9}},
+	{m68k_op_tst_32_i , 0xffff, 0x4abc, { 0, 0, 6}},
+	{m68k_op_tas_8_pi7 , 0xffff, 0x4adf, { 18, 18, 16}},
+	{m68k_op_tas_8_pd7 , 0xffff, 0x4ae7, { 20, 20, 17}},
+	{m68k_op_tas_8_aw , 0xffff, 0x4af8, { 22, 22, 16}},
+	{m68k_op_tas_8_al , 0xffff, 0x4af9, { 26, 26, 16}},
+	{m68k_op_illegal , 0xffff, 0x4afc, { 4, 4, 4}},
+	{m68k_op_mull_32_aw , 0xffff, 0x4c38, { 0, 0, 47}},
+	{m68k_op_mull_32_al , 0xffff, 0x4c39, { 0, 0, 47}},
+	{m68k_op_mull_32_pcdi , 0xffff, 0x4c3a, { 0, 0, 48}},
+	{m68k_op_mull_32_pcix , 0xffff, 0x4c3b, { 0, 0, 50}},
+	{m68k_op_mull_32_i , 0xffff, 0x4c3c, { 0, 0, 47}},
+	{m68k_op_divl_32_aw , 0xffff, 0x4c78, { 0, 0, 88}},
+	{m68k_op_divl_32_al , 0xffff, 0x4c79, { 0, 0, 88}},
+	{m68k_op_divl_32_pcdi , 0xffff, 0x4c7a, { 0, 0, 89}},
+	{m68k_op_divl_32_pcix , 0xffff, 0x4c7b, { 0, 0, 91}},
+	{m68k_op_divl_32_i , 0xffff, 0x4c7c, { 0, 0, 88}},
+	{m68k_op_movem_16_er_aw , 0xffff, 0x4cb8, { 20, 20, 12}},
+	{m68k_op_movem_16_er_al , 0xffff, 0x4cb9, { 24, 24, 12}},
+	{m68k_op_movem_16_er_pcdi , 0xffff, 0x4cba, { 16, 16, 9}},
+	{m68k_op_movem_16_er_pcix , 0xffff, 0x4cbb, { 18, 18, 11}},
+	{m68k_op_movem_32_er_aw , 0xffff, 0x4cf8, { 24, 24, 12}},
+	{m68k_op_movem_32_er_al , 0xffff, 0x4cf9, { 28, 28, 12}},
+	{m68k_op_movem_32_er_pcdi , 0xffff, 0x4cfa, { 20, 20, 9}},
+	{m68k_op_movem_32_er_pcix , 0xffff, 0x4cfb, { 22, 22, 11}},
+	{m68k_op_link_16_a7 , 0xffff, 0x4e57, { 16, 16, 5}},
+	{m68k_op_unlk_32_a7 , 0xffff, 0x4e5f, { 12, 12, 6}},
+	{m68k_op_reset , 0xffff, 0x4e70, { 0, 0, 0}},
+	{m68k_op_nop , 0xffff, 0x4e71, { 4, 4, 2}},
+	{m68k_op_stop , 0xffff, 0x4e72, { 4, 4, 8}},
+	{m68k_op_rte_32 , 0xffff, 0x4e73, { 20, 24, 20}},
+	{m68k_op_rtd_32 , 0xffff, 0x4e74, { 0, 16, 10}},
+	{m68k_op_rts_32 , 0xffff, 0x4e75, { 16, 16, 10}},
+	{m68k_op_trapv , 0xffff, 0x4e76, { 4, 4, 4}},
+	{m68k_op_rtr_32 , 0xffff, 0x4e77, { 20, 20, 14}},
+	{m68k_op_movec_32_cr , 0xffff, 0x4e7a, { 0, 12, 6}},
+	{m68k_op_movec_32_rc , 0xffff, 0x4e7b, { 0, 10, 12}},
+	{m68k_op_jsr_32_aw , 0xffff, 0x4eb8, { 18, 18, 4}},
+	{m68k_op_jsr_32_al , 0xffff, 0x4eb9, { 20, 20, 4}},
+	{m68k_op_jsr_32_pcdi , 0xffff, 0x4eba, { 18, 18, 5}},
+	{m68k_op_jsr_32_pcix , 0xffff, 0x4ebb, { 22, 22, 7}},
+	{m68k_op_jmp_32_aw , 0xffff, 0x4ef8, { 10, 10, 4}},
+	{m68k_op_jmp_32_al , 0xffff, 0x4ef9, { 12, 12, 4}},
+	{m68k_op_jmp_32_pcdi , 0xffff, 0x4efa, { 10, 10, 5}},
+	{m68k_op_jmp_32_pcix , 0xffff, 0x4efb, { 14, 14, 7}},
+	{m68k_op_st_8_pi7 , 0xffff, 0x50df, { 12, 12, 10}},
+	{m68k_op_st_8_pd7 , 0xffff, 0x50e7, { 14, 14, 11}},
+	{m68k_op_st_8_aw , 0xffff, 0x50f8, { 16, 16, 10}},
+	{m68k_op_st_8_al , 0xffff, 0x50f9, { 20, 20, 10}},
+	{m68k_op_trapt_16 , 0xffff, 0x50fa, { 0, 0, 6}},
+	{m68k_op_trapt_32 , 0xffff, 0x50fb, { 0, 0, 8}},
+	{m68k_op_trapt , 0xffff, 0x50fc, { 0, 0, 4}},
+	{m68k_op_sf_8_pi7 , 0xffff, 0x51df, { 12, 12, 10}},
+	{m68k_op_sf_8_pd7 , 0xffff, 0x51e7, { 14, 14, 11}},
+	{m68k_op_sf_8_aw , 0xffff, 0x51f8, { 16, 16, 10}},
+	{m68k_op_sf_8_al , 0xffff, 0x51f9, { 20, 20, 10}},
+	{m68k_op_trapf_16 , 0xffff, 0x51fa, { 0, 0, 6}},
+	{m68k_op_trapf_32 , 0xffff, 0x51fb, { 0, 0, 8}},
+	{m68k_op_trapf , 0xffff, 0x51fc, { 0, 0, 4}},
+	{m68k_op_shi_8_pi7 , 0xffff, 0x52df, { 12, 12, 10}},
+	{m68k_op_shi_8_pd7 , 0xffff, 0x52e7, { 14, 14, 11}},
+	{m68k_op_shi_8_aw , 0xffff, 0x52f8, { 16, 16, 10}},
+	{m68k_op_shi_8_al , 0xffff, 0x52f9, { 20, 20, 10}},
+	{m68k_op_traphi_16 , 0xffff, 0x52fa, { 0, 0, 6}},
+	{m68k_op_traphi_32 , 0xffff, 0x52fb, { 0, 0, 8}},
+	{m68k_op_traphi , 0xffff, 0x52fc, { 0, 0, 4}},
+	{m68k_op_sls_8_pi7 , 0xffff, 0x53df, { 12, 12, 10}},
+	{m68k_op_sls_8_pd7 , 0xffff, 0x53e7, { 14, 14, 11}},
+	{m68k_op_sls_8_aw , 0xffff, 0x53f8, { 16, 16, 10}},
+	{m68k_op_sls_8_al , 0xffff, 0x53f9, { 20, 20, 10}},
+	{m68k_op_trapls_16 , 0xffff, 0x53fa, { 0, 0, 6}},
+	{m68k_op_trapls_32 , 0xffff, 0x53fb, { 0, 0, 8}},
+	{m68k_op_trapls , 0xffff, 0x53fc, { 0, 0, 4}},
+	{m68k_op_scc_8_pi7 , 0xffff, 0x54df, { 12, 12, 10}},
+	{m68k_op_scc_8_pd7 , 0xffff, 0x54e7, { 14, 14, 11}},
+	{m68k_op_scc_8_aw , 0xffff, 0x54f8, { 16, 16, 10}},
+	{m68k_op_scc_8_al , 0xffff, 0x54f9, { 20, 20, 10}},
+	{m68k_op_trapcc_16 , 0xffff, 0x54fa, { 0, 0, 6}},
+	{m68k_op_trapcc_32 , 0xffff, 0x54fb, { 0, 0, 8}},
+	{m68k_op_trapcc , 0xffff, 0x54fc, { 0, 0, 4}},
+	{m68k_op_scs_8_pi7 , 0xffff, 0x55df, { 12, 12, 10}},
+	{m68k_op_scs_8_pd7 , 0xffff, 0x55e7, { 14, 14, 11}},
+	{m68k_op_scs_8_aw , 0xffff, 0x55f8, { 16, 16, 10}},
+	{m68k_op_scs_8_al , 0xffff, 0x55f9, { 20, 20, 10}},
+	{m68k_op_trapcs_16 , 0xffff, 0x55fa, { 0, 0, 6}},
+	{m68k_op_trapcs_32 , 0xffff, 0x55fb, { 0, 0, 8}},
+	{m68k_op_trapcs , 0xffff, 0x55fc, { 0, 0, 4}},
+	{m68k_op_sne_8_pi7 , 0xffff, 0x56df, { 12, 12, 10}},
+	{m68k_op_sne_8_pd7 , 0xffff, 0x56e7, { 14, 14, 11}},
+	{m68k_op_sne_8_aw , 0xffff, 0x56f8, { 16, 16, 10}},
+	{m68k_op_sne_8_al , 0xffff, 0x56f9, { 20, 20, 10}},
+	{m68k_op_trapne_16 , 0xffff, 0x56fa, { 0, 0, 6}},
+	{m68k_op_trapne_32 , 0xffff, 0x56fb, { 0, 0, 8}},
+	{m68k_op_trapne , 0xffff, 0x56fc, { 0, 0, 4}},
+	{m68k_op_seq_8_pi7 , 0xffff, 0x57df, { 12, 12, 10}},
+	{m68k_op_seq_8_pd7 , 0xffff, 0x57e7, { 14, 14, 11}},
+	{m68k_op_seq_8_aw , 0xffff, 0x57f8, { 16, 16, 10}},
+	{m68k_op_seq_8_al , 0xffff, 0x57f9, { 20, 20, 10}},
+	{m68k_op_trapeq_16 , 0xffff, 0x57fa, { 0, 0, 6}},
+	{m68k_op_trapeq_32 , 0xffff, 0x57fb, { 0, 0, 8}},
+	{m68k_op_trapeq , 0xffff, 0x57fc, { 0, 0, 4}},
+	{m68k_op_svc_8_pi7 , 0xffff, 0x58df, { 12, 12, 10}},
+	{m68k_op_svc_8_pd7 , 0xffff, 0x58e7, { 14, 14, 11}},
+	{m68k_op_svc_8_aw , 0xffff, 0x58f8, { 16, 16, 10}},
+	{m68k_op_svc_8_al , 0xffff, 0x58f9, { 20, 20, 10}},
+	{m68k_op_trapvc_16 , 0xffff, 0x58fa, { 0, 0, 6}},
+	{m68k_op_trapvc_32 , 0xffff, 0x58fb, { 0, 0, 8}},
+	{m68k_op_trapvc , 0xffff, 0x58fc, { 0, 0, 4}},
+	{m68k_op_svs_8_pi7 , 0xffff, 0x59df, { 12, 12, 10}},
+	{m68k_op_svs_8_pd7 , 0xffff, 0x59e7, { 14, 14, 11}},
+	{m68k_op_svs_8_aw , 0xffff, 0x59f8, { 16, 16, 10}},
+	{m68k_op_svs_8_al , 0xffff, 0x59f9, { 20, 20, 10}},
+	{m68k_op_trapvs_16 , 0xffff, 0x59fa, { 0, 0, 6}},
+	{m68k_op_trapvs_32 , 0xffff, 0x59fb, { 0, 0, 8}},
+	{m68k_op_trapvs , 0xffff, 0x59fc, { 0, 0, 4}},
+	{m68k_op_spl_8_pi7 , 0xffff, 0x5adf, { 12, 12, 10}},
+	{m68k_op_spl_8_pd7 , 0xffff, 0x5ae7, { 14, 14, 11}},
+	{m68k_op_spl_8_aw , 0xffff, 0x5af8, { 16, 16, 10}},
+	{m68k_op_spl_8_al , 0xffff, 0x5af9, { 20, 20, 10}},
+	{m68k_op_trappl_16 , 0xffff, 0x5afa, { 0, 0, 6}},
+	{m68k_op_trappl_32 , 0xffff, 0x5afb, { 0, 0, 8}},
+	{m68k_op_trappl , 0xffff, 0x5afc, { 0, 0, 4}},
+	{m68k_op_smi_8_pi7 , 0xffff, 0x5bdf, { 12, 12, 10}},
+	{m68k_op_smi_8_pd7 , 0xffff, 0x5be7, { 14, 14, 11}},
+	{m68k_op_smi_8_aw , 0xffff, 0x5bf8, { 16, 16, 10}},
+	{m68k_op_smi_8_al , 0xffff, 0x5bf9, { 20, 20, 10}},
+	{m68k_op_trapmi_16 , 0xffff, 0x5bfa, { 0, 0, 6}},
+	{m68k_op_trapmi_32 , 0xffff, 0x5bfb, { 0, 0, 8}},
+	{m68k_op_trapmi , 0xffff, 0x5bfc, { 0, 0, 4}},
+	{m68k_op_sge_8_pi7 , 0xffff, 0x5cdf, { 12, 12, 10}},
+	{m68k_op_sge_8_pd7 , 0xffff, 0x5ce7, { 14, 14, 11}},
+	{m68k_op_sge_8_aw , 0xffff, 0x5cf8, { 16, 16, 10}},
+	{m68k_op_sge_8_al , 0xffff, 0x5cf9, { 20, 20, 10}},
+	{m68k_op_trapge_16 , 0xffff, 0x5cfa, { 0, 0, 6}},
+	{m68k_op_trapge_32 , 0xffff, 0x5cfb, { 0, 0, 8}},
+	{m68k_op_trapge , 0xffff, 0x5cfc, { 0, 0, 4}},
+	{m68k_op_slt_8_pi7 , 0xffff, 0x5ddf, { 12, 12, 10}},
+	{m68k_op_slt_8_pd7 , 0xffff, 0x5de7, { 14, 14, 11}},
+	{m68k_op_slt_8_aw , 0xffff, 0x5df8, { 16, 16, 10}},
+	{m68k_op_slt_8_al , 0xffff, 0x5df9, { 20, 20, 10}},
+	{m68k_op_traplt_16 , 0xffff, 0x5dfa, { 0, 0, 6}},
+	{m68k_op_traplt_32 , 0xffff, 0x5dfb, { 0, 0, 8}},
+	{m68k_op_traplt , 0xffff, 0x5dfc, { 0, 0, 4}},
+	{m68k_op_sgt_8_pi7 , 0xffff, 0x5edf, { 12, 12, 10}},
+	{m68k_op_sgt_8_pd7 , 0xffff, 0x5ee7, { 14, 14, 11}},
+	{m68k_op_sgt_8_aw , 0xffff, 0x5ef8, { 16, 16, 10}},
+	{m68k_op_sgt_8_al , 0xffff, 0x5ef9, { 20, 20, 10}},
+	{m68k_op_trapgt_16 , 0xffff, 0x5efa, { 0, 0, 6}},
+	{m68k_op_trapgt_32 , 0xffff, 0x5efb, { 0, 0, 8}},
+	{m68k_op_trapgt , 0xffff, 0x5efc, { 0, 0, 4}},
+	{m68k_op_sle_8_pi7 , 0xffff, 0x5fdf, { 12, 12, 10}},
+	{m68k_op_sle_8_pd7 , 0xffff, 0x5fe7, { 14, 14, 11}},
+	{m68k_op_sle_8_aw , 0xffff, 0x5ff8, { 16, 16, 10}},
+	{m68k_op_sle_8_al , 0xffff, 0x5ff9, { 20, 20, 10}},
+	{m68k_op_traple_16 , 0xffff, 0x5ffa, { 0, 0, 6}},
+	{m68k_op_traple_32 , 0xffff, 0x5ffb, { 0, 0, 8}},
+	{m68k_op_traple , 0xffff, 0x5ffc, { 0, 0, 4}},
+	{m68k_op_bra_16 , 0xffff, 0x6000, { 10, 10, 10}},
+	{m68k_op_bra_32 , 0xffff, 0x60ff, { 0, 0, 10}},
+	{m68k_op_bsr_16 , 0xffff, 0x6100, { 18, 18, 7}},
+	{m68k_op_bsr_32 , 0xffff, 0x61ff, { 0, 0, 7}},
+	{m68k_op_bhi_16 , 0xffff, 0x6200, { 10, 10, 6}},
+	{m68k_op_bhi_32 , 0xffff, 0x62ff, { 0, 0, 6}},
+	{m68k_op_bls_16 , 0xffff, 0x6300, { 10, 10, 6}},
+	{m68k_op_bls_32 , 0xffff, 0x63ff, { 0, 0, 6}},
+	{m68k_op_bcc_16 , 0xffff, 0x6400, { 10, 10, 6}},
+	{m68k_op_bcc_32 , 0xffff, 0x64ff, { 0, 0, 6}},
+	{m68k_op_bcs_16 , 0xffff, 0x6500, { 10, 10, 6}},
+	{m68k_op_bcs_32 , 0xffff, 0x65ff, { 0, 0, 6}},
+	{m68k_op_bne_16 , 0xffff, 0x6600, { 10, 10, 6}},
+	{m68k_op_bne_32 , 0xffff, 0x66ff, { 0, 0, 6}},
+	{m68k_op_beq_16 , 0xffff, 0x6700, { 10, 10, 6}},
+	{m68k_op_beq_32 , 0xffff, 0x67ff, { 0, 0, 6}},
+	{m68k_op_bvc_16 , 0xffff, 0x6800, { 10, 10, 6}},
+	{m68k_op_bvc_32 , 0xffff, 0x68ff, { 0, 0, 6}},
+	{m68k_op_bvs_16 , 0xffff, 0x6900, { 10, 10, 6}},
+	{m68k_op_bvs_32 , 0xffff, 0x69ff, { 0, 0, 6}},
+	{m68k_op_bpl_16 , 0xffff, 0x6a00, { 10, 10, 6}},
+	{m68k_op_bpl_32 , 0xffff, 0x6aff, { 0, 0, 6}},
+	{m68k_op_bmi_16 , 0xffff, 0x6b00, { 10, 10, 6}},
+	{m68k_op_bmi_32 , 0xffff, 0x6bff, { 0, 0, 6}},
+	{m68k_op_bge_16 , 0xffff, 0x6c00, { 10, 10, 6}},
+	{m68k_op_bge_32 , 0xffff, 0x6cff, { 0, 0, 6}},
+	{m68k_op_blt_16 , 0xffff, 0x6d00, { 10, 10, 6}},
+	{m68k_op_blt_32 , 0xffff, 0x6dff, { 0, 0, 6}},
+	{m68k_op_bgt_16 , 0xffff, 0x6e00, { 10, 10, 6}},
+	{m68k_op_bgt_32 , 0xffff, 0x6eff, { 0, 0, 6}},
+	{m68k_op_ble_16 , 0xffff, 0x6f00, { 10, 10, 6}},
+	{m68k_op_ble_32 , 0xffff, 0x6fff, { 0, 0, 6}},
+	{m68k_op_sbcd_8_mm_axy7 , 0xffff, 0x8f0f, { 18, 18, 16}},
+	{m68k_op_pack_16_mm_axy7 , 0xffff, 0x8f4f, { 0, 0, 13}},
+	{m68k_op_unpk_16_mm_axy7 , 0xffff, 0x8f8f, { 0, 0, 13}},
+	{m68k_op_subx_8_mm_axy7 , 0xffff, 0x9f0f, { 18, 18, 12}},
+	{m68k_op_cmpm_8_axy7 , 0xffff, 0xbf0f, { 12, 12, 9}},
+	{m68k_op_abcd_8_mm_axy7 , 0xffff, 0xcf0f, { 18, 18, 16}},
+	{m68k_op_addx_8_mm_axy7 , 0xffff, 0xdf0f, { 18, 18, 12}},
+	{m68k_op_asr_16_aw , 0xffff, 0xe0f8, { 16, 16, 9}},
+	{m68k_op_asr_16_al , 0xffff, 0xe0f9, { 20, 20, 9}},
+	{m68k_op_asl_16_aw , 0xffff, 0xe1f8, { 16, 16, 10}},
+	{m68k_op_asl_16_al , 0xffff, 0xe1f9, { 20, 20, 10}},
+	{m68k_op_lsr_16_aw , 0xffff, 0xe2f8, { 16, 16, 9}},
+	{m68k_op_lsr_16_al , 0xffff, 0xe2f9, { 20, 20, 9}},
+	{m68k_op_lsl_16_aw , 0xffff, 0xe3f8, { 16, 16, 9}},
+	{m68k_op_lsl_16_al , 0xffff, 0xe3f9, { 20, 20, 9}},
+	{m68k_op_roxr_16_aw , 0xffff, 0xe4f8, { 16, 16, 9}},
+	{m68k_op_roxr_16_al , 0xffff, 0xe4f9, { 20, 20, 9}},
+	{m68k_op_roxl_16_aw , 0xffff, 0xe5f8, { 16, 16, 9}},
+	{m68k_op_roxl_16_al , 0xffff, 0xe5f9, { 20, 20, 9}},
+	{m68k_op_ror_16_aw , 0xffff, 0xe6f8, { 16, 16, 11}},
+	{m68k_op_ror_16_al , 0xffff, 0xe6f9, { 20, 20, 11}},
+	{m68k_op_rol_16_aw , 0xffff, 0xe7f8, { 16, 16, 11}},
+	{m68k_op_rol_16_al , 0xffff, 0xe7f9, { 20, 20, 11}},
+	{m68k_op_bftst_32_aw , 0xffff, 0xe8f8, { 0, 0, 17}},
+	{m68k_op_bftst_32_al , 0xffff, 0xe8f9, { 0, 0, 17}},
+	{m68k_op_bftst_32_pcdi , 0xffff, 0xe8fa, { 0, 0, 18}},
+	{m68k_op_bftst_32_pcix , 0xffff, 0xe8fb, { 0, 0, 20}},
+	{m68k_op_bfextu_32_aw , 0xffff, 0xe9f8, { 0, 0, 19}},
+	{m68k_op_bfextu_32_al , 0xffff, 0xe9f9, { 0, 0, 19}},
+	{m68k_op_bfextu_32_pcdi , 0xffff, 0xe9fa, { 0, 0, 20}},
+	{m68k_op_bfextu_32_pcix , 0xffff, 0xe9fb, { 0, 0, 22}},
+	{m68k_op_bfchg_32_aw , 0xffff, 0xeaf8, { 0, 0, 24}},
+	{m68k_op_bfchg_32_al , 0xffff, 0xeaf9, { 0, 0, 24}},
+	{m68k_op_bfexts_32_aw , 0xffff, 0xebf8, { 0, 0, 19}},
+	{m68k_op_bfexts_32_al , 0xffff, 0xebf9, { 0, 0, 19}},
+	{m68k_op_bfexts_32_pcdi , 0xffff, 0xebfa, { 0, 0, 20}},
+	{m68k_op_bfexts_32_pcix , 0xffff, 0xebfb, { 0, 0, 22}},
+	{m68k_op_bfclr_32_aw , 0xffff, 0xecf8, { 0, 0, 24}},
+	{m68k_op_bfclr_32_al , 0xffff, 0xecf9, { 0, 0, 24}},
+	{m68k_op_bfffo_32_aw , 0xffff, 0xedf8, { 0, 0, 32}},
+	{m68k_op_bfffo_32_al , 0xffff, 0xedf9, { 0, 0, 32}},
+	{m68k_op_bfffo_32_pcdi , 0xffff, 0xedfa, { 0, 0, 33}},
+	{m68k_op_bfffo_32_pcix , 0xffff, 0xedfb, { 0, 0, 35}},
+	{m68k_op_bfset_32_aw , 0xffff, 0xeef8, { 0, 0, 24}},
+	{m68k_op_bfset_32_al , 0xffff, 0xeef9, { 0, 0, 24}},
+	{m68k_op_bfins_32_aw , 0xffff, 0xeff8, { 0, 0, 21}},
+	{m68k_op_bfins_32_al , 0xffff, 0xeff9, { 0, 0, 21}},
+	{0, 0, 0, {0, 0, 0}}
+};
+
+
+/* Build the opcode handler jump table */
+void m68ki_build_opcode_table(void)
+{
+	opcode_handler_struct *ostruct;
+	int instr;
+	int i;
+	int j;
+	int k;
+
+	for(i = 0; i < 0x10000; i++)
+	{
+		/* default to illegal */
+		m68ki_instruction_jump_table[i] = m68k_op_illegal;
+		for(k=0;k<NUM_CPU_TYPES;k++)
+			m68ki_cycles[k][i] = 0;
+	}
+
+	ostruct = m68k_opcode_handler_table;
+	while(ostruct->mask != 0xff00)
+	{
+		for(i = 0;i < 0x10000;i++)
+		{
+			if((i & ostruct->mask) == ostruct->match)
+			{
+				m68ki_instruction_jump_table[i] = ostruct->opcode_handler;
+				for(k=0;k<NUM_CPU_TYPES;k++)
+					m68ki_cycles[k][i] = ostruct->cycles[k];
+			}
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xff00)
+	{
+		for(i = 0;i <= 0xff;i++)
+		{
+			m68ki_instruction_jump_table[ostruct->match | i] = ostruct->opcode_handler;
+			for(k=0;k<NUM_CPU_TYPES;k++)
+				m68ki_cycles[k][ostruct->match | i] = ostruct->cycles[k];
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xf1f8)
+	{
+		for(i = 0;i < 8;i++)
+		{
+			for(j = 0;j < 8;j++)
+			{
+				instr = ostruct->match | (i << 9) | j;
+				m68ki_instruction_jump_table[instr] = ostruct->opcode_handler;
+				for(k=0;k<NUM_CPU_TYPES;k++)
+					m68ki_cycles[k][instr] = ostruct->cycles[k];
+				if((instr & 0xf000) == 0xe000 && (!(instr & 0x20)))
+					m68ki_cycles[0][instr] = m68ki_cycles[1][instr] = ostruct->cycles[k] + ((((j-1)&7)+1)<<1);
+			}
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xfff0)
+	{
+		for(i = 0;i <= 0x0f;i++)
+		{
+			m68ki_instruction_jump_table[ostruct->match | i] = ostruct->opcode_handler;
+			for(k=0;k<NUM_CPU_TYPES;k++)
+				m68ki_cycles[k][ostruct->match | i] = ostruct->cycles[k];
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xf1ff)
+	{
+		for(i = 0;i <= 0x07;i++)
+		{
+			m68ki_instruction_jump_table[ostruct->match | (i << 9)] = ostruct->opcode_handler;
+			for(k=0;k<NUM_CPU_TYPES;k++)
+				m68ki_cycles[k][ostruct->match | (i << 9)] = ostruct->cycles[k];
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xfff8)
+	{
+		for(i = 0;i <= 0x07;i++)
+		{
+			m68ki_instruction_jump_table[ostruct->match | i] = ostruct->opcode_handler;
+			for(k=0;k<NUM_CPU_TYPES;k++)
+				m68ki_cycles[k][ostruct->match | i] = ostruct->cycles[k];
+		}
+		ostruct++;
+	}
+	while(ostruct->mask == 0xffff)
+	{
+		m68ki_instruction_jump_table[ostruct->match] = ostruct->opcode_handler;
+		for(k=0;k<NUM_CPU_TYPES;k++)
+			m68ki_cycles[k][ostruct->match] = ostruct->cycles[k];
+		ostruct++;
+	}
+}
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/m68kops.h Added

@@ -0,0 +1,1986 @@
+#ifndef M68KOPS__HEADER
+#define M68KOPS__HEADER
+
+#include "m68kcpu.h"
+
+/* ======================================================================== */
+/* ============================ OPCODE HANDLERS =========================== */
+/* ======================================================================== */
+
+
+void m68k_op_1010(m68ki_cpu_core *cpu);
+void m68k_op_1111(m68ki_cpu_core *cpu);
+void m68k_op_abcd_8_rr(m68ki_cpu_core *cpu);
+void m68k_op_abcd_8_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_abcd_8_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_abcd_8_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_abcd_8_mm(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_d(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pi7(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pd7(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_di(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_al(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_add_8_er_i(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_d(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_a(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_di(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_al(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_add_16_er_i(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_d(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_a(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_di(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_al(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_add_32_er_i(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_pi7(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_pd7(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_di(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_8_re_al(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_di(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_16_re_al(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_di(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_add_32_re_al(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_d(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_a(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_di(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_al(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_adda_16_i(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_d(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_a(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_di(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_al(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_adda_32_i(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_addi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_d(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_di(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_addi_16_al(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_d(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_di(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_addi_32_al(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_d(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_di(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_addq_8_al(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_d(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_a(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_di(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_addq_16_al(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_d(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_a(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_di(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_addq_32_al(m68ki_cpu_core *cpu);
+void m68k_op_addx_8_rr(m68ki_cpu_core *cpu);
+void m68k_op_addx_16_rr(m68ki_cpu_core *cpu);
+void m68k_op_addx_32_rr(m68ki_cpu_core *cpu);
+void m68k_op_addx_8_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_addx_8_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_addx_8_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_addx_8_mm(m68ki_cpu_core *cpu);
+void m68k_op_addx_16_mm(m68ki_cpu_core *cpu);
+void m68k_op_addx_32_mm(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_d(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pi7(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pd7(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_di(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_al(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_and_8_er_i(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_d(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_di(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_al(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_and_16_er_i(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_d(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_di(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_al(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_and_32_er_i(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_pi7(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_pd7(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_di(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_8_re_al(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_di(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_16_re_al(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_di(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_and_32_re_al(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_andi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_d(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_di(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_al(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_d(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_di(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_andi_32_al(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_toc(m68ki_cpu_core *cpu);
+void m68k_op_andi_16_tos(m68ki_cpu_core *cpu);
+void m68k_op_asr_8_s(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_s(m68ki_cpu_core *cpu);
+void m68k_op_asr_32_s(m68ki_cpu_core *cpu);
+void m68k_op_asr_8_r(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_r(m68ki_cpu_core *cpu);
+void m68k_op_asr_32_r(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_di(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_asr_16_al(m68ki_cpu_core *cpu);
+void m68k_op_asl_8_s(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_s(m68ki_cpu_core *cpu);
+void m68k_op_asl_32_s(m68ki_cpu_core *cpu);
+void m68k_op_asl_8_r(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_r(m68ki_cpu_core *cpu);
+void m68k_op_asl_32_r(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_di(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_asl_16_al(m68ki_cpu_core *cpu);
+void m68k_op_bhi_8(m68ki_cpu_core *cpu);
+void m68k_op_bls_8(m68ki_cpu_core *cpu);
+void m68k_op_bcc_8(m68ki_cpu_core *cpu);
+void m68k_op_bcs_8(m68ki_cpu_core *cpu);
+void m68k_op_bne_8(m68ki_cpu_core *cpu);
+void m68k_op_beq_8(m68ki_cpu_core *cpu);
+void m68k_op_bvc_8(m68ki_cpu_core *cpu);
+void m68k_op_bvs_8(m68ki_cpu_core *cpu);
+void m68k_op_bpl_8(m68ki_cpu_core *cpu);
+void m68k_op_bmi_8(m68ki_cpu_core *cpu);
+void m68k_op_bge_8(m68ki_cpu_core *cpu);
+void m68k_op_blt_8(m68ki_cpu_core *cpu);
+void m68k_op_bgt_8(m68ki_cpu_core *cpu);
+void m68k_op_ble_8(m68ki_cpu_core *cpu);
+void m68k_op_bhi_16(m68ki_cpu_core *cpu);
+void m68k_op_bls_16(m68ki_cpu_core *cpu);
+void m68k_op_bcc_16(m68ki_cpu_core *cpu);
+void m68k_op_bcs_16(m68ki_cpu_core *cpu);
+void m68k_op_bne_16(m68ki_cpu_core *cpu);
+void m68k_op_beq_16(m68ki_cpu_core *cpu);
+void m68k_op_bvc_16(m68ki_cpu_core *cpu);
+void m68k_op_bvs_16(m68ki_cpu_core *cpu);
+void m68k_op_bpl_16(m68ki_cpu_core *cpu);
+void m68k_op_bmi_16(m68ki_cpu_core *cpu);
+void m68k_op_bge_16(m68ki_cpu_core *cpu);
+void m68k_op_blt_16(m68ki_cpu_core *cpu);
+void m68k_op_bgt_16(m68ki_cpu_core *cpu);
+void m68k_op_ble_16(m68ki_cpu_core *cpu);
+void m68k_op_bhi_32(m68ki_cpu_core *cpu);
+void m68k_op_bls_32(m68ki_cpu_core *cpu);
+void m68k_op_bcc_32(m68ki_cpu_core *cpu);
+void m68k_op_bcs_32(m68ki_cpu_core *cpu);
+void m68k_op_bne_32(m68ki_cpu_core *cpu);
+void m68k_op_beq_32(m68ki_cpu_core *cpu);
+void m68k_op_bvc_32(m68ki_cpu_core *cpu);
+void m68k_op_bvs_32(m68ki_cpu_core *cpu);
+void m68k_op_bpl_32(m68ki_cpu_core *cpu);
+void m68k_op_bmi_32(m68ki_cpu_core *cpu);
+void m68k_op_bge_32(m68ki_cpu_core *cpu);
+void m68k_op_blt_32(m68ki_cpu_core *cpu);
+void m68k_op_bgt_32(m68ki_cpu_core *cpu);
+void m68k_op_ble_32(m68ki_cpu_core *cpu);
+void m68k_op_bchg_32_r_d(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_ai(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_pi(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_pd(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_di(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_ix(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_aw(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_r_al(m68ki_cpu_core *cpu);
+void m68k_op_bchg_32_s_d(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_ai(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_pi(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_pd(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_di(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_ix(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_aw(m68ki_cpu_core *cpu);
+void m68k_op_bchg_8_s_al(m68ki_cpu_core *cpu);
+void m68k_op_bclr_32_r_d(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_ai(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_pi(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_pd(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_di(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_ix(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_aw(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_r_al(m68ki_cpu_core *cpu);
+void m68k_op_bclr_32_s_d(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_ai(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_pi(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_pd(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_di(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_ix(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_aw(m68ki_cpu_core *cpu);
+void m68k_op_bclr_8_s_al(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfchg_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfclr_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_bfexts_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_bfextu_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_bfffo_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfins_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bfset_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_d(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_di(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_al(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_bftst_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_bkpt(m68ki_cpu_core *cpu);
+void m68k_op_bra_8(m68ki_cpu_core *cpu);
+void m68k_op_bra_16(m68ki_cpu_core *cpu);
+void m68k_op_bra_32(m68ki_cpu_core *cpu);
+void m68k_op_bset_32_r_d(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_ai(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_pi(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_pd(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_di(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_ix(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_aw(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_r_al(m68ki_cpu_core *cpu);
+void m68k_op_bset_32_s_d(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_ai(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_pi(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_pi7(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_pd(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_pd7(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_di(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_ix(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_aw(m68ki_cpu_core *cpu);
+void m68k_op_bset_8_s_al(m68ki_cpu_core *cpu);
+void m68k_op_bsr_8(m68ki_cpu_core *cpu);
+void m68k_op_bsr_16(m68ki_cpu_core *cpu);
+void m68k_op_bsr_32(m68ki_cpu_core *cpu);
+void m68k_op_btst_32_r_d(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_ai(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pi(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pi7(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pd(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pd7(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_di(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_ix(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_aw(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_al(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_pcix(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_r_i(m68ki_cpu_core *cpu);
+void m68k_op_btst_32_s_d(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_ai(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pi(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pi7(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pd(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pd7(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_di(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_ix(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_aw(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_al(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_btst_8_s_pcix(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_di(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_al(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_callm_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_di(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_cas_8_al(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_di(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_cas_16_al(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_di(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_cas_32_al(m68ki_cpu_core *cpu);
+void m68k_op_cas2_16(m68ki_cpu_core *cpu);
+void m68k_op_cas2_32(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_d(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_di(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_al(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_chk_16_i(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_d(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_di(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_al(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_chk_32_i(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_pcix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_di(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_8_al(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_di(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_16_al(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_di(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_chk2cmp2_32_al(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_d(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_di(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_clr_8_al(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_d(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_di(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_clr_16_al(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_d(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_di(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_clr_32_al(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_d(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_di(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_al(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_8_i(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_d(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_a(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_di(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_al(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_16_i(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_d(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_a(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_di(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_al(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmp_32_i(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_d(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_a(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_di(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_al(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_16_i(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_d(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_a(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_di(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_al(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmpa_32_i(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_8_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_d(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_di(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_al(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_d(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_di(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_al(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_cmpi_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_8_ax7(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_8_ay7(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_8_axy7(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_8(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_16(m68ki_cpu_core *cpu);
+void m68k_op_cmpm_32(m68ki_cpu_core *cpu);
+void m68k_op_cpbcc_32(m68ki_cpu_core *cpu);
+void m68k_op_cpdbcc_32(m68ki_cpu_core *cpu);
+void m68k_op_cpgen_32(m68ki_cpu_core *cpu);
+void m68k_op_cpscc_32(m68ki_cpu_core *cpu);
+void m68k_op_cptrapcc_32(m68ki_cpu_core *cpu);
+void m68k_op_dbt_16(m68ki_cpu_core *cpu);
+void m68k_op_dbf_16(m68ki_cpu_core *cpu);
+void m68k_op_dbhi_16(m68ki_cpu_core *cpu);
+void m68k_op_dbls_16(m68ki_cpu_core *cpu);
+void m68k_op_dbcc_16(m68ki_cpu_core *cpu);
+void m68k_op_dbcs_16(m68ki_cpu_core *cpu);
+void m68k_op_dbne_16(m68ki_cpu_core *cpu);
+void m68k_op_dbeq_16(m68ki_cpu_core *cpu);
+void m68k_op_dbvc_16(m68ki_cpu_core *cpu);
+void m68k_op_dbvs_16(m68ki_cpu_core *cpu);
+void m68k_op_dbpl_16(m68ki_cpu_core *cpu);
+void m68k_op_dbmi_16(m68ki_cpu_core *cpu);
+void m68k_op_dbge_16(m68ki_cpu_core *cpu);
+void m68k_op_dblt_16(m68ki_cpu_core *cpu);
+void m68k_op_dbgt_16(m68ki_cpu_core *cpu);
+void m68k_op_dble_16(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_d(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_di(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_al(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_divs_16_i(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_d(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_di(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_al(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_divu_16_i(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_d(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_di(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_al(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_divl_32_i(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_d(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_di(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_eor_8_al(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_d(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_di(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_eor_16_al(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_d(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_di(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_eor_32_al(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_d(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_di(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_eori_8_al(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_d(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_di(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_al(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_d(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_di(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_eori_32_al(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_toc(m68ki_cpu_core *cpu);
+void m68k_op_eori_16_tos(m68ki_cpu_core *cpu);
+void m68k_op_exg_32_dd(m68ki_cpu_core *cpu);
+void m68k_op_exg_32_aa(m68ki_cpu_core *cpu);
+void m68k_op_exg_32_da(m68ki_cpu_core *cpu);
+void m68k_op_ext_16(m68ki_cpu_core *cpu);
+void m68k_op_ext_32(m68ki_cpu_core *cpu);
+void m68k_op_extb_32(m68ki_cpu_core *cpu);
+void m68k_op_illegal(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_di(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_al(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_jmp_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_di(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_al(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_jsr_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_di(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_al(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_lea_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_link_16_a7(m68ki_cpu_core *cpu);
+void m68k_op_link_16(m68ki_cpu_core *cpu);
+void m68k_op_link_32_a7(m68ki_cpu_core *cpu);
+void m68k_op_link_32(m68ki_cpu_core *cpu);
+void m68k_op_lsr_8_s(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_s(m68ki_cpu_core *cpu);
+void m68k_op_lsr_32_s(m68ki_cpu_core *cpu);
+void m68k_op_lsr_8_r(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_r(m68ki_cpu_core *cpu);
+void m68k_op_lsr_32_r(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_di(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_lsr_16_al(m68ki_cpu_core *cpu);
+void m68k_op_lsl_8_s(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_s(m68ki_cpu_core *cpu);
+void m68k_op_lsl_32_s(m68ki_cpu_core *cpu);
+void m68k_op_lsl_8_r(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_r(m68ki_cpu_core *cpu);
+void m68k_op_lsl_32_r(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_di(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_lsl_16_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_d_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ai_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi7_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pi_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd7_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_pd_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_di_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_ix_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_aw_i(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_d(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pi7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pd7(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_di(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_al(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_8_al_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_d_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ai_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pi_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_pd_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_di_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_ix_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_aw_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_a(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_al_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_d_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ai_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pi_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_pd_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_di_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_ix_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_aw_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_d(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_a(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_di(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_al(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_32_al_i(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_d(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_a(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_di(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_al(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_movea_16_i(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_d(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_a(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_di(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_al(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_movea_32_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frc_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_toc_i(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_frs_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_d(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_ai(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_pi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_pd(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_di(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_ix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_aw(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_al(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_pcix(m68ki_cpu_core *cpu);
+void m68k_op_move_16_tos_i(m68ki_cpu_core *cpu);
+void m68k_op_move_32_fru(m68ki_cpu_core *cpu);
+void m68k_op_move_32_tou(m68ki_cpu_core *cpu);
+void m68k_op_movec_32_cr(m68ki_cpu_core *cpu);
+void m68k_op_movec_32_rc(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_di(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_re_al(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_di(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_re_al(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_di(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_movem_16_er_al(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_di(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_movem_32_er_al(m68ki_cpu_core *cpu);
+void m68k_op_movep_16_re(m68ki_cpu_core *cpu);
+void m68k_op_movep_32_re(m68ki_cpu_core *cpu);
+void m68k_op_movep_16_er(m68ki_cpu_core *cpu);
+void m68k_op_movep_32_er(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_di(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_moves_8_al(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_di(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_moves_16_al(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_di(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_moves_32_al(m68ki_cpu_core *cpu);
+void m68k_op_moveq_32(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_d(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_di(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_al(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_muls_16_i(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_d(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_di(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_al(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_mulu_16_i(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_d(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_di(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_al(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_mull_32_i(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_d(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_di(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_nbcd_8_al(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_d(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_di(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_neg_8_al(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_d(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_di(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_neg_16_al(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_d(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_di(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_neg_32_al(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_d(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_di(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_negx_8_al(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_d(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_di(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_negx_16_al(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_d(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_di(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_negx_32_al(m68ki_cpu_core *cpu);
+void m68k_op_nop(m68ki_cpu_core *cpu);
+void m68k_op_not_8_d(m68ki_cpu_core *cpu);
+void m68k_op_not_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_not_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_not_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_not_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_not_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_not_8_di(m68ki_cpu_core *cpu);
+void m68k_op_not_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_not_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_not_8_al(m68ki_cpu_core *cpu);
+void m68k_op_not_16_d(m68ki_cpu_core *cpu);
+void m68k_op_not_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_not_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_not_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_not_16_di(m68ki_cpu_core *cpu);
+void m68k_op_not_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_not_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_not_16_al(m68ki_cpu_core *cpu);
+void m68k_op_not_32_d(m68ki_cpu_core *cpu);
+void m68k_op_not_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_not_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_not_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_not_32_di(m68ki_cpu_core *cpu);
+void m68k_op_not_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_not_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_not_32_al(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_d(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pi7(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pd7(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_di(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_al(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_or_8_er_i(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_d(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_di(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_al(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_or_16_er_i(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_d(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_di(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_al(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_or_32_er_i(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_pi7(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_pd7(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_di(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_8_re_al(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_di(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_16_re_al(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_di(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_or_32_re_al(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_d(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_di(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_ori_8_al(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_d(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_di(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_al(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_d(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_di(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_ori_32_al(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_toc(m68ki_cpu_core *cpu);
+void m68k_op_ori_16_tos(m68ki_cpu_core *cpu);
+void m68k_op_pack_16_rr(m68ki_cpu_core *cpu);
+void m68k_op_pack_16_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_pack_16_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_pack_16_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_pack_16_mm(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_di(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_al(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_pea_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_reset(m68ki_cpu_core *cpu);
+void m68k_op_ror_8_s(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_s(m68ki_cpu_core *cpu);
+void m68k_op_ror_32_s(m68ki_cpu_core *cpu);
+void m68k_op_ror_8_r(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_r(m68ki_cpu_core *cpu);
+void m68k_op_ror_32_r(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_di(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_ror_16_al(m68ki_cpu_core *cpu);
+void m68k_op_rol_8_s(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_s(m68ki_cpu_core *cpu);
+void m68k_op_rol_32_s(m68ki_cpu_core *cpu);
+void m68k_op_rol_8_r(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_r(m68ki_cpu_core *cpu);
+void m68k_op_rol_32_r(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_di(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_rol_16_al(m68ki_cpu_core *cpu);
+void m68k_op_roxr_8_s(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_s(m68ki_cpu_core *cpu);
+void m68k_op_roxr_32_s(m68ki_cpu_core *cpu);
+void m68k_op_roxr_8_r(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_r(m68ki_cpu_core *cpu);
+void m68k_op_roxr_32_r(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_di(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_roxr_16_al(m68ki_cpu_core *cpu);
+void m68k_op_roxl_8_s(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_s(m68ki_cpu_core *cpu);
+void m68k_op_roxl_32_s(m68ki_cpu_core *cpu);
+void m68k_op_roxl_8_r(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_r(m68ki_cpu_core *cpu);
+void m68k_op_roxl_32_r(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_di(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_roxl_16_al(m68ki_cpu_core *cpu);
+void m68k_op_rtd_32(m68ki_cpu_core *cpu);
+void m68k_op_rte_32(m68ki_cpu_core *cpu);
+void m68k_op_rtm_32(m68ki_cpu_core *cpu);
+void m68k_op_rtr_32(m68ki_cpu_core *cpu);
+void m68k_op_rts_32(m68ki_cpu_core *cpu);
+void m68k_op_sbcd_8_rr(m68ki_cpu_core *cpu);
+void m68k_op_sbcd_8_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_sbcd_8_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_sbcd_8_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_sbcd_8_mm(m68ki_cpu_core *cpu);
+void m68k_op_st_8_d(m68ki_cpu_core *cpu);
+void m68k_op_st_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_st_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_st_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_st_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_st_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_st_8_di(m68ki_cpu_core *cpu);
+void m68k_op_st_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_st_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_st_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sf_8_al(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_d(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_d(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_d(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_d(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_d(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_d(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_d(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_d(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_d(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_d(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_shi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sls_8_al(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_di(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_scc_8_al(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_di(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_scs_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sne_8_al(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_di(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_seq_8_al(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_di(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_svc_8_al(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_di(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_svs_8_al(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_di(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_spl_8_al(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_smi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sge_8_al(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_di(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_slt_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sgt_8_al(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_di(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_sle_8_al(m68ki_cpu_core *cpu);
+void m68k_op_stop(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_d(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_al(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_er_i(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_d(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_a(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_al(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_er_i(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_d(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_a(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_al(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_pcix(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_er_i(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_pi7(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_pd7(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_8_re_al(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_16_re_al(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_ai(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_pi(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_pd(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_di(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_ix(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_aw(m68ki_cpu_core *cpu);
+void m68k_op_sub_32_re_al(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_d(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_a(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_di(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_al(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_suba_16_i(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_d(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_a(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_di(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_al(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_suba_32_i(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_d(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_di(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_subi_8_al(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_d(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_di(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_subi_16_al(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_d(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_di(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_subi_32_al(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_d(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_di(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_subq_8_al(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_d(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_a(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_di(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_subq_16_al(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_d(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_a(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_di(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_subq_32_al(m68ki_cpu_core *cpu);
+void m68k_op_subx_8_rr(m68ki_cpu_core *cpu);
+void m68k_op_subx_16_rr(m68ki_cpu_core *cpu);
+void m68k_op_subx_32_rr(m68ki_cpu_core *cpu);
+void m68k_op_subx_8_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_subx_8_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_subx_8_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_subx_8_mm(m68ki_cpu_core *cpu);
+void m68k_op_subx_16_mm(m68ki_cpu_core *cpu);
+void m68k_op_subx_32_mm(m68ki_cpu_core *cpu);
+void m68k_op_swap_32(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_d(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_di(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_tas_8_al(m68ki_cpu_core *cpu);
+void m68k_op_trap(m68ki_cpu_core *cpu);
+void m68k_op_trapt(m68ki_cpu_core *cpu);
+void m68k_op_trapt_16(m68ki_cpu_core *cpu);
+void m68k_op_trapt_32(m68ki_cpu_core *cpu);
+void m68k_op_trapf(m68ki_cpu_core *cpu);
+void m68k_op_trapf_16(m68ki_cpu_core *cpu);
+void m68k_op_trapf_32(m68ki_cpu_core *cpu);
+void m68k_op_traphi(m68ki_cpu_core *cpu);
+void m68k_op_trapls(m68ki_cpu_core *cpu);
+void m68k_op_trapcc(m68ki_cpu_core *cpu);
+void m68k_op_trapcs(m68ki_cpu_core *cpu);
+void m68k_op_trapne(m68ki_cpu_core *cpu);
+void m68k_op_trapeq(m68ki_cpu_core *cpu);
+void m68k_op_trapvc(m68ki_cpu_core *cpu);
+void m68k_op_trapvs(m68ki_cpu_core *cpu);
+void m68k_op_trappl(m68ki_cpu_core *cpu);
+void m68k_op_trapmi(m68ki_cpu_core *cpu);
+void m68k_op_trapge(m68ki_cpu_core *cpu);
+void m68k_op_traplt(m68ki_cpu_core *cpu);
+void m68k_op_trapgt(m68ki_cpu_core *cpu);
+void m68k_op_traple(m68ki_cpu_core *cpu);
+void m68k_op_traphi_16(m68ki_cpu_core *cpu);
+void m68k_op_trapls_16(m68ki_cpu_core *cpu);
+void m68k_op_trapcc_16(m68ki_cpu_core *cpu);
+void m68k_op_trapcs_16(m68ki_cpu_core *cpu);
+void m68k_op_trapne_16(m68ki_cpu_core *cpu);
+void m68k_op_trapeq_16(m68ki_cpu_core *cpu);
+void m68k_op_trapvc_16(m68ki_cpu_core *cpu);
+void m68k_op_trapvs_16(m68ki_cpu_core *cpu);
+void m68k_op_trappl_16(m68ki_cpu_core *cpu);
+void m68k_op_trapmi_16(m68ki_cpu_core *cpu);
+void m68k_op_trapge_16(m68ki_cpu_core *cpu);
+void m68k_op_traplt_16(m68ki_cpu_core *cpu);
+void m68k_op_trapgt_16(m68ki_cpu_core *cpu);
+void m68k_op_traple_16(m68ki_cpu_core *cpu);
+void m68k_op_traphi_32(m68ki_cpu_core *cpu);
+void m68k_op_trapls_32(m68ki_cpu_core *cpu);
+void m68k_op_trapcc_32(m68ki_cpu_core *cpu);
+void m68k_op_trapcs_32(m68ki_cpu_core *cpu);
+void m68k_op_trapne_32(m68ki_cpu_core *cpu);
+void m68k_op_trapeq_32(m68ki_cpu_core *cpu);
+void m68k_op_trapvc_32(m68ki_cpu_core *cpu);
+void m68k_op_trapvs_32(m68ki_cpu_core *cpu);
+void m68k_op_trappl_32(m68ki_cpu_core *cpu);
+void m68k_op_trapmi_32(m68ki_cpu_core *cpu);
+void m68k_op_trapge_32(m68ki_cpu_core *cpu);
+void m68k_op_traplt_32(m68ki_cpu_core *cpu);
+void m68k_op_trapgt_32(m68ki_cpu_core *cpu);
+void m68k_op_traple_32(m68ki_cpu_core *cpu);
+void m68k_op_trapv(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_d(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_ai(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pi(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pi7(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pd(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pd7(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_di(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_ix(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_aw(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_al(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_pcix(m68ki_cpu_core *cpu);
+void m68k_op_tst_8_i(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_d(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_a(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_ai(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_pi(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_pd(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_di(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_ix(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_aw(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_al(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_pcix(m68ki_cpu_core *cpu);
+void m68k_op_tst_16_i(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_d(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_a(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_ai(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_pi(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_pd(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_di(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_ix(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_aw(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_al(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_pcdi(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_pcix(m68ki_cpu_core *cpu);
+void m68k_op_tst_32_i(m68ki_cpu_core *cpu);
+void m68k_op_unlk_32_a7(m68ki_cpu_core *cpu);
+void m68k_op_unlk_32(m68ki_cpu_core *cpu);
+void m68k_op_unpk_16_rr(m68ki_cpu_core *cpu);
+void m68k_op_unpk_16_mm_ax7(m68ki_cpu_core *cpu);
+void m68k_op_unpk_16_mm_ay7(m68ki_cpu_core *cpu);
+void m68k_op_unpk_16_mm_axy7(m68ki_cpu_core *cpu);
+void m68k_op_unpk_16_mm(m68ki_cpu_core *cpu);
+/* Build the opcode handler table */
+void m68ki_build_opcode_table();
+
+extern void (*m68ki_instruction_jump_table[0x10000])(m68ki_cpu_core *cpu); /* opcode handler jump table */
+extern unsigned char m68ki_cycles[][0x10000];
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68KOPS__HEADER */
+
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/sat_hw.c Added

@@ -0,0 +1,180 @@
+/*
+ sat_hw.c - Saturn sound hardware glue/emulation/whatever
+
+ supported: main RAM (512 KB)
+ 	 SCSP + timers
+	 MC68000 CPU
+
+ Copyright (c) 2007, R. Belmont and Richard Bannister.
+ 
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ 
+ 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 <stdio.h>
+
+#include "ao.h"
+#include "scsp.h"
+#include "sat_hw.h"
+#include "m68k.h"
+#include "m68kcpu.h"
+
+static void scsp_irq(m68ki_cpu_core *cpu, int irq)
+{
+	if (irq > 0)
+	{
+		m68k_set_irq(cpu, irq);
+	}
+}
+
+#define MIXER_PAN_LEFT 1
+#define MIXER_PAN_RIGHT 2
+#define MIXER(level,pan) ((level & 0xff) | ((pan & 0x03) << 8))
+#define YM3012_VOL(LVol,LPan,RVol,RPan) (MIXER(LVol,LPan)|(MIXER(RVol,RPan) << 16))
+
+#if 0
+static struct SCSPinterface scsp_interface =
+{
+	1,
+	{ sat_ram, },
+	{ YM3012_VOL(100, MIXER_PAN_LEFT, 100, MIXER_PAN_RIGHT) },
+	{ scsp_irq, },
+};
+#endif
+
+void sat_hw_init(m68ki_cpu_core *cpu)
+{
+//	m68k_init();
+	m68k_set_cpu_type(cpu, M68K_CPU_TYPE_68000);
+	m68k_pulse_reset(cpu);
+ struct SCSPinterface scsp_interface;
+	scsp_interface.num = 1;
+	scsp_interface.region[0] = cpu->sat_ram;
+	scsp_interface.mixing_level[0] = YM3012_VOL(100, MIXER_PAN_LEFT, 100, MIXER_PAN_RIGHT);
+	scsp_interface.irq_callback[0] = scsp_irq;
+	scsp_interface.cpu = cpu;
+
+	cpu->SCSP = SCSP_Start(&scsp_interface);
+}
+
+void sat_hw_free(struct m68ki_cpu_core_s *cpu) {
+ SCSP_Exit (cpu->SCSP);
+}
+
+/* M68k memory handlers */
+
+unsigned int m68k_read_memory_8(m68ki_cpu_core *cpu, unsigned int address)
+{
+	if (address < (512*1024))
+		return cpu->sat_ram[address^1];
+
+	if (address >= 0x100000 && address < 0x100c00)
+	{
+		int foo = SCSP_0_r(cpu->SCSP, (address - 0x100000)/2, 0);
+
+		if (address & 1)
+			return foo & 0xff;
+		else
+			return foo>>8;
+	}
+
+	printf("R8 @ %x\n", address);
+	return 0;
+}
+
+unsigned int m68k_read_memory_16(m68ki_cpu_core *cpu, unsigned int address)
+{
+	if (address < (512*1024))
+	{
+		return mem_readword_swap((unsigned short *)(cpu->sat_ram+address));
+	}
+
+	if (address >= 0x100000 && address < 0x100c00)
+		return SCSP_0_r(cpu->SCSP, (address-0x100000)/2, 0);
+
+	printf("R16 @ %x\n", address);
+	return 0;
+}
+
+unsigned int m68k_read_memory_32(m68ki_cpu_core *cpu, unsigned int address)
+{
+	if (address < 0x80000)
+	{
+		return cpu->sat_ram[address+2] | cpu->sat_ram[address+3]<<8 | cpu->sat_ram[address]<<16 | cpu->sat_ram[address+1]<<24;
+	}
+
+	printf("R32 @ %x\n", address);
+	return 0;
+}
+
+void m68k_write_memory_8(m68ki_cpu_core *cpu, unsigned int address, unsigned int data)
+{
+	if (address < 0x80000)
+	{
+		cpu->sat_ram[address^1] = data;
+		return;
+	}
+
+	if (address >= 0x100000 && address < 0x100c00)
+	{
+		address -= 0x100000;
+		if (address & 1)
+			SCSP_0_w(cpu->SCSP, address>>1, data, 0xff00);
+		else
+			SCSP_0_w(cpu->SCSP, address>>1, data<<8, 0x00ff);
+		return;
+	}
+}
+
+void m68k_write_memory_16(m68ki_cpu_core *cpu, unsigned int address, unsigned int data)
+{
+	if (address < 0x80000)
+	{
+		cpu->sat_ram[address+1] = (data>>8)&0xff;
+		cpu->sat_ram[address] = data&0xff;
+		return;
+	}
+
+	if (address >= 0x100000 && address < 0x100c00)
+	{
+		SCSP_0_w(cpu->SCSP, (address-0x100000)>>1, data, 0x0000);
+		return;
+	}
+}
+
+void m68k_write_memory_32(m68ki_cpu_core *cpu, unsigned int address, unsigned int data)
+{
+	if (address < 0x80000)
+	{
+		cpu->sat_ram[address+1] = (data>>24)&0xff;
+		cpu->sat_ram[address] = (data>>16)&0xff;
+		cpu->sat_ram[address+3] = (data>>8)&0xff;
+		cpu->sat_ram[address+2] = data&0xff;
+		return;
+	}
+
+	if (address >= 0x100000 && address < 0x100c00)
+	{
+		address -= 0x100000;
+		SCSP_0_w(cpu->SCSP, address>>1, data>>16, 0x0000);
+		SCSP_0_w(cpu->SCSP, (address>>1)+1, data&0xffff, 0x0000);
+		return;
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/sat_hw.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/scsp.c Added

@@ -0,0 +1,1277 @@
+/*
+ Sega/Yamaha YMF292-F (SCSP = Saturn Custom Sound Processor) emulation
+ By ElSemi
+ MAME/M1 conversion and cleanup by R. Belmont
+ Additional code and bugfixes by kingshriek
+
+ This chip has 32 voices. Each voice can play a sample or be part of
+ an FM construct. Unlike traditional Yamaha FM chips, the base waveform
+ for the FM still comes from the wavetable RAM.
+
+ ChangeLog:
+ * November 25, 2003 (ES) Fixed buggy timers and envelope overflows.
+ (RB) Improved sample rates other than 44100, multiple
+ chips now works properly.
+ * December 02, 2003 (ES) Added DISDL register support, improves mix.
+ * April 28, 2004 (ES) Corrected envelope rates, added key-rate scaling,
+ added ringbuffer support.
+ * January 8, 2005 (RB) Added ability to specify region offset for RAM.
+ * January 26, 2007 (ES) Added on-board DSP capability
+ * December 16, 2007 (kingshriek) Many EG bug fixes, implemented effects mixer,
+ implemented FM.
+*/
+
+#include <math.h>
+#include <string.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "scsp.h"
+#include "scspdsp.h"
+#include "sat_hw.h"
+
+#define ICLIP16(x) (x<-32768)?-32768:((x>32767)?32767:x)
+
+#define SHIFT	12
+#define FIX(v)	((UINT32) ((float) (1<<SHIFT)*(v)))
+
+
+#define EG_SHIFT	16
+#define FM_DELAY 0 // delay in number of slots processed before samples are written to the FM ring buffer
+
+// include the LFO handling code
+#include "scsplfo.c"
+
+/*
+ SCSP features 32 programmable slots
+ that can generate FM and PCM (from ROM/RAM) sound
+*/
+
+//SLOT PARAMETERS
+#define KEYONEX(slot)		((slot->udata.data[0x0]>>0x0)&0x1000)
+#define KEYONB(slot)		((slot->udata.data[0x0]>>0x0)&0x0800)
+#define SBCTL(slot)		((slot->udata.data[0x0]>>0x9)&0x0003)
+#define SSCTL(slot)		((slot->udata.data[0x0]>>0x7)&0x0003)
+#define LPCTL(slot)		((slot->udata.data[0x0]>>0x5)&0x0003)
+#define PCM8B(slot)		((slot->udata.data[0x0]>>0x0)&0x0010)
+
+#define SA(slot)		(((slot->udata.data[0x0]&0xF)<<16)|(slot->udata.data[0x1]))
+
+#define LSA(slot)		(slot->udata.data[0x2])
+
+#define LEA(slot)		(slot->udata.data[0x3])
+
+#define D2R(slot)		((slot->udata.data[0x4]>>0xB)&0x001F)
+#define D1R(slot)		((slot->udata.data[0x4]>>0x6)&0x001F)
+#define EGHOLD(slot)		((slot->udata.data[0x4]>>0x0)&0x0020)
+#define AR(slot)		((slot->udata.data[0x4]>>0x0)&0x001F)
+
+#define LPSLNK(slot)		((slot->udata.data[0x5]>>0x0)&0x4000)
+#define KRS(slot)		((slot->udata.data[0x5]>>0xA)&0x000F)
+#define DL(slot)		((slot->udata.data[0x5]>>0x5)&0x001F)
+#define RR(slot)		((slot->udata.data[0x5]>>0x0)&0x001F)
+
+#define STWINH(slot)		((slot->udata.data[0x6]>>0x0)&0x0200)
+#define SDIR(slot)		((slot->udata.data[0x6]>>0x0)&0x0100)
+#define TL(slot)		((slot->udata.data[0x6]>>0x0)&0x00FF)
+
+#define MDL(slot)		((slot->udata.data[0x7]>>0xC)&0x000F)
+#define MDXSL(slot)		((slot->udata.data[0x7]>>0x6)&0x003F)
+#define MDYSL(slot)		((slot->udata.data[0x7]>>0x0)&0x003F)
+
+#define OCT(slot)		((slot->udata.data[0x8]>>0xB)&0x000F)
+#define FNS(slot)		((slot->udata.data[0x8]>>0x0)&0x03FF)
+
+#define LFORE(slot)		((slot->udata.data[0x9]>>0x0)&0x8000)
+#define LFOF(slot)		((slot->udata.data[0x9]>>0xA)&0x001F)
+#define PLFOWS(slot)		((slot->udata.data[0x9]>>0x8)&0x0003)
+#define PLFOS(slot)		((slot->udata.data[0x9]>>0x5)&0x0007)
+#define ALFOWS(slot)		((slot->udata.data[0x9]>>0x3)&0x0003)
+#define ALFOS(slot)		((slot->udata.data[0x9]>>0x0)&0x0007)
+
+#define ISEL(slot)		((slot->udata.data[0xA]>>0x3)&0x000F)
+#define IMXL(slot)		((slot->udata.data[0xA]>>0x0)&0x0007)
+
+#define DISDL(slot)		((slot->udata.data[0xB]>>0xD)&0x0007)
+#define DIPAN(slot)		((slot->udata.data[0xB]>>0x8)&0x001F)
+#define EFSDL(slot)		((slot->udata.data[0xB]>>0x5)&0x0007)
+#define EFPAN(slot)		((slot->udata.data[0xB]>>0x0)&0x001F)
+
+//Envelope times in ms
+static const double ARTimes[64]={100000/*infinity*/,100000/*infinity*/,8100.0,6900.0,6000.0,4800.0,4000.0,3400.0,3000.0,2400.0,2000.0,1700.0,1500.0,
+					1200.0,1000.0,860.0,760.0,600.0,500.0,430.0,380.0,300.0,250.0,220.0,190.0,150.0,130.0,110.0,95.0,
+					76.0,63.0,55.0,47.0,38.0,31.0,27.0,24.0,19.0,15.0,13.0,12.0,9.4,7.9,6.8,6.0,4.7,3.8,3.4,3.0,2.4,
+					2.0,1.8,1.6,1.3,1.1,0.93,0.85,0.65,0.53,0.44,0.40,0.35,0.0,0.0};
+static const double DRTimes[64]={100000/*infinity*/,100000/*infinity*/,118200.0,101300.0,88600.0,70900.0,59100.0,50700.0,44300.0,35500.0,29600.0,25300.0,22200.0,17700.0,
+					14800.0,12700.0,11100.0,8900.0,7400.0,6300.0,5500.0,4400.0,3700.0,3200.0,2800.0,2200.0,1800.0,1600.0,1400.0,1100.0,
+					920.0,790.0,690.0,550.0,460.0,390.0,340.0,270.0,230.0,200.0,170.0,140.0,110.0,98.0,85.0,68.0,57.0,49.0,43.0,34.0,
+					28.0,25.0,22.0,18.0,14.0,12.0,11.0,8.5,7.1,6.1,5.4,4.3,3.6,3.1};
+static UINT32 FNS_Table[0x400];
+static INT32 EG_TABLE[0x400];
+
+typedef enum {ATTACK,DECAY1,DECAY2,RELEASE} _STATE;
+struct _EG
+{
+	int volume;	//
+	_STATE state;
+	int step;
+	//step vals
+	int AR;		//Attack
+	int D1R;	//Decay1
+	int D2R;	//Decay2
+	int RR;		//Release
+
+	int DL;		//Decay level
+	UINT8 EGHOLD;
+	UINT8 LPLINK;
+};
+
+struct _SLOT
+{
+	union
+	{
+		UINT16 data[0x10];	//only 0x1a bytes used
+		UINT8 datab[0x20];
+	} udata;
+	UINT8 active;	//this slot is currently playing
+	UINT8 *base;		//samples base address
+	UINT32 cur_addr;	//current play address (24.8)
+	UINT32 nxt_addr;	//next play address
+	UINT32 step;		//pitch step (24.8)
+	UINT8 Backwards;	//the wave is playing backwards
+	struct _EG EG;			//Envelope
+	struct _LFO PLFO;		//Phase LFO
+	struct _LFO ALFO;		//Amplitude LFO
+	int slot;
+	signed short Prev;	//Previous sample (for interpolation)
+};
+
+#define MEM4B(scsp)		((scsp->udata.data[0]>>0x0)&0x0200)
+#define DAC18B(scsp)		((scsp->udata.data[0]>>0x0)&0x0100)
+#define MVOL(scsp)		((scsp->udata.data[0]>>0x0)&0x000F)
+#define RBL(scsp)		((scsp->udata.data[1]>>0x7)&0x0003)
+#define RBP(scsp)		((scsp->udata.data[1]>>0x0)&0x003F)
+#define MOFULL(scsp) 		((scsp->udata.data[2]>>0x0)&0x1000)
+#define MOEMPTY(scsp)		((scsp->udata.data[2]>>0x0)&0x0800)
+#define MIOVF(scsp)		((scsp->udata.data[2]>>0x0)&0x0400)
+#define MIFULL(scsp)		((scsp->udata.data[2]>>0x0)&0x0200)
+#define MIEMPTY(scsp)		((scsp->udata.data[2]>>0x0)&0x0100)
+
+#define SCILV0(scsp) 	((scsp->udata.data[0x24/2]>>0x0)&0xff)
+#define SCILV1(scsp) 	((scsp->udata.data[0x26/2]>>0x0)&0xff)
+#define SCILV2(scsp) 	((scsp->udata.data[0x28/2]>>0x0)&0xff)
+
+#define SCIEX0	0
+#define SCIEX1	1
+#define SCIEX2	2
+#define SCIMID	3
+#define SCIDMA	4
+#define SCIIRQ	5
+#define SCITMA	6
+#define SCITMB	7
+
+#define USEDSP
+
+struct m68ki_cpu_core_s;
+
+struct _SCSP
+{
+	union
+	{
+		UINT16 data[0x30/2];
+		UINT8 datab[0x30];
+	} udata;
+	struct _SLOT Slots[32];
+	signed short RINGBUF[64];
+	unsigned char BUFPTR;
+#if FM_DELAY
+	signed short DELAYBUF[FM_DELAY];
+	unsigned char DELAYPTR;
+#endif
+	unsigned char *SCSPRAM;
+	UINT32 SCSPRAM_LENGTH;
+	char Master;
+	void (*Int68kCB)(struct m68ki_cpu_core_s *cpu, int irq);
+
+	INT32 *buffertmpl, *buffertmpr;
+
+	UINT32 IrqTimA;
+	UINT32 IrqTimBC;
+	UINT32 IrqMidi;
+
+	UINT8 MidiOutW,MidiOutR;
+	UINT8 MidiStack[16];
+	UINT8 MidiW,MidiR;
+
+	int LPANTABLE[0x10000];
+	int RPANTABLE[0x10000];
+
+	int TimPris[3];
+	int TimCnt[3];
+
+	// DMA stuff
+	UINT32 scsp_dmea;
+	UINT16 scsp_drga;
+	UINT16 scsp_dtlg;
+
+	int ARTABLE[64], DRTABLE[64];
+
+ struct m68ki_cpu_core_s *cpu;
+	struct _SCSPDSP DSP;
+
+ INT16 *bufferl;
+ INT16 *bufferr;
+
+ int length;
+
+ signed short *RBUFDST;	//this points to where the sample will be stored in the RingBuf
+};
+
+static void dma_scsp(struct _SCSP *SCSP); 		/*SCSP DMA transfer function*/
+#define	scsp_dgate		scsp_regs[0x16/2] & 0x4000
+#define	scsp_ddir		scsp_regs[0x16/2] & 0x2000
+#define scsp_dexe 		scsp_regs[0x16/2] & 0x1000
+#define dma_transfer_end	((scsp_regs[0x24/2] & 0x10)>>4)|(((scsp_regs[0x26/2] & 0x10)>>4)<<1)|(((scsp_regs[0x28/2] & 0x10)>>4)<<2)
+
+static const float SDLT[8]={-1000000.0,-36.0,-30.0,-24.0,-18.0,-12.0,-6.0,0.0};
+
+static unsigned char DecodeSCI(struct _SCSP *SCSP,unsigned char irq)
+{
+	unsigned char SCI=0;
+	unsigned char v;
+	v=(SCILV0((SCSP))&(1<<irq))?1:0;
+	SCI|=v;
+	v=(SCILV1((SCSP))&(1<<irq))?1:0;
+	SCI|=v<<1;
+	v=(SCILV2((SCSP))&(1<<irq))?1:0;
+	SCI|=v<<2;
+	return SCI;
+}
+
+static void ResetInterrupts(struct _SCSP *SCSP)
+{
+	UINT32 reset = SCSP->udata.data[0x22/2];
+	if (reset & 0x40)
+		SCSP->Int68kCB(SCSP->cpu, -SCSP->IrqTimA);
+	if (reset & 0x180)
+		SCSP->Int68kCB(SCSP->cpu, -SCSP->IrqTimBC);
+}
+
+static void CheckPendingIRQ(struct _SCSP *SCSP)
+{
+	UINT32 pend=SCSP->udata.data[0x20/2];
+	UINT32 en=SCSP->udata.data[0x1e/2];
+	if(SCSP->MidiW!=SCSP->MidiR)
+	{
+		SCSP->Int68kCB(SCSP->cpu, SCSP->IrqMidi);
+		return;
+	}
+	if(!pend)
+		return;
+	if(pend&0x40)
+		if(en&0x40)
+		{
+			SCSP->Int68kCB(SCSP->cpu, SCSP->IrqTimA);
+			return;
+		}
+	if(pend&0x80)
+		if(en&0x80)
+		{
+			SCSP->Int68kCB(SCSP->cpu, SCSP->IrqTimBC);
+			return;
+		}
+	if(pend&0x100)
+		if(en&0x100)
+		{
+			SCSP->Int68kCB(SCSP->cpu, SCSP->IrqTimBC);
+			return;
+		}
+
+	SCSP->Int68kCB(SCSP->cpu, 0);
+}
+
+static int Get_AR(struct _SCSP *SCSP,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return SCSP->ARTABLE[Rate];
+}
+
+static int Get_DR(struct _SCSP *SCSP,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return SCSP->DRTABLE[Rate];
+}
+
+static int Get_RR(struct _SCSP *SCSP,int base,int R)
+{
+	int Rate=base+(R<<1);
+	if(Rate>63)	Rate=63;
+	if(Rate<0) Rate=0;
+	return SCSP->DRTABLE[Rate];
+}
+
+static void Compute_EG(struct _SCSP *SCSP,struct _SLOT *slot)
+{
+	int octave=OCT(slot);
+	int rate;
+	if(octave&8) octave=octave-16;
+	if(KRS(slot)!=0xf)
+		rate=octave+2*KRS(slot)+((FNS(slot)>>9)&1);
+	else
+		rate=0; //rate=((FNS(slot)>>9)&1);
+
+	slot->EG.volume=0x17F<<EG_SHIFT;
+	slot->EG.AR=Get_AR(SCSP,rate,AR(slot));
+	slot->EG.D1R=Get_DR(SCSP,rate,D1R(slot));
+	slot->EG.D2R=Get_DR(SCSP,rate,D2R(slot));
+	slot->EG.RR=Get_RR(SCSP,rate,RR(slot));
+	slot->EG.DL=0x1f-DL(slot);
+	slot->EG.EGHOLD=EGHOLD(slot);
+}
+
+static void SCSP_StopSlot(struct _SLOT *slot,int keyoff);
+
+static int EG_Update(struct _SLOT *slot)
+{
+	switch(slot->EG.state)
+	{
+		case ATTACK:
+			slot->EG.volume+=slot->EG.AR;
+			if(slot->EG.volume>=(0x3ff<<EG_SHIFT))
+			{
+				if (!LPSLNK(slot)) 
+				{
+					slot->EG.state=DECAY1;
+					if(slot->EG.D1R>=(1024<<EG_SHIFT)) //Skip DECAY1, go directly to DECAY2
+						slot->EG.state=DECAY2;
+				}
+				slot->EG.volume=0x3ff<<EG_SHIFT;
+			}
+			if(slot->EG.EGHOLD)
+				return 0x3ff<<(SHIFT-10);
+			break;
+		case DECAY1:
+			slot->EG.volume-=slot->EG.D1R;
+			if(slot->EG.volume<=0)
+				slot->EG.volume=0;
+			if(slot->EG.volume>>(EG_SHIFT+5)<=slot->EG.DL)
+				slot->EG.state=DECAY2;
+			break;
+		case DECAY2:
+			if(D2R(slot)==0)
+				return (slot->EG.volume>>EG_SHIFT)<<(SHIFT-10);
+			slot->EG.volume-=slot->EG.D2R;
+			if(slot->EG.volume<=0)
+				slot->EG.volume=0;
+
+			break;
+		case RELEASE:
+			slot->EG.volume-=slot->EG.RR;
+			if(slot->EG.volume<=0)
+			{
+				slot->EG.volume=0;
+				SCSP_StopSlot(slot,0);
+				//slot->EG.volume=0x17F<<EG_SHIFT;
+				//slot->EG.state=ATTACK;
+			}
+			break;
+		default:
+			return 1<<SHIFT;
+	}
+	return (slot->EG.volume>>EG_SHIFT)<<(SHIFT-10);
+}
+
+static UINT32 SCSP_Step(struct _SLOT *slot)
+{
+	int octave=OCT(slot);
+	UINT64 Fn;
+
+	Fn=(FNS_Table[FNS(slot)]);	//24.8
+	if(octave&8)
+		Fn>>=(16-octave);
+	else
+		Fn<<=octave;
+
+	return Fn/(44100);
+}
+
+
+static void Compute_LFO(struct _SLOT *slot)
+{
+	if(PLFOS(slot)!=0)
+		LFO_ComputeStep(&(slot->PLFO),LFOF(slot),PLFOWS(slot),PLFOS(slot),0);
+	if(ALFOS(slot)!=0)
+		LFO_ComputeStep(&(slot->ALFO),LFOF(slot),ALFOWS(slot),ALFOS(slot),1);
+}
+
+static void SCSP_StartSlot(struct _SCSP *SCSP, struct _SLOT *slot)
+{
+	UINT32 start_offset;
+	slot->active=1;
+	slot->Backwards=0;
+	slot->cur_addr=0; slot->nxt_addr=1<<SHIFT;
+	start_offset = PCM8B(slot) ? SA(slot) : SA(slot) & 0x7FFFE;
+	slot->base=SCSP->SCSPRAM + start_offset;
+	slot->step=SCSP_Step(slot);
+	Compute_EG(SCSP,slot);
+	slot->EG.state=ATTACK;
+	slot->EG.volume=0x17F<<EG_SHIFT;
+	slot->Prev=0;
+	Compute_LFO(slot);
+
+//	printf("StartSlot: SA %x PCM8B %x LPCTL %x ALFOS %x STWINH %x TL %x EFSDL %x\n", SA(slot), PCM8B(slot), LPCTL(slot), ALFOS(slot), STWINH(slot), TL(slot), EFSDL(slot));
+//	printf(" AR %x D1R %x D2R %x RR %x DL %x KRS %x EGHOLD %x LPSLNK %x\n", AR(slot), D1R(slot), D2R(slot), RR(slot), DL(slot), KRS(slot), EGHOLD(slot), LPSLNK(slot));
+}
+
+static void SCSP_StopSlot(struct _SLOT *slot,int keyoff)
+{
+	if(keyoff /*&& slot->EG.state!=RELEASE*/)
+	{
+		slot->EG.state=RELEASE;
+	}
+	else
+	{
+		slot->active=0;
+	}
+	slot->udata.data[0]&=~0x800;
+}
+
+#define log_base_2(n) (log((float) n)/log((float) 2))
+
+static void SCSP_Init(struct _SCSP *SCSP, const struct SCSPinterface *intf)
+{
+	int i=0;
+
+	SCSP->IrqTimA = SCSP->IrqTimBC = SCSP->IrqMidi = 0;
+	SCSP->MidiR=SCSP->MidiW=0;
+	SCSP->MidiOutR=SCSP->MidiOutW=0;
+
+	// get SCSP RAM
+	{
+		memset(SCSP,0,sizeof(*SCSP));
+ SCSP->cpu = intf->cpu;
+
+		if (!i)
+		{
+			SCSP->Master=1;
+		}
+		else
+		{
+			SCSP->Master=0;
+		}
+
+		if (intf->region)
+		{
+			SCSP->SCSPRAM = (unsigned char *)intf->region[0];
+			SCSP->SCSPRAM_LENGTH = 512*1024;
+			SCSP->DSP.SCSPRAM = (UINT16 *)SCSP->SCSPRAM;
+			SCSP->DSP.SCSPRAM_LENGTH = (512*1024)/2;
+//			SCSP->SCSPRAM += intf->roffset;
+		}
+	}
+
+	for(i=0;i<0x400;++i)
+	{
+		float fcent=(double) 1200.0*log_base_2((double)(((double) 1024.0+(double)i)/(double)1024.0));
+		fcent=(double) 44100.0*pow(2.0,fcent/1200.0);
+		FNS_Table[i]=(float) (1<<SHIFT) *fcent;
+	}
+	
+	for(i=0;i<0x400;++i)
+	{
+		float envDB=((float)(3*(i-0x3ff)))/32.0;
+		float scale=(float)(1<<SHIFT);
+		EG_TABLE[i]=(INT32)(pow(10.0,envDB/20.0)*scale);
+	}
+
+	for(i=0;i<0x10000;++i)
+	{
+		int iTL =(i>>0x0)&0xff;
+		int iPAN=(i>>0x8)&0x1f;
+		int iSDL=(i>>0xD)&0x07;
+		float TL=1.0;
+		float SegaDB=0;
+		float fSDL=1.0;
+		float PAN=1.0;
+		float LPAN,RPAN;
+
+		if(iTL&0x01) SegaDB-=0.4;
+		if(iTL&0x02) SegaDB-=0.8;
+		if(iTL&0x04) SegaDB-=1.5;
+		if(iTL&0x08) SegaDB-=3;
+		if(iTL&0x10) SegaDB-=6;
+		if(iTL&0x20) SegaDB-=12;
+		if(iTL&0x40) SegaDB-=24;
+		if(iTL&0x80) SegaDB-=48;
+
+		TL=pow(10.0,SegaDB/20.0);
+
+		SegaDB=0;
+		if(iPAN&0x1) SegaDB-=3;
+		if(iPAN&0x2) SegaDB-=6;
+		if(iPAN&0x4) SegaDB-=12;
+		if(iPAN&0x8) SegaDB-=24;
+
+		if((iPAN&0xf)==0xf) PAN=0.0;
+		else PAN=pow(10.0,SegaDB/20.0);
+
+		if(iPAN<0x10)
+		{
+			LPAN=PAN;
+			RPAN=1.0;
+		}
+		else
+		{
+			RPAN=PAN;
+			LPAN=1.0;
+		}
+
+		if(iSDL)
+			fSDL=pow(10.0,(SDLT[iSDL])/20.0);
+		else
+			fSDL=0.0;
+
+		SCSP->LPANTABLE[i]=FIX((4.0*LPAN*TL*fSDL));
+		SCSP->RPANTABLE[i]=FIX((4.0*RPAN*TL*fSDL));
+	}
+
+	SCSP->ARTABLE[0]=SCSP->DRTABLE[0]=0;	//Infinite time
+	SCSP->ARTABLE[1]=SCSP->DRTABLE[1]=0;	//Infinite time
+	for(i=2;i<64;++i)
+	{
+		double t,step,scale;
+		t=ARTimes[i];	//In ms
+		if(t!=0.0)
+		{
+			step=(1023*1000.0)/((float) 44100.0f*t);
+			scale=(double) (1<<EG_SHIFT);
+			SCSP->ARTABLE[i]=(int) (step*scale);
+		}
+		else
+			SCSP->ARTABLE[i]=1024<<EG_SHIFT;
+
+		t=DRTimes[i];	//In ms
+		step=(1023*1000.0)/((float) 44100.0f*t);
+		scale=(double) (1<<EG_SHIFT);
+		SCSP->DRTABLE[i]=(int) (step*scale);
+	}
+
+	// make sure all the slots are off
+	for(i=0;i<32;++i)
+	{
+		SCSP->Slots[i].slot=i;
+		SCSP->Slots[i].active=0;
+		SCSP->Slots[i].base=NULL;
+	}
+
+	LFO_Init();
+	SCSP->buffertmpl=(signed int*) malloc(44100*sizeof(signed int));
+	SCSP->buffertmpr=(signed int*) malloc(44100*sizeof(signed int));
+	memset(SCSP->buffertmpl,0,44100*sizeof(signed int));
+	memset(SCSP->buffertmpr,0,44100*sizeof(signed int));
+
+	// no "pend"
+	SCSP[0].udata.data[0x20/2] = 0;
+	//SCSP[1].udata.data[0x20/2] = 0;
+	SCSP->TimCnt[0] = 0xffff;
+	SCSP->TimCnt[1] = 0xffff;
+	SCSP->TimCnt[2] = 0xffff;
+}
+
+static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
+{
+	struct _SLOT *slot=SCSP->Slots+s;
+	int sl;
+	switch(r&0x3f)
+	{
+		case 0:
+		case 1:
+			if(KEYONEX(slot))
+			{
+				for(sl=0;sl<32;++sl)
+				{
+					struct _SLOT *s2=SCSP->Slots+sl;
+					{
+						if(KEYONB(s2) && s2->EG.state==RELEASE/*&& !s2->active*/)
+						{
+							SCSP_StartSlot(SCSP, s2);
+						}
+						if(!KEYONB(s2) /*&& s2->active*/)
+						{
+							SCSP_StopSlot(s2,1);
+						}
+					}
+				}
+				slot->udata.data[0]&=~0x1000;
+			}
+			break;
+		case 0x10:
+		case 0x11:
+			slot->step=SCSP_Step(slot);
+			break;
+		case 0xA:
+		case 0xB:
+			slot->EG.RR=Get_RR(SCSP,0,RR(slot));
+			slot->EG.DL=0x1f-DL(slot);
+			break;
+		case 0x12:
+		case 0x13:
+			Compute_LFO(slot);
+			break;
+	}
+}
+
+static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
+{
+	switch(reg&0x3f)
+	{
+		case 0x2:
+		case 0x3:
+			{
+				unsigned int v=RBL(SCSP);
+				SCSP->DSP.RBP=RBP(SCSP);
+				if(v==0)
+					SCSP->DSP.RBL=8*1024;
+				else if(v==1)
+					SCSP->DSP.RBL=16*1024;
+				if(v==2)
+					SCSP->DSP.RBL=32*1024;
+				if(v==3)
+					SCSP->DSP.RBL=64*1024;
+			}
+			break;
+		case 0x6:
+		case 0x7:
+			SCSP_MidiIn(SCSP, 0, SCSP->udata.data[0x6/2]&0xff, 0);
+			break;
+		case 0x12:
+		case 0x13:
+		case 0x14:
+		case 0x15:
+		case 0x16:
+		case 0x17:
+			break;
+		case 0x18:
+		case 0x19:
+			if(SCSP->Master)
+			{
+				SCSP->TimPris[0]=1<<((SCSP->udata.data[0x18/2]>>8)&0x7);
+				SCSP->TimCnt[0]=(SCSP->udata.data[0x18/2]&0xff)<<8;
+			}
+			break;
+		case 0x1a:
+		case 0x1b:
+			if(SCSP->Master)
+			{
+				SCSP->TimPris[1]=1<<((SCSP->udata.data[0x1A/2]>>8)&0x7);
+				SCSP->TimCnt[1]=(SCSP->udata.data[0x1A/2]&0xff)<<8;
+			}
+			break;
+		case 0x1C:
+		case 0x1D:
+			if(SCSP->Master)
+			{
+				SCSP->TimPris[2]=1<<((SCSP->udata.data[0x1C/2]>>8)&0x7);
+				SCSP->TimCnt[2]=(SCSP->udata.data[0x1C/2]&0xff)<<8;
+			}
+			break;
+		case 0x22:	//SCIRE
+		case 0x23:
+
+			if(SCSP->Master)		 
+			{
+				SCSP->udata.data[0x20/2]&=~SCSP->udata.data[0x22/2];
+				ResetInterrupts(SCSP);
+
+				// behavior from real hardware: if you SCIRE a timer that's expired,
+				// it'll immediately pop up again. ask Sakura Taisen on the Saturn...
+				if (SCSP->TimCnt[0] >= 0xff00)
+				{
+					SCSP->udata.data[0x20/2] |= 0x40;
+				}
+				if (SCSP->TimCnt[1] >= 0xff00)
+				{
+					SCSP->udata.data[0x20/2] |= 0x80;
+				}
+				if (SCSP->TimCnt[2] >= 0xff00)
+				{
+					SCSP->udata.data[0x20/2] |= 0x100;
+				}
+			}
+			break;
+		case 0x24:
+		case 0x25:
+		case 0x26:
+		case 0x27:
+		case 0x28:
+		case 0x29:
+			if(SCSP->Master)
+			{
+				SCSP->IrqTimA=DecodeSCI(SCSP,SCITMA);
+				SCSP->IrqTimBC=DecodeSCI(SCSP,SCITMB);
+				SCSP->IrqMidi=DecodeSCI(SCSP,SCIMID);
+			}
+			break;
+	}
+}
+
+static void SCSP_UpdateSlotRegR(struct _SCSP *SCSP, int slot,int reg)
+{
+
+}
+
+static void SCSP_UpdateRegR(struct _SCSP *SCSP, int reg)
+{
+	switch(reg&0x3f)
+	{
+		case 4:
+		case 5:
+			{
+				unsigned short v=SCSP->udata.data[0x5/2];
+				v&=0xff00;
+				v|=SCSP->MidiStack[SCSP->MidiR];
+				SCSP->Int68kCB(SCSP->cpu, 0);	// cancel the IRQ
+				if(SCSP->MidiR!=SCSP->MidiW)
+				{
+					++SCSP->MidiR;
+					SCSP->MidiR&=15;
+				}
+				SCSP->udata.data[0x5/2]=v;
+			}
+			break;
+		case 8:
+		case 9:
+			{
+				unsigned char slot=SCSP->udata.data[0x8/2]>>11;
+				unsigned int CA=SCSP->Slots[slot&0x1f].cur_addr>>(SHIFT+12);
+				SCSP->udata.data[0x8/2]&=~(0x780);
+				SCSP->udata.data[0x8/2]|=CA<<7;
+			}
+			break;
+	}
+}
+
+static void SCSP_w16(struct _SCSP *SCSP,unsigned int addr,unsigned short val)
+{
+	addr&=0xffff;
+	if(addr<0x400)
+	{
+		int slot=addr/0x20;
+		addr&=0x1f;
+		*((unsigned short *) (SCSP->Slots[slot].udata.datab+(addr))) = val;
+		SCSP_UpdateSlotReg(SCSP,slot,addr&0x1f);
+	}
+	else if(addr<0x600)
+	{
+		if (addr < 0x430)
+		{
+			*((unsigned short *) (SCSP->udata.datab+((addr&0x3f)))) = val;
+			SCSP_UpdateReg(SCSP, addr&0x3f);
+		}
+	}
+	else if(addr<0x700)
+		SCSP->RINGBUF[(addr-0x600)/2]=val;
+	else
+	{
+		//DSP
+		if(addr<0x780)	//COEF
+			*((unsigned short *) (SCSP->DSP.COEF+(addr-0x700)/2))=val;
+		else if(addr<0x800)
+			*((unsigned short *) (SCSP->DSP.MADRS+(addr-0x780)/2))=val;
+		else if(addr<0xC00)
+			*((unsigned short *) (SCSP->DSP.MPRO+(addr-0x800)/2))=val;
+
+		if(addr==0xBF0)
+		{
+//			printf("DSP start\n");
+			SCSPDSP_Start(&SCSP->DSP);
+		}
+	}
+}
+
+static unsigned short SCSP_r16(struct _SCSP *SCSP, unsigned int addr)
+{
+	unsigned short v=0;
+	addr&=0xffff;
+	if(addr<0x400)
+	{
+		int slot=addr/0x20;
+		addr&=0x1f;
+		SCSP_UpdateSlotRegR(SCSP, slot,addr&0x1f);
+		v=*((unsigned short *) (SCSP->Slots[slot].udata.datab+(addr)));
+	}
+	else if(addr<0x600)
+	{
+		if (addr < 0x430)
+		{
+			SCSP_UpdateRegR(SCSP, addr&0x3f);
+			v= *((unsigned short *) (SCSP->udata.datab+((addr&0x3f))));
+		}
+	}
+	else if(addr<0x700)
+		v=SCSP->RINGBUF[(addr-0x600)/2];
+	return v;
+}
+
+
+#define REVSIGN(v) ((~v)+1)
+
+void SCSP_TimersAddTicks(struct _SCSP *SCSP, int ticks)
+{
+	if(SCSP->TimCnt[0]<=0xff00)
+	{
+ 		SCSP->TimCnt[0] += ticks << (8-((SCSP->udata.data[0x18/2]>>8)&0x7));
+		if (SCSP->TimCnt[0] > 0xFF00)
+		{
+			SCSP->TimCnt[0] = 0xFFFF;
+			SCSP->udata.data[0x20/2]|=0x40;
+		}
+		SCSP->udata.data[0x18/2]&=0xff00;
+		SCSP->udata.data[0x18/2]|=SCSP->TimCnt[0]>>8;
+	}
+
+	if(SCSP->TimCnt[1]<=0xff00)
+	{
+		SCSP->TimCnt[1] += ticks << (8-((SCSP->udata.data[0x1a/2]>>8)&0x7));
+		if (SCSP->TimCnt[1] > 0xFF00)
+		{
+			SCSP->TimCnt[1] = 0xFFFF;
+			SCSP->udata.data[0x20/2]|=0x80;
+		}
+		SCSP->udata.data[0x1a/2]&=0xff00;
+		SCSP->udata.data[0x1a/2]|=SCSP->TimCnt[1]>>8;
+	}
+
+	if(SCSP->TimCnt[2]<=0xff00)
+	{
+		SCSP->TimCnt[2] += ticks << (8-((SCSP->udata.data[0x1c/2]>>8)&0x7));
+		if (SCSP->TimCnt[2] > 0xFF00)
+		{
+			SCSP->TimCnt[2] = 0xFFFF;
+			SCSP->udata.data[0x20/2]|=0x100;
+		}
+		SCSP->udata.data[0x1c/2]&=0xff00;
+		SCSP->udata.data[0x1c/2]|=SCSP->TimCnt[2]>>8;
+	}
+}
+
+INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot)
+{
+	INT32 sample;
+	int step=slot->step;
+	UINT32 addr1,addr2,addr_select; // current and next sample addresses
+	UINT32 *addr[2] = {&addr1, &addr2}; // used for linear interpolation
+	UINT32 *slot_addr[2] = {&(slot->cur_addr), &(slot->nxt_addr)}; //
+
+	if(SSCTL(slot)!=0)	//no FM or noise yet
+		return 0;
+
+	if(PLFOS(slot)!=0)
+	{
+		step=step*PLFO_Step(&(slot->PLFO));
+		step>>=SHIFT;
+	}
+
+	if(PCM8B(slot))
+	{
+		addr1=slot->cur_addr>>SHIFT;
+		addr2=slot->nxt_addr>>SHIFT;
+	}
+	else
+	{
+		addr1=(slot->cur_addr>>(SHIFT-1))&0x7fffe;
+		addr2=(slot->nxt_addr>>(SHIFT-1))&0x7fffe;
+	}
+
+	if(MDL(slot)!=0 || MDXSL(slot)!=0 || MDYSL(slot)!=0)
+	{
+		INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2;
+
+		smp<<=0xA; // associate cycle with 1024
+		smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF)
+		if(!PCM8B(slot)) smp<<=1;
+		
+		addr1+=smp; addr2+=smp;
+	}
+
+	if(PCM8B(slot))	//8 bit signed
+	{
+		INT8 *p1=(signed char *) (SCSP->SCSPRAM+(((SA(slot)+addr1)^1)&0x7FFFF));
+		INT8 *p2=(signed char *) (SCSP->SCSPRAM+(((SA(slot)+addr2)^1)&0x7FFFF));
+		//sample=(p[0])<<8;
+		INT32 s;
+		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
+		s=(int) (p1[0]<<8)*((1<<SHIFT)-fpart)+(int) (p2[0]<<8)*fpart;
+		sample=(s>>SHIFT);
+	}
+	else	//16 bit signed (endianness?)
+	{
+		INT16 *p1=(signed short *) (SCSP->SCSPRAM+((SA(slot)+addr1)&0x7FFFE));
+		INT16 *p2=(signed short *) (SCSP->SCSPRAM+((SA(slot)+addr2)&0x7FFFE));
+		//sample=LE16(p[0]);
+		INT32 s;
+		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
+		s=(int) LE16(p1[0])*((1<<SHIFT)-fpart)+(int) LE16(p2[0])*fpart;
+		sample=(s>>SHIFT);
+	}
+
+	if(SBCTL(slot)&0x1)
+		sample ^= 0x7FFF;
+	if(SBCTL(slot)&0x2)
+		sample = (INT16)(sample^0x8000);
+
+	if(slot->Backwards)
+		slot->cur_addr-=step;
+	else
+		slot->cur_addr+=step;
+	slot->nxt_addr=slot->cur_addr+(1<<SHIFT);
+	
+	addr1=slot->cur_addr>>SHIFT;
+	addr2=slot->nxt_addr>>SHIFT;
+	
+	if(addr1>=LSA(slot) && !(slot->Backwards))
+	{
+		if(LPSLNK(slot) && slot->EG.state==ATTACK)
+			slot->EG.state = DECAY1;
+	}
+	
+	for (addr_select=0;addr_select<2;addr_select++)
+	{
+		INT32 rem_addr;
+		switch(LPCTL(slot))
+		{
+		case 0:	//no loop
+			if(*addr[addr_select]>=LSA(slot) && *addr[addr_select]>=LEA(slot))
+			{
+			//slot->active=0;
+			SCSP_StopSlot(slot,0);
+			}
+			break;
+		case 1: //normal loop
+			if(*addr[addr_select]>=LEA(slot))
+			{
+				rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT);
+				*slot_addr[addr_select]=(LSA(slot)<<SHIFT) + rem_addr;
+			}
+			break;
+		case 2:	//reverse loop
+			if((*addr[addr_select]>=LSA(slot)) && !(slot->Backwards))
+			{
+				rem_addr = *slot_addr[addr_select] - (LSA(slot)<<SHIFT);
+				*slot_addr[addr_select]=(LEA(slot)<<SHIFT) - rem_addr;
+				slot->Backwards=1;
+			}
+			else if((*addr[addr_select]<LSA(slot) || (*slot_addr[addr_select]&0x80000000)) && slot->Backwards)
+			{
+				rem_addr = (LSA(slot)<<SHIFT) - *slot_addr[addr_select];
+				*slot_addr[addr_select]=(LEA(slot)<<SHIFT) - rem_addr;
+			}
+			break;
+		case 3: //ping-pong
+			if(*addr[addr_select]>=LEA(slot)) //reached end, reverse till start
+			{
+				rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT); 
+				*slot_addr[addr_select]=(LEA(slot)<<SHIFT) - rem_addr;
+				slot->Backwards=1;
+			}
+			else if((*addr[addr_select]<LSA(slot) || (*slot_addr[addr_select]&0x80000000)) && slot->Backwards)//reached start or negative
+			{
+				rem_addr = (LSA(slot)<<SHIFT) - *slot_addr[addr_select];
+				*slot_addr[addr_select]=(LSA(slot)<<SHIFT) + rem_addr;
+				slot->Backwards=0;
+			}
+			break;
+		}
+	}
+
+	if(ALFOS(slot)!=0)
+	{
+		sample=sample*ALFO_Step(&(slot->ALFO));
+		sample>>=SHIFT;
+	}
+
+	if(slot->EG.state==ATTACK)
+		sample=(sample*EG_Update(slot))>>SHIFT;
+	else
+		sample=(sample*EG_TABLE[EG_Update(slot)>>(SHIFT-10)])>>SHIFT;
+
+	if(!STWINH(slot))
+	{
+		unsigned short Enc=((TL(slot))<<0x0)|(0x7<<0xd);
+		*SCSP->RBUFDST=(sample*SCSP->LPANTABLE[Enc])>>(SHIFT+1);
+	}
+		
+	return sample;
+}
+
+static void SCSP_DoMasterSamples(struct _SCSP *SCSP, int nsamples)
+{
+	INT16 *bufr,*bufl;
+	int sl, s, i;
+
+	bufr=SCSP->bufferr;
+	bufl=SCSP->bufferl;
+
+	for(s=0;s<nsamples;++s)
+	{
+		INT32 smpl, smpr;
+
+		smpl = smpr = 0;
+
+		for(sl=0;sl<32;++sl)
+		{
+#if FM_DELAY
+			SCSP->RBUFDST=SCSP->DELAYBUF+SCSP->DELAYPTR;
+#else
+			SCSP->RBUFDST=SCSP->RINGBUF+SCSP->BUFPTR;
+#endif
+			if(SCSP->Slots[sl].active)
+			{
+				struct _SLOT *slot=SCSP->Slots+sl;
+				unsigned short Enc;
+				signed int sample;
+
+				sample=SCSP_UpdateSlot(SCSP, slot);
+
+				Enc=((TL(slot))<<0x0)|((IMXL(slot))<<0xd);
+				SCSPDSP_SetSample(&SCSP->DSP,(sample*SCSP->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
+				{
+					smpl+=(sample*SCSP->LPANTABLE[Enc])>>SHIFT;
+					smpr+=(sample*SCSP->RPANTABLE[Enc])>>SHIFT;
+				}
+			}
+			
+#if FM_DELAY
+			SCSP->RINGBUF[(SCSP->BUFPTR+64-(FM_DELAY-1))&63] = SCSP->DELAYBUF[(SCSP->DELAYPTR+FM_DELAY-(FM_DELAY-1))%FM_DELAY];
+#endif
+			++SCSP->BUFPTR;
+			SCSP->BUFPTR&=63;
+#if FM_DELAY
+			++SCSP->DELAYPTR;
+			if(SCSP->DELAYPTR>FM_DELAY-1) SCSP->DELAYPTR=0;
+#endif
+		}
+
+		SCSPDSP_Step(&SCSP->DSP);
+
+		for(i=0;i<16;++i)
+		{
+			struct _SLOT *slot=SCSP->Slots+i;
+			if(EFSDL(slot))
+			{
+				unsigned short Enc=((EFPAN(slot))<<0x8)|((EFSDL(slot))<<0xd);
+				smpl+=(SCSP->DSP.EFREG[i]*SCSP->LPANTABLE[Enc])>>SHIFT;
+				smpr+=(SCSP->DSP.EFREG[i]*SCSP->RPANTABLE[Enc])>>SHIFT;
+			}
+		}
+
+		*bufl++ = ICLIP16(smpl>>2);
+		*bufr++ = ICLIP16(smpr>>2);
+
+		SCSP_TimersAddTicks(SCSP, 1);
+		CheckPendingIRQ(SCSP);
+	}
+
+}
+
+static void dma_scsp(struct _SCSP *SCSP)
+{
+	static UINT16 tmp_dma[3], *scsp_regs;
+
+	scsp_regs = (UINT16 *)SCSP->udata.datab;
+
+	printf("SCSP: DMA transfer START\n"
+			 "DMEA: %04x DRGA: %04x DTLG: %04x\n"
+			 "DGATE: %d DDIR: %d\n",SCSP->scsp_dmea,SCSP->scsp_drga,SCSP->scsp_dtlg,scsp_dgate ? 1 : 0,scsp_ddir ? 1 : 0);
+
+	/* Copy the dma values in a temp storage for resuming later *
+ * (DMA *can't* overwrite his parameters). */
+	if(!(scsp_ddir))
+	{
+		tmp_dma[0] = scsp_regs[0x12/2];
+		tmp_dma[1] = scsp_regs[0x14/2];
+		tmp_dma[2] = scsp_regs[0x16/2];
+	}
+
+	if(scsp_ddir)
+	{
+		for(;SCSP->scsp_dtlg > 0;SCSP->scsp_dtlg-=2)
+		{
+//			program_write_word(SCSP->scsp_dmea, program_read_word(0x100000|SCSP->scsp_drga));
+			SCSP->scsp_dmea+=2;
+			SCSP->scsp_drga+=2;
+		}
+	}
+	else
+	{
+		for(;SCSP->scsp_dtlg > 0;SCSP->scsp_dtlg-=2)
+		{
+// 			program_write_word(0x100000|SCSP->scsp_drga,program_read_word(SCSP->scsp_dmea));
+			SCSP->scsp_dmea+=2;
+			SCSP->scsp_drga+=2;
+		}
+	}
+
+	/*Resume the values*/
+	if(!(scsp_ddir))
+	{
+	 	scsp_regs[0x12/2] = tmp_dma[0];
+		scsp_regs[0x14/2] = tmp_dma[1];
+		scsp_regs[0x16/2] = tmp_dma[2];
+	}
+
+	/*Job done,request a dma end irq*/
+//	if(scsp_regs[0x1e/2] & 0x10)
+//		cpunum_set_input_line(2,dma_transfer_end,HOLD_LINE);
+}
+
+int SCSP_IRQCB(void *param)
+{
+	CheckPendingIRQ(param);
+	return -1;
+}
+
+void SCSP_Update(void *param, INT16 **inputs, INT16 **buf, int samples)
+{
+	struct _SCSP *SCSP = param;
+	SCSP->bufferl = buf[0];
+	SCSP->bufferr = buf[1];
+	SCSP->length = samples;
+	SCSP_DoMasterSamples(SCSP, samples);
+}
+
+void *SCSP_Start(const void *config)
+{
+	const struct SCSPinterface *intf;
+
+	struct _SCSP *SCSP;
+
+	SCSP = malloc(sizeof(*SCSP));
+	memset(SCSP, 0, sizeof(*SCSP));
+
+	intf = config;
+
+	// init the emulation
+	SCSP_Init(SCSP, intf);
+
+	// set up the IRQ callbacks
+	{
+		SCSP->Int68kCB = intf->irq_callback[0];
+
+//		SCSP->stream = stream_create(0, 2, 44100, SCSP, SCSP_Update);
+	}
+
+	return SCSP;
+}
+
+void SCSP_Exit (void *param) {
+ if (param) {
+ struct _SCSP *SCSP = param;
+ if (SCSP->buffertmpl) {
+ free (SCSP->buffertmpl);
+ }
+ if (SCSP->buffertmpr) {
+ free (SCSP->buffertmpr);
+ }
+ free (param);
+ }
+}
+
+
+void SCSP_set_ram_base(struct _SCSP *SCSP, int which, void *base)
+{
+	if (SCSP)
+	{
+		SCSP->SCSPRAM = base;
+		SCSP->DSP.SCSPRAM = base;
+	}
+}
+
+
+READ16_HANDLER( SCSP_0_r )
+{
+	return SCSP_r16(param, offset*2);
+}
+
+WRITE16_HANDLER( SCSP_0_w )
+{
+	struct _SCSP *SCSP = param;
+	UINT16 tmp, *scsp_regs;
+
+	tmp = SCSP_r16(SCSP, offset*2);
+	COMBINE_DATA(&tmp);
+	SCSP_w16(SCSP,offset*2, tmp);
+
+	scsp_regs = (UINT16 *)SCSP->udata.datab;
+
+	switch(offset*2)
+	{
+		// check DMA
+		case 0x412:
+		/*DMEA [15:1]*/
+		/*Sound memory address*/
+		SCSP->scsp_dmea = (((scsp_regs[0x14/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x12/2] & 0xfffe);
+		break;
+		case 0x414:
+		/*DMEA [19:16]*/
+		SCSP->scsp_dmea = (((scsp_regs[0x14/2] & 0xf000)>>12)*0x10000) | (scsp_regs[0x12/2] & 0xfffe);
+		/*DRGA [11:1]*/
+		/*Register memory address*/
+		SCSP->scsp_drga = scsp_regs[0x14/2] & 0x0ffe;
+		break;
+		case 0x416:
+		/*DGATE[14]*/
+		/*DDIR[13]*/
+		/*if 0 sound_mem -> reg*/
+		/*if 1 sound_mem <- reg*/
+		/*DEXE[12]*/
+		/*starting bit*/
+		/*DTLG[11:1]*/
+		/*size of transfer*/
+		SCSP->scsp_dtlg = scsp_regs[0x16/2] & 0x0ffe;
+		if(scsp_dexe)
+		{
+			dma_scsp(SCSP);
+			scsp_regs[0x16/2]^=0x1000;//disable starting bit
+		}
+		break;
+		//check main cpu IRQ
+		case 0x42a:
+#if 0
+ extern UINT32* stv_scu;
+
+			if(stv_scu && !(stv_scu[40] & 0x40) /*&& scsp_regs[0x42c/2] & 0x20*/)/*Main CPU allow sound irq*/
+			{
+				cpunum_set_input_line_and_vector(0, 9, HOLD_LINE , 0x46);
+			 logerror("SCSP: Main CPU interrupt\n");
+			}
+#endif
+		break;
+		case 0x42c:
+		break;
+		case 0x42e:
+		break;
+	}
+}
+
+WRITE16_HANDLER( SCSP_MidiIn )
+{
+	struct _SCSP *SCSP = param; 
+	SCSP->MidiStack[SCSP->MidiW++]=data;
+	SCSP->MidiW &= 15;
+}
+
+READ16_HANDLER( SCSP_MidiOutR )
+{
+	struct _SCSP *SCSP = param; 
+	unsigned char val;
+
+	val=SCSP->MidiStack[SCSP->MidiR++];
+	SCSP->MidiR&=7;
+	return val;
+}
+

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/scsp.h Added

@@ -0,0 +1,47 @@
+/*
+
+	SCSP (YMF292-F) header
+*/
+
+#ifndef _SCSP_H_
+#define _SCSP_H_
+
+#define MAX_SCSP	(2)
+
+#define COMBINE_DATA(varptr)	(*(varptr) = (*(varptr) & mem_mask) | (data & ~mem_mask))
+
+// convert AO types
+typedef int8 data8_t;
+typedef int16 data16_t;
+typedef int32 data32_t;
+typedef int offs_t;
+struct m68ki_cpu_core_s;
+
+struct SCSPinterface 
+{
+	int num;
+	void *region[MAX_SCSP];
+	int mixing_level[MAX_SCSP];			/* volume */
+	void (*irq_callback[MAX_SCSP])(struct m68ki_cpu_core_s *cpu, int state);	/* irq callback */
+	struct m68ki_cpu_core_s *cpu;
+};
+
+void *SCSP_Start(const void *config);
+void SCSP_Exit (void *param);
+
+void SCSP_Update(void *param, INT16 **inputs, INT16 **buf, int samples);
+
+#define READ16_HANDLER(name)	data16_t name(void *param, offs_t offset, data16_t mem_mask)
+#define WRITE16_HANDLER(name)	void     name(void *param, offs_t offset, data16_t data, data16_t mem_mask)
+
+// SCSP register access
+READ16_HANDLER( SCSP_0_r );
+WRITE16_HANDLER( SCSP_0_w );
+READ16_HANDLER( SCSP_1_r );
+WRITE16_HANDLER( SCSP_1_w );
+
+// MIDI I/O access (used for comms on Model 2/3)
+WRITE16_HANDLER( SCSP_MidiIn );
+READ16_HANDLER( SCSP_MidiOutR );
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/scspdsp.c Added

@@ -0,0 +1,349 @@
+#include <assert.h>
+#include <math.h>
+#include "ao.h"
+#include "cpuintrf.h"
+#include "scsp.h"
+#include "scspdsp.h"
+
+static UINT16 PACK(INT32 val)
+{
+	UINT32 temp;
+	int sign,exponent,k;
+
+	sign = (val >> 23) & 0x1;
+	temp = (val ^ (val << 1)) & 0xFFFFFF;
+	exponent = 0;
+	for (k=0; k<12; k++)
+	{
+		if (temp & 0x800000)
+			break;
+		temp <<= 1;
+		exponent += 1;
+	}
+	if (exponent < 12)
+		val = (val << exponent) & 0x3FFFFF;
+	else
+		val <<= 11;
+	val >>= 11;
+	val |= sign << 15;
+	val |= exponent << 11;
+
+	return (UINT16)val;
+}
+
+static INT32 UNPACK(UINT16 val)
+{
+	int sign,exponent,mantissa;
+	INT32 uval;
+
+	sign = (val >> 15) & 0x1;
+	exponent = (val >> 11) & 0xF;
+	mantissa = val & 0x7FF;
+	uval = mantissa << 11;
+	if (exponent > 11)
+		exponent = 11;
+	else
+		uval |= (sign ^ 1) << 22;
+	uval |= sign << 23;
+	uval <<= 8;
+	uval >>= 8;
+	uval >>= exponent;
+
+	return uval;
+}
+
+void SCSPDSP_Init(struct _SCSPDSP *DSP)
+{
+	memset(DSP,0,sizeof(struct _SCSPDSP));
+	DSP->RBL=0x8000;
+	DSP->Stopped=1;
+}
+
+void SCSPDSP_Step(struct _SCSPDSP *DSP)
+{
+	INT32 ACC=0;	//26 bit
+	INT32 SHIFTED=0;	//24 bit
+	INT32 X=0;	//24 bit
+	INT32 Y=0;	//13 bit
+	INT32 B=0;	//26 bit
+	INT32 INPUTS=0;	//24 bit
+	INT32 MEMVAL=0;
+	INT32 FRC_REG=0;	//13 bit
+	INT32 Y_REG=0;		//24 bit
+	UINT32 ADDR=0;
+	UINT32 ADRS_REG=0;	//13 bit
+	int step;
+
+	if(DSP->Stopped)
+		return;
+
+	memset(DSP->EFREG,0,2*16);
+#if 0
+	int dump=0;
+	FILE *f=NULL;
+	if(dump)
+		f=fopen("dsp.txt","wt");
+#endif
+	for(step=0;step</*128*/DSP->LastStep;++step)
+	{
+		UINT16 *IPtr=DSP->MPRO+step*4;
+
+// if(IPtr[0]==0 && IPtr[1]==0 && IPtr[2]==0 && IPtr[3]==0)
+// break;
+
+		UINT32 TRA=(IPtr[0]>>8)&0x7F;
+		UINT32 TWT=(IPtr[0]>>7)&0x01;
+		UINT32 TWA=(IPtr[0]>>0)&0x7F;
+
+		UINT32 XSEL=(IPtr[1]>>15)&0x01;
+		UINT32 YSEL=(IPtr[1]>>13)&0x03;
+		UINT32 IRA=(IPtr[1]>>6)&0x3F;
+		UINT32 IWT=(IPtr[1]>>5)&0x01;
+		UINT32 IWA=(IPtr[1]>>0)&0x1F;
+
+		UINT32 TABLE=(IPtr[2]>>15)&0x01;
+		UINT32 MWT=(IPtr[2]>>14)&0x01;
+		UINT32 MRD=(IPtr[2]>>13)&0x01;
+		UINT32 EWT=(IPtr[2]>>12)&0x01;
+		UINT32 EWA=(IPtr[2]>>8)&0x0F;
+		UINT32 ADRL=(IPtr[2]>>7)&0x01;
+		UINT32 FRCL=(IPtr[2]>>6)&0x01;
+		UINT32 SHIFT=(IPtr[2]>>4)&0x03;
+		UINT32 YRL=(IPtr[2]>>3)&0x01;
+		UINT32 NEGB=(IPtr[2]>>2)&0x01;
+		UINT32 ZERO=(IPtr[2]>>1)&0x01;
+		UINT32 BSEL=(IPtr[2]>>0)&0x01;
+
+		UINT32 NOFL=(IPtr[3]>>15)&1;		//????
+		UINT32 COEF=(IPtr[3]>>9)&0x3f;
+
+		UINT32 MASA=(IPtr[3]>>2)&0x1f;	//???
+		UINT32 ADREB=(IPtr[3]>>1)&0x1;
+		UINT32 NXADR=(IPtr[3]>>0)&0x1;
+
+		INT64 v;
+
+		//operations are done at 24 bit precision
+#if 0
+		if(MASA)
+			int a=1;
+		if(NOFL)
+			int a=1;
+
+// int dump=0;
+
+		if(f)
+		{
+#define DUMP(v)	fprintf(f," " #v ": %04X",v);
+
+			fprintf(f,"%d: ",step);
+			DUMP(ACC);
+			DUMP(SHIFTED);
+			DUMP(X);
+			DUMP(Y);
+			DUMP(B);
+			DUMP(INPUTS);
+			DUMP(MEMVAL);
+			DUMP(FRC_REG);
+			DUMP(Y_REG);
+			DUMP(ADDR);
+			DUMP(ADRS_REG);
+			fprintf(f,"\n");
+		}
+#endif
+		//INPUTS RW
+		assert(IRA<0x32);
+		if(IRA<=0x1f)
+			INPUTS=DSP->MEMS[IRA];
+		else if(IRA<=0x2F)
+			INPUTS=DSP->MIXS[IRA-0x20]<<4;	//MIXS is 20 bit
+		else if(IRA<=0x31)
+			INPUTS=0;
+
+		INPUTS<<=8;
+		INPUTS>>=8;
+		//if(INPUTS&0x00800000)
+		// INPUTS|=0xFF000000;
+
+		if(IWT)
+		{
+			DSP->MEMS[IWA]=MEMVAL;	//MEMVAL was selected in previous MRD
+			if(IRA==IWA)
+				INPUTS=MEMVAL;
+		}
+
+		//Operand sel
+		//B
+		if(!ZERO)
+		{
+			if(BSEL)
+				B=ACC;
+			else
+			{
+				B=DSP->TEMP[(TRA+DSP->DEC)&0x7F];
+				B<<=8;
+				B>>=8;
+				//if(B&0x00800000)
+				// B|=0xFF000000; //Sign extend
+			}
+			if(NEGB)
+				B=0-B;
+		}
+		else
+			B=0;
+
+		//X
+		if(XSEL)
+			X=INPUTS;
+		else
+		{
+			X=DSP->TEMP[(TRA+DSP->DEC)&0x7F];
+			X<<=8;
+			X>>=8;
+			//if(X&0x00800000)
+			// X|=0xFF000000;
+		}
+
+		//Y
+		if(YSEL==0)
+			Y=FRC_REG;
+		else if(YSEL==1)
+			Y=DSP->COEF[COEF]>>3;	//COEF is 16 bits
+		else if(YSEL==2)
+			Y=(Y_REG>>11)&0x1FFF;
+		else if(YSEL==3)
+			Y=(Y_REG>>4)&0x0FFF;
+
+		if(YRL)
+			Y_REG=INPUTS;
+
+		//Shifter
+		if(SHIFT==0)
+		{
+			SHIFTED=ACC;
+			if(SHIFTED>0x007FFFFF)
+				SHIFTED=0x007FFFFF;
+			if(SHIFTED<(-0x00800000))
+				SHIFTED=-0x00800000;
+		}
+		else if(SHIFT==1)
+		{
+			SHIFTED=ACC*2;
+			if(SHIFTED>0x007FFFFF)
+				SHIFTED=0x007FFFFF;
+			if(SHIFTED<(-0x00800000))
+				SHIFTED=-0x00800000;
+		}
+		else if(SHIFT==2)
+		{
+			SHIFTED=ACC*2;
+			SHIFTED<<=8;
+			SHIFTED>>=8;
+			//SHIFTED&=0x00FFFFFF;
+			//if(SHIFTED&0x00800000)
+			// SHIFTED|=0xFF000000;
+		}
+		else if(SHIFT==3)
+		{
+			SHIFTED=ACC;
+			SHIFTED<<=8;
+			SHIFTED>>=8;
+			//SHIFTED&=0x00FFFFFF;
+			//if(SHIFTED&0x00800000)
+			// SHIFTED|=0xFF000000;
+		}
+
+		//ACCUM
+		Y<<=19;
+		Y>>=19;
+		//if(Y&0x1000)
+		// Y|=0xFFFFF000;
+
+		v=(((INT64) X*(INT64) Y)>>12);
+		ACC=(int) v+B;
+
+		if(TWT)
+			DSP->TEMP[(TWA+DSP->DEC)&0x7F]=SHIFTED;
+
+		if(FRCL)
+		{
+			if(SHIFT==3)
+				FRC_REG=SHIFTED&0x0FFF;
+			else
+				FRC_REG=(SHIFTED>>11)&0x1FFF;
+		}
+
+		if(MRD || MWT)
+		//if(0)
+		{
+			ADDR=DSP->MADRS[MASA];
+			if(!TABLE)
+				ADDR+=DSP->DEC;
+			if(ADREB)
+				ADDR+=ADRS_REG&0x0FFF;
+			if(NXADR)
+				ADDR++;
+			if(!TABLE)
+				ADDR&=DSP->RBL-1;
+			else
+				ADDR&=0xFFFF;
+			//ADDR<<=1;
+			//ADDR+=DSP->RBP<<13;
+			//MEMVAL=DSP->SCSPRAM[ADDR>>1];
+			ADDR+=DSP->RBP<<12;
+			if(MRD && (step&1))	//memory only allowed on odd? DoA inserts NOPs on even
+			{
+				if(NOFL)
+					MEMVAL=DSP->SCSPRAM[ADDR]<<8;
+				else
+					MEMVAL=UNPACK(DSP->SCSPRAM[ADDR]);
+			}
+			if(MWT && (step&1))
+			{
+				if(NOFL)
+					DSP->SCSPRAM[ADDR]=SHIFTED>>8;
+				else
+					DSP->SCSPRAM[ADDR]=PACK(SHIFTED);
+			}
+		}
+
+		if(ADRL)
+		{
+			if(SHIFT==3)
+				ADRS_REG=(SHIFTED>>12)&0xFFF;
+			else
+				ADRS_REG=(INPUTS>>16);
+		}
+
+		if(EWT)
+			DSP->EFREG[EWA]+=SHIFTED>>8;
+
+	}
+	--DSP->DEC;
+	memset(DSP->MIXS,0,4*16);
+// if(f)
+// fclose(f);
+}
+
+void SCSPDSP_SetSample(struct _SCSPDSP *DSP,INT32 sample,int SEL,int MXL)
+{
+	//DSP->MIXS[SEL]+=sample<<(MXL+1)/*7*/;
+	DSP->MIXS[SEL]+=sample;
+// if(MXL)
+// int a=1;
+}
+
+void SCSPDSP_Start(struct _SCSPDSP *DSP)
+{
+	int i;
+	DSP->Stopped=0;
+	for(i=127;i>=0;--i)
+	{
+		UINT16 *IPtr=DSP->MPRO+i*4;
+
+		if(IPtr[0]!=0 || IPtr[1]!=0 || IPtr[2]!=0 || IPtr[3]!=0)
+			break;
+	}
+	DSP->LastStep=i+1;
+
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/scspdsp.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/eng_ssf/scsplfo.c Added

@@ -0,0 +1,157 @@
+/*
+	SCSP LFO handling
+
+	Part of the SCSP (YMF292-F) emulator package.
+	(not compiled directly, #included from scsp.c)
+
+	By ElSemi
+	MAME/M1 conversion and cleanup by R. Belmont
+*/
+
+#define LFO_SHIFT 	8
+
+struct _LFO
+{
+ unsigned short phase;
+ UINT32 phase_step;
+ int *table;
+ int *scale;
+};
+
+#define LFIX(v)	((unsigned int) ((float) (1<<LFO_SHIFT)*(v)))
+
+//Convert DB to multiply amplitude
+#define DB(v) 	LFIX(pow(10.0,v/20.0))
+
+//Convert cents to step increment
+#define CENTS(v) LFIX(pow(2.0,v/1200.0))
+
+static int PLFO_TRI[256],PLFO_SQR[256],PLFO_SAW[256],PLFO_NOI[256];
+static int ALFO_TRI[256],ALFO_SQR[256],ALFO_SAW[256],ALFO_NOI[256];
+static float LFOFreq[32]={0.17,0.19,0.23,0.27,0.34,0.39,0.45,0.55,0.68,0.78,0.92,1.10,1.39,1.60,1.87,2.27,
+			 2.87,3.31,3.92,4.79,6.15,7.18,8.60,10.8,14.4,17.2,21.5,28.7,43.1,57.4,86.1,172.3};
+static float ASCALE[8]={0.0,0.4,0.8,1.5,3.0,6.0,12.0,24.0};
+static float PSCALE[8]={0.0,7.0,13.5,27.0,55.0,112.0,230.0,494};
+static int PSCALES[8][256];
+static int ASCALES[8][256];
+
+void LFO_Init(void)
+{
+ int i,s;
+ for(i=0;i<256;++i)
+ {
+		int a,p;
+//		float TL;
+		//Saw
+		a=255-i;
+		if(i<128)
+			p=i;
+		else
+			p=i-256; 
+		ALFO_SAW[i]=a;
+		PLFO_SAW[i]=p;
+	
+		//Square
+		if(i<128)
+		{
+			a=255;
+			p=127;
+		}
+		else
+		{
+			a=0;
+			p=-128;
+		}
+		ALFO_SQR[i]=a;
+		PLFO_SQR[i]=p;
+	
+		//Tri
+		if(i<128)
+			a=255-(i*2);
+		else
+			a=(i*2)-256;
+		if(i<64)
+			p=i*2;
+		else if(i<128)
+			p=255-i*2;
+		else if(i<192)
+			p=256-i*2;
+		else
+			p=i*2-511;
+		ALFO_TRI[i]=a;
+		PLFO_TRI[i]=p;
+	
+		//noise
+		//a=lfo_noise[i];
+		a=rand()&0xff;
+		p=128-a;
+		ALFO_NOI[i]=a;
+		PLFO_NOI[i]=p;
+ }
+
+	for(s=0;s<8;++s)
+	{
+		float limit=PSCALE[s];
+		for(i=-128;i<128;++i)
+		{
+			PSCALES[s][i+128]=CENTS(((limit*(float) i)/128.0));
+		}
+		limit=-ASCALE[s];
+		for(i=0;i<256;++i)
+		{
+			ASCALES[s][i]=DB(((limit*(float) i)/256.0));
+		}
+	}
+}
+
+signed int INLINE PLFO_Step(struct _LFO *LFO)
+{
+	int p;
+ LFO->phase+=LFO->phase_step; 
+#if LFO_SHIFT!=8 
+ LFO->phase&=(1<<(LFO_SHIFT+8))-1;
+#endif 
+ p=LFO->table[LFO->phase>>LFO_SHIFT];
+	p=LFO->scale[p+128];
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+signed int INLINE ALFO_Step(struct _LFO *LFO)
+{
+	int p;
+ LFO->phase+=LFO->phase_step; 
+#if LFO_SHIFT!=8 
+ LFO->phase&=(1<<(LFO_SHIFT+8))-1;
+#endif 
+ p=LFO->table[LFO->phase>>LFO_SHIFT];
+	p=LFO->scale[p];
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+void LFO_ComputeStep(struct _LFO *LFO,UINT32 LFOF,UINT32 LFOWS,UINT32 LFOS,int ALFO)
+{
+ float step=(float) LFOFreq[LFOF]*256.0/(float)44100.0;
+ LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
+ if(ALFO)
+ {
+		switch(LFOWS)
+		{
+			case 0: LFO->table=ALFO_SAW; break;
+			case 1: LFO->table=ALFO_SQR; break;
+			case 2: LFO->table=ALFO_TRI; break;
+			case 3: LFO->table=ALFO_NOI; break;
+		}
+		LFO->scale=ASCALES[LFOS];
+	}
+	else
+	{
+		switch(LFOWS)
+		{
+		 case 0: LFO->table=PLFO_SAW; break;
+		 case 1: LFO->table=PLFO_SQR; break;
+			case 2: LFO->table=PLFO_TRI; break;
+		 case 3: LFO->table=PLFO_NOI; break;
+		}
+		LFO->scale=PSCALES[LFOS];
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/main.c Added

@@ -0,0 +1,262 @@
+/*
+	Audio Overload SDK - main driver. for demonstration only, not user friendly!
+
+	Copyright (c) 2007-2009 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "../../deadbeef.h"
+
+#include "ao.h"
+#include "eng_protos.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+extern DB_functions_t *deadbeef;
+
+/* file types */
+static uint32 type;
+
+static struct 
+{ 
+	uint32 sig; 
+	char *name; 
+	void * (*start)(const char *path, uint8 *, uint32); // returns handle
+	int32 (*gen)(void *handle, int16 *, uint32); 
+	int32 (*stop)(void *handle); 
+	int32 (*command)(void *handle, int32, int32); 
+	uint32 rate; 
+	int32 (*fillinfo)(void *handle, ao_display_info *); 
+} types[] = {
+	{ 0x50534641, "Capcom QSound (.qsf)", qsf_start, qsf_gen, qsf_stop, qsf_command, 60, qsf_fill_info },
+	{ 0x50534611, "Sega Saturn (.ssf)", ssf_start, ssf_gen, ssf_stop, ssf_command, 60, ssf_fill_info },
+	{ 0x50534601, "Sony PlayStation (.psf)", psf_start, psf_gen, psf_stop, psf_command, 60, psf_fill_info },
+	{ 0x53505500, "Sony PlayStation (.spu)", spu_start, spu_gen, spu_stop, spu_command, 60, spu_fill_info },
+	{ 0x50534602, "Sony PlayStation 2 (.psf2)", psf2_start, psf2_gen, psf2_stop, psf2_command, 60, psf2_fill_info },
+	{ 0x50534612, "Sega Dreamcast (.dsf)", dsf_start, dsf_gen, dsf_stop, dsf_command, 60, dsf_fill_info },
+
+	{ 0xffffffff, "", NULL, NULL, NULL, NULL, 0, NULL }
+};
+
+/* ao_get_lib: called to load secondary files */
+int ao_get_lib(char *filename, uint8 **buffer, uint64 *length)
+{
+	uint8 *filebuf;
+	uint32 size;
+	DB_FILE *auxfile;
+
+	auxfile = deadbeef->fopen(filename);
+	if (!auxfile)
+	{
+		fprintf(stderr, "Unable to find auxiliary file %s\n", filename);
+		return AO_FAIL;
+	}
+
+	deadbeef->fseek(auxfile, 0, SEEK_END);
+	size = deadbeef->ftell(auxfile);
+	deadbeef->fseek(auxfile, 0, SEEK_SET);
+
+	filebuf = malloc(size);
+
+	if (!filebuf)
+	{
+		deadbeef->fclose(auxfile);
+		printf("ERROR: could not allocate %d bytes of memory\n", size);
+		return AO_FAIL;
+	}
+
+	deadbeef->fread(filebuf, size, 1, auxfile);
+	deadbeef->fclose(auxfile);
+
+	*buffer = filebuf;
+	*length = (uint64)size;
+
+	return AO_SUCCESS;
+}
+
+#if 0
+static void do_frame(uint32 size, int16 *buffer)
+{
+	(*types[type].gen)(buffer, size);
+}
+#endif
+
+int main(int argv, char *argc[])
+{
+	FILE *file;
+	uint8 *buffer;
+	uint32 size, filesig;
+
+	printf("AOSDK test program v1.0 by R. Belmont [AOSDK release 1.4.8]\nCopyright (c) 2007-2009 R. Belmont and Richard Bannister - please read license.txt for license details\n\n");
+
+	// check if an argument was given
+	if (argv < 2)
+	{
+		printf("Error: must specify a filename!\n");
+		return -1;
+	}	
+
+	file = fopen(argc[1], "rb");
+
+	if (!file)
+	{
+		printf("ERROR: could not open file %s\n", argc[1]);
+		return -1;
+	}
+
+	// get the length of the file by seeking to the end then reading the current position
+	fseek(file, 0, SEEK_END);
+	size = ftell(file);
+	// reset the pointer
+	fseek(file, 0, SEEK_SET);
+
+	buffer = malloc(size);
+
+	if (!buffer)
+	{
+		fclose(file);
+		printf("ERROR: could not allocate %d bytes of memory\n", size);
+		return -1;
+	}
+
+	// read the file
+	fread(buffer, size, 1, file);
+	fclose(file);
+
+	// now try to identify the file
+	type = 0;
+	filesig = buffer[0]<<24 | buffer[1]<<16 | buffer[2]<<8 | buffer[3];
+	while (types[type].sig != 0xffffffff)
+	{
+		if (filesig == types[type].sig)
+		{
+			break;
+		}
+		else
+		{
+			type++;
+		}
+	}
+
+	// now did we identify it above or just fall through?
+	if (types[type].sig != 0xffffffff)
+	{
+		printf("File identified as %s\n", types[type].name);
+	}
+	else
+	{
+		printf("ERROR: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]);
+		free(buffer);
+		return -1;
+	}
+
+ void *handle = (*types[type].start)(argc[1], buffer, size);
+
+	if (!handle)
+	{
+		free(buffer);
+		printf("ERROR: Engine rejected file!\n");
+		return -1;
+	}
+	
+#if 0
+	m1sdr_Init(44100);
+	m1sdr_SetCallback(do_frame);
+	m1sdr_PlayStart();
+
+	printf("\n\nPlaying. Press CTRL-C to stop.\n");
+
+	while (1)
+	{
+		m1sdr_TimeCheck();
+	}		
+#endif
+	free(buffer);
+
+	return 1;
+}
+
+// stub for MAME stuff
+int change_pc(int foo)
+{
+ return 0;
+}
+
+int
+ao_identify (char *buffer) {
+ uint32 filesig;
+ uint32 type = 0;
+
+	filesig = buffer[0]<<24 | buffer[1]<<16 | buffer[2]<<8 | buffer[3];
+	while (types[type].sig != 0xffffffff)
+	{
+		if (filesig == types[type].sig)
+		{
+			break;
+		}
+		else
+		{
+			type++;
+		}
+	}
+
+	// now did we identify it above or just fall through?
+	if (types[type].sig != 0xffffffff)
+	{
+		trace ("psf: File identified as %s\n", types[type].name);
+	}
+	else
+	{
+		trace ("psf: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]);
+		return -1;
+ }
+ return type;
+}
+
+void *
+ao_start (uint32 type, const char *path, uint8 *buffer, uint32 size) {
+	return (*types[type].start)(path, buffer, size);
+}
+
+int
+ao_stop (uint32 type, void *handle) {
+	return (*types[type].stop)(handle);
+}
+
+int
+ao_get_info (uint32 type, void *handle, ao_display_info *info) {
+	return (*types[type].fillinfo)(handle, info);
+}
+
+int
+ao_decode (uint32 type, void *handle, int16 *buffer, uint32 size) {
+	(*types[type].gen)(handle, buffer, size);
+	return size;
+}
+
+int
+ao_command (uint32 type, void *handle, int32 command, int32 param) {
+	return (*types[type].command)(handle, command, param);
+}

deadbeef-0.5.2.tar.bz2/plugins/ao/mem.h Added

deadbeef-0.5.2.tar.bz2/plugins/ao/osd_cpu.h Added

@@ -0,0 +1,70 @@
+/*******************************************************************************
+*																			 *
+*	Define size independent data types and operations.						 *
+*																			 *
+* The following types must be supported by all platforms:					 *
+*																			 *
+*	UINT8 - Unsigned 8-bit Integer		INT8 - Signed 8-bit integer *
+*	UINT16 - Unsigned 16-bit Integer	INT16 - Signed 16-bit integer *
+*	UINT32 - Unsigned 32-bit Integer	INT32 - Signed 32-bit integer *
+*	UINT64 - Unsigned 64-bit Integer	INT64 - Signed 64-bit integer *
+*																			 *
+*																			 *
+* The macro names for the artithmatic operations are composed as follows: *
+*																			 *
+* XXX_R_A_B, where XXX - 3 letter operation code (ADD, SUB, etc.)			 *
+*					 R - The type	of the result							 *
+*					 A - The type of operand 1							 *
+*			 B - The type of operand 2 (if binary operation)		 *
+*																			 *
+*				 Each type is one of: U8,8,U16,16,U32,32,U64,64			 *
+*																			 *
+*******************************************************************************/
+
+
+#ifndef OSD_CPU_H
+#define OSD_CPU_H
+
+#include "ao.h"
+
+/* Combine two 32-bit integers into a 64-bit integer */
+#define COMBINE_64_32_32(A,B) ((((UINT64)(A))<<32) | (UINT32)(B))
+#define COMBINE_U64_U32_U32(A,B) COMBINE_64_32_32(A,B)
+
+/* Return upper 32 bits of a 64-bit integer */
+#define HI32_32_64(A)		 (((UINT64)(A)) >> 32)
+#define HI32_U32_U64(A)		 HI32_32_64(A)
+
+/* Return lower 32 bits of a 64-bit integer */
+#define LO32_32_64(A)		 ((A) & 0xffffffff)
+#define LO32_U32_U64(A)		 LO32_32_64(A)
+
+#define DIV_64_64_32(A,B)	 ((A)/(B))
+#define DIV_U64_U64_U32(A,B) ((A)/(UINT32)(B))
+
+#define MOD_32_64_32(A,B)	 ((A)%(B))
+#define MOD_U32_U64_U32(A,B) ((A)%(UINT32)(B))
+
+#define MUL_64_32_32(A,B)	 ((A)*(INT64)(B))
+#define MUL_U64_U32_U32(A,B) ((A)*(UINT64)(UINT32)(B))
+
+
+/******************************************************************************
+ * Union of UINT8, UINT16 and UINT32 in native endianess of the target
+ * This is used to access bytes and words in a machine independent manner.
+ * The upper bytes h2 and h3 normally contain zero (16 bit CPU cores)
+ * thus PAIR.d can be used to pass arguments to the memory system
+ * which expects 'int' really.
+ ******************************************************************************/
+typedef union {
+#if LSB_FIRST
+	struct { UINT8 l,h,h2,h3; } b;
+	struct { UINT16 l,h; } w;
+#else
+	struct { UINT8 h3,h2,h,l; } b;
+	struct { UINT16 h,l; } w;
+#endif
+	UINT32 d;
+}	PAIR;
+
+#endif	/* defined OSD_CPU_H */

deadbeef-0.5.2.tar.bz2/plugins/ao/plugin.c Added

@@ -0,0 +1,394 @@
+/*
+ DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+#include <stdlib.h>
+#include <string.h>
+#include "../../deadbeef.h"
+#include "ao.h"
+#include "eng_protos.h"
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+DB_functions_t *deadbeef;
+static DB_decoder_t plugin;
+
+static const char * exts[] = { "psf", "psf2", "spu", "ssf", "qsf", "dsf", "minipsf", "minipsf2", "minissf", "miniqsf", "minidsf", NULL };
+
+typedef struct {
+ DB_fileinfo_t info;
+ int currentsample;
+ uint32 type;
+ void *decoder;
+ char *filebuffer;
+ size_t filesize;
+ char buffer[735*4]; // psf2 decoder only works with 735 samples buffer
+ int remaining;
+ int skipsamples;
+ float duration;
+} aoplug_info_t;
+
+static DB_fileinfo_t *
+aoplug_open (uint32_t hints) {
+ DB_fileinfo_t *_info = malloc (sizeof (aoplug_info_t));
+ aoplug_info_t *info = (aoplug_info_t *)_info;
+ memset (info, 0, sizeof (aoplug_info_t));
+ return _info;
+}
+
+static int
+aoplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ aoplug_info_t *info = (aoplug_info_t *)_info;
+
+ _info->fmt.bps = 16;
+ _info->fmt.channels = 2;
+ _info->fmt.samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100);
+ _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
+ _info->readpos = 0;
+ _info->plugin = &plugin;
+ info->duration = deadbeef->pl_get_item_duration (it);
+
+ DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ if (!file) {
+ trace ("psf: failed to fopen %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ return -1;
+ }
+
+ info->filesize = deadbeef->fgetlength (file);
+ info->filebuffer = malloc (info->filesize);
+ if (!info->filebuffer) {
+		fprintf(stderr, "psf: could not allocate %d bytes of memory\n", (int)info->filesize);
+		deadbeef->fclose (file);
+ return -1;
+ }
+
+	if (deadbeef->fread(info->filebuffer, 1, info->filesize, file) != info->filesize) {
+		fprintf(stderr, "psf: file read error: %s\n", deadbeef->pl_find_meta (it, ":URI"));
+		deadbeef->fclose (file);
+ return -1;
+ }
+ deadbeef->fclose (file);
+
+ info->type = ao_identify (info->filebuffer);
+ if (info->type < 0) {
+ fprintf (stderr, "psf: ao_identify failed\n");
+ return -1;
+ }
+
+ info->decoder = ao_start (info->type, deadbeef->pl_find_meta (it, ":URI"), (uint8 *)info->filebuffer, info->filesize);
+ if (!info->decoder) {
+ fprintf (stderr, "psf: ao_start failed\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static void
+aoplug_free (DB_fileinfo_t *_info) {
+ aoplug_info_t *info = (aoplug_info_t *)_info;
+ if (info) {
+ if (info->filebuffer) {
+ ao_stop (info->type, info->decoder);
+ free (info->filebuffer);
+ info->filebuffer = NULL;
+ }
+ free (info);
+ }
+}
+
+static int
+aoplug_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ aoplug_info_t *info = (aoplug_info_t *)_info;
+// printf ("aoplug_read_int16 %d samples, curr %d, end %d\n", size/4, info->currentsample, (int)(info->duration * _info->samplerate));
+
+ if (info->currentsample >= info->duration * _info->fmt.samplerate) {
+ return 0;
+ }
+
+ int initsize = size;
+
+ while (size > 0) {
+ if (info->remaining > 0) {
+ if (info->skipsamples > 0) {
+ int n = min (info->skipsamples, info->remaining);
+ if (info->remaining > n) {
+ memmove (info->buffer, info->buffer+n*4, (info->remaining - n)*4);
+ }
+ info->remaining -= n;
+ info->skipsamples -= n;
+ continue;
+ }
+ int n = size / 4;
+ n = min (info->remaining, n);
+ memcpy (bytes, info->buffer, n * 4);
+ if (info->remaining > n) {
+ memmove (info->buffer, info->buffer+n*4, (info->remaining - n)*4);
+ }
+ info->remaining -= n;
+ bytes += n*4;
+ size -= n*4;
+ }
+ if (!info->remaining) {
+ ao_decode (info->type, info->decoder, (int16_t *)info->buffer, 735);
+ info->remaining = 735;
+ }
+ }
+ info->currentsample += (initsize-size) / (_info->fmt.channels * _info->fmt.bps/8);
+ _info->readpos = (float)info->currentsample / _info->fmt.samplerate;
+ return initsize-size;
+}
+
+static int
+aoplug_seek_sample (DB_fileinfo_t *_info, int sample) {
+ aoplug_info_t *info = (aoplug_info_t *)_info;
+ if (sample > info->currentsample) {
+ info->skipsamples = sample-info->currentsample;
+ }
+ else {
+ // restart song
+ ao_command (info->type, info->decoder, COMMAND_RESTART, 0);
+ info->skipsamples = sample;
+ }
+ info->currentsample = sample;
+ _info->readpos = (float)sample / _info->fmt.samplerate;
+ return 0;
+}
+
+static int
+aoplug_seek (DB_fileinfo_t *_info, float time) {
+ return aoplug_seek_sample (_info, time * _info->fmt.samplerate);
+}
+
+static void
+aoplug_add_meta (DB_playItem_t *it, const char *key, const char *value, const char *comment_title) {
+ const char *res = NULL;
+ char tmp[200];
+ // check utf8
+ if (deadbeef->junk_recode (value, strlen (value), tmp, sizeof (tmp), "utf-8") >= 0) {
+ if (key) {
+ deadbeef->pl_add_meta (it, key, value);
+ }
+ res = value;
+ }
+ // check shift-jis
+ if (deadbeef->junk_recode (value, strlen (value), tmp, sizeof (tmp), "SHIFT-JIS") >= 0) {
+ if (key) {
+ deadbeef->pl_add_meta (it, key, tmp);
+ }
+ res = tmp;
+ }
+
+// if (res) {
+// char s[1024];
+// snprintf (s, sizeof (s), "%s%s", comment_title, res);
+// deadbeef->pl_append_meta (it, "comment", s);
+// }
+}
+
+static DB_playItem_t *
+aoplug_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("psf: failed to fopen %s\n", fname);
+ return NULL;
+ }
+
+ size_t size = deadbeef->fgetlength (fp);
+ char *buffer = malloc (size);
+ if (!buffer) {
+ deadbeef->fclose (fp);
+		fprintf(stderr, "psf: could not allocate %d bytes of memory\n", (int)size);
+ return NULL;
+ }
+
+	if (deadbeef->fread(buffer, 1, size, fp) != size) {
+ deadbeef->fclose (fp);
+		fprintf(stderr, "psf: file read error: %s\n", fname);
+ return NULL;
+ }
+
+ deadbeef->fclose (fp);
+
+ int type = ao_identify (buffer);
+ if (type < 0) {
+ free (buffer);
+ return NULL;
+ }
+
+ void *dec = ao_start (type, fname, (uint8*)buffer, size);
+ if (!dec) {
+ free (buffer);
+ return NULL;
+ }
+ ao_display_info info;
+ memset (&info, 0, sizeof (info));
+ int have_info = 0;
+ if (ao_get_info (type, dec, &info) == AO_SUCCESS) {
+ have_info = 1;
+ }
+
+ ao_stop (type, dec);
+ dec = NULL;
+
+	free (buffer);
+	
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ const char *ext = fname + strlen (fname);
+ while (*ext != '.' && ext > fname) {
+ ext--;
+ }
+ if (*ext == '.') {
+ ext++;
+ if (!strcasecmp (ext, "psf") || !strcasecmp (ext, "minipsf")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "PSF");
+ }
+ else if (!strcasecmp (ext, "psf2") || !strcasecmp (ext, "minipsf2")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "PSF2");
+ }
+ else if (!strcasecmp (ext, "spu")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "SPU");
+ }
+ else if (!strcasecmp (ext, "ssf") || !strcasecmp (ext, "minissf")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "SSF");
+ }
+ else if (!strcasecmp (ext, "qsf") || !strcasecmp (ext, "miniqsf")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "QSF");
+ }
+ else if (!strcasecmp (ext, "dsf") || !strcasecmp (ext, "minidsf")) {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "DSF");
+ }
+ }
+ else {
+ deadbeef->pl_add_meta (it, ":FILETYPE", "PSF");
+ }
+
+ float duration = 120;
+ float fade = 0;
+
+ if (have_info) {
+ int i;
+ for (i = 1; i < 9; i++) {
+ if (!strncasecmp (info.title[i], "Length: ", 8)) {
+ int min;
+ float sec;
+ if (sscanf (info.info[i], "%d:%f", &min, &sec) == 2) {
+ duration = min * 60 + sec;
+ }
+ else if (sscanf (info.info[i], "%f", &sec) == 1) {
+ duration = sec;
+ }
+ aoplug_add_meta (it, NULL, info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Name: ", 6) || !strncasecmp (info.title[i], "Song: ", 6)) {
+ aoplug_add_meta (it, "title", info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Game: ", 6)) {
+ aoplug_add_meta (it, "album", info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Artist: ", 8)) {
+ aoplug_add_meta (it, "artist", info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Copyright: ", 11)) {
+ aoplug_add_meta (it, "copyright", info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Year: ", 6)) {
+ aoplug_add_meta (it, "year", info.info[i], info.title[i]);
+ }
+ else if (!strncasecmp (info.title[i], "Fade: ", 6)) {
+ fade = atof (info.info[i]);
+ aoplug_add_meta (it, "fade", info.info[i], info.title[i]);
+ }
+ else {
+ char *colon = strchr (info.title[i], ':');
+ char name[colon-info.title[i]+1];
+ memcpy (name, info.title[i], colon-info.title[i]);
+ name[colon-info.title[i]] = 0;
+ aoplug_add_meta (it, name, info.info[i], info.title[i]);
+ }
+ }
+ }
+ deadbeef->plt_set_item_duration (plt, it, duration+fade);
+ deadbeef->pl_add_meta (it, "title", NULL);
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ return after;
+}
+
+static int
+aoplug_start (void) {
+ return 0;
+}
+
+static int
+aoplug_stop (void) {
+ return 0;
+}
+
+static DB_decoder_t plugin = {
+ .plugin.api_vmajor = 1,
+ .plugin.api_vminor = 0,
+ .plugin.version_major = 1,
+ .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_DECODER,
+ .plugin.id = "psf",
+ .plugin.name = "PSF player using Audio Overload SDK",
+ .plugin.descr = "plays psf, psf2, spu, ssf, dsf, qsf file formats",
+ .plugin.copyright = 
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "Uses modified aosdk-1.4.8 - library for playing .PSF (Sony PlayStation), .SPU (Sony PlayStation), .PSF2 (Sony PlayStation 2), .SSF (Sega Saturn), .DSF (Sega Dreamcast), and .QSF (Capcom QSound) audio file formats,\n"
+ "http://rbelmont.mameworld.info/?page_id=221\n"
+ "Copyright © 2007-2009 R. Belmont and Richard Bannister.\n"
+ "\n"
+ "This program is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License\n"
+ "as published by the Free Software Foundation; either version 2\n"
+ "of the License, or (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, USA.\n"
+ ,
+ .plugin.website = "http://deadbeef.sf.net",
+ .plugin.start = aoplug_start,
+ .plugin.stop = aoplug_stop,
+ .open = aoplug_open,
+ .init = aoplug_init,
+ .free = aoplug_free,
+ .read = aoplug_read,
+ .seek = aoplug_seek,
+ .seek_sample = aoplug_seek_sample,
+ .insert = aoplug_insert,
+ .exts = exts,
+};
+
+DB_plugin_t *
+ddb_ao_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}
+

deadbeef-0.5.1.tar.bz2/plugins/artwork/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/artwork/Makefile.am Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/artwork/Makefile.in Changed

@@ -74,13 +74,19 @@
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE@	$(am__DEPENDENCIES_1)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@am__DEPENDENCIES_2 = \
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@	$(am__DEPENDENCIES_1)
-@HAVE_ARTWORK_TRUE@artwork_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@am__DEPENDENCIES_3 = \
+@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_ARTWORK_TRUE@artwork_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@HAVE_ARTWORK_TRUE@	$(am__DEPENDENCIES_3)
 am__artwork_la_SOURCES_DIST = artwork.c artwork.h albumartorg.c \
 	albumartorg.h lastfm.c lastfm.h escape.c escape.h
 @HAVE_ARTWORK_TRUE@am_artwork_la_OBJECTS = artwork.lo albumartorg.lo \
 @HAVE_ARTWORK_TRUE@	lastfm.lo escape.lo
 artwork_la_OBJECTS = $(am_artwork_la_OBJECTS)
-artwork_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+artwork_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(artwork_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_ARTWORK_TRUE@am_artwork_la_rpath = -rpath $(pkglibdir)
@@ -90,13 +96,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(artwork_la_SOURCES)
 DIST_SOURCES = $(am__artwork_la_SOURCES_DIST)
 ETAGS = etags
@@ -108,6 +127,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -155,14 +175,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -252,7 +275,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -263,6 +285,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -325,8 +348,10 @@
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_FALSE@ARTWORK_DEPS = $(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@ARTWORK_DEPS = $(IMLIB2_DEPS_LIBS)
 @HAVE_ARTWORK_TRUE@@HAVE_IMLIB2_TRUE@ARTWORK_CFLAGS = -DUSE_IMLIB2
-@HAVE_ARTWORK_TRUE@AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) -std=c99
-@HAVE_ARTWORK_TRUE@artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS)
+@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@FLAC_DEPS = $(FLAC_LIBS)
+@HAVE_ARTWORK_TRUE@@HAVE_FLAC_TRUE@FLAC_CFLAGS = -DUSE_METAFLAC
+@HAVE_ARTWORK_TRUE@AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(FLAC_CFLAGS) -std=c99
+@HAVE_ARTWORK_TRUE@artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS)
 all: all-am
 
 .SUFFIXES:
@@ -393,7 +418,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 artwork.la: $(artwork_la_OBJECTS) $(artwork_la_DEPENDENCIES) 
-	$(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(artwork_la_LINK) $(am_artwork_la_rpath) $(artwork_la_OBJECTS) $(artwork_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -407,22 +432,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastfm.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/artwork/albumartorg.c -> deadbeef-0.5.2.tar.bz2/plugins/artwork/albumartorg.c Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/albumartorg.h -> deadbeef-0.5.2.tar.bz2/plugins/artwork/albumartorg.h Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/artwork.c -> deadbeef-0.5.2.tar.bz2/plugins/artwork/artwork.c Changed

@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,13 +25,17 @@
 #include <png.h>
 #endif
 
+#ifdef USE_METAFLAC
+#include <FLAC/metadata.h>
+#endif
+
 #define min(x,y) ((x)<(y)?(x):(y))
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(...)
 
 static char default_cover[PATH_MAX];
-#define DEFAULT_FILEMASK "*cover*.jpg;*front*.jpg;*folder*.jpg"
+#define DEFAULT_FILEMASK "*cover*.jpg;*front*.jpg;*folder*.jpg;*cover*.png;*front*.png;*folder*.png"
 
 static DB_artwork_plugin_t plugin;
 DB_functions_t *deadbeef;
@@ -45,6 +52,11 @@
 struct cover_query_s *next;
 } cover_query_t;
 
+typedef struct mutex_cond_s {
+ uintptr_t mutex;
+ uintptr_t cond;
+} mutex_cond_t;
+
 static cover_query_t *queue;
 static cover_query_t *queue_tail;
 static uintptr_t mutex;
@@ -183,8 +195,7 @@
 }
 if (slash)
 *slash = '/';
- }
- while (slash);
+ } while (slash);
 free (tmp);
 return 1;
 }
@@ -721,6 +732,11 @@
 static int
 filter_custom (const struct dirent *f)
 {
+// FNM_CASEFOLD is not defined on solaris. On other platforms it is.
+// It should be safe to define it as FNM_INGORECASE if it isn't defined.
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD FNM_IGNORECASE
+#endif
 if (!fnmatch (filter_custom_mask, f->d_name, FNM_CASEFOLD)) {
 return 1;
 }
@@ -802,83 +818,88 @@
 make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
 int got_pic = 0;
 
- // try to load embedded from id3v2
 if (deadbeef->is_local_file (param->fname)) {
 if (artwork_enable_embedded) {
- trace ("trying to load artwork from id3v2 tag for %s\n", param->fname);
- DB_id3v2_tag_t tag;
- memset (&tag, 0, sizeof (tag));
- DB_FILE *fp = deadbeef->fopen (param->fname);
- current_file = fp;
- if (fp) {
- int res = deadbeef->junk_id3v2_read_full (NULL, &tag, fp);
- if (!res) {
- for (DB_id3v2_frame_t *f = tag.frames; f; f = f->next) {
- if (!strcmp (f->id, "APIC")) {
-
- if (f->size < 20) {
- trace ("artwork: id3v2 APIC frame is too small\n");
- continue;
- }
- uint8_t *data = f->data;
- uint8_t *end = f->data + f->size;
- int enc = *data;
- data++; // enc
- // mime-type must always be ASCII - hence enc is 0 here
- uint8_t *mime_end = id3v2_skip_str (0, data, end);
- if (!mime_end) {
- trace ("artwork: corrupted id3v2 APIC frame\n");
- continue;
- }
- if (strcasecmp (data, "image/jpeg") && strcasecmp (data, "image/png")) {
- trace ("artwork: unsupported mime type: %s\n", data);
- continue;
- }
- if (*mime_end != 3) {
- trace ("artwork: picture type=%d, skipped: %s\n", *mime_end);
- continue;
- }
- trace ("artwork: mime-type=%s, picture type: %d\n", data, *mime_end);
- data = mime_end;
- data++; // picture type
- data = id3v2_skip_str (enc, data, end); // description
- if (!data) {
- trace ("artwork: corrupted id3v2 APIC frame\n");
- continue;
- }
- int sz = f->size - (data - f->data);
-
- char tmp_path[1024];
- trace ("will write id3v2 APIC into %s\n", cache_path);
- snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
- FILE *out = fopen (tmp_path, "w+b");
- if (!out) {
- trace ("artwork: failed to open %s for writing\n", tmp_path);
- break;
- }
- if (fwrite (data, 1, sz, out) != sz) {
- trace ("artwork: failed to write id3v2 picture into %s\n", tmp_path);
+ // try to load embedded from id3v2
+ {
+ trace ("trying to load artwork from id3v2 tag for %s\n", param->fname);
+ DB_id3v2_tag_t tag;
+ memset (&tag, 0, sizeof (tag));
+ DB_FILE *fp = deadbeef->fopen (param->fname);
+ current_file = fp;
+ if (fp) {
+ int res = deadbeef->junk_id3v2_read_full (NULL, &tag, fp);
+ if (!res) {
+ for (DB_id3v2_frame_t *f = tag.frames; f; f = f->next) {
+ if (!strcmp (f->id, "APIC")) {
+ if (f->size < 20) {
+ trace ("artwork: id3v2 APIC frame is too small\n");
+ continue;
+ }
+ uint8_t *data = f->data;
+ if (tag.version[0] == 4) {
+ // skip size
+ data += 4;
+ }
+ uint8_t *end = f->data + f->size;
+ int enc = *data;
+ data++; // enc
+ // mime-type must always be ASCII - hence enc is 0 here
+ uint8_t *mime_end = id3v2_skip_str (enc, data, end);
+ if (!mime_end) {
+ trace ("artwork: corrupted id3v2 APIC frame\n");
+ continue;
+ }
+ if (strcasecmp (data, "image/jpeg") && strcasecmp (data, "image/png")) {
+ trace ("artwork: unsupported mime type: %s\n", data);
+ continue;
+ }
+ if (*mime_end != 3) {
+ trace ("artwork: picture type=%d, skipped: %s\n", *mime_end);
+ continue;
+ }
+ trace ("artwork: mime-type=%s, picture type: %d\n", data, *mime_end);
+ data = mime_end;
+ data++; // picture type
+ data = id3v2_skip_str (enc, data, end); // description
+ if (!data) {
+ trace ("artwork: corrupted id3v2 APIC frame\n");
+ continue;
+ }
+ int sz = f->size - (data - f->data);
+
+ char tmp_path[1024];
+ trace ("will write id3v2 APIC into %s\n", cache_path);
+ snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
+ FILE *out = fopen (tmp_path, "w+b");
+ if (!out) {
+ trace ("artwork: failed to open %s for writing\n", tmp_path);
+ break;
+ }
+ if (fwrite (data, 1, sz, out) != sz) {
+ trace ("artwork: failed to write id3v2 picture into %s\n", tmp_path);
+ fclose (out);
+ unlink (tmp_path);
+ break;
+ }
 fclose (out);
+ int err = rename (tmp_path, cache_path);
+ if (err != 0) {
+ trace ("Failed not move %s to %s: %s\n", tmp_path, cache_path, strerror (err));
+ unlink (tmp_path);
+ break;
+ }
 unlink (tmp_path);
+ got_pic = 1;
 break;
 }
- fclose (out);
- int err = rename (tmp_path, cache_path);
- if (err != 0) {
- trace ("Failed not move %s to %s: %s\n", tmp_path, cache_path, strerror (err));
- unlink (tmp_path);
- break;
- }
- unlink (tmp_path);
- got_pic = 1;
- break;
 }
 }
- }
 
- deadbeef->junk_id3v2_free (&tag);
- current_file = NULL;
- deadbeef->fclose (fp);
+ deadbeef->junk_id3v2_free (&tag);
+ current_file = NULL;
+ deadbeef->fclose (fp);
+ }
 }
 
 // try to load embedded from apev2
@@ -951,6 +972,79 @@
 deadbeef->fclose (fp);
 }
 }
+
+#ifdef USE_METAFLAC
+ // try to load embedded from flac metadata
+ {
+ FLAC__StreamMetadata *meta = NULL;
+ do {
+ trace ("trying to load artwork flac metadata for %s\n", param->fname);
+
+ if (!FLAC__metadata_get_picture (
+ param->fname, // filename
+ &meta, // picture
+ FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER, // type
+ NULL, // mime_type
+ NULL, // description
+ (unsigned)(-1), // max_width
+ (unsigned)(-1), // max_height
+ (unsigned)(-1), // max_depth
+ (unsigned)(-1) // max_colors
+ )){
+ trace ("%s don't have an embedded cover\n",param->fname);
+
+ if (!FLAC__metadata_get_picture (
+ param->fname, // filename
+ &meta, // picture
+ -1, // type
+ NULL, // mime_type
+ NULL, // description
+ (unsigned)(-1), // max_width
+ (unsigned)(-1), // max_height
+ (unsigned)(-1), // max_depth
+ (unsigned)(-1) // max_colors
+ )){
+ trace ("%s don't have an embedded album art\n",param->fname);
+ break;
+ }
+
+ }
+ FLAC__StreamMetadata_Picture *pic = &meta->data.picture;
+
+ trace ("found flac cover art of %d bytes (%s)\n", pic->data_length, pic->description);
+ char tmp_path[1024];
+ char cache_path[1024];
+ make_cache_path (cache_path, sizeof (cache_path), param->album, param->artist, -1);
+ trace ("will write flac cover art into %s\n", cache_path);
+ snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
+ FILE *out = fopen (tmp_path, "w+b");
+ if (!out) {
+ trace ("artwork: failed to open %s for writing\n", tmp_path);
+ break;
+ }
+ if (fwrite (pic->data, 1, pic->data_length, out) != pic->data_length) {
+ trace ("artwork: failed to write flac picture into %s\n", tmp_path);
+ fclose (out);
+ unlink (tmp_path);
+ break;
+ }
+ fclose (out);
+ int err = rename (tmp_path, cache_path);
+ if (err != 0) {
+ trace ("Failed not move %s to %s: %s\n", tmp_path, cache_path, strerror (err));
+ unlink (tmp_path);
+ break;
+ }
+ unlink (tmp_path);
+ got_pic = 1;
+ } while (0);
+
+ if (meta != NULL) {
+ trace ("release flac metadata block\n");
+ FLAC__metadata_object_delete (meta);
+ }
+ }
+#endif
 }
 
 if (!got_pic && artwork_enable_local) {
@@ -1129,6 +1223,31 @@
 return size == -1 ? strdup (get_default_cover ()) : NULL;
 }
 
+static void
+sync_callback (const char *fname, const char *artist, const char *album, void *user_data) {
+ mutex_cond_t *mc = (mutex_cond_t *)user_data;
+ deadbeef->mutex_lock (mc->mutex);
+ deadbeef->cond_signal (mc->cond);
+ deadbeef->mutex_unlock (mc->mutex);
+}
+
+static char*
+get_album_art_sync (const char *fname, const char *artist, const char *album, int size) {
+ mutex_cond_t mc;
+ mc.mutex = deadbeef->mutex_create ();
+ mc.cond = deadbeef->cond_create ();
+ deadbeef->mutex_lock (mc.mutex);
+ char *image_fname = get_album_art (fname, artist, album, size, sync_callback, &mc);
+ while (!image_fname) {
+ deadbeef->cond_wait (mc.cond, mc.mutex);
+ image_fname = get_album_art (fname, artist, album, size, sync_callback, &mc);
+ }
+ deadbeef->mutex_unlock (mc.mutex);
+ deadbeef->mutex_free (mc.mutex);
+ deadbeef->cond_free (mc.cond);
+ return image_fname;
+}
+
 DB_plugin_t *
 artwork_load (DB_functions_t *api) {
 deadbeef = api;
@@ -1147,6 +1266,9 @@
 free (queue->next->fname);
 free (queue->next->artist);
 free (queue->next->album);
+ if (queue->next->callback == sync_callback) {
+ sync_callback (NULL, NULL, NULL, queue->next->user_data);
+ }
 queue->next = next;
 if (next == NULL) {
 queue_tail = queue;
@@ -1289,13 +1411,13 @@
 .plugin.plugin.api_vmajor = 1,
 .plugin.plugin.api_vminor = 0,
 .plugin.plugin.version_major = 1,
- .plugin.plugin.version_minor = 0,
+ .plugin.plugin.version_minor = 1,
 .plugin.plugin.type = DB_PLUGIN_MISC,
 .plugin.plugin.id = "artwork",
 .plugin.plugin.name = "Album Artwork",
 .plugin.plugin.descr = "Loads album artwork either from local directories or from internet",
 .plugin.plugin.copyright = 
- "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
 "Copyright (C) 2009-2011 Viktor Semykin <thesame.ml@gmail.com>\n"
 "\n"
 "This program is free software; you can redistribute it and/or\n"
@@ -1320,4 +1442,5 @@
 .get_album_art = get_album_art,
 .reset = artwork_reset,
 .get_default_cover = get_default_cover,
+ .get_album_art_sync = get_album_art_sync,
 };

deadbeef-0.5.1.tar.bz2/plugins/artwork/artwork.h -> deadbeef-0.5.2.tar.bz2/plugins/artwork/artwork.h Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/escape.h -> deadbeef-0.5.2.tar.bz2/plugins/artwork/escape.h Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/lastfm.c -> deadbeef-0.5.2.tar.bz2/plugins/artwork/lastfm.c Changed

deadbeef-0.5.1.tar.bz2/plugins/artwork/lastfm.h -> deadbeef-0.5.2.tar.bz2/plugins/artwork/lastfm.h Changed

deadbeef-0.5.1.tar.bz2/plugins/cdda/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/cdda/Makefile.in Changed

@@ -73,9 +73,12 @@
 am__cdda_la_SOURCES_DIST = cdda.c
 @HAVE_CDDA_TRUE@am_cdda_la_OBJECTS = cdda.lo
 cdda_la_OBJECTS = $(am_cdda_la_OBJECTS)
-cdda_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(cdda_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+cdda_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(cdda_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_CDDA_TRUE@am_cdda_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(cdda_la_SOURCES)
 DIST_SOURCES = $(am__cdda_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 cdda.la: $(cdda_la_OBJECTS) $(cdda_la_DEPENDENCIES) 
-	$(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(cdda_la_LINK) $(am_cdda_la_rpath) $(cdda_la_OBJECTS) $(cdda_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdda.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/cdda/cdda.c -> deadbeef-0.5.2.tar.bz2/plugins/cdda/cdda.c Changed

deadbeef-0.5.1.tar.bz2/plugins/converter/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/converter/Makefile.am Changed

@@ -1,6 +1,16 @@
 if HAVE_CONVERTER
 
-pkglib_LTLIBRARIES = converter.la converter_gtkui.la
+if HAVE_GTK2
+if HAVE_GTK3
+pkglib_LTLIBRARIES = converter.la converter_gtk2.la converter_gtk3.la
+else
+pkglib_LTLIBRARIES = converter.la converter_gtk2.la
+endif
+else
+if HAVE_GTK3
+pkglib_LTLIBRARIES = converter.la converter_gtk3.la
+endif
+endif
 
 convdatadir = $(libdir)/deadbeef/convpresets
 convdata_DATA = \
@@ -17,21 +27,34 @@
 EXTRA_DIST = $(convdata_DATA)
 
 AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+
 converter_la_SOURCES = converter.c converter.h
 converter_la_LDFLAGS = -module
-converter_gtkui_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
-converter_gtkui_la_LDFLAGS = -module
+if HAVE_GTK2
+converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+converter_gtk2_la_LDFLAGS = -module
+endif
+if HAVE_GTK3
+converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+converter_gtk3_la_LDFLAGS = -module
+endif
 
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 
-converter_gtkui_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
 
-converter_gtkui_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
+converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
 else
-converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+if HAVE_GTK2
+converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
+endif
+if HAVE_GTK3
+converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 endif
 
+endif
 
 endif

deadbeef-0.5.1.tar.bz2/plugins/converter/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/converter/Makefile.in Changed

@@ -73,14 +73,24 @@
 am__converter_la_SOURCES_DIST = converter.c converter.h
 @HAVE_CONVERTER_TRUE@am_converter_la_OBJECTS = converter.lo
 converter_la_OBJECTS = $(am_converter_la_OBJECTS)
-converter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+converter_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(converter_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_CONVERTER_TRUE@am_converter_la_rpath = -rpath $(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@am_converter_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@	$(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@am_converter_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@	$(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@am_converter_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
 am__DEPENDENCIES_1 =
-@HAVE_CONVERTER_TRUE@@STATICLINK_FALSE@converter_gtkui_la_DEPENDENCIES = \
-@HAVE_CONVERTER_TRUE@@STATICLINK_FALSE@	$(am__DEPENDENCIES_1)
-@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtkui_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE@converter_gtk2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtk2_la_DEPENDENCIES = $(GTK_ROOT)/lib/libgtk-x11-2.0.la \
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgdk-x11-2.0.la \
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangoft2-1.0.la \
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libpangocairo-1.0.la \
@@ -91,34 +101,70 @@
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la
-am__converter_gtkui_la_SOURCES_DIST = convgui.c interface.c support.c \
+am__converter_gtk2_la_SOURCES_DIST = convgui.c interface.c support.c \
 	callbacks.h converter.h interface.h support.h
-@HAVE_CONVERTER_TRUE@am_converter_gtkui_la_OBJECTS = \
-@HAVE_CONVERTER_TRUE@	converter_gtkui_la-convgui.lo \
-@HAVE_CONVERTER_TRUE@	converter_gtkui_la-interface.lo \
-@HAVE_CONVERTER_TRUE@	converter_gtkui_la-support.lo
-converter_gtkui_la_OBJECTS = $(am_converter_gtkui_la_OBJECTS)
-converter_gtkui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(converter_gtkui_la_CFLAGS) $(CFLAGS) \
-	$(converter_gtkui_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_CONVERTER_TRUE@am_converter_gtkui_la_rpath = -rpath $(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@am_converter_gtk2_la_OBJECTS = converter_gtk2_la-convgui.lo \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@	converter_gtk2_la-interface.lo \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@	converter_gtk2_la-support.lo
+converter_gtk2_la_OBJECTS = $(am_converter_gtk2_la_OBJECTS)
+converter_gtk2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(converter_gtk2_la_CFLAGS) $(CFLAGS) \
+	$(converter_gtk2_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@am_converter_gtk2_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@	$(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@am_converter_gtk2_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@converter_gtk3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__converter_gtk3_la_SOURCES_DIST = convgui.c interface.c support.c \
+	callbacks.h converter.h interface.h support.h
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@am_converter_gtk3_la_OBJECTS = converter_gtk3_la-convgui.lo \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@	converter_gtk3_la-interface.lo \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@	converter_gtk3_la-support.lo
+converter_gtk3_la_OBJECTS = $(am_converter_gtk3_la_OBJECTS)
+converter_gtk3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(converter_gtk3_la_CFLAGS) $(CFLAGS) \
+	$(converter_gtk3_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@am_converter_gtk3_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@	$(pkglibdir)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@am_converter_gtk3_la_rpath = \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	-rpath \
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@	$(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(converter_la_SOURCES) $(converter_gtkui_la_SOURCES)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(converter_la_SOURCES) $(converter_gtk2_la_SOURCES) \
+	$(converter_gtk3_la_SOURCES)
 DIST_SOURCES = $(am__converter_la_SOURCES_DIST) \
-	$(am__converter_gtkui_la_SOURCES_DIST)
+	$(am__converter_gtk2_la_SOURCES_DIST) \
+	$(am__converter_gtk3_la_SOURCES_DIST)
 DATA = $(convdata_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -129,6 +175,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -176,14 +223,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -273,7 +323,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -284,6 +333,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -339,7 +389,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@HAVE_CONVERTER_TRUE@pkglib_LTLIBRARIES = converter.la converter_gtkui.la
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@pkglib_LTLIBRARIES = converter.la converter_gtk3.la
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@pkglib_LTLIBRARIES = converter.la converter_gtk2.la
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@pkglib_LTLIBRARIES = converter.la converter_gtk2.la converter_gtk3.la
 @HAVE_CONVERTER_TRUE@convdatadir = $(libdir)/deadbeef/convpresets
 @HAVE_CONVERTER_TRUE@convdata_DATA = \
 @HAVE_CONVERTER_TRUE@	presets/AAC_(Nero_FAAC).txt\
@@ -356,13 +408,17 @@
 @HAVE_CONVERTER_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
 @HAVE_CONVERTER_TRUE@converter_la_SOURCES = converter.c converter.h
 @HAVE_CONVERTER_TRUE@converter_la_LDFLAGS = -module
-@HAVE_CONVERTER_TRUE@converter_gtkui_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
-@HAVE_CONVERTER_TRUE@converter_gtkui_la_LDFLAGS = -module
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@converter_gtk2_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@converter_gtk2_la_LDFLAGS = -module
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@converter_gtk3_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@converter_gtk3_la_LDFLAGS = -module
 @HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
-@HAVE_CONVERTER_TRUE@@STATICLINK_FALSE@converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtkui_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
-@HAVE_CONVERTER_TRUE@@STATICLINK_FALSE@converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
-@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtkui_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE@converter_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+@HAVE_CONVERTER_TRUE@@HAVE_GTK2_TRUE@@STATICLINK_FALSE@converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
+@HAVE_CONVERTER_TRUE@@STATICLINK_TRUE@converter_gtk2_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+@HAVE_CONVERTER_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -429,9 +485,11 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 converter.la: $(converter_la_OBJECTS) $(converter_la_DEPENDENCIES) 
-	$(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
-converter_gtkui.la: $(converter_gtkui_la_OBJECTS) $(converter_gtkui_la_DEPENDENCIES) 
-	$(converter_gtkui_la_LINK) $(am_converter_gtkui_la_rpath) $(converter_gtkui_la_OBJECTS) $(converter_gtkui_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(converter_la_LINK) $(am_converter_la_rpath) $(converter_la_OBJECTS) $(converter_la_LIBADD) $(LIBS)
+converter_gtk2.la: $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(converter_gtk2_la_LINK) $(am_converter_gtk2_la_rpath) $(converter_gtk2_la_OBJECTS) $(converter_gtk2_la_LIBADD) $(LIBS)
+converter_gtk3.la: $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(converter_gtk3_la_LINK) $(am_converter_gtk3_la_rpath) $(converter_gtk3_la_OBJECTS) $(converter_gtk3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -440,51 +498,84 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtkui_la-convgui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtkui_la-interface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtkui_la-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk2_la-convgui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk2_la-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk2_la-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk3_la-convgui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk3_la-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/converter_gtk3_la-support.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-converter_gtkui_la-convgui.lo: convgui.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -MT converter_gtkui_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtkui_la-convgui.Tpo -c -o converter_gtkui_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtkui_la-convgui.Tpo $(DEPDIR)/converter_gtkui_la-convgui.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='convgui.c' object='converter_gtkui_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+converter_gtk2_la-convgui.lo: convgui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-convgui.Tpo -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-convgui.Tpo $(DEPDIR)/converter_gtk2_la-convgui.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='convgui.c' object='converter_gtk2_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+
+converter_gtk2_la-interface.lo: interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-interface.Tpo -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-interface.Tpo $(DEPDIR)/converter_gtk2_la-interface.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='converter_gtk2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+
+converter_gtk2_la-support.lo: support.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -MT converter_gtk2_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk2_la-support.Tpo -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk2_la-support.Tpo $(DEPDIR)/converter_gtk2_la-support.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='converter_gtk2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk2_la_CFLAGS) $(CFLAGS) -c -o converter_gtk2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+
+converter_gtk3_la-convgui.lo: convgui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-convgui.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-convgui.Tpo -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-convgui.Tpo $(DEPDIR)/converter_gtk3_la-convgui.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='convgui.c' object='converter_gtk3_la-convgui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -c -o converter_gtkui_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-convgui.lo `test -f 'convgui.c' || echo '$(srcdir)/'`convgui.c
 
-converter_gtkui_la-interface.lo: interface.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -MT converter_gtkui_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtkui_la-interface.Tpo -c -o converter_gtkui_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtkui_la-interface.Tpo $(DEPDIR)/converter_gtkui_la-interface.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='converter_gtkui_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+converter_gtk3_la-interface.lo: interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-interface.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-interface.Tpo -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-interface.Tpo $(DEPDIR)/converter_gtk3_la-interface.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='converter_gtk3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -c -o converter_gtkui_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
-converter_gtkui_la-support.lo: support.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -MT converter_gtkui_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtkui_la-support.Tpo -c -o converter_gtkui_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/converter_gtkui_la-support.Tpo $(DEPDIR)/converter_gtkui_la-support.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='converter_gtkui_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+converter_gtk3_la-support.lo: support.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -MT converter_gtk3_la-support.lo -MD -MP -MF $(DEPDIR)/converter_gtk3_la-support.Tpo -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/converter_gtk3_la-support.Tpo $(DEPDIR)/converter_gtk3_la-support.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='converter_gtk3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtkui_la_CFLAGS) $(CFLAGS) -c -o converter_gtkui_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(converter_gtk3_la_CFLAGS) $(CFLAGS) -c -o converter_gtk3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/converter/converter.c -> deadbeef-0.5.2.tar.bz2/plugins/converter/converter.c Changed

deadbeef-0.5.1.tar.bz2/plugins/converter/converter.h -> deadbeef-0.5.2.tar.bz2/plugins/converter/converter.h Changed

deadbeef-0.5.1.tar.bz2/plugins/converter/convgui.c -> deadbeef-0.5.2.tar.bz2/plugins/converter/convgui.c Changed

deadbeef-0.5.1.tar.bz2/plugins/converter/interface.c -> deadbeef-0.5.2.tar.bz2/plugins/converter/interface.c Changed

deadbeef-0.5.1.tar.bz2/plugins/converter/support.c -> deadbeef-0.5.2.tar.bz2/plugins/converter/support.c Changed

@@ -27,7 +27,7 @@
       if (GTK_IS_MENU (widget))
         parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
       else
-        parent = widget->parent;
+        parent = gtk_widget_get_parent (widget);
       if (!parent)
         parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
       if (parent == NULL)
@@ -142,3 +142,45 @@
     }
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+GtkWidget *
+gtk_combo_box_entry_new_text(void) {
+    GtkWidget *w = gtk_combo_box_text_new_with_entry ();
+}
+void
+gtk_dialog_set_has_separator (GtkDialog *dlg, gboolean has) {
+}
+#endif
+
+#if !GTK_CHECK_VERSION(2,24,0)
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+GtkWidget *
+gtk_combo_box_text_new () {
+    return gtk_combo_box_new_text ();
+}
+
+GtkWidget *
+gtk_combo_box_text_new_with_entry   (void) {
+    return gtk_combo_box_entry_new ();
+}
+
+void
+gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_append_text (combo_box, text);
+}
+
+void
+gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, gint position, const gchar *text) {
+    gtk_combo_box_insert_text (combo_box, position, text);
+}
+
+void
+gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_prepend_text (combo_box, text);
+}
+gchar *
+gtk_combo_box_text_get_active_text  (GtkComboBoxText *combo_box) {
+    return gtk_combo_box_get_active_text (combo_box);
+}
+
+#endif

deadbeef-0.5.1.tar.bz2/plugins/converter/support.h -> deadbeef-0.5.2.tar.bz2/plugins/converter/support.h Changed

deadbeef-0.5.1.tar.bz2/plugins/dca/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/dca/Makefile.in Changed

@@ -79,9 +79,12 @@
 @HAVE_DCA_TRUE@	gettimeofday.lo parse.lo bitstream.lo \
 @HAVE_DCA_TRUE@	downmix.lo
 dca_la_OBJECTS = $(am_dca_la_OBJECTS)
-dca_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dca_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+dca_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(dca_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DCA_TRUE@am_dca_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -89,13 +92,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(dca_la_SOURCES)
 DIST_SOURCES = $(am__dca_la_SOURCES_DIST)
 ETAGS = etags
@@ -107,6 +123,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -154,14 +171,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -251,7 +271,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -262,6 +281,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -407,7 +427,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 dca.la: $(dca_la_OBJECTS) $(dca_la_DEPENDENCIES) 
-	$(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(dca_la_LINK) $(am_dca_la_rpath) $(dca_la_OBJECTS) $(dca_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -423,22 +443,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/dca/dcaplug.c -> deadbeef-0.5.2.tar.bz2/plugins/dca/dcaplug.c Changed

deadbeef-0.5.1.tar.bz2/plugins/dsp_libsrc/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/dsp_libsrc/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__dsp_libsrc_la_SOURCES_DIST = src.c src.h
 @HAVE_DSP_SRC_TRUE@am_dsp_libsrc_la_OBJECTS = dsp_libsrc_la-src.lo
 dsp_libsrc_la_OBJECTS = $(am_dsp_libsrc_la_OBJECTS)
-dsp_libsrc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+dsp_libsrc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(dsp_libsrc_la_CFLAGS) \
 	$(CFLAGS) $(dsp_libsrc_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_DSP_SRC_TRUE@am_dsp_libsrc_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(dsp_libsrc_la_SOURCES)
 DIST_SOURCES = $(am__dsp_libsrc_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -382,7 +402,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 dsp_libsrc.la: $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_DEPENDENCIES) 
-	$(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(dsp_libsrc_la_LINK) $(am_dsp_libsrc_la_rpath) $(dsp_libsrc_la_OBJECTS) $(dsp_libsrc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -393,32 +413,36 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsp_libsrc_la-src.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 dsp_libsrc_la-src.lo: src.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -MT dsp_libsrc_la-src.lo -MD -MP -MF $(DEPDIR)/dsp_libsrc_la-src.Tpo -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dsp_libsrc_la-src.Tpo $(DEPDIR)/dsp_libsrc_la-src.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src.c' object='dsp_libsrc_la-src.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dsp_libsrc_la_CFLAGS) $(CFLAGS) -c -o dsp_libsrc_la-src.lo `test -f 'src.c' || echo '$(srcdir)/'`src.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/dsp_libsrc/src.c -> deadbeef-0.5.2.tar.bz2/plugins/dsp_libsrc/src.c Changed

deadbeef-0.5.1.tar.bz2/plugins/dsp_libsrc/src.h -> deadbeef-0.5.2.tar.bz2/plugins/dsp_libsrc/src.h Changed

deadbeef-0.5.2.tar.bz2/plugins/dumb Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/Makefile.am Added

@@ -0,0 +1,107 @@
+if HAVE_DUMB
+dumbpath=@top_srcdir@/plugins/dumb/dumb-kode54
+
+EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt
+
+pkglib_LTLIBRARIES = ddb_dumb.la
+
+AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
+ddb_dumb_la_LDFLAGS = -module -lm
+
+ddb_dumb_la_SOURCES =\
+dumb-kode54/src/it/readam.c\
+dumb-kode54/src/it/readstm.c\
+dumb-kode54/src/it/loads3m.c\
+dumb-kode54/src/it/loadxm.c\
+dumb-kode54/src/it/ptmeffect.c\
+dumb-kode54/src/it/loadstm.c\
+dumb-kode54/src/it/readxm.c\
+dumb-kode54/src/it/itorder.c\
+dumb-kode54/src/it/loadpsm.c\
+dumb-kode54/src/it/itload.c\
+dumb-kode54/src/it/loadasy2.c\
+dumb-kode54/src/it/readasy.c\
+dumb-kode54/src/it/loadasy.c\
+dumb-kode54/src/it/read669.c\
+dumb-kode54/src/it/readdsmf.c\
+dumb-kode54/src/it/reads3m.c\
+dumb-kode54/src/it/readriff.c\
+dumb-kode54/src/it/load6692.c\
+dumb-kode54/src/it/read6692.c\
+dumb-kode54/src/it/readmod2.c\
+dumb-kode54/src/it/loadriff2.c\
+dumb-kode54/src/it/xmeffect.c\
+dumb-kode54/src/it/loadmod2.c\
+dumb-kode54/src/it/itread.c\
+dumb-kode54/src/it/itunload.c\
+dumb-kode54/src/it/loadmtm2.c\
+dumb-kode54/src/it/loadptm.c\
+dumb-kode54/src/it/itload2.c\
+dumb-kode54/src/it/loadmtm.c\
+dumb-kode54/src/it/loadoldpsm.c\
+dumb-kode54/src/it/loadstm2.c\
+dumb-kode54/src/it/readstm2.c\
+dumb-kode54/src/it/readptm.c\
+dumb-kode54/src/it/itrender.c\
+dumb-kode54/src/it/readoldpsm.c\
+dumb-kode54/src/it/reads3m2.c\
+dumb-kode54/src/it/readpsm.c\
+dumb-kode54/src/it/itread2.c\
+dumb-kode54/src/it/loads3m2.c\
+dumb-kode54/src/it/loadpsm2.c\
+dumb-kode54/src/it/loadxm2.c\
+dumb-kode54/src/it/loadptm2.c\
+dumb-kode54/src/it/readxm2.c\
+dumb-kode54/src/it/itmisc.c\
+dumb-kode54/src/it/loadoldpsm2.c\
+dumb-kode54/src/it/readmod.c\
+dumb-kode54/src/it/loadmod.c\
+dumb-kode54/src/it/loadriff.c\
+dumb-kode54/src/it/readmtm.c\
+dumb-kode54/src/it/load669.c\
+dumb-kode54/src/core/rendduh.c\
+dumb-kode54/src/core/readduh.c\
+dumb-kode54/src/core/duhlen.c\
+dumb-kode54/src/core/loadduh.c\
+dumb-kode54/src/core/unload.c\
+dumb-kode54/src/core/duhtag.c\
+dumb-kode54/src/core/register.c\
+dumb-kode54/src/core/rawsig.c\
+dumb-kode54/src/core/dumbfile.c\
+dumb-kode54/src/core/rendsig.c\
+dumb-kode54/src/core/makeduh.c\
+dumb-kode54/src/core/atexit.c\
+dumb-kode54/src/helpers/clickrem.c\
+dumb-kode54/src/helpers/silence.c\
+dumb-kode54/src/helpers/stdfile.c\
+dumb-kode54/src/helpers/resample.c\
+dumb-kode54/src/helpers/riff.c\
+dumb-kode54/src/helpers/memfile.c\
+dumb-kode54/src/helpers/sampbuf.c\
+dumb-kode54/src/helpers/barray.c\
+dumb-kode54/studio/include/guitop.h\
+dumb-kode54/studio/include/dumbgui.h\
+dumb-kode54/studio/include/options.h\
+dumb-kode54/studio/include/subclip.h\
+dumb-kode54/studio/include/main.h\
+dumb-kode54/studio/include/guiproc.h\
+dumb-kode54/studio/include/dumbmenu.h\
+dumb-kode54/studio/include/dumbdesk.h\
+dumb-kode54/src/tools/it/modulus.h\
+dumb-kode54/include/internal/it.h\
+dumb-kode54/include/internal/dumb.h\
+dumb-kode54/include/internal/barray.h\
+dumb-kode54/include/internal/riff.h\
+dumb-kode54/include/internal/aldumb.h\
+dumb-kode54/include/dumb.h\
+dumb-kode54/include/aldumb.h\
+dumb-kode54/winamp/in_duh.h\
+dumb-kode54/winamp/in2.h\
+dumb-kode54/winamp/resource.h\
+dumb-kode54/winamp/out.h\
+dumb-kode54/winamp/gui.h\
+dumb-kode54/src/helpers/resample.inc\
+dumb-kode54/src/helpers/resamp2.inc\
+dumb-kode54/src/helpers/resamp3.inc\
+cdumb.c
+endif

deadbeef-0.5.2.tar.bz2/plugins/dumb/Makefile.in Added

@@ -0,0 +1,1452 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/dumb
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_dumb_la_LIBADD =
+am__ddb_dumb_la_SOURCES_DIST = dumb-kode54/src/it/readam.c \
+	dumb-kode54/src/it/readstm.c dumb-kode54/src/it/loads3m.c \
+	dumb-kode54/src/it/loadxm.c dumb-kode54/src/it/ptmeffect.c \
+	dumb-kode54/src/it/loadstm.c dumb-kode54/src/it/readxm.c \
+	dumb-kode54/src/it/itorder.c dumb-kode54/src/it/loadpsm.c \
+	dumb-kode54/src/it/itload.c dumb-kode54/src/it/loadasy2.c \
+	dumb-kode54/src/it/readasy.c dumb-kode54/src/it/loadasy.c \
+	dumb-kode54/src/it/read669.c dumb-kode54/src/it/readdsmf.c \
+	dumb-kode54/src/it/reads3m.c dumb-kode54/src/it/readriff.c \
+	dumb-kode54/src/it/load6692.c dumb-kode54/src/it/read6692.c \
+	dumb-kode54/src/it/readmod2.c dumb-kode54/src/it/loadriff2.c \
+	dumb-kode54/src/it/xmeffect.c dumb-kode54/src/it/loadmod2.c \
+	dumb-kode54/src/it/itread.c dumb-kode54/src/it/itunload.c \
+	dumb-kode54/src/it/loadmtm2.c dumb-kode54/src/it/loadptm.c \
+	dumb-kode54/src/it/itload2.c dumb-kode54/src/it/loadmtm.c \
+	dumb-kode54/src/it/loadoldpsm.c dumb-kode54/src/it/loadstm2.c \
+	dumb-kode54/src/it/readstm2.c dumb-kode54/src/it/readptm.c \
+	dumb-kode54/src/it/itrender.c dumb-kode54/src/it/readoldpsm.c \
+	dumb-kode54/src/it/reads3m2.c dumb-kode54/src/it/readpsm.c \
+	dumb-kode54/src/it/itread2.c dumb-kode54/src/it/loads3m2.c \
+	dumb-kode54/src/it/loadpsm2.c dumb-kode54/src/it/loadxm2.c \
+	dumb-kode54/src/it/loadptm2.c dumb-kode54/src/it/readxm2.c \
+	dumb-kode54/src/it/itmisc.c dumb-kode54/src/it/loadoldpsm2.c \
+	dumb-kode54/src/it/readmod.c dumb-kode54/src/it/loadmod.c \
+	dumb-kode54/src/it/loadriff.c dumb-kode54/src/it/readmtm.c \
+	dumb-kode54/src/it/load669.c dumb-kode54/src/core/rendduh.c \
+	dumb-kode54/src/core/readduh.c dumb-kode54/src/core/duhlen.c \
+	dumb-kode54/src/core/loadduh.c dumb-kode54/src/core/unload.c \
+	dumb-kode54/src/core/duhtag.c dumb-kode54/src/core/register.c \
+	dumb-kode54/src/core/rawsig.c dumb-kode54/src/core/dumbfile.c \
+	dumb-kode54/src/core/rendsig.c dumb-kode54/src/core/makeduh.c \
+	dumb-kode54/src/core/atexit.c \
+	dumb-kode54/src/helpers/clickrem.c \
+	dumb-kode54/src/helpers/silence.c \
+	dumb-kode54/src/helpers/stdfile.c \
+	dumb-kode54/src/helpers/resample.c \
+	dumb-kode54/src/helpers/riff.c \
+	dumb-kode54/src/helpers/memfile.c \
+	dumb-kode54/src/helpers/sampbuf.c \
+	dumb-kode54/src/helpers/barray.c \
+	dumb-kode54/studio/include/guitop.h \
+	dumb-kode54/studio/include/dumbgui.h \
+	dumb-kode54/studio/include/options.h \
+	dumb-kode54/studio/include/subclip.h \
+	dumb-kode54/studio/include/main.h \
+	dumb-kode54/studio/include/guiproc.h \
+	dumb-kode54/studio/include/dumbmenu.h \
+	dumb-kode54/studio/include/dumbdesk.h \
+	dumb-kode54/src/tools/it/modulus.h \
+	dumb-kode54/include/internal/it.h \
+	dumb-kode54/include/internal/dumb.h \
+	dumb-kode54/include/internal/barray.h \
+	dumb-kode54/include/internal/riff.h \
+	dumb-kode54/include/internal/aldumb.h \
+	dumb-kode54/include/dumb.h dumb-kode54/include/aldumb.h \
+	dumb-kode54/winamp/in_duh.h dumb-kode54/winamp/in2.h \
+	dumb-kode54/winamp/resource.h dumb-kode54/winamp/out.h \
+	dumb-kode54/winamp/gui.h dumb-kode54/src/helpers/resample.inc \
+	dumb-kode54/src/helpers/resamp2.inc \
+	dumb-kode54/src/helpers/resamp3.inc cdumb.c
+@HAVE_DUMB_TRUE@am_ddb_dumb_la_OBJECTS = readam.lo readstm.lo \
+@HAVE_DUMB_TRUE@	loads3m.lo loadxm.lo ptmeffect.lo loadstm.lo \
+@HAVE_DUMB_TRUE@	readxm.lo itorder.lo loadpsm.lo itload.lo \
+@HAVE_DUMB_TRUE@	loadasy2.lo readasy.lo loadasy.lo read669.lo \
+@HAVE_DUMB_TRUE@	readdsmf.lo reads3m.lo readriff.lo load6692.lo \
+@HAVE_DUMB_TRUE@	read6692.lo readmod2.lo loadriff2.lo \
+@HAVE_DUMB_TRUE@	xmeffect.lo loadmod2.lo itread.lo itunload.lo \
+@HAVE_DUMB_TRUE@	loadmtm2.lo loadptm.lo itload2.lo loadmtm.lo \
+@HAVE_DUMB_TRUE@	loadoldpsm.lo loadstm2.lo readstm2.lo \
+@HAVE_DUMB_TRUE@	readptm.lo itrender.lo readoldpsm.lo \
+@HAVE_DUMB_TRUE@	reads3m2.lo readpsm.lo itread2.lo loads3m2.lo \
+@HAVE_DUMB_TRUE@	loadpsm2.lo loadxm2.lo loadptm2.lo readxm2.lo \
+@HAVE_DUMB_TRUE@	itmisc.lo loadoldpsm2.lo readmod.lo loadmod.lo \
+@HAVE_DUMB_TRUE@	loadriff.lo readmtm.lo load669.lo rendduh.lo \
+@HAVE_DUMB_TRUE@	readduh.lo duhlen.lo loadduh.lo unload.lo \
+@HAVE_DUMB_TRUE@	duhtag.lo register.lo rawsig.lo dumbfile.lo \
+@HAVE_DUMB_TRUE@	rendsig.lo makeduh.lo atexit.lo clickrem.lo \
+@HAVE_DUMB_TRUE@	silence.lo stdfile.lo resample.lo riff.lo \
+@HAVE_DUMB_TRUE@	memfile.lo sampbuf.lo barray.lo cdumb.lo
+ddb_dumb_la_OBJECTS = $(am_ddb_dumb_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ddb_dumb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ddb_dumb_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_DUMB_TRUE@am_ddb_dumb_la_rpath = -rpath $(pkglibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(ddb_dumb_la_SOURCES)
+DIST_SOURCES = $(am__ddb_dumb_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
+ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
+IMLIB2_DEPS_LIBS = @IMLIB2_DEPS_LIBS@
+INSANE_CFLAGS = @INSANE_CFLAGS@
+INSANE_CXXFLAGS = @INSANE_CXXFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIB = @LIB@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMMS_LIBS = @LIBMMS_LIBS@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBSAMPLERATE_DEPS_CFLAGS = @LIBSAMPLERATE_DEPS_CFLAGS@
+LIBSAMPLERATE_DEPS_LIBS = @LIBSAMPLERATE_DEPS_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OSS_CFLAGS = @OSS_CFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
+PULSE_DEPS_LIBS = @PULSE_DEPS_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@HAVE_DUMB_TRUE@dumbpath = @top_srcdir@/plugins/dumb/dumb-kode54
+@HAVE_DUMB_TRUE@EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt
+@HAVE_DUMB_TRUE@pkglib_LTLIBRARIES = ddb_dumb.la
+@HAVE_DUMB_TRUE@AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
+@HAVE_DUMB_TRUE@ddb_dumb_la_LDFLAGS = -module -lm
+@HAVE_DUMB_TRUE@ddb_dumb_la_SOURCES = \
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readam.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readstm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loads3m.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadxm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/ptmeffect.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadstm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readxm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itorder.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadpsm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itload.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadasy2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readasy.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadasy.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/read669.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readdsmf.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/reads3m.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readriff.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/load6692.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/read6692.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readmod2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadriff2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/xmeffect.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadmod2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itread.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itunload.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadmtm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadptm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itload2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadmtm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadoldpsm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadstm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readstm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readptm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itrender.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readoldpsm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/reads3m2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readpsm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itread2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loads3m2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadpsm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadxm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadptm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readxm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/itmisc.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadoldpsm2.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readmod.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadmod.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/loadriff.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/readmtm.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/it/load669.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/rendduh.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/readduh.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/duhlen.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/loadduh.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/unload.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/duhtag.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/register.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/rawsig.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/dumbfile.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/rendsig.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/makeduh.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/core/atexit.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/clickrem.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/silence.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/stdfile.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/resample.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/riff.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/memfile.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/sampbuf.c\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/barray.c\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/guitop.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/dumbgui.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/options.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/subclip.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/main.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/guiproc.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/dumbmenu.h\
+@HAVE_DUMB_TRUE@dumb-kode54/studio/include/dumbdesk.h\
+@HAVE_DUMB_TRUE@dumb-kode54/src/tools/it/modulus.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/internal/it.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/internal/dumb.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/internal/barray.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/internal/riff.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/internal/aldumb.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/dumb.h\
+@HAVE_DUMB_TRUE@dumb-kode54/include/aldumb.h\
+@HAVE_DUMB_TRUE@dumb-kode54/winamp/in_duh.h\
+@HAVE_DUMB_TRUE@dumb-kode54/winamp/in2.h\
+@HAVE_DUMB_TRUE@dumb-kode54/winamp/resource.h\
+@HAVE_DUMB_TRUE@dumb-kode54/winamp/out.h\
+@HAVE_DUMB_TRUE@dumb-kode54/winamp/gui.h\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/resample.inc\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/resamp2.inc\
+@HAVE_DUMB_TRUE@dumb-kode54/src/helpers/resamp3.inc\
+@HAVE_DUMB_TRUE@cdumb.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	 case '$(am__configure_deps)' in \
+	 *$$dep*) \
+	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	 && { if test -f $@; then exit 0; else break; fi; }; \
+	 exit 1;; \
+	 esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dumb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu plugins/dumb/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	 *config.status*) \
+	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	 *) \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	 if test -f $$p; then \
+	 list2="$$list2 $$p"; \
+	 else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	 $(am__strip_dir) \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	 test "$$dir" != "$$p" || dir=.; \
+	 echo "rm -f \"$${dir}/so_locations\""; \
+	 rm -f "$${dir}/so_locations"; \
+	done
+ddb_dumb.la: $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_dumb_la_LINK) $(am_ddb_dumb_la_rpath) $(ddb_dumb_la_OBJECTS) $(ddb_dumb_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atexit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/barray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdumb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clickrem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/duhlen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/duhtag.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumbfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itload.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itload2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itmisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itorder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itread2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itrender.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itunload.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load669.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load6692.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadasy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadasy2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadduh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadmod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadmod2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadmtm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadmtm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadoldpsm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadoldpsm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadpsm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadpsm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadptm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadptm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadriff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadriff2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loads3m.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loads3m2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadstm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadstm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadxm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadxm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makeduh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptmeffect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawsig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read669.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read6692.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readam.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readasy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readdsmf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readduh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readmod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readmod2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readmtm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readoldpsm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpsm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readptm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readriff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reads3m.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reads3m2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readstm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readstm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readxm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readxm2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/register.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rendduh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rendsig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resample.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/riff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sampbuf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/silence.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unload.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmeffect.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+readam.lo: dumb-kode54/src/it/readam.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readam.lo -MD -MP -MF $(DEPDIR)/readam.Tpo -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readam.Tpo $(DEPDIR)/readam.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readam.c' object='readam.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readam.lo `test -f 'dumb-kode54/src/it/readam.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readam.c
+
+readstm.lo: dumb-kode54/src/it/readstm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm.lo -MD -MP -MF $(DEPDIR)/readstm.Tpo -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readstm.Tpo $(DEPDIR)/readstm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readstm.c' object='readstm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm.lo `test -f 'dumb-kode54/src/it/readstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm.c
+
+loads3m.lo: dumb-kode54/src/it/loads3m.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m.lo -MD -MP -MF $(DEPDIR)/loads3m.Tpo -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loads3m.Tpo $(DEPDIR)/loads3m.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loads3m.c' object='loads3m.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m.lo `test -f 'dumb-kode54/src/it/loads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m.c
+
+loadxm.lo: dumb-kode54/src/it/loadxm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm.lo -MD -MP -MF $(DEPDIR)/loadxm.Tpo -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadxm.Tpo $(DEPDIR)/loadxm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadxm.c' object='loadxm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm.lo `test -f 'dumb-kode54/src/it/loadxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm.c
+
+ptmeffect.lo: dumb-kode54/src/it/ptmeffect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptmeffect.lo -MD -MP -MF $(DEPDIR)/ptmeffect.Tpo -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptmeffect.Tpo $(DEPDIR)/ptmeffect.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/ptmeffect.c' object='ptmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptmeffect.lo `test -f 'dumb-kode54/src/it/ptmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/ptmeffect.c
+
+loadstm.lo: dumb-kode54/src/it/loadstm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm.lo -MD -MP -MF $(DEPDIR)/loadstm.Tpo -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadstm.Tpo $(DEPDIR)/loadstm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadstm.c' object='loadstm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm.lo `test -f 'dumb-kode54/src/it/loadstm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm.c
+
+readxm.lo: dumb-kode54/src/it/readxm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm.lo -MD -MP -MF $(DEPDIR)/readxm.Tpo -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readxm.Tpo $(DEPDIR)/readxm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readxm.c' object='readxm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm.lo `test -f 'dumb-kode54/src/it/readxm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm.c
+
+itorder.lo: dumb-kode54/src/it/itorder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itorder.lo -MD -MP -MF $(DEPDIR)/itorder.Tpo -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itorder.Tpo $(DEPDIR)/itorder.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itorder.c' object='itorder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itorder.lo `test -f 'dumb-kode54/src/it/itorder.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itorder.c
+
+loadpsm.lo: dumb-kode54/src/it/loadpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm.lo -MD -MP -MF $(DEPDIR)/loadpsm.Tpo -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm.Tpo $(DEPDIR)/loadpsm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadpsm.c' object='loadpsm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm.lo `test -f 'dumb-kode54/src/it/loadpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm.c
+
+itload.lo: dumb-kode54/src/it/itload.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload.lo -MD -MP -MF $(DEPDIR)/itload.Tpo -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itload.Tpo $(DEPDIR)/itload.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itload.c' object='itload.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload.lo `test -f 'dumb-kode54/src/it/itload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload.c
+
+loadasy2.lo: dumb-kode54/src/it/loadasy2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy2.lo -MD -MP -MF $(DEPDIR)/loadasy2.Tpo -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadasy2.Tpo $(DEPDIR)/loadasy2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadasy2.c' object='loadasy2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy2.lo `test -f 'dumb-kode54/src/it/loadasy2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy2.c
+
+readasy.lo: dumb-kode54/src/it/readasy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readasy.lo -MD -MP -MF $(DEPDIR)/readasy.Tpo -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readasy.Tpo $(DEPDIR)/readasy.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readasy.c' object='readasy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readasy.lo `test -f 'dumb-kode54/src/it/readasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readasy.c
+
+loadasy.lo: dumb-kode54/src/it/loadasy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadasy.lo -MD -MP -MF $(DEPDIR)/loadasy.Tpo -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadasy.Tpo $(DEPDIR)/loadasy.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadasy.c' object='loadasy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadasy.lo `test -f 'dumb-kode54/src/it/loadasy.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadasy.c
+
+read669.lo: dumb-kode54/src/it/read669.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read669.lo -MD -MP -MF $(DEPDIR)/read669.Tpo -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/read669.Tpo $(DEPDIR)/read669.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/read669.c' object='read669.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read669.lo `test -f 'dumb-kode54/src/it/read669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read669.c
+
+readdsmf.lo: dumb-kode54/src/it/readdsmf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readdsmf.lo -MD -MP -MF $(DEPDIR)/readdsmf.Tpo -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readdsmf.Tpo $(DEPDIR)/readdsmf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readdsmf.c' object='readdsmf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readdsmf.lo `test -f 'dumb-kode54/src/it/readdsmf.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readdsmf.c
+
+reads3m.lo: dumb-kode54/src/it/reads3m.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m.lo -MD -MP -MF $(DEPDIR)/reads3m.Tpo -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reads3m.Tpo $(DEPDIR)/reads3m.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/reads3m.c' object='reads3m.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m.lo `test -f 'dumb-kode54/src/it/reads3m.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m.c
+
+readriff.lo: dumb-kode54/src/it/readriff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readriff.lo -MD -MP -MF $(DEPDIR)/readriff.Tpo -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readriff.Tpo $(DEPDIR)/readriff.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readriff.c' object='readriff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readriff.lo `test -f 'dumb-kode54/src/it/readriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readriff.c
+
+load6692.lo: dumb-kode54/src/it/load6692.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load6692.lo -MD -MP -MF $(DEPDIR)/load6692.Tpo -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load6692.Tpo $(DEPDIR)/load6692.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/load6692.c' object='load6692.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load6692.lo `test -f 'dumb-kode54/src/it/load6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load6692.c
+
+read6692.lo: dumb-kode54/src/it/read6692.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT read6692.lo -MD -MP -MF $(DEPDIR)/read6692.Tpo -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/read6692.Tpo $(DEPDIR)/read6692.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/read6692.c' object='read6692.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o read6692.lo `test -f 'dumb-kode54/src/it/read6692.c' || echo '$(srcdir)/'`dumb-kode54/src/it/read6692.c
+
+readmod2.lo: dumb-kode54/src/it/readmod2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod2.lo -MD -MP -MF $(DEPDIR)/readmod2.Tpo -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmod2.Tpo $(DEPDIR)/readmod2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmod2.c' object='readmod2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod2.lo `test -f 'dumb-kode54/src/it/readmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod2.c
+
+loadriff2.lo: dumb-kode54/src/it/loadriff2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff2.lo -MD -MP -MF $(DEPDIR)/loadriff2.Tpo -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadriff2.Tpo $(DEPDIR)/loadriff2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadriff2.c' object='loadriff2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff2.lo `test -f 'dumb-kode54/src/it/loadriff2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff2.c
+
+xmeffect.lo: dumb-kode54/src/it/xmeffect.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmeffect.lo -MD -MP -MF $(DEPDIR)/xmeffect.Tpo -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xmeffect.Tpo $(DEPDIR)/xmeffect.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/xmeffect.c' object='xmeffect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmeffect.lo `test -f 'dumb-kode54/src/it/xmeffect.c' || echo '$(srcdir)/'`dumb-kode54/src/it/xmeffect.c
+
+loadmod2.lo: dumb-kode54/src/it/loadmod2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod2.lo -MD -MP -MF $(DEPDIR)/loadmod2.Tpo -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmod2.Tpo $(DEPDIR)/loadmod2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmod2.c' object='loadmod2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod2.lo `test -f 'dumb-kode54/src/it/loadmod2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod2.c
+
+itread.lo: dumb-kode54/src/it/itread.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread.lo -MD -MP -MF $(DEPDIR)/itread.Tpo -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itread.Tpo $(DEPDIR)/itread.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itread.c' object='itread.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread.lo `test -f 'dumb-kode54/src/it/itread.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread.c
+
+itunload.lo: dumb-kode54/src/it/itunload.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itunload.lo -MD -MP -MF $(DEPDIR)/itunload.Tpo -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itunload.Tpo $(DEPDIR)/itunload.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itunload.c' object='itunload.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itunload.lo `test -f 'dumb-kode54/src/it/itunload.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itunload.c
+
+loadmtm2.lo: dumb-kode54/src/it/loadmtm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm2.lo -MD -MP -MF $(DEPDIR)/loadmtm2.Tpo -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm2.Tpo $(DEPDIR)/loadmtm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmtm2.c' object='loadmtm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm2.lo `test -f 'dumb-kode54/src/it/loadmtm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm2.c
+
+loadptm.lo: dumb-kode54/src/it/loadptm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm.lo -MD -MP -MF $(DEPDIR)/loadptm.Tpo -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadptm.Tpo $(DEPDIR)/loadptm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadptm.c' object='loadptm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm.lo `test -f 'dumb-kode54/src/it/loadptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm.c
+
+itload2.lo: dumb-kode54/src/it/itload2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itload2.lo -MD -MP -MF $(DEPDIR)/itload2.Tpo -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itload2.Tpo $(DEPDIR)/itload2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itload2.c' object='itload2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itload2.lo `test -f 'dumb-kode54/src/it/itload2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itload2.c
+
+loadmtm.lo: dumb-kode54/src/it/loadmtm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmtm.lo -MD -MP -MF $(DEPDIR)/loadmtm.Tpo -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmtm.Tpo $(DEPDIR)/loadmtm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmtm.c' object='loadmtm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmtm.lo `test -f 'dumb-kode54/src/it/loadmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmtm.c
+
+loadoldpsm.lo: dumb-kode54/src/it/loadoldpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm.lo -MD -MP -MF $(DEPDIR)/loadoldpsm.Tpo -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm.Tpo $(DEPDIR)/loadoldpsm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadoldpsm.c' object='loadoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm.lo `test -f 'dumb-kode54/src/it/loadoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm.c
+
+loadstm2.lo: dumb-kode54/src/it/loadstm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadstm2.lo -MD -MP -MF $(DEPDIR)/loadstm2.Tpo -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadstm2.Tpo $(DEPDIR)/loadstm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadstm2.c' object='loadstm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadstm2.lo `test -f 'dumb-kode54/src/it/loadstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadstm2.c
+
+readstm2.lo: dumb-kode54/src/it/readstm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readstm2.lo -MD -MP -MF $(DEPDIR)/readstm2.Tpo -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readstm2.Tpo $(DEPDIR)/readstm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readstm2.c' object='readstm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readstm2.lo `test -f 'dumb-kode54/src/it/readstm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readstm2.c
+
+readptm.lo: dumb-kode54/src/it/readptm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readptm.lo -MD -MP -MF $(DEPDIR)/readptm.Tpo -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readptm.Tpo $(DEPDIR)/readptm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readptm.c' object='readptm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readptm.lo `test -f 'dumb-kode54/src/it/readptm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readptm.c
+
+itrender.lo: dumb-kode54/src/it/itrender.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itrender.lo -MD -MP -MF $(DEPDIR)/itrender.Tpo -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itrender.Tpo $(DEPDIR)/itrender.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itrender.c' object='itrender.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itrender.lo `test -f 'dumb-kode54/src/it/itrender.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itrender.c
+
+readoldpsm.lo: dumb-kode54/src/it/readoldpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readoldpsm.lo -MD -MP -MF $(DEPDIR)/readoldpsm.Tpo -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readoldpsm.Tpo $(DEPDIR)/readoldpsm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readoldpsm.c' object='readoldpsm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readoldpsm.lo `test -f 'dumb-kode54/src/it/readoldpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readoldpsm.c
+
+reads3m2.lo: dumb-kode54/src/it/reads3m2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reads3m2.lo -MD -MP -MF $(DEPDIR)/reads3m2.Tpo -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reads3m2.Tpo $(DEPDIR)/reads3m2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/reads3m2.c' object='reads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reads3m2.lo `test -f 'dumb-kode54/src/it/reads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/reads3m2.c
+
+readpsm.lo: dumb-kode54/src/it/readpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readpsm.lo -MD -MP -MF $(DEPDIR)/readpsm.Tpo -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readpsm.Tpo $(DEPDIR)/readpsm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readpsm.c' object='readpsm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readpsm.lo `test -f 'dumb-kode54/src/it/readpsm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readpsm.c
+
+itread2.lo: dumb-kode54/src/it/itread2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itread2.lo -MD -MP -MF $(DEPDIR)/itread2.Tpo -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itread2.Tpo $(DEPDIR)/itread2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itread2.c' object='itread2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itread2.lo `test -f 'dumb-kode54/src/it/itread2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itread2.c
+
+loads3m2.lo: dumb-kode54/src/it/loads3m2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loads3m2.lo -MD -MP -MF $(DEPDIR)/loads3m2.Tpo -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loads3m2.Tpo $(DEPDIR)/loads3m2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loads3m2.c' object='loads3m2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loads3m2.lo `test -f 'dumb-kode54/src/it/loads3m2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loads3m2.c
+
+loadpsm2.lo: dumb-kode54/src/it/loadpsm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadpsm2.lo -MD -MP -MF $(DEPDIR)/loadpsm2.Tpo -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadpsm2.Tpo $(DEPDIR)/loadpsm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadpsm2.c' object='loadpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadpsm2.lo `test -f 'dumb-kode54/src/it/loadpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadpsm2.c
+
+loadxm2.lo: dumb-kode54/src/it/loadxm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadxm2.lo -MD -MP -MF $(DEPDIR)/loadxm2.Tpo -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadxm2.Tpo $(DEPDIR)/loadxm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadxm2.c' object='loadxm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadxm2.lo `test -f 'dumb-kode54/src/it/loadxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadxm2.c
+
+loadptm2.lo: dumb-kode54/src/it/loadptm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadptm2.lo -MD -MP -MF $(DEPDIR)/loadptm2.Tpo -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadptm2.Tpo $(DEPDIR)/loadptm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadptm2.c' object='loadptm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadptm2.lo `test -f 'dumb-kode54/src/it/loadptm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadptm2.c
+
+readxm2.lo: dumb-kode54/src/it/readxm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readxm2.lo -MD -MP -MF $(DEPDIR)/readxm2.Tpo -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readxm2.Tpo $(DEPDIR)/readxm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readxm2.c' object='readxm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readxm2.lo `test -f 'dumb-kode54/src/it/readxm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readxm2.c
+
+itmisc.lo: dumb-kode54/src/it/itmisc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT itmisc.lo -MD -MP -MF $(DEPDIR)/itmisc.Tpo -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/itmisc.Tpo $(DEPDIR)/itmisc.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/itmisc.c' object='itmisc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o itmisc.lo `test -f 'dumb-kode54/src/it/itmisc.c' || echo '$(srcdir)/'`dumb-kode54/src/it/itmisc.c
+
+loadoldpsm2.lo: dumb-kode54/src/it/loadoldpsm2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadoldpsm2.lo -MD -MP -MF $(DEPDIR)/loadoldpsm2.Tpo -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadoldpsm2.Tpo $(DEPDIR)/loadoldpsm2.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadoldpsm2.c' object='loadoldpsm2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadoldpsm2.lo `test -f 'dumb-kode54/src/it/loadoldpsm2.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadoldpsm2.c
+
+readmod.lo: dumb-kode54/src/it/readmod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmod.lo -MD -MP -MF $(DEPDIR)/readmod.Tpo -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmod.Tpo $(DEPDIR)/readmod.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmod.c' object='readmod.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmod.lo `test -f 'dumb-kode54/src/it/readmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmod.c
+
+loadmod.lo: dumb-kode54/src/it/loadmod.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadmod.lo -MD -MP -MF $(DEPDIR)/loadmod.Tpo -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadmod.Tpo $(DEPDIR)/loadmod.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadmod.c' object='loadmod.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadmod.lo `test -f 'dumb-kode54/src/it/loadmod.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadmod.c
+
+loadriff.lo: dumb-kode54/src/it/loadriff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadriff.lo -MD -MP -MF $(DEPDIR)/loadriff.Tpo -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadriff.Tpo $(DEPDIR)/loadriff.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/loadriff.c' object='loadriff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadriff.lo `test -f 'dumb-kode54/src/it/loadriff.c' || echo '$(srcdir)/'`dumb-kode54/src/it/loadriff.c
+
+readmtm.lo: dumb-kode54/src/it/readmtm.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readmtm.lo -MD -MP -MF $(DEPDIR)/readmtm.Tpo -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readmtm.Tpo $(DEPDIR)/readmtm.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/readmtm.c' object='readmtm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readmtm.lo `test -f 'dumb-kode54/src/it/readmtm.c' || echo '$(srcdir)/'`dumb-kode54/src/it/readmtm.c
+
+load669.lo: dumb-kode54/src/it/load669.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT load669.lo -MD -MP -MF $(DEPDIR)/load669.Tpo -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/load669.Tpo $(DEPDIR)/load669.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/it/load669.c' object='load669.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o load669.lo `test -f 'dumb-kode54/src/it/load669.c' || echo '$(srcdir)/'`dumb-kode54/src/it/load669.c
+
+rendduh.lo: dumb-kode54/src/core/rendduh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendduh.lo -MD -MP -MF $(DEPDIR)/rendduh.Tpo -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rendduh.Tpo $(DEPDIR)/rendduh.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rendduh.c' object='rendduh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendduh.lo `test -f 'dumb-kode54/src/core/rendduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendduh.c
+
+readduh.lo: dumb-kode54/src/core/readduh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT readduh.lo -MD -MP -MF $(DEPDIR)/readduh.Tpo -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readduh.Tpo $(DEPDIR)/readduh.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/readduh.c' object='readduh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o readduh.lo `test -f 'dumb-kode54/src/core/readduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/readduh.c
+
+duhlen.lo: dumb-kode54/src/core/duhlen.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhlen.lo -MD -MP -MF $(DEPDIR)/duhlen.Tpo -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/duhlen.Tpo $(DEPDIR)/duhlen.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/duhlen.c' object='duhlen.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhlen.lo `test -f 'dumb-kode54/src/core/duhlen.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhlen.c
+
+loadduh.lo: dumb-kode54/src/core/loadduh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT loadduh.lo -MD -MP -MF $(DEPDIR)/loadduh.Tpo -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/loadduh.Tpo $(DEPDIR)/loadduh.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/loadduh.c' object='loadduh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o loadduh.lo `test -f 'dumb-kode54/src/core/loadduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/loadduh.c
+
+unload.lo: dumb-kode54/src/core/unload.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unload.lo -MD -MP -MF $(DEPDIR)/unload.Tpo -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unload.Tpo $(DEPDIR)/unload.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/unload.c' object='unload.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unload.lo `test -f 'dumb-kode54/src/core/unload.c' || echo '$(srcdir)/'`dumb-kode54/src/core/unload.c
+
+duhtag.lo: dumb-kode54/src/core/duhtag.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT duhtag.lo -MD -MP -MF $(DEPDIR)/duhtag.Tpo -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/duhtag.Tpo $(DEPDIR)/duhtag.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/duhtag.c' object='duhtag.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o duhtag.lo `test -f 'dumb-kode54/src/core/duhtag.c' || echo '$(srcdir)/'`dumb-kode54/src/core/duhtag.c
+
+register.lo: dumb-kode54/src/core/register.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT register.lo -MD -MP -MF $(DEPDIR)/register.Tpo -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/register.Tpo $(DEPDIR)/register.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/register.c' object='register.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o register.lo `test -f 'dumb-kode54/src/core/register.c' || echo '$(srcdir)/'`dumb-kode54/src/core/register.c
+
+rawsig.lo: dumb-kode54/src/core/rawsig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rawsig.lo -MD -MP -MF $(DEPDIR)/rawsig.Tpo -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawsig.Tpo $(DEPDIR)/rawsig.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rawsig.c' object='rawsig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rawsig.lo `test -f 'dumb-kode54/src/core/rawsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rawsig.c
+
+dumbfile.lo: dumb-kode54/src/core/dumbfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dumbfile.lo -MD -MP -MF $(DEPDIR)/dumbfile.Tpo -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dumbfile.Tpo $(DEPDIR)/dumbfile.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/dumbfile.c' object='dumbfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dumbfile.lo `test -f 'dumb-kode54/src/core/dumbfile.c' || echo '$(srcdir)/'`dumb-kode54/src/core/dumbfile.c
+
+rendsig.lo: dumb-kode54/src/core/rendsig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT rendsig.lo -MD -MP -MF $(DEPDIR)/rendsig.Tpo -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rendsig.Tpo $(DEPDIR)/rendsig.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/rendsig.c' object='rendsig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rendsig.lo `test -f 'dumb-kode54/src/core/rendsig.c' || echo '$(srcdir)/'`dumb-kode54/src/core/rendsig.c
+
+makeduh.lo: dumb-kode54/src/core/makeduh.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT makeduh.lo -MD -MP -MF $(DEPDIR)/makeduh.Tpo -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makeduh.Tpo $(DEPDIR)/makeduh.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/makeduh.c' object='makeduh.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o makeduh.lo `test -f 'dumb-kode54/src/core/makeduh.c' || echo '$(srcdir)/'`dumb-kode54/src/core/makeduh.c
+
+atexit.lo: dumb-kode54/src/core/atexit.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atexit.lo -MD -MP -MF $(DEPDIR)/atexit.Tpo -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/atexit.Tpo $(DEPDIR)/atexit.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/core/atexit.c' object='atexit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atexit.lo `test -f 'dumb-kode54/src/core/atexit.c' || echo '$(srcdir)/'`dumb-kode54/src/core/atexit.c
+
+clickrem.lo: dumb-kode54/src/helpers/clickrem.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clickrem.lo -MD -MP -MF $(DEPDIR)/clickrem.Tpo -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clickrem.Tpo $(DEPDIR)/clickrem.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/clickrem.c' object='clickrem.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clickrem.lo `test -f 'dumb-kode54/src/helpers/clickrem.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/clickrem.c
+
+silence.lo: dumb-kode54/src/helpers/silence.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT silence.lo -MD -MP -MF $(DEPDIR)/silence.Tpo -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/silence.Tpo $(DEPDIR)/silence.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/silence.c' object='silence.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o silence.lo `test -f 'dumb-kode54/src/helpers/silence.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/silence.c
+
+stdfile.lo: dumb-kode54/src/helpers/stdfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT stdfile.lo -MD -MP -MF $(DEPDIR)/stdfile.Tpo -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/stdfile.Tpo $(DEPDIR)/stdfile.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/stdfile.c' object='stdfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stdfile.lo `test -f 'dumb-kode54/src/helpers/stdfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/stdfile.c
+
+resample.lo: dumb-kode54/src/helpers/resample.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resample.lo -MD -MP -MF $(DEPDIR)/resample.Tpo -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resample.Tpo $(DEPDIR)/resample.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/resample.c' object='resample.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resample.lo `test -f 'dumb-kode54/src/helpers/resample.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/resample.c
+
+riff.lo: dumb-kode54/src/helpers/riff.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT riff.lo -MD -MP -MF $(DEPDIR)/riff.Tpo -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/riff.Tpo $(DEPDIR)/riff.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/riff.c' object='riff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o riff.lo `test -f 'dumb-kode54/src/helpers/riff.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/riff.c
+
+memfile.lo: dumb-kode54/src/helpers/memfile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memfile.lo -MD -MP -MF $(DEPDIR)/memfile.Tpo -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/memfile.Tpo $(DEPDIR)/memfile.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/memfile.c' object='memfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memfile.lo `test -f 'dumb-kode54/src/helpers/memfile.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/memfile.c
+
+sampbuf.lo: dumb-kode54/src/helpers/sampbuf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sampbuf.lo -MD -MP -MF $(DEPDIR)/sampbuf.Tpo -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sampbuf.Tpo $(DEPDIR)/sampbuf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/sampbuf.c' object='sampbuf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sampbuf.lo `test -f 'dumb-kode54/src/helpers/sampbuf.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/sampbuf.c
+
+barray.lo: dumb-kode54/src/helpers/barray.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT barray.lo -MD -MP -MF $(DEPDIR)/barray.Tpo -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/barray.Tpo $(DEPDIR)/barray.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dumb-kode54/src/helpers/barray.c' object='barray.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o barray.lo `test -f 'dumb-kode54/src/helpers/barray.c' || echo '$(srcdir)/'`dumb-kode54/src/helpers/barray.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	 test -n "$$unique" || unique=$$empty_fix; \
+	 if test $$# -gt 0; then \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 "$$@" $$unique; \
+	 else \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 $$unique; \
+	 fi; \
+	fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	 $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	 && $(am__cd) $(top_srcdir) \
+	 && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	 dist_files=`for file in $$list; do echo $$file; done | \
+	 sed -e "s|^$$srcdirstrip/||;t" \
+	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	 */*) $(MKDIR_P) `echo "$$dist_files" | \
+			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			 sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	 if test -d $$d/$$file; then \
+	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	 if test -d "$(distdir)/$$file"; then \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	 else \
+	 test -f "$(distdir)/$$file" \
+	 || cp -p $$d/$$file "$(distdir)/$$file" \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 `test -z '$(STRIP)' || \
+	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

deadbeef-0.5.2.tar.bz2/plugins/dumb/cdumb.c Added

@@ -0,0 +1,927 @@
+/*
+ DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// based on fb2k dumb plugin from http://kode54.foobar2000.org
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "dumb.h"
+#include "internal/it.h"
+#include "../../deadbeef.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+static DB_decoder_t plugin;
+static DB_functions_t *deadbeef;
+
+typedef struct {
+ DB_fileinfo_t info;
+ DUH *duh;
+ DUH_SIGRENDERER *renderer;
+} dumb_info_t;
+
+//#define DUMB_RQ_ALIASING
+//#define DUMB_RQ_LINEAR
+//#define DUMB_RQ_CUBIC
+//#define DUMB_RQ_N_LEVELS
+extern int dumb_resampling_quality;
+extern int dumb_it_max_to_mix;
+
+static int
+cdumb_startrenderer (DB_fileinfo_t *_info);
+
+static DUH*
+open_module(const char *fname, const char *ext, int *start_order, int *is_it, int *is_dos, const char **filetype);
+
+static DB_fileinfo_t *
+cdumb_open (uint32_t hints) {
+ DB_fileinfo_t *_info = malloc (sizeof (dumb_info_t));
+ memset (_info, 0, sizeof (dumb_info_t));
+ return _info;
+}
+
+static int
+cdumb_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ trace ("cdumb_init %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ dumb_info_t *info = (dumb_info_t *)_info;
+
+ int start_order = 0;
+	int is_dos, is_it;
+ const char *ext = deadbeef->pl_find_meta (it, ":URI") + strlen (deadbeef->pl_find_meta (it, ":URI")) - 1;
+ while (*ext != '.' && ext > deadbeef->pl_find_meta (it, ":URI")) {
+ ext--;
+ }
+ ext++;
+ const char *ftype;
+ info->duh = open_module(deadbeef->pl_find_meta (it, ":URI"), ext, &start_order, &is_it, &is_dos, &ftype);
+
+ dumb_it_do_initial_runthrough (info->duh);
+
+ _info->plugin = &plugin;
+ _info->fmt.bps = deadbeef->conf_get_int ("dumb.8bitoutput", 0) ? 8 : 16;
+ _info->fmt.channels = 2;
+ _info->fmt.samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100);
+ _info->readpos = 0;
+ _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
+
+ if (cdumb_startrenderer (_info) < 0) {
+ return -1;
+ }
+
+ trace ("cdumb_init success (ptr=%p)\n", _info);
+ return 0;
+}
+
+static int
+cdumb_startrenderer (DB_fileinfo_t *_info) {
+ dumb_info_t *info = (dumb_info_t *)_info;
+ // reopen
+ if (info->renderer) {
+ duh_end_sigrenderer (info->renderer);
+ info->renderer = NULL;
+ }
+ info->renderer = duh_start_sigrenderer (info->duh, 0, 2, 0);
+ if (!info->renderer) {
+ return -1;
+ }
+
+ DUMB_IT_SIGRENDERER *itsr = duh_get_it_sigrenderer (info->renderer);
+ dumb_it_set_loop_callback (itsr, &dumb_it_callback_terminate, NULL);
+
+ int q = deadbeef->conf_get_int ("dumb.resampling_quality", 2);
+ if (q < 0) {
+ q = 0;
+ }
+ else if (q >= DUMB_RQ_N_LEVELS) {
+ q = DUMB_RQ_N_LEVELS - 1;
+ }
+
+ dumb_it_set_resampling_quality (itsr, q);
+ dumb_it_set_xm_speed_zero_callback (itsr, &dumb_it_callback_terminate, NULL);
+ dumb_it_set_global_volume_zero_callback (itsr, &dumb_it_callback_terminate, NULL);
+ return 0;
+}
+
+static void
+cdumb_free (DB_fileinfo_t *_info) {
+ trace ("cdumb_free %p\n", _info);
+ dumb_info_t *info = (dumb_info_t *)_info;
+ if (info) {
+ if (info->renderer) {
+ duh_end_sigrenderer (info->renderer);
+ info->renderer = NULL;
+ }
+ if (info->duh) {
+ unload_duh (info->duh);
+ info->duh = NULL;
+ }
+ free (info);
+ }
+}
+
+static int
+cdumb_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ trace ("cdumb_read req %d\n", size);
+ dumb_info_t *info = (dumb_info_t *)_info;
+ int samplesize = (_info->fmt.bps >> 3) * _info->fmt.channels;
+ int length = size / samplesize;
+ long ret;
+ ret = duh_render (info->renderer, _info->fmt.bps, 0, 1, 65536.f / _info->fmt.samplerate, length, bytes);
+ _info->readpos += ret / (float)_info->fmt.samplerate;
+ trace ("cdumb_read %d\n", ret*samplesize);
+ return ret*samplesize;
+}
+
+static int
+cdumb_seek (DB_fileinfo_t *_info, float time) {
+ trace ("cdumb_read seek %f\n", time);
+ dumb_info_t *info = (dumb_info_t *)_info;
+ if (time < _info->readpos) {
+ if (cdumb_startrenderer (_info) < 0) {
+ return -1;
+ } 
+ }
+ else {
+ time -= _info->readpos;
+ }
+ int pos = time * _info->fmt.samplerate;
+ duh_sigrenderer_generate_samples (info->renderer, 0, 65536.0f / _info->fmt.samplerate, pos, NULL);
+ _info->readpos = duh_sigrenderer_get_position (info->renderer) / 65536.f;
+ return 0;
+}
+
+static const char * exts[]=
+{
+	"mod","mdz",
+	"s3m","s3z",
+	"stm","stz",
+	"it","itz",
+	"xm","xmz",
+	"ptm","ptz",
+	"mtm","mtz",
+	"669",
+	"psm",
+	"umx",
+	"am","j2b",
+	"dsm",
+	"amf",
+	NULL
+};
+
+// derived from mod.cpp of foo_dumb source code
+static DUH * open_module(const char *fname, const char *ext, int *start_order, int *is_it, int *is_dos, const char** filetype)
+{
+ *filetype = NULL;
+	DUH * duh = 0;
+
+	*is_it = 0;
+	*is_dos = 1;
+
+ uint8_t ptr[2000];
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ return NULL;
+ }
+ int size = deadbeef->fread (ptr, 1, 2000, fp);
+ deadbeef->fclose (fp);
+
+	DUMBFILE * f = dumbfile_open (fname);
+	if (!f) {
+ return NULL;
+ }
+
+// {{{ no umr yet
+#if 0
+ if (size >= 4 &&
+		ptr[0] == 0xC1 && ptr[1] == 0x83 &&
+		ptr[2] == 0x2A && ptr[3] == 0x9E)
+	{
+		umr_mem_reader memreader(ptr, size);
+		umr::upkg pkg;
+		if (pkg.open(&memreader))
+		{
+			for (int i = 1, j = pkg.ocount(); i <= j; i++)
+			{
+				char * classname = pkg.oclassname(i);
+				if (classname && !strcmp(pkg.oclassname(i), "Music"))
+				{
+					char * type = pkg.otype(i);
+					if (!type) continue;
+					/*
+					if (!stricmp(type, "it"))
+					{
+					is_it = true;
+					ptr += memdata.offset = pkg.object_offset(i);
+					size = memdata.size = memdata.offset + pkg.object_size(i);
+					duh = dumb_read_it_quick(f);
+					break;
+					}
+					else if (!stricmp(type, "s3m"))
+					{
+					memdata.offset = pkg.object_offset(i);
+					memdata.size = memdata.offset + pkg.object_size(i);
+					duh = dumb_read_s3m_quick(f);
+					break;
+					}
+					else if (!stricmp(type, "xm"))
+					{
+					memdata.offset = pkg.object_offset(i);
+					memdata.size = memdata.offset + pkg.object_size(i);
+					duh = dumb_read_xm_quick(f);
+					break;
+					}
+					*/
+					// blah, type can't be trusted
+					if (!stricmp(type, "it") || !stricmp(type, "s3m") || !stricmp(type, "xm"))
+					{
+						ptr += memdata.offset = pkg.object_offset(i);
+						size = memdata.size = memdata.offset + pkg.object_size(i);
+						if (size >= 4 && ptr[0] == 'I' && ptr[1] == 'M' && ptr[2] == 'P' && ptr[3] == 'M')
+						{
+							is_it = true;
+							duh = dumb_read_it_quick(f);
+						}
+						else if (size >= 42 && ptr[38] == 'F' && ptr[39] == 'a' && ptr[40] == 's' && ptr[41] == 't')
+						{
+							duh = dumb_read_xm_quick(f);
+						}
+						else if (size >= 48 && ptr[44] == 'S' && ptr[45] == 'C' && ptr[46] == 'R' && ptr[47] == 'M')
+						{
+							duh = dumb_read_s3m_quick(f);
+						}
+
+						break;
+					}
+				}
+			}
+		}
+	}
+	else
+#endif
+// end of umr code
+// }}}
+	if (size >= 4 &&
+		ptr[0] == 'I' && ptr[1] == 'M' &&
+		ptr[2] == 'P' && ptr[3] == 'M')
+	{
+		*is_it = 1;
+		duh = dumb_read_it_quick(f);
+		*filetype = "IT";
+	}
+	else if (size >= 17 && !memcmp(ptr, "Extended Module: ", 17))
+	{
+		duh = dumb_read_xm_quick(f);
+		*filetype = "XM";
+	}
+	else if (size >= 0x30 &&
+		ptr[0x2C] == 'S' && ptr[0x2D] == 'C' &&
+		ptr[0x2E] == 'R' && ptr[0x2F] == 'M')
+	{
+		duh = dumb_read_s3m_quick(f);
+		*filetype = "S3M";
+	}
+	else if (size >= 1168 &&
+		/*ptr[28] == 0x1A &&*/ ptr[29] == 2 &&
+		( ! strncasecmp( ( const char * ) ptr + 20, "!Scream!", 8 ) ||
+		! strncasecmp( ( const char * ) ptr + 20, "BMOD2STM", 8 ) ||
+		! strncasecmp( ( const char * ) ptr + 20, "WUZAMOD!", 8 ) ) )
+	{
+		duh = dumb_read_stm_quick(f);
+		*filetype = "STM";
+	}
+	else if (size >= 2 &&
+		((ptr[0] == 0x69 && ptr[1] == 0x66) ||
+		(ptr[0] == 0x4A && ptr[1] == 0x4E)))
+	{
+		duh = dumb_read_669_quick(f);
+		*filetype = "669";
+	}
+	else if (size >= 0x30 &&
+		ptr[0x2C] == 'P' && ptr[0x2D] == 'T' &&
+		ptr[0x2E] == 'M' && ptr[0x2F] == 'F')
+	{
+		duh = dumb_read_ptm_quick(f);
+		*filetype = "PTM";
+	}
+	else if (size >= 4 &&
+		ptr[0] == 'P' && ptr[1] == 'S' &&
+		ptr[2] == 'M' && ptr[3] == ' ')
+	{
+		duh = dumb_read_psm_quick(f, *start_order);
+		*start_order = 0;
+		*filetype = "PSM";
+	}
+	else if (size >= 4 &&
+		ptr[0] == 'P' && ptr[1] == 'S' &&
+		ptr[2] == 'M' && ptr[3] == 254)
+	{
+		duh = dumb_read_old_psm_quick(f);
+		*filetype = "PSM";
+	}
+	else if (size >= 3 &&
+		ptr[0] == 'M' && ptr[1] == 'T' &&
+		ptr[2] == 'M')
+	{
+		duh = dumb_read_mtm_quick(f);
+		*filetype = "MTM";
+	}
+	else if ( size >= 4 &&
+		ptr[0] == 'R' && ptr[1] == 'I' &&
+		ptr[2] == 'F' && ptr[3] == 'F')
+	{
+		duh = dumb_read_riff_quick(f);
+		*filetype = "RIFF";
+	}
+	else if ( size >= 32 &&
+		!memcmp( ptr, "ASYLUM Music Format", 19 ) &&
+		!memcmp( ptr + 19, " V1.0", 5 ) )
+	{
+		duh = dumb_read_asy_quick(f);
+		*filetype = "ASY";
+	}
+
+	if (!duh)
+	{
+ dumbfile_close(f);
+ f = dumbfile_open (fname);
+		*is_dos = 0;
+		duh = dumb_read_mod_quick (f, (!strcasecmp (ext, exts[0]) || !strcasecmp (ext, exts[1])) ? 0 : 1);
+		*filetype = "MOD";
+	}
+
+ if (f) {
+ dumbfile_close(f);
+ }
+
+// {{{ no volume ramping
+#if 0
+	// XXX test
+	if (duh)
+	{
+		int ramp_mode = 0; // none
+		if (ramp_mode)
+		{
+			DUMB_IT_SIGDATA * itsd = duh_get_it_sigdata(duh);
+			if (itsd)
+			{
+				if (ramp_mode > 2)
+				{
+					if ( ( itsd->flags & ( IT_WAS_AN_XM | IT_WAS_A_MOD ) ) == IT_WAS_AN_XM )
+						ramp_mode = 2;
+					else
+						ramp_mode = 1;
+				}
+				for (int i = 0, j = itsd->n_samples; i < j; i++)
+				{
+					IT_SAMPLE * sample = &itsd->sample[i];
+					if ( sample->flags & IT_SAMPLE_EXISTS && !( sample->flags & IT_SAMPLE_LOOP ) )
+					{
+						double rate = 1. / double( sample->C5_speed );
+						double length = double( sample->length ) * rate;
+						if ( length >= .1 )
+						{
+							int k, l = sample->length;
+							if ( ramp_mode == 1 && ( ( rate * 16. ) < .01 ) )
+							{
+								if (sample->flags & IT_SAMPLE_16BIT)
+								{
+									k = l - 15;
+									signed short * data = (signed short *) sample->data;
+									if (sample->flags & IT_SAMPLE_STEREO)
+									{
+										for (int shift = 1; k < l; k++, shift++)
+										{
+											data [k * 2] >>= shift;
+											data [k * 2 + 1] >>= shift;
+										}
+									}
+									else
+									{
+										for (int shift = 1; k < l; k++, shift++)
+										{
+											data [k] >>= shift;
+										}
+									}
+								}
+								else
+								{
+									k = l - 7;
+									signed char * data = (signed char *) sample->data;
+									if (sample->flags & IT_SAMPLE_STEREO)
+									{
+										for (int shift = 1; k < l; k++, shift++)
+										{
+											data [k * 2] >>= shift;
+											data [k * 2 + 1] >>= shift;
+										}
+									}
+									else
+									{
+										for (int shift = 1; k < l; k++, shift++)
+										{
+											data [k] >>= shift;
+										}
+									}
+								}
+							}
+							else
+							{
+								int m = int( .01 * double( sample->C5_speed ) + .5 );
+								k = l - m;
+								if (sample->flags & IT_SAMPLE_16BIT)
+								{
+									signed short * data = (signed short *) sample->data;
+									if (sample->flags & IT_SAMPLE_STEREO)
+									{
+										for (; k < l; k++)
+										{
+											data [k * 2] = MulDiv( data [k * 2], l - k, m );
+											data [k * 2 + 1] = MulDiv( data [k * 2 + 1], l - k, m );
+										}
+									}
+									else
+									{
+										for (; k < l; k++)
+										{
+											data [k] = MulDiv( data [k], l - k, m );
+										}
+									}
+								}
+								else
+								{
+									signed char * data = (signed char *) sample->data;
+									if (sample->flags & IT_SAMPLE_STEREO)
+									{
+										for (; k < l; k++)
+										{
+											data [k * 2] = MulDiv( data [k * 2], l - k, m );
+											data [k * 2 + 1] = MulDiv( data [k * 2 + 1], l - k, m );
+										}
+									}
+									else
+									{
+										for (; k < l; k++)
+										{
+											data [k] = MulDiv( data [k], l - k, m );
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+#endif
+// }}}
+
+// {{{ no autochip
+#if 0
+	if (duh && cfg_autochip)
+	{
+		int size_force = cfg_autochip_size_force;
+		int size_scan = cfg_autochip_size_scan;
+		int scan_threshold_8 = ((cfg_autochip_scan_threshold * 0x100) + 50) / 100;
+		int scan_threshold_16 = ((cfg_autochip_scan_threshold * 0x10000) + 50) / 100;
+		DUMB_IT_SIGDATA * itsd = duh_get_it_sigdata(duh);
+
+		if (itsd)
+		{
+			for (int i = 0, j = itsd->n_samples; i < j; i++)
+			{
+				IT_SAMPLE * sample = &itsd->sample[i];
+				if (sample->flags & IT_SAMPLE_EXISTS)
+				{
+					int channels = sample->flags & IT_SAMPLE_STEREO ? 2 : 1;
+					if (sample->length < size_force) sample->max_resampling_quality = 0;
+					else if (sample->length < size_scan)
+					{
+						if ((sample->flags & (IT_SAMPLE_LOOP|IT_SAMPLE_PINGPONG_LOOP)) == IT_SAMPLE_LOOP)
+						{
+							int loop_start = sample->loop_start * channels;
+							int loop_end = sample->loop_end * channels;
+							int s1, s2;
+							if (sample->flags & IT_SAMPLE_16BIT)
+							{
+								s1 = ((signed short *)sample->data)[loop_start];
+								s2 = ((signed short *)sample->data)[loop_end - channels];
+								if (abs(s1 - s2) > scan_threshold_16)
+								{
+									sample->max_resampling_quality = 0;
+									continue;
+								}
+								if (channels == 2)
+								{
+									s1 = ((signed short *)sample->data)[loop_start + 1];
+									s2 = ((signed short *)sample->data)[loop_end - 1];
+									if (abs(s1 - s2) > scan_threshold_16)
+									{
+										sample->max_resampling_quality = 0;
+										continue;
+									}
+								}
+							}
+							else
+							{
+								s1 = ((signed char *)sample->data)[loop_start];
+								s2 = ((signed char *)sample->data)[loop_end - channels];
+								if (abs(s1 - s2) > scan_threshold_8)
+								{
+									sample->max_resampling_quality = 0;
+									continue;
+								}
+								if (channels == 2)
+								{
+									s1 = ((signed char *)sample->data)[loop_start + 1];
+									s2 = ((signed char *)sample->data)[loop_end - 1];
+									if (abs(s1 - s2) > scan_threshold_8)
+									{
+										sample->max_resampling_quality = 0;
+										continue;
+									}
+								}
+							}
+						}
+						if ((sample->flags & (IT_SAMPLE_SUS_LOOP|IT_SAMPLE_PINGPONG_SUS_LOOP)) == IT_SAMPLE_SUS_LOOP)
+						{
+							int sus_loop_start = sample->sus_loop_start * channels;
+							int sus_loop_end = sample->sus_loop_end * channels;
+							int s1, s2;
+							if (sample->flags & IT_SAMPLE_16BIT)
+							{
+								s1 = ((signed short *)sample->data)[sus_loop_start];
+								s2 = ((signed short *)sample->data)[sus_loop_end - channels];
+								if (abs(s1 - s2) > scan_threshold_16)
+								{
+									sample->max_resampling_quality = 0;
+									continue;
+								}
+								if (channels == 2)
+								{
+									s1 = ((signed short *)sample->data)[sus_loop_start + 1];
+									s2 = ((signed short *)sample->data)[sus_loop_end - 1];
+									if (abs(s1 - s2) > scan_threshold_16)
+									{
+										sample->max_resampling_quality = 0;
+										continue;
+									}
+								}
+							}
+							else
+							{
+								s1 = ((signed char *)sample->data)[sus_loop_start];
+								s2 = ((signed char *)sample->data)[sus_loop_end - channels];
+								if (abs(s1 - s2) > scan_threshold_8)
+								{
+									sample->max_resampling_quality = 0;
+									continue;
+								}
+								if (channels == 2)
+								{
+									s1 = ((signed char *)sample->data)[sus_loop_start + 1];
+									s2 = ((signed char *)sample->data)[sus_loop_end - 1];
+									if (abs(s1 - s2) > scan_threshold_8)
+									{
+										sample->max_resampling_quality = 0;
+										continue;
+									}
+								}
+							}
+						}
+
+						int k, l = sample->length * channels;
+						if (sample->flags & IT_SAMPLE_LOOP) l = sample->loop_end * channels;
+						if (sample->flags & IT_SAMPLE_16BIT)
+						{
+							for (k = channels; k < l; k += channels)
+							{
+								if (abs(((signed short *)sample->data)[k - channels] - ((signed short *)sample->data)[k]) > scan_threshold_16)
+								{
+									break;
+								}
+							}
+							if (k < l)
+							{
+								sample->max_resampling_quality = 0;
+								continue;
+							}
+							if (channels == 2)
+							{
+								for (k = 2 + 1; k < l; k += 2)
+								{
+									if (abs(((signed short *)sample->data)[k - 2] - ((signed short *)sample->data)[k]) > scan_threshold_16)
+									{
+										break;
+									}
+								}
+							}
+							if (k < l)
+							{
+								sample->max_resampling_quality = 0;
+								continue;
+							}
+						}
+						else
+						{
+							for (k = channels; k < l; k += channels)
+							{
+								if (abs(((signed char *)sample->data)[k - channels] - ((signed char *)sample->data)[k]) > scan_threshold_8)
+								{
+									break;
+								}
+							}
+							if (k < l)
+							{
+								sample->max_resampling_quality = 0;
+								continue;
+							}
+							if (channels == 2)
+							{
+								for (k = 2 + 1; k < l; k += 2)
+								{
+									if (abs(((signed char *)sample->data)[k - 2] - ((signed char *)sample->data)[k]) > scan_threshold_8)
+									{
+										break;
+									}
+								}
+							}
+							if (k < l)
+							{
+								sample->max_resampling_quality = 0;
+								continue;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+#endif
+// }}}
+
+// {{{ no trim
+#if 0
+	if ( duh && cfg_trim )
+	{
+		if ( dumb_it_trim_silent_patterns( duh ) < 0 )
+		{
+			unload_duh( duh );
+			duh = 0;
+		}
+	}
+#endif
+// }}}
+
+	return duh;
+}
+
+static const char *
+convstr (const char* str, int sz, char *out, int out_sz) {
+ int i;
+ for (i = 0; i < sz; i++) {
+ if (str[i] != ' ') {
+ break;
+ }
+ }
+ if (i == sz) {
+ out[0] = 0;
+ return out;
+ }
+
+ const char *cs = deadbeef->junk_detect_charset (str);
+ if (!cs) {
+ return str;
+ }
+ else {
+ if (deadbeef->junk_iconv (str, sz, out, out_sz, cs, "utf-8") >= 0) {
+ return out;
+ }
+ }
+
+ trace ("cdumb: failed to detect charset\n");
+ return NULL;
+}
+
+static void
+read_metadata_internal (DB_playItem_t *it, DUMB_IT_SIGDATA *itsd) {
+ char temp[2048];
+
+ if (itsd->name[0]) {
+ int tl = sizeof(itsd->name);
+ int i;
+ for (i = 0; i < tl && itsd->name[i] && itsd->name[i] == ' '; i++);
+ if (i == tl || !itsd->name[i]) {
+ deadbeef->pl_add_meta (it, "title", NULL);
+ }
+ else {
+ deadbeef->pl_add_meta (it, "title", convstr ((char*)&itsd->name, sizeof(itsd->name), temp, sizeof (temp)));
+ }
+ }
+ else {
+ deadbeef->pl_add_meta (it, "title", NULL);
+ }
+ int i;
+ for (i = 0; i < itsd->n_instruments; i++) {
+ char key[100];
+ snprintf (key, sizeof (key), "INST%03d", i);
+ deadbeef->pl_add_meta (it, key, convstr ((char *)&itsd->instrument[i].name, sizeof (itsd->instrument[i].name), temp, sizeof (temp)));
+ }
+ for (i = 0; i < itsd->n_samples; i++) {
+ char key[100];
+ snprintf (key, sizeof (key), "SAMP%03d", i);
+ deadbeef->pl_add_meta (it, key, convstr ((char *)&itsd->sample[i].name, sizeof (itsd->sample[i].name), temp, sizeof (temp)));
+ }
+
+ char s[100];
+
+ snprintf (s, sizeof (s), "%d", itsd->n_orders);
+ deadbeef->pl_add_meta (it, ":MOD_ORDERS", s);
+ snprintf (s, sizeof (s), "%d", itsd->n_instruments);
+ deadbeef->pl_add_meta (it, ":MOD_INSTRUMENTS", s);
+ snprintf (s, sizeof (s), "%d", itsd->n_samples);
+ deadbeef->pl_add_meta (it, ":MOD_SAMPLES", s);
+ snprintf (s, sizeof (s), "%d", itsd->n_patterns);
+ deadbeef->pl_add_meta (it, ":MOD_PATTERNS", s);
+ snprintf (s, sizeof (s), "%d", itsd->n_pchannels);
+ deadbeef->pl_add_meta (it, ":MOD_CHANNELS", s);
+}
+
+static int
+cdumb_read_metadata (DB_playItem_t *it) {
+ const char *fname = deadbeef->pl_find_meta (it, ":URI");
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ ext++;
+ }
+ else {
+ ext = "";
+ }
+ int start_order = 0;
+ int is_it;
+ int is_dos;
+ const char *ftype;
+ DUH* duh = open_module(fname, ext, &start_order, &is_it, &is_dos, &ftype);
+ if (!duh) {
+ unload_duh (duh);
+ return -1;
+ }
+ DUMB_IT_SIGDATA * itsd = duh_get_it_sigdata(duh);
+
+ deadbeef->pl_delete_all_meta (it);
+ read_metadata_internal (it, itsd);
+ unload_duh (duh);
+ return 0;
+}
+
+static DB_playItem_t *
+cdumb_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ ext++;
+ }
+ else {
+ ext = "";
+ }
+ int start_order = 0;
+ int is_it;
+ int is_dos;
+ const char *ftype;
+ DUH* duh = open_module(fname, ext, &start_order, &is_it, &is_dos, &ftype);
+ if (!duh) {
+ return NULL;
+ }
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DUMB_IT_SIGDATA * itsd = duh_get_it_sigdata(duh);
+
+ read_metadata_internal (it, itsd);
+
+ dumb_it_do_initial_runthrough (duh);
+ deadbeef->plt_set_item_duration (plt, it, duh_get_length (duh)/65536.0f);
+ deadbeef->pl_add_meta (it, ":FILETYPE", ftype);
+// printf ("duration: %f\n", _info->duration);
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ unload_duh (duh);
+
+ return after;
+}
+
+static DUMBFILE_SYSTEM dumb_vfs;
+
+static int
+dumb_vfs_skip (void *f, long n) {
+ return deadbeef->fseek (f, n, SEEK_CUR);
+}
+
+static int
+dumb_vfs_getc (void *f) {
+ uint8_t c;
+ deadbeef->fread (&c, 1, 1, f);
+ return (int)c;
+}
+
+static long
+dumb_vfs_getnc (char *ptr, long n, void *f) {
+ return deadbeef->fread (ptr, 1, n, f);
+}
+
+static void
+dumb_vfs_close (void *f) {
+ deadbeef->fclose (f);
+}
+
+static void
+dumb_register_db_vfs (void) {
+ dumb_vfs.open = (void *(*)(const char *))deadbeef->fopen;
+ dumb_vfs.skip = dumb_vfs_skip;
+ dumb_vfs.getc = dumb_vfs_getc;
+ dumb_vfs.getnc = dumb_vfs_getnc;
+ dumb_vfs.close = dumb_vfs_close;
+ register_dumbfile_system (&dumb_vfs);
+}
+
+int
+cgme_start (void) {
+ dumb_register_db_vfs ();
+ return 0;
+}
+
+int
+cgme_stop (void) {
+ dumb_exit ();
+ return 0;
+}
+
+static const char settings_dlg[] =
+ "property \"Resampling quality (0..2, higher is better)\" entry dumb.resampling_quality 2;\n"
+ "property \"8-bit output (default is 16)\" checkbox dumb.8bitoutput 0;\n"
+;
+
+// define plugin interface
+static DB_decoder_t plugin = {
+ .plugin.api_vmajor = 1,
+ .plugin.api_vminor = 0,
+ .plugin.version_major = 1,
+ .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_DECODER,
+ .plugin.id = "stddumb",
+ .plugin.name = "DUMB module player",
+ .plugin.descr = "module player based on DUMB library",
+ .plugin.copyright = 
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "Uses a fork of DUMB (Dynamic Universal Music Bibliotheque), Version 0.9.3\n"
+ "Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere\n"
+ "Uses code from kode54's foobar2000 plugin, http://kode54.foobar2000.org/\n"
+ "\n"
+ "This program is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License\n"
+ "as published by the Free Software Foundation; either version 2\n"
+ "of the License, or (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, USA.\n"
+ ,
+ .plugin.website = "http://deadbeef.sf.net",
+ .plugin.start = cgme_start,
+ .plugin.stop = cgme_stop,
+ .plugin.configdialog = settings_dlg,
+ .open = cdumb_open,
+ .init = cdumb_init,
+ .free = cdumb_free,
+ .read = cdumb_read,
+ .seek = cdumb_seek,
+ .insert = cdumb_insert,
+ .read_metadata = cdumb_read_metadata,
+ .exts = exts,
+};
+
+DB_plugin_t *
+ddb_dumb_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54 Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/ChangeLog Added

@@ -0,0 +1,1959 @@
+2003-11-08 11:20 aegis
+
+	* src/Makefile.am: fix automake build
+
+2003-09-06 22:41 entheh
+
+	* include/dumb.h, include/internal/it.h, make/Makefile.inc,
+	src/helpers/resample.c, src/helpers/resample.inc, src/it/itread.c,
+	src/it/itrender.c, src/it/readmod.c, src/it/reads3m.c,
+	src/it/readxm.c: 8-bit and 16-bit source resamplers created (dest
+	is always 32-bit with 24-bit range). Cubic way faster too - look-up
+	table idea stolen from ModPlugXMMS ;)
+
+2003-09-06 11:11 entheh
+
+	* src/core/rendsig.c: I did this ages ago.
+
+2003-07-19 03:00 entheh
+
+	* Makefile.ready, release.txt, include/dumb.h, make/Makefile.inc,
+	src/core/register.c, src/it/itrender.c, src/sigtypes/sample.c:
+	Stuff.
+
+2003-07-01 10:12 entheh
+
+	* include/dumb.h: Support for another compiler suite.
+
+2003-06-19 21:24 entheh
+
+	* src/helpers/resample.c: Crash bug fixed.
+
+2003-06-19 20:49 entheh
+
+	* src/it/: itrender.c, reads3m.c: Now we honour IT's pan separation
+	control.
+
+2003-06-19 17:31 entheh
+
+	* release.txt, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c: Fixed warnings
+	in the file loaders, and made an IT playback fix.
+
+2003-06-15 19:09 aegis
+
+	* vc6/: dumbout/dumbout.dsp, dumbplay/dumbplay.dsp,
+	playduh/playduh.dsp: adding project files I missed
+
+2003-06-15 19:08 aegis
+
+	* release.txt: updating release.txt
+
+2003-06-15 18:40 aegis
+
+	* configure.in, include/Makefile.am, include/internal/Makefile.am,
+	vc6/dumb.dsw, vc6/dumb2wav/dumb2wav.dsp: include the
+	include/internal directory in distributions, and build allegro
+	examples in VC6 build
+
+2003-06-15 18:36 aegis
+
+	* examples/dumb2wav.c: add a -l option to specify number of loops
+
+2003-06-12 17:34 aegis
+
+	* vc6/dumb_static/dumb_static.dsp: build dumbd_static.lib instead
+	of dumb_staticd.lib
+
+2003-06-12 03:19 aegis
+
+	* vc6/: dumb.dsw, aldumb/aldumb.dsp, dumb/dumb.dsp,
+	dumb2wav/dumb2wav.dsp, dumb_static/dumb_static.dsp: adding projects
+	for dumb_static (compiled with /MT) and dumb2wav
+
+2003-06-12 03:16 aegis
+
+	* examples/dumb2wav.c: all .wav files are little-endian so get rid
+	of the bigendian option
+
+2003-06-12 02:30 aegis
+
+	* make/Makefile.am: forgot to add this file...
+
+2003-06-12 02:14 aegis
+
+	* obj/mingw/release/tmpfile.txt, obj/msvc/debug/tmpfile.txt,
+	obj/msvc/release/tmpfile.txt, obj/unix/debug/tmpfile.txt,
+	obj/unix/release/tmpfile.txt, src/Makefile.am,
+	src/core/Makefile.am, src/helpers/Makefile.am, src/it/Makefile.am,
+	src/it/itread.c, src/it/readmod.c, src/it/reads3m.c,
+	src/it/readxm.c: automake build:	 include a bunch of extra
+	files in 'make dist'	 build examples so they actually run 
+	 copy Makefile.ready to Makefile in the default distribution
+	
+	Makefile.ready: 	support for SGI cc	 create output
+	directories in build rather than including them in CVS	 move
+	some compile flags to the beginning of the compile line
+	
+	Add dumb2wav example SGI LONG_LONG support Fix some issues with the
+	const tag arrays in itread.c and such
+	
+	:
+	-------------------------------------------------------------------
+	---
+
+2003-06-12 02:13 aegis
+
+	* Makefile.am, Makefile.ready, configure.in, docs/Makefile.am,
+	examples/Makefile.am, examples/dumb2wav.c, include/dumb.h,
+	lib/djgpp/tmpfile.txt, lib/mingw/tmpfile.txt, lib/msvc/tmpfile.txt,
+	lib/unix/tmpfile.txt, make/Makefile.inc,
+	obj/djgpp/debug/tmpfile.txt, obj/djgpp/release/tmpfile.txt,
+	obj/mingw/debug/tmpfile.txt: automake build:	 include a
+	bunch of extra files in 'make dist'	 build examples so they
+	actually run	 copy Makefile.ready to Makefile in the default
+	distribution
+	
+	Makefile.ready: 	support for SGI cc	 create output
+	directories in build rather than including them in CVS	 move
+	some compile flags to the beginning of the compile line
+	
+	Add dumb2wav example SGI LONG_LONG support Fix some issues with the
+	const tag arrays in itread.c and such
+
+2003-06-11 06:29 entheh
+
+	* include/dumb.h: Should compile with OpenWatcom now. I've yet to
+	look at the project files and decide whether to add them though :)
+
+2003-06-10 14:10 aegis
+
+	* configure.in: oops, forgot configure.in when committing the
+	automake build
+
+2003-06-07 07:14 entheh
+
+	* Makefile.ready: Small fix to compiling flags for icc.
+
+2003-06-06 12:26 entheh
+
+	* include/internal/it.h, src/it/itrender.c: XM Key Off effect now
+	works the way it should (I hope).
+
+2003-06-05 06:19 aegis
+
+	* Makefile.ready: fix Makefile.ready so it refers to itself when
+	recursively invoking make
+
+2003-06-04 02:16 aegis
+
+	* vc6/: dumb.dsp, dumb.dsw, aldumb/aldumb.dsp, dumb/dumb.dsp:
+	finishing VC6 build system
+
+2003-05-29 20:55 aegis
+
+	* release.txt: updating release.txt
+
+2003-05-29 20:55 aegis
+
+	* examples/Makefile.am: install examples
+
+2003-05-29 20:37 aegis
+
+	* Makefile, Makefile.am, Makefile.ready, bootstrap,
+	docs/Makefile.am, examples/Makefile.am, include/Makefile.am,
+	src/Makefile.am, src/core/Makefile.am, src/helpers/Makefile.am,
+	src/it/Makefile.am: initial pass of automake build
+
+2003-05-28 11:56 aegis
+
+	* vc6/: dumb.dsp, dumb.dsw: updating VC6 project: the sigtypes
+	stuff doesn't compile yet though
+
+2003-05-17 09:33 entheh
+
+	* Makefile, release.txt, include/dumb.h, src/it/itrender.c: Bugfix:
+	Gxx didn't store effect value when no note was (previously)
+	playing. Also added support for the Intel C compiler for Linux.
+
+2003-04-27 11:49 entheh
+
+	* make/config.sh: Small fix. Thanks to Sam Hocevar from Debian for
+	pointing this out.
+
+2003-04-25 09:23 entheh
+
+	* release.txt, include/internal/it.h, src/it/itrender.c,
+	src/it/xmeffect.c: XM Kxx effect should work better now.
+
+2003-04-24 15:26 entheh
+
+	* docs/faq.txt, include/dumb.h, include/internal/it.h,
+	src/it/itmisc.c, src/it/itread.c, src/it/itunload.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c: DUMB now loads
+	song message and other author data, and these can be retrieved.
+
+2003-04-23 00:14 entheh
+
+	* release.txt, docs/deprec.txt: Misc commits
+	
+	-------------------------------------------------------------------
+	---
+
+2003-04-18 03:00 entheh
+
+	* include/dumb.h, include/internal/it.h, src/it/itread.c,
+	src/it/itrender.c, winamp/in_duh.c: New envelope code. I don't
+	trust it fully yet, but it seems to work.
+
+2003-04-17 16:54 entheh
+
+	* Makefile, release.txt, include/dumb.h, include/internal/dumb.h,
+	include/internal/it.h, src/core/duhtag.c, src/core/makeduh.c,
+	src/core/unload.c, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c,
+	winamp/in_duh.c: Added a tagging system; using it for the song
+	title. Yay!
+
+2003-04-15 00:13 entheh
+
+	* include/internal/it.h, src/it/itrender.c, src/it/readxm.c,
+	src/it/xmeffect.c: Panning slides! Finally \o/
+
+2003-04-12 01:01 entheh
+
+	* Makefile, include/aldumb.h, src/allegro/alplay.c: Added
+	al_duh_get_volume(). Not documented yet.
+
+2003-04-12 00:12 entheh
+
+	* Makefile, todo.txt, src/it/readxm.c: XM files: map_sample[] was
+	uninitialised for instruments with no samples - led to strange
+	noises occasionally.
+
+2003-04-04 08:04 entheh
+
+	* winamp/in_duh.c: Winamp plug-in improved a bit.
+
+2003-04-03 16:26 entheh
+
+	* make/config.bat: Huge bugfix!
+
+2003-04-03 12:07 entheh
+
+	* Makefile: Bug fixed. Example programs will now be installed.
+
+2003-04-03 07:02 entheh
+
+	* vc6/dumb.dsp: Added the VC6 project file to CVS.
+
+2003-04-03 07:01 entheh
+
+	* readme.txt: Bah.
+
+2003-04-02 04:55 entheh
+
+	* Makefile, readme.txt, release.txt: The makefile now works for the
+	Mac.
+
+2003-04-02 04:00 entheh
+
+	* release.txt: OK, this time it really is ready for release ...
+
+2003-04-02 03:56 entheh
+
+	* Makefile, licence.txt, readme.txt, release.txt, todo.txt,
+	docs/deprec.txt, docs/dumb.txt, docs/faq.txt, docs/howto.txt,
+	docs/modplug.txt, examples/dumb.ini, examples/dumbout.c,
+	include/dumb.h, include/internal/it.h, src/core/rendsig.c,
+	src/helpers/resample.c, src/it/itrender.c: Ready for release!
+
+2003-03-30 12:05 entheh
+
+	* Makefile, release.txt, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c: No longer
+	installing the example programs when on Windows.
+
+2003-03-30 09:01 entheh
+
+	* Makefile, make/djgpp.inc, make/mingw.inc, make/unix.inc: Fix for
+	BeOS
+
+2003-03-30 08:22 entheh
+
+	* Makefile, Makefile.dj, Makefile.inc, Makefile.mgw, Makefile.uni,
+	config.bat, config.sh, readme.txt, make/Makefile.inc,
+	make/config.bat, make/config.sh, make/djgpp.inc, make/dumbask.c,
+	make/makefile.dj, make/makefile.lst, make/makefile.mgw,
+	make/makefile.uni, make/makefile.vc, make/mingw.inc, make/unix.inc,
+	src/misc/dumbask.c, src/misc/runner.c: Makefiles restructured a
+	bit. Should now support BeOS and Mac too :)
+
+2003-03-29 19:45 entheh
+
+	* Makefile, Makefile.dj, Makefile.inc, Makefile.mgw, Makefile.uni,
+	config.bat, config.sh, fix.bat, fix.sh, makeall.bat, makeall.sh,
+	makecore.bat, makecore.sh, release.txt, examples/dumbout.c,
+	include/dumb.h, include/internal/it.h, src/it/itrender.c,
+	src/misc/dumbask.c, src/misc/gccver.c: New makefile system! No
+	provision for MSVC yet ...
+
+2003-03-28 06:06 entheh
+
+	* make/makefile.mgw: -funroll-loops removed from makefiles.
+
+2003-03-28 05:29 entheh
+
+	* src/helpers/resample.c: Some optimisation. Still needs work!
+
+2003-03-27 04:13 entheh
+
+	* src/it/itrender.c: Pacified valgrind.
+
+2003-03-19 08:42 entheh
+
+	* examples/dumb.ini, include/dumb.h, src/helpers/clickrem.c,
+	src/helpers/resample.c: Blah, stuff.
+
+2003-03-16 01:13 entheh
+
+	* licence.txt, readme.txt, release.txt, docs/deprec.txt,
+	docs/duhspecs.txt, docs/dumb.txt, docs/dumbfull.txt, docs/faq.txt,
+	docs/fnptr.txt, docs/howto.txt, docs/modplug.txt, docs/ptr.txt,
+	docs/tutorial.txt, examples/dumbout.c, examples/dumbplay.c,
+	examples/playduh.c, include/aldumb.h, include/dumb.h,
+	include/internal/aldumb.h, include/internal/dumb.h,
+	include/internal/it.h, src/allegro/alplay.c, src/allegro/datduh.c,
+	src/allegro/datit.c, src/allegro/datmod.c, src/allegro/dats3m.c,
+	src/allegro/datunld.c, src/allegro/datxm.c, src/allegro/packfile.c,
+	src/core/atexit.c, src/core/duhlen.c, src/core/dumbfile.c,
+	src/core/loadduh.c, src/core/makeduh.c, src/core/rawsig.c,
+	src/core/readduh.c, src/core/register.c, src/core/rendduh.c,
+	src/core/rendsig.c, src/core/unload.c, src/helpers/clickrem.c,
+	src/helpers/memfile.c, src/helpers/resample.c,
+	src/helpers/sampbuf.c, src/helpers/silence.c,
+	src/helpers/stdfile.c, src/it/itload.c, src/it/itmisc.c,
+	src/it/itorder.c, src/it/itread.c, src/it/itrender.c,
+	src/it/itunload.c, src/it/loadmod.c, src/it/loads3m.c,
+	src/it/loadxm.c, src/it/readmod.c, src/it/reads3m.c,
+	src/it/readxm.c, src/it/xmeffect.c, src/sigtypes/combine.c,
+	src/sigtypes/sample.c, src/sigtypes/sequence.c,
+	src/sigtypes/sterpan.c, tools/cit.c, winamp/in2.h, winamp/in_duh.c,
+	winamp/in_duh.h, winamp/out.h: SHAZZAM! DUMB now has a decent name.
+	:D
+
+2003-03-16 00:36 entheh
+
+	* src/helpers/clickrem.c: Added a #warning to an evil piece of code
+
+2003-03-15 21:03 entheh
+
+	* src/helpers/clickrem.c: Click remover now copes with the huge
+	values.
+
+2003-03-15 19:53 entheh
+
+	* src/: core/rendduh.c, it/itread.c, it/readmod.c, it/reads3m.c,
+	it/readxm.c: 24-bit mixing YAAAAAAAY :D Click remover overflows -
+	will fix that later.
+
+2003-03-15 19:16 entheh
+
+	* examples/dumbout.c, src/helpers/resample.c: MULSC macro created
+	and tweaked for speed AND precision! Yaaaaay ^~ Thanks for the help
+	Bob :)
+
+2003-03-11 18:41 entheh
+
+	* src/it/itrender.c: Reinstating the vibrato I disabled while
+	playing with valgrind (oops).
+
+2003-03-11 00:02 entheh
+
+	* src/helpers/resample.c: Resamplers didn't quite Do The Right
+	Thing for click removal. Fixed.
+
+2003-03-10 22:49 entheh
+
+	* readme.txt, docs/deprec.txt, docs/faq.txt, docs/howto.txt,
+	examples/dumbout.c, include/dumb.h, include/internal/it.h,
+	src/core/makeduh.c, src/core/register.c, src/core/rendduh.c,
+	src/core/rendsig.c, src/helpers/clickrem.c, src/helpers/resample.c,
+	src/it/itread.c, src/it/itrender.c, src/it/itrender.old.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c: Resamplers
+	reworked, finally! More to do, but it's bug-free and usable. :)
+
+2003-02-14 01:25 entheh
+
+	* readme.txt, docs/howto.txt, src/helpers/clickrem.c,
+	src/it/itrender.c: Removed an old #warning (and did some other
+	stuff it seems).
+
+2003-01-26 19:16 entheh
+
+	* release.txt, docs/dumb.txt, include/dumb.h, src/it/itrender.c:
+	dumb_it_sr_get_channel_state() now provides a more precise pan
+	value.
+
+2003-01-24 19:13 entheh
+
+	* docs/dumb.txt, include/dumb.h, src/it/itrender.c:
+	dumb_it_get_state() now returns more precise information on
+	filters.
+
+2003-01-21 06:40 entheh
+
+	* release.txt, docs/dumb.txt, examples/dumbplay.c,
+	include/aldumb.h, src/allegro/alplay.c, src/allegro/packfile.c:
+	Stuff... dumbfile_from_packfile() added, if nothing else.
+
+2003-01-15 19:43 entheh
+
+	* src/it/readmod.c: Committing what appears to be an MSVC warning
+	pacifier.
+
+2003-01-03 15:28 entheh
+
+	* include/internal/it.h, make/makefile.mgw, src/core/dumbfile.c,
+	src/it/itrender.c, src/it/readmod.c, src/it/xmeffect.c: Muted
+	channels supported, more accurate envelopes, several bugs fixed
+
+2003-01-03 15:03 entheh
+
+	* release.txt, docs/dumb.txt, examples/dumb.ini: Muted channels,
+	and lots of bugs fixed
+
+2002-12-24 06:41 entheh
+
+	* include/dumb.h, src/core/dumbfile.c, src/it/itrender.c: Fixed
+	some bugs.
+
+2002-12-20 21:51 entheh
+
+	* src/it/readxm.c: Fixed the bug I thought I fixed just now.
+
+2002-12-20 21:45 entheh
+
+	* examples/dumb.ini, make/makefile.mgw, make/makefile.vc,
+	src/allegro/alplay.c, src/it/readxm.c: Fixed a bug.
+
+2002-12-20 21:07 joe_programmer
+
+	* src/it/itrender.c: MSVC6 does'nt support C99 - fixed variable
+	declarations
+
+2002-12-20 01:49 entheh
+
+	* make/makefile.dj, make/makefile.mgw, src/it/itrender.c: Filter
+	instability fixed.
+
+2002-12-19 05:35 entheh
+
+	* readme.txt, release.txt, docs/deprec.txt, docs/dumb.txt,
+	docs/howto.txt, docs/modplug.txt, examples/dumb.ini,
+	include/dumb.h, include/internal/it.h, src/it/itmisc.c,
+	src/it/itread.c, src/it/itrender.c, src/it/xmeffect.c,
+	winamp/in_duh.c: Err... stuff
+
+2002-12-18 17:15 entheh
+
+	* docs/faq.txt: New stuff in FAQ.
+
+2002-12-18 17:06 entheh
+
+	* licence.txt, readme.txt, release.txt, docs/deprec.txt,
+	docs/dumb.txt, docs/faq.txt, docs/fnptr.txt, docs/howto.txt,
+	docs/modplug.txt, docs/ptr.txt, examples/dumbplay.c,
+	include/dumb.h, include/internal/it.h, make/makefile.lst,
+	src/core/rendduh.c, src/helpers/memfile.c, src/helpers/sampbuf.c,
+	src/it/itmisc.c, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/readxm.c, src/it/xmeffect.c: XM and MOD
+	support improved, and lots of docs written.
+
+2002-12-17 00:23 entheh
+
+	* release.txt, examples/dumbplay.c, examples/playit.c,
+	examples/playmod.c, examples/plays3m.c, examples/playxm.c,
+	include/aldumb.h, include/dumb.h, make/makefile.lst,
+	make/makefile.vc, src/allegro/datmod.c, src/core/loadduh.c,
+	src/it/itrender.c, src/it/readxm.c, src/misc/gccver.c: Lots o'
+	little changes. Notably the examples have been combined.
+
+2002-12-16 22:13 entheh
+
+	* include/dumb.h, make/makefile.dj, make/makefile.mgw,
+	make/makefile.uni, make/makefile.vc, src/misc/gccver.c: Improved
+	the makefiles and... stuff. GCC 2.x should be happy now.
+
+2002-12-13 23:25 entheh
+
+	* src/it/itrender.c: Filtered samples now have click removal
+	applied. Yay \o/
+
+2002-12-12 00:17 entheh
+
+	* examples/dumb.ini, include/dumb.h, include/internal/it.h,
+	make/makefile.lst, src/helpers/clickrem.c, src/helpers/resample.c,
+	src/it/itrender.c: Click removal! Incomplete though; not applied to
+	filtered samples...
+
+2002-12-09 17:25 entheh
+
+	* src/it/readxm.c: #warning removed. MSVC might just be happy now.
+
+2002-12-09 17:23 entheh
+
+	* src/it/itrender.c: Fixed some MSVC warnings, probably.
+
+2002-12-07 18:04 entheh
+
+	* src/core/rendduh.c: Readding file that got removed because I
+	thought I was going to rename it >_<
+
+2002-12-07 17:48 entheh
+
+	* examples/playit.c, include/aldumb.h, include/dumb.h,
+	src/allegro/alplay.c, src/core/rendduh.c, src/core/rendsig.c:
+	Deprecated some stuff, and added some stuff. \o/
+
+2002-12-01 09:08 entheh
+
+	* src/it/itrender.c, winamp/in_duh.c: Bugfix in tremor (Ixx)
+	handling.
+
+2002-11-26 06:39 entheh
+
+	* include/internal/it.h, src/it/itrender.c, src/it/readxm.c: Wow,
+	who'd have thought an XM file could contain that many samples!
+
+2002-11-26 00:20 entheh
+
+	* examples/playduh.c, examples/playit.c, examples/playmod.c,
+	examples/plays3m.c, examples/playxm.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c,
+	src/it/xmeffect.c: Quite a few bugfixes.
+
+2002-11-22 06:46 entheh
+
+	* examples/playit.c, include/dumb.h, include/internal/it.h,
+	src/it/itmisc.c, src/it/itorder.c, src/it/itread.c,
+	src/it/itrender.c, src/it/itunload.c, src/it/readmod.c,
+	src/it/reads3m.c, src/it/readxm.c, winamp/config.rc,
+	winamp/in_duh.c: Uh... stuff :o
+
+2002-11-18 21:35 entheh
+
+	* docs/: faq.txt, howto.txt: Addition to the docs.
+
+2002-11-18 05:46 entheh
+
+	* src/it/itread.c: Bleh.
+
+2002-11-18 05:42 entheh
+
+	* src/it/itread.c: Added a "duplicate check" to the IT loader...
+	not the kind you're thinking of though :)
+
+2002-11-18 04:32 entheh
+
+	* examples/playit.c, include/aldumb.h, include/dumb.h,
+	src/allegro/alplay.c, src/core/rendduh.c, src/core/rendsig.c,
+	src/it/itrender.c: Extra API functions
+
+2002-11-16 23:17 entheh
+
+	* src/it/itrender.c: mmm, pie...
+
+2002-11-16 23:04 entheh
+
+	* release.txt, examples/dumb.ini, include/internal/it.h,
+	make/makefile.dj, make/makefile.lst, make/makefile.mgw,
+	make/makefile.uni, src/core/rendduh.c, src/core/rendsig.c,
+	src/helpers/memfile.c, src/it/itread.c, src/it/itrender.c,
+	src/it/itunload.c, src/it/readmod.c, src/it/reads3m.c,
+	src/it/readxm.c:
+	FILTERS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+2002-11-01 17:02 entheh
+
+	* include/internal/it.h, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c: DUMB now freezes (correctly I
+	hope) on speed=0 in XM and MOD files.
+
+2002-10-29 09:39 entheh
+
+	* include/internal/it.h, src/core/rawsig.c, src/it/itrender.c,
+	src/it/readxm.c: Sample vibrato :D
+
+2002-10-26 07:43 entheh
+
+	* src/core/rendsig.c: Some more safety; it shouldn't crash on low
+	memory or invalid start order now.
+
+2002-10-26 07:25 entheh
+
+	* examples/playit.c, include/dumb.h, src/it/itrender.c: Fixed
+	another bug :P
+
+2002-10-26 07:12 entheh
+
+	* examples/playit.c, src/it/itrender.c: Fixed bug.
+
+2002-10-26 06:56 entheh
+
+	* todo.txt, include/aldumb.h, include/dumb.h,
+	include/internal/it.h, make/makefile.lst, src/allegro/alplay.c,
+	src/core/rawsig.c, src/core/rendduh.c, src/core/rendsig.c,
+	src/it/itmisc.c, src/it/itrender.c, studio/include/dumbdesk.h,
+	studio/include/guiproc.h, studio/include/guitop.h,
+	studio/src/dumbdesk.c, studio/src/guitop.c, studio/src/main.c:
+	Added some rough & ready start-at-order functionality at short
+	order (no pun intended :)
+
+2002-10-20 05:42 entheh
+
+	* studio/: font0.bmp, font1.bmp, font2.bmp: Added binary files for
+	DUMB Studio
+
+2002-10-16 07:04 entheh
+
+	* examples/: dumb.ini, playit.c: Neatened the examples up a bit.
+
+2002-10-16 06:52 entheh
+
+	* fix.bat, readme.txt, release.txt, docs/dumb.txt,
+	docs/dumbfull.txt, docs/faq.txt, docs/fnptr.txt, docs/howto.txt,
+	include/aldumb.h, include/dumb.h, lib/mingw/tmpfile.txt,
+	lib/mingw32/tmpfile.txt, make/makefile.mgw,
+	obj/mingw/debug/tmpfile.txt, obj/mingw/release/tmpfile.txt,
+	obj/mingw32/debug/tmpfile.txt, obj/mingw32/release/tmpfile.txt,
+	src/allegro/alplay.c, src/it/itrender.c, src/it/readmod.c,
+	src/it/reads3m.c, src/it/readxm.c: Lotsa changes... notably mingw32
+	changed to mingw, and should be ready for release today.
+
+2002-10-05 01:55 jcugniere
+
+	* src/it/: reads3m.c, readxm.c: Prevented that silly test.pcm from
+	taking ALL the space on my c: drive ;)
+
+2002-09-27 04:55 entheh
+
+	* docs/fnptr.txt: Function pointer explanation fleshed out with the
+	whys and wherefores.
+
+2002-09-26 13:03 entheh
+
+	* src/it/: itrender.c, readxm.c: XM envelopes fixed
+
+2002-09-26 06:31 entheh
+
+	* include/internal/it.h, src/it/itrender.c: Improvements to the IT
+	and XM support, tone portamento handling in particular. WARNING:
+	code restructured slightly; bugs possibly introduced in IT support.
+	If your IT file plays wrong yadda yadda yadda.
+
+2002-09-25 04:29 entheh
+
+	* include/dumb.h, include/internal/dumb.h, include/internal/it.h,
+	src/core/makeduh.c, src/core/readduh.c, src/core/register.c,
+	src/core/rendduh.c, src/core/rendsig.c, src/core/unload.c,
+	src/it/itorder.c, src/it/itread.c, src/it/itrender.c,
+	src/it/itunload.c, src/it/readmod.c, src/it/reads3m.c,
+	src/it/readxm.c: Change in terminology
+
+2002-09-24 14:14 entheh
+
+	* src/it/: itrender.c, readxm.c: :o
+
+2002-09-24 04:50 entheh
+
+	* todo.txt, docs/dumb.txt, include/aldumb.h, src/allegro/alplay.c:
+	Small addition to API; added info and proposal to todo.txt.
+
+2002-09-23 03:31 jcugniere
+
+	* examples/dumb.ini, include/internal/it.h, make/makefile.lst,
+	src/it/itorder.c, src/it/itread.c, src/it/itrender.c,
+	src/it/readmod.c, src/it/reads3m.c, src/it/readxm.c: Made non
+	existant patterns be considered as containing 64 empty rows.
+
+2002-09-22 05:49 entheh
+
+	* src/it/readxm.c: Now we correctly handle the weird case of
+	envelope on but n_nodes = 0 for XM files.
+
+2002-09-20 08:07 entheh
+
+	* src/it/readmod.c: Panning fixed; error checking cleaned up to
+	some extent.
+
+2002-09-20 02:29 entheh
+
+	* src/it/: loadmod.c, loadxm.c, readmod.c: Don't Convert Numbers To
+	BCD On Loading. To Do So Would Be DUMB. :P
+
+2002-09-19 01:08 jcugniere
+
+	* src/core/rendduh.c: fixed compilation problems related to
+	CHAR_BITS and FAST_MID
+
+2002-09-18 09:31 entheh
+
+	* readme.txt, release.txt, todo.txt, docs/dumb.txt,
+	examples/playmod.c, include/aldumb.h, include/dumb.h,
+	include/internal/it.h, make/makefile.lst, src/allegro/datmod.c,
+	src/it/loadmod.c, src/it/readmod.c, src/it/readxm.c,
+	src/it/xmeffect.c: First signs of .mod support :D
+
+2002-09-11 19:42 joe_programmer
+
+	* make/makefile.vc: Fix for MSVC install target
+
+2002-09-08 22:46 entheh
+
+	* src/it/itrender.c, winamp/in_duh.c: Seeking fixed; Winamp plug-in
+	improved in theory, but it crashes sometimes :x
+
+2002-09-08 10:50 entheh
+
+	* src/it/itrender.c: Seeking should now be quick :)
+
+2002-09-08 09:20 entheh
+
+	* src/it/itrender.c: Bug fixed. Odd that it only affected one IT
+	file. That's uninitialised variables for ya :)
+
+2002-09-08 08:26 entheh
+
+	* examples/playit.c, include/internal/it.h, src/it/itread.c,
+	src/it/itrender.c, src/it/itunload.c, src/it/reads3m.c,
+	src/it/readxm.c: Length of songs now being calculated. Shame it
+	gets it wrong ;)
+
+2002-09-08 07:46 joe_programmer
+
+	* src/core/rendduh.c: Optimized the convertors
+
+2002-09-08 04:09 entheh
+
+	* include/internal/it.h, src/it/itrender.c: _dumb_it_dup_sampinfo()
+	coded - first step towards length calculation and fast seeking
+
+2002-09-06 10:31 entheh
+
+	* studio/makedat: Datafile makefile updated.
+
+2002-09-06 09:59 entheh
+
+	* studio/: dumbdesk.c, dumbdesk.h, dumbgui.c, dumbgui.h,
+	dumbmenu.c, guiproc.c, guiproc.h, guitop.c, guitop.h, main.c,
+	main.h, options.c, options.h, subclip.c, subclip.h,
+	include/dumbdesk.h, include/dumbgui.h, include/dumbmenu.h,
+	include/guiproc.h, include/guitop.h, include/main.h,
+	include/options.h, include/subclip.h, src/dumbdesk.c,
+	src/dumbgui.c, src/dumbmenu.c, src/guiproc.c, src/guitop.c,
+	src/main.c, src/options.c, src/subclip.c: Moved studio stuff into
+	subdirs
+
+2002-09-05 14:55 entheh
+
+	* studio/: dumbdesk.c, dumbmenu.c, guiproc.h: Hmm
+
+2002-09-05 13:06 entheh
+
+	* studio/dumbmenu.c: The menu module compiles. It isn't used at all
+	though.
+
+2002-09-05 12:58 entheh
+
+	* studio/dumbmenu.c: Menu module committed; no testing done yet.
+
+2002-09-05 08:03 entheh
+
+	* studio/: datafile.h, makedat: Created a makefile for building the
+	datafile. (Binary files left out of repository.)
+
+2002-09-04 20:53 entheh
+
+	* studio/: datafile.h, dumbdesk.c, dumbdesk.h, dumbgui.c,
+	dumbgui.h, guiproc.c, guiproc.h, guitop.c, guitop.h, main.c,
+	main.h, options.c, options.h, subclip.c, subclip.h: DUMB Studio
+	added. Little more than a freaky GUI test so far...
+
+2002-09-04 16:49 entheh
+
+	* docs/dumb.txt, examples/dumb.ini, examples/playduh.c,
+	examples/playit.c, examples/plays3m.c, examples/playxm.c,
+	include/internal/it.h, make/makefile.uni: Various changes :o
+
+2002-08-26 02:37 entheh
+
+	* makeall.sh, makecore.sh: I thought I already fixed this :)
+
+2002-08-16 04:49 entheh
+
+	* examples/playit.c: Yay 2...
+
+2002-08-16 04:21 entheh
+
+	* examples/playit.c, make/makefile.uni: Yay...
+
+2002-08-12 02:20 entheh
+
+	* readme.txt, release.txt, docs/ptr.txt, examples/dumb.ini,
+	make/makefile.dj, make/makefile.mgw, make/makefile.vc: A few typos
+	corrected. Not much else. Actually I'm not sure.
+
+2002-08-10 17:44 entheh
+
+	* readme.txt, release.txt, docs/faq.txt, docs/fnptr.txt,
+	docs/ptr.txt: Last commit before 0.8.1 release...
+
+2002-08-10 16:03 entheh
+
+	* docs/dumb.txt, examples/dumb.ini, include/dumb.h,
+	make/makefile.dj, make/makefile.mgw, make/makefile.uni,
+	make/makefile.vc, src/it/readxm.c: Another bug fixed; should be
+	ready for a release soon...
+
+2002-08-06 12:57 entheh
+
+	* docs/howto.txt, examples/dumb.ini, make/makefile.lst,
+	src/allegro/datit.c, src/allegro/dats3m.c, src/allegro/datxm.c,
+	src/it/readxm.c: dumb_register_dat_xm() added (!) Also fixed a
+	Freudian slip in the docs, and added dumb_resampling_quality to
+	howto.txt.
+
+2002-07-30 07:02 entheh
+
+	* docs/: dumb.txt, howto.txt: Position about null pointers
+	clarified in the docs
+
+2002-07-29 19:02 entheh
+
+	* src/it/reads3m.c: S3M support made more robust; now handles some
+	buggy files.
+
+2002-07-29 08:28 entheh
+
+	* make/: makefile.dj, makefile.mgw, makefile.uni: Makefiles
+	updated.
+
+2002-07-29 07:57 entheh
+
+	* src/it/itrender.c: XM bug relating to invalid instruments fixed.
+
+2002-07-28 17:40 entheh
+
+	* docs/faq.txt, make/makefile.dj, make/makefile.vc,
+	src/it/readxm.c, winamp/gui.c, winamp/in_duh.c, winamp/in_duh.h:
+	Winamp plug-in up to date, and plays IT/XM/S3M ;D
+
+2002-07-10 09:17 jcugniere
+
+	* include/internal/it.h, src/it/itrender.c, src/it/readxm.c: fixed
+	a bug involving XM's fine volume slide down
+
+2002-06-16 17:59 entheh
+
+	* release.txt, src/it/readxm.c: Can now load XM files with stereo
+	samples
+
+2002-06-16 02:35 entheh
+
+	* release.txt, make/makefile.dj, make/makefile.mgw,
+	make/makefile.vc: 'make veryclean' fixed in DOS/Windows makefiles.
+
+2002-06-15 17:56 entheh
+
+	* readme.txt: Another change...
+
+2002-06-15 17:49 entheh
+
+	* licence.txt, release.txt, docs/faq.txt, docs/howto.txt: More
+	changes to the docs.
+
+2002-06-15 17:12 entheh
+
+	* fix.bat, fix.sh, readme.txt, docs/howto.txt: A few corrections to
+	the docs; fix scripts slightly improved.
+
+2002-06-14 15:13 entheh
+
+	* fix.bat, fix.sh, make/makefile.vc: Fix to the MSVC makefile
+
+2002-06-14 12:33 entheh
+
+	* readme.txt, release.txt, docs/dumb.txt, docs/faq.txt,
+	docs/howto.txt, examples/dumb.ini, examples/playit.c,
+	examples/plays3m.c, examples/playxm.c, include/aldumb.h,
+	make/makefile.dj, make/makefile.mgw, make/makefile.uni,
+	make/makefile.vc: Last commit before release - everything's working
+	:)
+
+2002-06-14 09:02 entheh
+
+	* makeall.sh, makecore.sh: Damn, it failed. Oh well, files added
+	back in.
+
+2002-06-14 08:58 entheh
+
+	* makeall.sh, makecore.sh: Make 'em executable, Phase 1
+
+2002-06-14 08:37 entheh
+
+	* makeall.sh, makecore.sh, readme.txt: Unix stuff should be ready.
+	Might still change to provide BeOS support though...
+
+2002-06-14 08:18 entheh
+
+	* readme.txt, docs/faq.txt: Getting there...
+
+2002-06-14 06:45 entheh
+
+	* release.txt, make/makefile.uni: Updated Unix/BeOS makefile,
+	thanks to networm (he's going in the credits soon :)
+
+2002-06-14 06:10 entheh
+
+	* makeall.bat, makecore.bat, release.txt, docs/faq.txt,
+	include/dumb.h, make/makefile.dj, make/makefile.lst,
+	make/makefile.mgw, make/makefile.uni, make/makefile.vc,
+	src/it/itread.c, src/it/itrender.c, src/it/readxm.c: Endianness
+	fixed, and work on the docs and makefiles preparing for release...
+
+2002-06-14 03:48 jcugniere
+
+	* src/it/itrender.c: Oops! fixed 2 stupid warnings...
+
+2002-06-13 12:34 jcugniere
+
+	* src/it/: itrender.c, readxm.c: more stuff on XM volpan
+
+2002-06-12 13:35 entheh
+
+	* include/internal/it.h, src/core/rendduh.c, src/it/itrender.c:
+	Added xm_volslide field for better handling of XM volume slides.
+
+2002-06-12 12:54 jcugniere
+
+	* src/it/: itrender.c, readxm.c: Trying to handle the XM volume
+	column more accurately.
+
+2002-05-30 13:36 entheh
+
+	* include/internal/dumb.h, src/it/itrender.c: Improvement to the XM
+	support.
+
+2002-05-07 10:49 jcugniere
+
+	* src/it/itrender.c: one liner to get volume properly initialized
+	with XM files
+
+2002-05-06 17:52 entheh
+
+	* src/it/itrender.c: Some uninitialised fields fixed for XM files.
+
+2002-05-06 11:37 jcugniere
+
+	* src/it/: itrender.c, readxm.c: Fixed premature fadeout
+
+2002-05-05 13:10 entheh
+
+	* include/internal/it.h, src/it/itrender.c, src/it/readxm.c: More
+	stuff
+
+2002-05-05 11:47 entheh
+
+	* src/it/: itrender.c, itrender.old.c: Stuff
+
+2002-05-04 13:46 jcugniere
+
+	* src/it/readxm.c: Removed some fixes from readxm.c, made obsolete
+	by ben's changes in itrender.c
+
+2002-04-21 09:54 entheh
+
+	* todo.txt, src/it/itrender.c, src/it/readxm.c,
+	src/sigtypes/sequence.c: Restructuring of the XM playing core. I've
+	done more harm than good... ostensibly ^_^ (look it up :P)
+
+2002-04-07 03:17 jcugniere
+
+	* include/internal/it.h, src/it/itrender.c, src/it/reads3m.c,
+	src/it/readxm.c: Fixed a stupid bug in the XM effects conversion.
+	Minor fixes to get more S3Ms to load.
+
+2002-03-26 10:30 jcugniere
+
+	* include/internal/it.h: Added a new IT_WAS_AN_XM signal flag, and
+	restart_position for XM compat.
+
+2002-03-26 10:27 jcugniere
+
+	* src/it/readxm.c: All effects are now supported (provided
+	itrender.c implements them ;). But volume effects are still
+	incorrect.
+
+2002-03-26 10:26 jcugniere
+
+	* src/it/reads3m.c: Added restart_position for XM compatibility.
+
+2002-03-26 10:25 jcugniere
+
+	* src/it/itrender.c: Modified the behavior of a few things when
+	IT_WAS_AN_XM is set. Hopefully I haven't broken anything for IT
+	files ;)
+
+2002-03-26 10:23 jcugniere
+
+	* src/it/itread.c: Added restart_position for XM compatibility
+
+2002-03-24 08:38 jcugniere
+
+	* src/it/readxm.c: Bug fixes.
+
+2002-03-21 11:44 jcugniere
+
+	* src/it/readxm.c: Some improvments on readxm.c.
+
+2002-03-14 12:50 jcugniere
+
+	* examples/playxm.c, src/it/loadxm.c, src/it/readxm.c: Added an XM
+	loader (still needs work).
+
+2002-03-14 12:46 jcugniere
+
+	* include/dumb.h, make/makefile.lst: Added an XM loader (still
+	needs work).
+
+2002-03-10 12:40 joe_programmer
+
+	* make/makefile.vc: Fixed Allegro incompatibility
+
+2002-03-03 10:21 joe_programmer
+
+	* src/it/itrender.c: Fixed some warnings
+
+2002-03-02 16:17 entheh
+
+	* include/dumb.h: MSVC compile fixed
+
+2002-03-02 13:31 entheh
+
+	* licence.txt, makeall.bat, makecore.bat, readme.txt, release.txt,
+	include/dumb.h, src/core/dumbfile.c: Hmm, possibly the last commit
+	before release?????????
+
+2002-03-02 12:23 entheh
+
+	* makeall.bat, makecore.bat: Fixed batch files.
+
+2002-03-02 12:17 entheh
+
+	* makeall.bat, makecore.bat: Added makeall.bat and makecore.bat, as
+	promised in readme.txt.
+
+2002-03-02 12:10 entheh
+
+	* readme.txt: readme.txt done.
+
+2002-03-02 10:57 entheh
+
+	* make/: makefile.dj, makefile.mgw, makefile.uni, makefile.vc:
+	Makefiles updated to allow for building without Allegro. Not tested
+	except DJGPP.
+
+2002-03-02 10:14 entheh
+
+	* readme.txt, docs/dumb.txt, include/dumb.h: Some constants added
+	and documented. First signs of content in the readme.
+
+2002-03-02 08:42 entheh
+
+	* lib/djgpp/tmpfile.txt, lib/mingw32/tmpfile.txt,
+	lib/msvc/tmpfile.txt, lib/unix/tmpfile.txt,
+	obj/djgpp/debug/tmpfile.txt, obj/djgpp/release/tmpfile.txt,
+	obj/mingw32/debug/tmpfile.txt, obj/mingw32/release/tmpfile.txt,
+	obj/msvc/debug/tmpfile.txt, obj/msvc/release/tmpfile.txt,
+	obj/unix/debug/tmpfile.txt, obj/unix/release/tmpfile.txt:
+	tmpfile.txt message changed, and some more added.
+
+2002-03-01 21:35 entheh
+
+	* include/dumb.h, make/makefile.lst: Detached default sigtype
+	stuff, since that's not to be released.
+
+2002-03-01 21:29 entheh
+
+	* readme.txt, docs/dumb.txt, docs/dumbfull.txt, docs/howto.txt,
+	docs/ptr.txt, include/aldumb.h, include/dumb.h,
+	src/allegro/datduh.c, src/allegro/datit.c, src/allegro/dats3m.c,
+	src/it/itread.c, src/it/itrender.c, src/it/itunload.c: Lots of
+	stuff, mostly work on docs. A few things neatened up.
+
+2002-02-22 21:09 entheh
+
+	* src/helpers/resample.c: High-quality resamplers are now more
+	accurate, thanks to a LONG_LONG trick that gcc optimises quite
+	nicely for us.
+
+2002-02-22 19:55 entheh
+
+	* src/helpers/resample.c: New comments at the top of resample.c,
+	and a compiler error fixed.
+
+2002-02-22 19:25 entheh
+
+	* docs/dumb.txt, docs/tutorial.txt, src/it/itread.c,
+	src/it/itrender.c, src/it/reads3m.c: Dunno what I did, but I'd
+	better commit it :)
+
+2002-02-22 14:42 joe_programmer
+
+	* src/helpers/resample.c: Volume scaling changed from float to int
+	(hope it works...)
+
+2002-02-17 03:41 entheh
+
+	* include/dumb.h, src/helpers/resample.c, src/it/itread.c,
+	src/it/itrender.c, src/it/reads3m.c: A few unresolved issues seen
+	to.
+
+2002-02-16 20:06 tjaden
+
+	* make/makefile.uni: Updated the Unix makefile (from the Mingw32
+	makefile)
+
+2002-02-16 15:10 entheh
+
+	* todo.txt: Stuff added to todo.txt
+
+2002-02-16 13:46 entheh
+
+	* include/dumb.h, make/makefile.lst, src/helpers/resample.c,
+	src/helpers/silence.c, src/it/itread.c, src/it/itrender.c,
+	src/it/reads3m.c, src/sigtypes/sample.c: Lots of work on S3M
+	support. Fundamental change; always mix into buffer, never write. 
+	Standard sigtypes probably aren't all reprogrammed correctly, but
+	they'll be stripped from the first release. Speaking of which...
+	not too long to wait now, I hope :)
+
+2002-02-06 17:28 entheh
+
+	* src/: allegro/datit.c, allegro/datunld.c, core/unload.c,
+	helpers/resample.c, it/itload.c, it/itread.c, it/itrender.c,
+	it/itunload.c, it/reads3m.c: S3M support improved upon, but it's
+	not right yet.
+
+2002-02-06 16:43 entheh
+
+	* make/: makefile.dj, makefile.lst: Makefiles updated slightly.
+
+2002-02-01 23:53 entheh
+
+	* examples/plays3m.c, include/dumb.h, make/makefile.lst,
+	src/it/itload.c, src/it/itread.c, src/it/loads3m.c,
+	src/it/reads3m.c: Hahaha S3M sounds GREAT! Utterly out of tune, but
+	GREAT! LOL, gotta show this to Louis :)
+
+2002-02-01 10:07 entheh
+
+	* include/internal/it.h: D'oh!
+
+2002-01-31 14:49 entheh
+
+	* docs/dumb.txt, include/dumb.h, make/makefile.lst, src/it/it.c,
+	src/it/itload.c, src/it/itread.c, src/it/itrender.c,
+	src/it/itunload.c: IT modularised, and dumb_it_max_to_mix
+	formalised. S3M soon!
+
+2002-01-30 17:51 entheh
+
+	* src/it/it.c: Amiga slides now programmed properly.
+
+2002-01-17 15:48 joe_programmer
+
+	* src/it/it.c: Bug fixes by entheh
+
+2002-01-11 13:21 entheh
+
+	* winamp/: in_duh.c, in_duh.h, winamp.dsp: Paranoima got the Winamp
+	plug-in up and running. Tx :)
+
+2002-01-11 12:01 entheh
+
+	* src/it/it.c, winamp/in_duh.c: Winamp plug-in updated to match new
+	API.
+
+2002-01-11 10:58 entheh
+
+	* examples/playit.c, src/it/it.c: Hmm, how to apply pan and pitch
+	envelopes in instruments that don't exist... I AM SO DUMB oh and
+	windowes sux bcasu it lets yuo get awawy with nullptrs in dos!@~
+
+2002-01-11 02:09 entheh
+
+	* src/it/it.c: Pattern loop done.
+
+2002-01-08 16:57 entheh
+
+	* examples/playit.c, src/helpers/resample.c, src/it/it.c: IT loader
+	was faulty in more ways than one! Fixed now. Only seven effects to
+	go!
+
+2002-01-07 17:05 entheh
+
+	* docs/dumb.txt, include/dumb.h, src/it/it.c: Pitch and panning
+	envelopes done, and a bug or two fixed.
+
+2002-01-06 17:17 entheh
+
+	* src/it/it.c: Note delay done. zasx.it should play perfectly now
+	:)
+
+2002-01-06 00:27 entheh
+
+	* src/it/it.c: Optimisations and 'damage limitation' in IT
+	playback; NEEDS TESTING.
+
+2002-01-02 02:39 entheh
+
+	* examples/playit.c, src/it/it.c: Added vibrato :) Also made the IT
+	loading code more robust, as it failed on one of my files. Testers
+	welcome :)
+
+2002-01-01 15:59 entheh
+
+	* docs/dumb.txt, src/allegro/alplay.c: Fixed a stupid bug in
+	alplay.c. Did something to dumb.txt, apparently...
+
+2001-12-31 20:44 entheh
+
+	* docs/dumb.txt: Extra info added to docs.
+
+2001-12-31 20:40 entheh
+
+	* docs/dumb.txt, examples/playduh.c, examples/playit.c,
+	include/aldumb.h, include/dumb.h, src/allegro/alplay.c,
+	src/core/rendduh.c: Additions to the renderer and Allegro player
+	APIs; docs updated.
+
+2001-12-30 17:31 entheh
+
+	* docs/dumb.txt: Modified docs to describe new dumb_[at]exit()
+	system.
+
+2001-12-30 16:25 entheh
+
+	* examples/playduh.c, examples/playit.c, include/dumb.h,
+	include/internal/dumb.h, make/makefile.lst, src/core/atexit.c,
+	src/core/main.c, src/core/readduh.c, src/core/register.c:
+	dumb_init() no longer exists. dumb_exit() just calls functions
+	registered by dumb_atexit(). Now to do the docs...
+
+2001-12-27 16:44 entheh
+
+	* docs/dumb.txt, docs/tutorial.txt, examples/playduh.c,
+	examples/playit.c, include/dumb.h, src/core/main.c,
+	src/core/register.c, src/core/rendduh.c, src/core/rendsig.c,
+	src/helpers/resample.c, src/it/it.c, src/sigtypes/combine.c,
+	src/sigtypes/sample.c, src/sigtypes/sequence.c,
+	src/sigtypes/sterpan.c: *** CHANGES TO THE API *** docs might not
+	be fully updated. Added tutorial.txt.
+
+2001-12-27 11:33 entheh
+
+	* docs/dumb.txt, include/dumb.h, src/it/it.c,
+	src/sigtypes/sequence.c: Fixed DJGPP compilation
+
+2001-12-26 22:16 joe_programmer
+
+	* make/: makefile.dj, makefile.mgw, makefile.vc: More bugs fixed in
+	the makefiles Also fixed up the DJGPP makefile
+
+2001-12-26 22:09 joe_programmer
+
+	* include/dumb.h, make/makefile.mgw, make/makefile.vc,
+	src/helpers/stdfile.c, src/it/it.c, src/sigtypes/sample.c,
+	src/sigtypes/sequence.c: Fixed warnings and errors in MSVC compile.
+	 Finished MSVC makefile. Fixed Mingw makefile
+
+2001-12-26 21:33 joe_programmer
+
+	* include/dumb.h, make/makefile.lst, make/makefile.mgw,
+	src/it/it.c, src/sigtypes/sequence.c: Fixed Mingw32 makefile Added
+	some temp files so CVS doesn't lose the directory tree
+
+2001-12-26 16:51 joe_programmer
+
+	* lib/djgpp/tmpfile.txt, lib/mingw32/tmpfile.txt,
+	lib/msvc/tmpfile.txt, obj/djgpp/debug/tmpfile.txt,
+	obj/djgpp/release/tmpfile.txt, obj/msvc/debug/tmpfile.txt,
+	obj/msvc/release/tmpfile.txt: Added some temp files so CVS does'nt
+	lose the directory tree
+
+2001-12-26 09:40 entheh
+
+	* docs/fnptr.txt: fnptr.txt added.
+
+2001-12-26 09:26 entheh
+
+	* docs/dumb.txt, include/dumb.h, src/core/makeduh.c,
+	src/core/unload.c: A lot of work on the docs, but not finished.
+	Fixed some bugs in make_duh().
+
+2001-12-22 17:28 entheh
+
+	* docs/dumb.txt, examples/playit.c, include/aldumb.h,
+	include/dumb.h, src/allegro/packfile.c, src/core/dumbfile.c,
+	src/core/file.c, src/helpers/stdfile.c: Provided a stdio file input
+	module, amongst other things.
+
+2001-12-20 05:25 entheh
+
+	* include/aldumb.h, include/internal/aldumb.h,
+	src/allegro/datduh.c, src/allegro/datit.c, src/allegro/datunld.c,
+	src/allegro/packfile.c, src/it/it.c: register_dat_it() fixed.
+
+2001-12-19 12:12 entheh
+
+	* src/sigtypes/: combine.c, sample.c, sequence.c, sterpan.c:
+	Removed dumb_errno references from signal types. Dunno how I missed
+	them :o
+
+2001-12-17 08:57 entheh
+
+	* include/dumb.h, src/helpers/resample.c, src/it/it.c: IT files can
+	now be started from somewhere in the middle, and silent samples'
+	positions are advanced. New do_silent_resample() function for this
+	purpose.
+
+2001-12-16 17:45 entheh
+
+	* include/internal/aldumb.h, src/allegro/datduh.c,
+	src/allegro/packfile.c: Finished what I started ;)
+
+2001-12-16 17:18 entheh
+
+	* todo.txt, examples/playit.c, include/aldumb.h, include/dumb.h,
+	include/dumb/file.h, include/internal/allegro/file.h,
+	src/allegro/file.c, src/allegro/packfile.c, src/core/file.c,
+	src/core/loadduh.c, src/core/main.c, src/core/readduh.c,
+	src/it/it.c: More changes - now the port (e.g. Allegro) must
+	actively register its file handlers. As for the IT support, note
+	retrig is now done.
+
+2001-12-16 06:11 entheh
+
+	* src/it/it.c: Some more IT effects... makefiles still out of date
+	though
+
+2001-12-14 13:32 entheh
+
+	* include/dumb.h, src/it/it.c: Did Amiga frequency slides =)
+
+2001-12-12 19:24 entheh
+
+	* todo.txt, examples/playduh.c, examples/playit.c,
+	include/aldumb.h, include/dintern.h, include/dumb.h,
+	include/minalleg.h, include/dumb/file.h, include/internal/dumb.h,
+	include/internal/allegro/file.h, src/combine.c, src/datduh.c,
+	src/getsig.c, src/it.c, src/llload.c, src/load.c, src/main.c,
+	src/play.c, src/register.c, src/render.c, src/resample.c,
+	src/sample.c, src/sequence.c, src/sterpan.c, src/unload.c,
+	src/allegro/alplay.c, src/allegro/datduh.c, src/allegro/file.c,
+	src/core/duhlen.c, src/core/loadduh.c, src/core/main.c,
+	src/core/makeduh.c, src/core/readduh.c, src/core/register.c,
+	src/core/rendduh.c, src/core/rendsig.c, src/core/unload.c,
+	src/helpers/resample.c, src/it/it.c, src/sigtypes/combine.c,
+	src/sigtypes/sample.c, src/sigtypes/sequence.c,
+	src/sigtypes/sterpan.c: NEW DIRECTORY STRUCTURE. Please do a new
+	checkout, but WARNING: NO MAKEFILES. However, DUMB is now (almost)
+	separable from Allegro.
+
+2001-12-08 17:09 entheh
+
+	* src/it.c: Neatened up a bit... possible a bug-fix or two that I
+	don't remember doing...
+
+2001-12-07 21:38 tjaden
+
+	* make/makefile.uni: Use rm for make clean under Unices
+
+2001-12-07 21:37 tjaden
+
+	* fix.sh: New fix.sh script
+
+2001-12-07 21:33 entheh
+
+	* make/: makefile.lnx, makefile.uni: File renamed
+
+2001-12-07 19:54 entheh
+
+	* examples/unload.c, src/unload.c: Damn, that was DUMB. unload.c
+	was in the wrong place :o
+
+2001-12-07 19:39 entheh
+
+	* src/it.c: Fixed a bug affecting IT files that don't use
+	instruments. Most noticeable in that tone portamento didn't work.
+
+2001-12-07 13:56 entheh
+
+	* todo.txt, examples/unload.c, make/makefile.lst, src/combine.c,
+	src/getsig.c, src/it.c, src/llload.c, src/render.c, src/resample.c,
+	src/sample.c, src/sequence.c, src/sterpan.c: unload_duh() in
+	separate file; checked usage of free() and other stuff.
+
+2001-12-07 09:55 entheh
+
+	* todo.txt: Added to todo.txt
+
+2001-12-06 21:00 entheh
+
+	* todo.txt: Amendment to todo.txt.
+
+2001-12-06 20:12 entheh
+
+	* docs/dumb.txt: dumb.txt added.
+
+2001-12-06 19:08 entheh
+
+	* examples/playduh.c, examples/playit.c, make/makefile.lst,
+	src/main.c, winamp/in_duh.c: playit.c added. register_sigtype_*()
+	calls finally moved out of install_dumb(). That means you have to
+	call them yourself! See docs/dumb.txt.
+
+2001-12-06 18:24 entheh
+
+	* todo.txt, make/makefile.lst, src/it.c: More bugs fixed; DUMB more
+	faithful to IT. Added to todo.txt.
+
+2001-12-06 13:54 entheh
+
+	* todo.txt, src/it.c: More IT stuff done/fixed/whatever. We have
+	official permission to use sample decompression algorithms, but see
+	todo.txt.
+
+2001-12-05 12:55 entheh
+
+	* src/: it.c, resample.c: Revamped IT support has caught up with
+	cit.c. It even reproduces a bug in IT itself - the lengthy
+	experimentation payed off :) Also implemented a system to limit the
+	number of samples mixed simultaneously.
+
+2001-12-05 06:33 entheh
+
+	* src/: it.c, resample.c: More work on the IT support. Some IT
+	files actually sound nice now :)
+
+2001-12-04 19:13 entheh
+
+	* src/: sample.c, sequence.c: Unused parameter warnings fixed. I
+	now use -W as well as -Wall ;)
+
+2001-12-04 18:59 entheh
+
+	* include/dumb.h, src/it.c, src/llload.c, src/load.c: IT support
+	revamped. Now you load IT files directly. Not finished though. A
+	few other minor changes.
+
+2001-10-27 08:26 joe_programmer
+
+	* src/render.c, src/resample.c, tools/citbugs.txt: Entheh's new
+	resampling code
+
+2001-10-25 16:50 joe_programmer
+
+	* src/resample.c: entheh started a workaround for incorrect
+	multiplication generation code by C compilers. 36 bits were in fact
+	needed when only 32 were provided. The low-pass (linear average)
+	filter is not yet completed.
+
+2001-10-21 15:40 joe_programmer
+
+	* todo.txt: Added some stuff
+
+2001-10-20 12:19 joe_programmer
+
+	* tools/citbugs.txt: Updated buglist
+
+2001-09-30 18:11 joe_programmer
+
+	* todo.txt: Updated todo
+
+2001-09-30 18:06 joe_programmer
+
+	* src/sample.c: Fixes to the loader. Samples are now properly
+	loaded, which akes the int code as good as the float code
+
+2001-09-30 17:00 joe_programmer
+
+	* todo.txt: Added todo.txt
+
+2001-09-30 10:43 joe_programmer
+
+	* include/dumb.h, src/combine.c, src/getsig.c, src/render.c,
+	src/resample.c, src/sample.c, src/sequence.c, src/sterpan.c,
+	winamp/config.rc, winamp/winamp.dsp: Converted all the floating
+	point code to integer math. 30% speed boost! Sounds like crap
+	though. I'll fix that later.
+
+2001-09-26 19:37 joe_programmer
+
+	* winamp/: config.rc, gui.c, resource.h: Fixes to the plug-in's UI
+
+2001-09-25 19:23 joe_programmer
+
+	* src/resample.c, winamp/config.rc: Minor changes to the UI
+
+2001-09-25 18:37 joe_programmer
+
+	* src/resample.c: Sped up the low pass filters
+
+2001-09-25 17:25 joe_programmer
+
+	* src/resample.c, winamp/config.rc, winamp/gui.c,
+	winamp/resource.h: Sped up the quadratic and cubic resamplers
+
+2001-09-25 16:54 joe_programmer
+
+	* src/resample.c: Added quadratic resampler
+
+2001-09-23 08:19 joe_programmer
+
+	* src/resample.c, winamp/config.rc, winamp/winamp.dsp: Slight
+	changes ot the plug-in presentation
+
+2001-09-22 11:36 joe_programmer
+
+	* include/minalleg.h, src/resample.c, winamp/config.rc,
+	winamp/gui.c, winamp/gui.h, winamp/in_duh.c, winamp/resource.h,
+	winamp/winamp.dsp: Plug-in supports threading priority, new plug-in
+	setup option, small speed-up in the cubic resampler
+
+2001-09-17 20:02 joe_programmer
+
+	* src/resample.c, winamp/config.rc, winamp/gui.c, winamp/in_duh.c,
+	winamp/resource.h, winamp/winamp.dsp: Minor speed tweaks.
+
+2001-09-16 18:49 joe_programmer
+
+	* tools/cit.c: Fixed yet another null dereferencing bug
+
+2001-09-16 12:13 joe_programmer
+
+	* winamp/: config.rc, gui.c, gui.h, in_duh.c, resource.h: Lots of
+	fixes ot the plugin
+
+2001-09-16 08:52 joe_programmer
+
+	* tools/cit.c: Fixed yet another null dereferencing bug
+
+2001-09-16 08:49 joe_programmer
+
+	* winamp/gui.c: Fixes to the plug-in
+
+2001-09-16 08:36 joe_programmer
+
+	* winamp/in_duh.c: Fixes to the plug-in
+
+2001-09-16 08:32 joe_programmer
+
+	* winamp/: config.rc, gui.c, gui.h, in_duh.c, in_duh.h, resource.h,
+	winamp.dsp: The plug-in works and is almost done now. Config screen
+	added, seeking also added
+
+2001-09-15 18:10 joe_programmer
+
+	* winamp/in_duh.h: Forgot to commit a file
+
+2001-09-15 18:08 joe_programmer
+
+	* winamp/in_duh.c: More fixes to the plug-in
+
+2001-09-15 15:47 joe_programmer
+
+	* tools/cit.c, winamp/in_duh.c, winamp/winamp.dsp: Winamp update:
+	Vis should work
+
+2001-09-15 14:38 joe_programmer
+
+	* include/minalleg.h, make/makefile.vc, src/main.c, tools/cit.c,
+	winamp/in2.h, winamp/in_duh.c, winamp/out.h, winamp/winamp.dsp:
+	Winamp plug-in works! (well, kinda)
+
+2001-09-15 13:29 joe_programmer
+
+	* make/makefile.lst, make/makefile.mgw, make/makefile.vc,
+	tools/cit.c: Updated makefiles, added drag&drop support to cit
+
+2001-09-15 11:48 joe_programmer
+
+	* examples/playduh.c, include/dumb.h, winamp/in_duh.c,
+	winamp/winamp.dsp: More Winamp changes. Plug-in is almost ready
+
+2001-09-15 09:25 joe_programmer
+
+	* include/minalleg.h, src/combine.c, src/getsig.c, src/llload.c,
+	src/load.c, src/main.c, src/play.c, src/register.c, src/render.c,
+	src/resample.c, src/sample.c, src/sequence.c, src/sterpan.c,
+	winamp/in2.h, winamp/in_duh.c, winamp/minalleg.c, winamp/out.h,
+	winamp/winamp.dsp, winamp/winamp.dsw: Winamp plug-in commit - not
+	finished yet
+
+2001-09-10 02:14 entheh
+
+	* docs/duhspecs.txt, tools/cit.c: Note Fade and New Note Actions
+	now supported. Argh! I never want to program that again. :P
+
+2001-09-09 14:25 entheh
+
+	* include/dumb.h, src/render.c: 8-bit bug fixed, but the code
+	hasn't been tested yet.
+
+2001-09-09 13:07 entheh
+
+	* include/dumb.h, src/play.c, src/render.c: Rendering and audio
+	stream playing are now separated into levels. The rendering level
+	is available in dumb.h. I've removed Bob's changes, so I hope it
+	won't set him back too much :)
+
+2001-09-08 20:23 joe_programmer
+
+	* src/play.c: Slight change to make winamp plugin easier to write
+	:)
+
+2001-09-07 23:38 entheh
+
+	* include/dintern.h, src/llload.c, tools/cit.c: The length of a DUH
+	file is now stored, in preparation for Winamp and/or looping
+	support.
+
+2001-09-05 19:16 entheh
+
+	* tools/cit.c: Panning bug fixed. Forgot default sample panning!
+	D'oh! :)
+
+2001-09-05 17:37 entheh
+
+	* tools/cit.c: Volume envelopes working properly now, and stereo
+	panning bug fixed.
+
+2001-09-05 11:10 entheh
+
+	* src/play.c, tools/cit.c: Volume envelopes... bleargh, zasx.duh
+	sounds pretty good now :)
+
+2001-09-04 21:12 entheh
+
+	* make/: makefile.dj, makefile.lst: Makefile update (untested)
+
+2001-09-04 19:46 entheh
+
+	* tools/cit.c: Portamento in the volume column is done, and
+	handling of 'Compatible Gxx' is in place.
+
+2001-09-04 12:56 entheh
+
+	* tools/cit.c: Pitch/Pan Separation is done.
+
+2001-09-03 09:24 entheh
+
+	* include/dumb.h, src/combine.c, src/main.c, src/sterpan.c,
+	tools/cit.c: Stereo sound now works, finally! Not all stereo stuff
+	is implemented though, and it'll suffer from the same bug as the
+	volume (see the citbugs.txt file).
+
+2001-09-02 19:34 entheh
+
+	* examples/playduh.c, include/dumb.h, src/combine.c, src/getsig.c,
+	src/main.c, src/play.c, src/sample.c, src/sequence.c: COMB signal
+	implemented. This will allow two mono signals to be combined into a
+	stereo one. SPAN (panning), and modifications to cit.c, still to do
+	before any stereo sound will be heard.
+
+2001-08-24 19:01 entheh
+
+	* include/dumb.h, src/getsig.c, src/play.c, src/resample.c,
+	src/sample.c, src/sequence.c: Support for multiple channels has
+	been added. Adding stereo sound support should be a breeze now, but
+	that'll have to wait for another day.
+
+2001-08-24 14:17 entheh
+
+	* include/dumb.h, tools/cit.c, tools/citbugs.txt: Dunno what this
+	commit is, but it seems it should've been done a long time ago :)
+
+2001-08-17 18:25 entheh
+
+	* docs/duhspecs.txt, src/sequence.c, tools/cit.c: A new compression
+	system is in use for the sequences. WARNING: OLDER DUH FILES WILL
+	CAUSE A CRASH. This is the price you pay for using a version of
+	DUMB prior to the first release :)
+
+2001-08-17 12:25 joe_programmer
+
+	* docs/duhspecs.txt: Proposal for new smaller format
+
+2001-08-17 01:49 entheh
+
+	* docs/duhspecs.txt: The DUH file format specification is now
+	documented :)
+
+2001-08-16 15:13 joe_programmer
+
+	* tools/cit.c: Fixed a NULL dereferencing bug
+
+2001-08-16 14:38 entheh
+
+	* tools/cit.c: Bug fixed (multisample instruments work) and more
+	flow control effects done
+
+2001-08-16 03:33 entheh
+
+	* src/resample.c, tools/cit.c, tools/citbugs.txt: Wahoo, resampling
+	fixed! Also did something to cit.c and added citbugs.txt.
+
+2001-08-15 22:15 joe_programmer
+
+	* src/resample.c: Fixed compilation warning
+
+2001-08-15 18:50 entheh
+
+	* include/dumb.h, src/sample.c, src/sequence.c, tools/cit.c:
+	Various stuff... cit.c improved, the sequence signal can now be
+	started halfway through...
+
+2001-08-14 23:32 entheh
+
+	* tools/cit.c: Yay, volume slides! :-)
+
+2001-08-14 16:06 entheh
+
+	* tools/cit.c: Some of the effects work! Yay! :-)
+
+2001-08-14 04:32 entheh
+
+	* tools/cit.c: cit.c has been revamped somewhat. It's a hell of a
+	lot uglier, and has lost some features. However, it is supposedly
+	more faithful to the IT standard. Thank goodness the IT converter
+	is not to be the central attraction :-)
+
+2001-08-13 12:36 entheh
+
+	* tools/cit.c: cit.c now loads everything in the IT file. It has
+	been adapted to support everything described in the ittech.txt file
+	that comes with Impulse Tracker 2.14. However, the conversion is
+	still as awful as ever :-)
+
+2001-08-11 22:40 entheh
+
+	* tools/cit.c: Some of the "Damn, I need more information"-style
+	comments in cit.c have been replaced with information on what the
+	stuff really is :D
+
+2001-08-10 21:30 entheh
+
+	* examples/playduh.c: allegro_exit()/allegro_message() bug
+	partially fixed in playduh.c. Still problems in case of usage(),
+	and failure on allegro_init().
+
+2001-08-10 20:07 entheh
+
+	* include/dumb.h, src/getsig.c, src/sequence.c: Removed the
+	MAX_SAMPLES limitation. STREAM_SIZE can be increased now.
+
+2001-08-10 19:31 entheh
+
+	* examples/playduh.c, include/dumb.h, src/play.c: A few
+	enhancements to the playback interface.
+
+2001-08-10 10:13 joe_programmer
+
+	* make/makefile.lst: Added new files
+
+2001-08-10 08:48 entheh
+
+	* include/dumb.h, src/play.c, src/resample.c, src/sample.c,
+	src/sequence.c, tools/cit.c: Looped samples :-)
+
+2001-08-09 11:15 entheh
+
+	* src/resample.c: Bug fixed! Resampling works
+
+2001-08-09 10:35 entheh
+
+	* include/dumb.h, src/play.c, src/resample.c, src/sample.c,
+	tools/cit.c: RESAMPLE_PICKUP stuff added, but there's a bug. Trying
+	to fix it... Various other minor changes
+
+2001-08-06 18:06 entheh
+
+	* include/dumb.h, src/resample.c, src/sample.c, tools/cit.c:
+	Resampling code is in a separate file, and extensive comments have
+	been written for it. cit.c has very limited volume support now.
+
+2001-08-05 10:18 entheh
+
+	* tools/cit.c: A check in cit.c has gone from ASSERT to if :-)
+
+2001-08-03 23:23 joe_programmer
+
+	* tools/cit.c: Fix to the it->duh converter
+
+2001-08-03 23:12 entheh
+
+	* tools/cit.c: Bugfix, another bug has surfaced :/
+
+2001-08-03 22:39 entheh
+
+	* examples/playduh.c, include/dintern.h, include/dumb.h,
+	src/datduh.c, src/getsig.c, src/llload.c, src/load.c, src/main.c,
+	src/play.c, src/register.c, src/sample.c, src/sequence.c,
+	tools/cit.c: CIT (IT Compiler) working, just about. Tut tut, such a
+	name, so suggestive of monopolistic intentions... But anyway, the
+	new ASCII art and credits are at the top of every file!
+
+2001-08-03 11:46 entheh
+
+	* tools/cit.c: cit.c added. Currently unchanged from Bob's IT
+	loader, except that the header files have been hard-included, and
+	it now compiles as C rather than C++. Oh, and check out the new
+	ASCII art :-)
+
+2001-08-02 17:49 entheh
+
+	* src/sample.c: Changes to the sample signal so that no special
+	case is required at the end of a sample when resampling.
+
+2001-08-02 14:33 joe_programmer
+
+	* src/tools/it/: load_it.cpp, modulus.h, typedef.hpp: Added code to
+	load ITs from old IT player. needs a rewrite to work with dumb
+
+2001-08-01 19:33 entheh
+
+	* include/dumb.h, src/getsig.c, src/play.c, src/sample.c,
+	src/sequence.c: New sequencing format done.
+
+2001-08-01 15:13 entheh
+
+	* include/dintern.h, include/dumb.h, src/getsig.c, src/play.c,
+	src/register.c, src/sample.c, src/sequence.c: First signs of signal
+	parameters
+
+2001-07-28 14:40 entheh
+
+	* include/dintern.h, include/dumb.h, src/getsig.c, src/main.c,
+	src/play.c, src/sample.c, src/sequence.c: Some restructuring...
+
+2001-07-28 11:27 entheh
+
+	* src/: play.c, sample.c: Resampling fixed
+
+2001-07-28 11:16 joe_programmer
+
+	* src/sample.c: Fixes to the lowpass filter
+
+2001-07-28 10:54 joe_programmer
+
+	* src/sample.c: Attempt at fixing the low-pass filter
+
+2001-07-28 09:53 entheh
+
+	* examples/playduh.c, src/play.c, src/sample.c: Huh? uh, I don't
+	remember what I did.
+
+2001-07-28 09:44 joe_programmer
+
+	* src/sample.c: Fixes to the low-pass filter
+
+2001-07-28 09:33 joe_programmer
+
+	* src/sample.c: Added a dithering filter
+
+2001-07-28 09:08 joe_programmer
+
+	* src/sample.c: Cubic interpolation, and some form of high-pass
+	filter?
+
+2001-07-27 17:38 joe_programmer
+
+	* examples/playduh.c: Made the player work in the background
+
+2001-07-27 13:39 joe_programmer
+
+	* src/sample.c: Fixes to the lowpass filter
+
+2001-07-27 12:40 joe_programmer
+
+	* examples/playduh.c, src/sample.c: Hopefully fixed the crackiling
+	problem in the linear filter.
+
+2001-07-27 12:33 joe_programmer
+
+	* src/sample.c: Fixed the downsampling
+
+2001-07-27 12:21 joe_programmer
+
+	* src/sample.c: Bug fixed int he resampler
+
+2001-07-27 12:21 joe_programmer
+
+	* examples/playduh.c, make/makefile.vc, src/sample.c: Added linear
+	resampler and explerimental lowpass filter. Also fixed teh VC
+	makefile
+
+2001-07-25 08:33 entheh
+
+	* examples/playduh.c, include/dumb.h, src/getsig.c, src/play.c,
+	src/sample.c, src/sequence.c: Yay, for the first time it actually
+	plays MUSIC!!! :D
+
+2001-07-23 12:24 joe_programmer
+
+	* fix.bat, make/makefile.dj, make/makefile.lnx, make/makefile.lst,
+	make/makefile.mgw, make/makefile.vc: Fixes to the build scripts
+
+2001-07-23 11:28 joe_programmer
+
+	* fix.bat, make/makefile.dj, make/makefile.lnx, make/makefile.lst,
+	make/makefile.mgw, make/makefile.vc, src/misc/runner.c: Added
+	makefile system
+
+2001-07-23 10:11 entheh
+
+	* examples/playduh.c, include/dumb.h, src/getsig.c, src/llload.c,
+	src/main.c, src/play.c, src/register.c, src/sample.c,
+	src/sequence.c: [no log message]
+
+2001-07-21 08:04 entheh
+
+	* include/: dintern.h, dumb.h.ex: dumb.h.ex added, containing DUMB
+	struct stuff which will not be used for now. Don't wanna lose
+	stuff though :-) dintern.h is now updated with the new signal
+	processing functions. The package compiles.
+
+2001-07-21 06:43 entheh
+
+	* include/dintern.h, include/dumb.h, src/register.c:
+	Signal-handling functions are improved.
+
+2001-07-20 15:03 joe_programmer
+
+	* src/Shortcut to src.lnk: Removed file added by error
+
+2001-07-20 14:57 joe_programmer
+
+	* licence.txt, include/dintern.h, include/dumb.h, src/Shortcut to
+	src.lnk, src/datduh.c, src/llload.c, src/load.c, src/main.c,
+	src/register.c: Initial revision
+
+2001-07-20 14:57 joe_programmer
+
+	* licence.txt, include/dintern.h, include/dumb.h, src/Shortcut to
+	src.lnk, src/datduh.c, src/llload.c, src/load.c, src/main.c,
+	src/register.c: Initial checkin
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/aldumb.h Added

@@ -0,0 +1,98 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * aldumb.h - The user header file for DUMB with / / \ \
+ * Allegro. | < / \_
+ * | \/ /\ /
+ * Include this file if you wish to use DUMB \_ / > /
+ * with Allegro. It will include dumb.h for you, | \ / /
+ * and provide extra functionality such as audio | ' /
+ * stream and datafile integration. \__/
+ */
+
+#ifndef ALDUMB_H
+#define ALDUMB_H
+
+
+#include <allegro.h>
+
+#include "dumb.h"
+
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+
+/* Packfile Support */
+
+void dumb_register_packfiles(void);
+
+DUMBFILE *dumbfile_open_packfile(PACKFILE *p);
+DUMBFILE *dumbfile_from_packfile(PACKFILE *p);
+
+
+/* Datafile Registration Functions */
+
+#define DUMB_DAT_DUH DAT_ID('D','U','H',' ')
+#define DUMB_DAT_IT DAT_ID('I','T',' ',' ')
+#define DUMB_DAT_XM DAT_ID('X','M',' ',' ')
+#define DUMB_DAT_S3M DAT_ID('S','3','M',' ')
+#define DUMB_DAT_MOD DAT_ID('M','O','D',' ')
+
+void dumb_register_dat_duh(long type);
+void dumb_register_dat_it(long type);
+void dumb_register_dat_xm(long type);
+void dumb_register_dat_s3m(long type);
+void dumb_register_dat_mod(long type);
+void dumb_register_dat_it_quick(long type);
+void dumb_register_dat_xm_quick(long type);
+void dumb_register_dat_s3m_quick(long type);
+void dumb_register_dat_mod_quick(long type);
+
+
+/* DUH Playing Functions */
+
+typedef struct AL_DUH_PLAYER AL_DUH_PLAYER;
+
+AL_DUH_PLAYER *al_start_duh(DUH *duh, int n_channels, long pos, float volume, long bufsize, int freq);
+void al_stop_duh(AL_DUH_PLAYER *dp);
+void al_pause_duh(AL_DUH_PLAYER *dp);
+void al_resume_duh(AL_DUH_PLAYER *dp);
+void al_duh_set_priority(AL_DUH_PLAYER *dp, int priority);
+void al_duh_set_volume(AL_DUH_PLAYER *dp, float volume);
+float al_duh_get_volume(AL_DUH_PLAYER *dp);
+int al_poll_duh(AL_DUH_PLAYER *dp);
+long al_duh_get_position(AL_DUH_PLAYER *dp);
+
+AL_DUH_PLAYER *al_duh_encapsulate_sigrenderer(DUH_SIGRENDERER *sigrenderer, float volume, long bufsize, int freq);
+DUH_SIGRENDERER *al_duh_get_sigrenderer(AL_DUH_PLAYER *dp);
+
+/* IMPORTANT: This function will return NULL if the music has ended. */
+DUH_SIGRENDERER *al_duh_decompose_to_sigrenderer(AL_DUH_PLAYER *dp);
+
+#ifdef DUMB_DECLARE_DEPRECATED
+
+AL_DUH_PLAYER *al_duh_encapsulate_renderer(DUH_SIGRENDERER *dr, float volume, long bufsize, int freq) DUMB_DEPRECATED;
+DUH_SIGRENDERER *al_duh_get_renderer(AL_DUH_PLAYER *dp) DUMB_DEPRECATED;
+DUH_SIGRENDERER *al_duh_decompose_to_renderer(AL_DUH_PLAYER *dp) DUMB_DEPRECATED;
+/* Replace 'renderer' with 'sigrenderer' in each case where you called one of
+ * these functions.
+ */
+
+#endif
+
+
+#ifdef __cplusplus
+	}
+#endif
+
+
+#endif /* ALDUMB_H */

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/dumb.h Added

@@ -0,0 +1,770 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * dumb.h - The user header file for DUMB. / / \ \
+ * | < / \_
+ * Include this file in any of your files in | \/ /\ /
+ * which you wish to use the DUMB functions \_ / > /
+ * and variables. | \ / /
+ * | ' /
+ * Allegro users, you will probably want aldumb.h. \__/
+ */
+
+#ifndef DUMB_H
+#define DUMB_H
+
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef _DEBUG
+#define _CRTDBG_MAP_ALLOC
+#include <crtdbg.h>
+#endif
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+
+#define DUMB_MAJOR_VERSION 0
+#define DUMB_MINOR_VERSION 9
+#define DUMB_REVISION_VERSION 3
+
+#define DUMB_VERSION (DUMB_MAJOR_VERSION*10000 + DUMB_MINOR_VERSION*100 + DUMB_REVISION_VERSION)
+
+#define DUMB_VERSION_STR "0.9.3"
+
+#define DUMB_NAME "DUMB v"DUMB_VERSION_STR
+
+#define DUMB_YEAR 2005
+#define DUMB_MONTH 8
+#define DUMB_DAY 7
+
+#define DUMB_YEAR_STR2 "05"
+#define DUMB_YEAR_STR4 "2005"
+#define DUMB_MONTH_STR1 "8"
+#define DUMB_DAY_STR1 "7"
+
+#define DUMB_YEAR_STR2 "05"
+#define DUMB_YEAR_STR4 "2005"
+#define DUMB_MONTH_STR1 "8"
+#define DUMB_DAY_STR1 "7"
+
+#if DUMB_MONTH < 10
+#define DUMB_MONTH_STR2 "0"DUMB_MONTH_STR1
+#else
+#define DUMB_MONTH_STR2 DUMB_MONTH_STR1
+#endif
+
+#if DUMB_DAY < 10
+#define DUMB_DAY_STR2 "0"DUMB_DAY_STR1
+#else
+#define DUMB_DAY_STR2 DUMB_DAY_STR1
+#endif
+
+
+/* WARNING: The month and day were inadvertently swapped in the v0.8 release.
+ * Please do not compare this constant against any date in 2002. In
+ * any case, DUMB_VERSION is probably more useful for this purpose.
+ */
+#define DUMB_DATE (DUMB_YEAR*10000 + DUMB_MONTH*100 + DUMB_DAY)
+
+#define DUMB_DATE_STR DUMB_DAY_STR1"."DUMB_MONTH_STR1"."DUMB_YEAR_STR4
+
+
+#undef MIN
+#undef MAX
+#undef MID
+
+#define MIN(x,y) (((x) < (y)) ? (x) : (y))
+#define MAX(x,y) (((x) > (y)) ? (x) : (y))
+#define MID(x,y,z) MAX((x), MIN((y), (z)))
+
+#undef ABS
+#define ABS(x) (((x) >= 0) ? (x) : (-(x)))
+
+
+#ifdef DEBUGMODE
+
+#ifndef ASSERT
+#include <assert.h>
+#define ASSERT(n) assert(n)
+#endif
+#ifndef TRACE
+// it would be nice if this did actually trace ...
+#define TRACE 1 ? (void)0 : (void)printf
+#endif
+
+#else
+
+#ifndef ASSERT
+#define ASSERT(n)
+#endif
+#ifndef TRACE
+#define TRACE 1 ? (void)0 : (void)printf
+#endif
+
+#endif
+
+
+#define DUMB_ID(a,b,c,d) (((unsigned int)(a) << 24) | \
+ ((unsigned int)(b) << 16) | \
+ ((unsigned int)(c) << 8) | \
+ ((unsigned int)(d) ))
+
+
+
+#ifndef LONG_LONG
+#if defined __GNUC__ || defined __INTEL_COMPILER || defined __MWERKS__
+#define LONG_LONG long long
+#elif defined _MSC_VER || defined __WATCOMC__
+#define LONG_LONG __int64
+#elif defined __sgi
+#define LONG_LONG long long
+#else
+#error 64-bit integer type unknown
+#endif
+#endif
+
+#if __GNUC__ * 100 + __GNUC_MINOR__ >= 301 /* GCC 3.1+ */
+#ifndef DUMB_DECLARE_DEPRECATED
+#define DUMB_DECLARE_DEPRECATED
+#endif
+#define DUMB_DEPRECATED __attribute__((__deprecated__))
+#else
+#define DUMB_DEPRECATED
+#endif
+
+
+/* Basic Sample Type. Normal range is -0x800000 to 0x7FFFFF. */
+
+typedef int sample_t;
+
+
+/* Library Clean-up Management */
+
+int dumb_atexit(void (*proc)(void));
+
+void dumb_exit(void);
+
+
+/* File Input Functions */
+
+typedef struct DUMBFILE_SYSTEM
+{
+	void *(*open)(const char *filename);
+	int (*skip)(void *f, long n);
+	int (*getc)(void *f);
+	long (*getnc)(char *ptr, long n, void *f);
+	void (*close)(void *f);
+}
+DUMBFILE_SYSTEM;
+
+typedef struct DUMBFILE DUMBFILE;
+
+void register_dumbfile_system(DUMBFILE_SYSTEM *dfs);
+
+DUMBFILE *dumbfile_open(const char *filename);
+DUMBFILE *dumbfile_open_ex(void *file, DUMBFILE_SYSTEM *dfs);
+
+long dumbfile_pos(DUMBFILE *f);
+int dumbfile_skip(DUMBFILE *f, long n);
+
+int dumbfile_getc(DUMBFILE *f);
+
+int dumbfile_igetw(DUMBFILE *f);
+int dumbfile_mgetw(DUMBFILE *f);
+
+long dumbfile_igetl(DUMBFILE *f);
+long dumbfile_mgetl(DUMBFILE *f);
+
+unsigned long dumbfile_cgetul(DUMBFILE *f);
+signed long dumbfile_cgetsl(DUMBFILE *f);
+
+long dumbfile_getnc(char *ptr, long n, DUMBFILE *f);
+
+int dumbfile_error(DUMBFILE *f);
+int dumbfile_close(DUMBFILE *f);
+
+
+/* stdio File Input Module */
+
+void dumb_register_stdfiles(void);
+
+DUMBFILE *dumbfile_open_stdfile(FILE *p);
+
+
+/* Memory File Input Module */
+
+DUMBFILE *dumbfile_open_memory(const char *data, long size);
+
+
+/* DUH Management */
+
+typedef struct DUH DUH;
+
+#define DUH_SIGNATURE DUMB_ID('D','U','H','!')
+
+void unload_duh(DUH *duh);
+
+DUH *load_duh(const char *filename);
+DUH *read_duh(DUMBFILE *f);
+
+long duh_get_length(DUH *duh);
+
+const char *duh_get_tag(DUH *duh, const char *key);
+
+const char *duh_get_tag(DUH *duh, const char *key);
+
+
+/* Signal Rendering Functions */
+
+typedef struct DUH_SIGRENDERER DUH_SIGRENDERER;
+
+DUH_SIGRENDERER *duh_start_sigrenderer(DUH *duh, int sig, int n_channels, long pos);
+
+#ifdef DUMB_DECLARE_DEPRECATED
+typedef void (*DUH_SIGRENDERER_CALLBACK)(void *data, sample_t **samples, int n_channels, long length);
+/* This is deprecated, but is not marked as such because GCC tends to
+ * complain spuriously when the typedef is used later. See comments below.
+ */
+
+void duh_sigrenderer_set_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_CALLBACK callback, void *data
+) DUMB_DEPRECATED;
+/* The 'callback' argument's type has changed for const-correctness. See the
+ * DUH_SIGRENDERER_CALLBACK definition just above. Also note that the samples
+ * in the buffer are now 256 times as large; the normal range is -0x800000 to
+ * 0x7FFFFF. The function has been renamed partly because its functionality
+ * has changed slightly and partly so that its name is more meaningful. The
+ * new one is duh_sigrenderer_set_analyser_callback(), and the typedef for
+ * the function pointer has also changed, from DUH_SIGRENDERER_CALLBACK to
+ * DUH_SIGRENDERER_ANALYSER_CALLBACK. (If you wanted to use this callback to
+ * apply a DSP effect, don't worry; there is a better way of doing this. It
+ * is undocumented, so contact me and I shall try to help. Contact details
+ * are in readme.txt.)
+ */
+
+typedef void (*DUH_SIGRENDERER_ANALYSER_CALLBACK)(void *data, const sample_t *const *samples, int n_channels, long length);
+/* This is deprecated, but is not marked as such because GCC tends to
+ * complain spuriously when the typedef is used later. See comments below.
+ */
+
+void duh_sigrenderer_set_analyser_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_ANALYSER_CALLBACK callback, void *data
+) DUMB_DEPRECATED;
+/* This is deprecated because the meaning of the 'samples' parameter in the
+ * callback needed to change. For stereo applications, the array used to be
+ * indexed with samples[channel][pos]. It is now indexed with
+ * samples[0][pos*2+channel]. Mono sample data are still indexed with
+ * samples[0][pos]. The array is still 2D because samples will probably only
+ * ever be interleaved in twos. In order to fix your code, adapt it to the
+ * new sample layout and then call
+ * duh_sigrenderer_set_sample_analyser_callback below instead of this
+ * function.
+ */
+#endif
+
+typedef void (*DUH_SIGRENDERER_SAMPLE_ANALYSER_CALLBACK)(void *data, const sample_t *const *samples, int n_channels, long length);
+
+void duh_sigrenderer_set_sample_analyser_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_SAMPLE_ANALYSER_CALLBACK callback, void *data
+);
+
+int duh_sigrenderer_get_n_channels(DUH_SIGRENDERER *sigrenderer);
+long duh_sigrenderer_get_position(DUH_SIGRENDERER *sigrenderer);
+
+void duh_sigrenderer_set_sigparam(DUH_SIGRENDERER *sigrenderer, unsigned char id, long value);
+
+#ifdef DUMB_DECLARE_DEPRECATED
+long duh_sigrenderer_get_samples(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+) DUMB_DEPRECATED;
+/* The sample format has changed, so if you were using this function,
+ * you should switch to duh_sigrenderer_generate_samples() and change
+ * how you interpret the samples array. See the comments for
+ * duh_sigrenderer_set_analyser_callback().
+ */
+#endif
+
+long duh_sigrenderer_generate_samples(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+);
+
+void duh_sigrenderer_get_current_sample(DUH_SIGRENDERER *sigrenderer, float volume, sample_t *samples);
+
+void duh_end_sigrenderer(DUH_SIGRENDERER *sigrenderer);
+
+
+/* DUH Rendering Functions */
+
+long duh_render(
+	DUH_SIGRENDERER *sigrenderer,
+	int bits, int unsign,
+	float volume, float delta,
+	long size, void *sptr
+);
+
+#ifdef DUMB_DECLARE_DEPRECATED
+
+long duh_render_signal(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+) DUMB_DEPRECATED;
+/* Please use duh_sigrenderer_generate_samples(), and see the
+ * comments for the deprecated duh_sigrenderer_get_samples() too.
+ */
+
+typedef DUH_SIGRENDERER DUH_RENDERER DUMB_DEPRECATED;
+/* Please use DUH_SIGRENDERER instead of DUH_RENDERER. */
+
+DUH_SIGRENDERER *duh_start_renderer(DUH *duh, int n_channels, long pos) DUMB_DEPRECATED;
+/* Please use duh_start_sigrenderer() instead. Pass 0 for 'sig'. */
+
+int duh_renderer_get_n_channels(DUH_SIGRENDERER *dr) DUMB_DEPRECATED;
+long duh_renderer_get_position(DUH_SIGRENDERER *dr) DUMB_DEPRECATED;
+/* Please use the duh_sigrenderer_*() equivalents of these two functions. */
+
+void duh_end_renderer(DUH_SIGRENDERER *dr) DUMB_DEPRECATED;
+/* Please use duh_end_sigrenderer() instead. */
+
+DUH_SIGRENDERER *duh_renderer_encapsulate_sigrenderer(DUH_SIGRENDERER *sigrenderer) DUMB_DEPRECATED;
+DUH_SIGRENDERER *duh_renderer_get_sigrenderer(DUH_SIGRENDERER *dr) DUMB_DEPRECATED;
+DUH_SIGRENDERER *duh_renderer_decompose_to_sigrenderer(DUH_SIGRENDERER *dr) DUMB_DEPRECATED;
+/* These functions have become no-ops that just return the parameter.
+ * So, for instance, replace
+ * duh_renderer_encapsulate_sigrenderer(my_sigrenderer)
+ * with
+ * my_sigrenderer
+ */
+
+#endif
+
+
+/* Impulse Tracker Support */
+
+extern int dumb_it_max_to_mix;
+
+typedef struct DUMB_IT_SIGDATA DUMB_IT_SIGDATA;
+typedef struct DUMB_IT_SIGRENDERER DUMB_IT_SIGRENDERER;
+
+DUMB_IT_SIGDATA *duh_get_it_sigdata(DUH *duh);
+DUH_SIGRENDERER *duh_encapsulate_it_sigrenderer(DUMB_IT_SIGRENDERER *it_sigrenderer, int n_channels, long pos);
+DUMB_IT_SIGRENDERER *duh_get_it_sigrenderer(DUH_SIGRENDERER *sigrenderer);
+
+int dumb_it_trim_silent_patterns(DUH * duh);
+
+typedef int (*dumb_scan_callback)(void *, int, long);
+int dumb_it_scan_for_playable_orders(DUMB_IT_SIGDATA *sigdata, dumb_scan_callback callback, void * callback_data);
+
+DUH_SIGRENDERER *dumb_it_start_at_order(DUH *duh, int n_channels, int startorder);
+
+void dumb_it_set_resampling_quality(DUMB_IT_SIGRENDERER * sigrenderer, int quality);
+
+void dumb_it_set_ramp_style(DUMB_IT_SIGRENDERER * sigrenderer, int ramp_style);
+
+void dumb_it_set_loop_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data);
+void dumb_it_set_xm_speed_zero_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data);
+void dumb_it_set_midi_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data, int channel, unsigned char midi_byte), void *data);
+void dumb_it_set_global_volume_zero_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data);
+
+int dumb_it_callback_terminate(void *data);
+int dumb_it_callback_midi_block(void *data, int channel, unsigned char midi_byte);
+
+DUH *dumb_load_it(const char *filename);
+DUH *dumb_load_xm(const char *filename);
+DUH *dumb_load_s3m(const char *filename);
+DUH *dumb_load_stm(const char *filename);
+DUH *dumb_load_mod(const char *filename, int restr);
+DUH *dumb_load_ptm(const char *filename);
+DUH *dumb_load_669(const char *filename);
+DUH *dumb_load_psm(const char *filename, int subsong);
+DUH *dumb_load_old_psm(const char * filename);
+DUH *dumb_load_mtm(const char *filename);
+DUH *dumb_load_riff(const char *filename);
+DUH *dumb_load_asy(const char *filename);
+
+DUH *dumb_read_it(DUMBFILE *f);
+DUH *dumb_read_xm(DUMBFILE *f);
+DUH *dumb_read_s3m(DUMBFILE *f);
+DUH *dumb_read_stm(DUMBFILE *f);
+DUH *dumb_read_mod(DUMBFILE *f, int restr);
+DUH *dumb_read_ptm(DUMBFILE *f);
+DUH *dumb_read_669(DUMBFILE *f);
+DUH *dumb_read_psm(DUMBFILE *f, int subsong);
+DUH *dumb_read_old_psm(DUMBFILE *f);
+DUH *dumb_read_mtm(DUMBFILE *f);
+DUH *dumb_read_riff(DUMBFILE *f);
+DUH *dumb_read_asy(DUMBFILE *f);
+
+DUH *dumb_load_it_quick(const char *filename);
+DUH *dumb_load_xm_quick(const char *filename);
+DUH *dumb_load_s3m_quick(const char *filename);
+DUH *dumb_load_stm_quick(const char *filename);
+DUH *dumb_load_mod_quick(const char *filename, int restr);
+DUH *dumb_load_ptm_quick(const char *filename);
+DUH *dumb_load_669_quick(const char *filename);
+DUH *dumb_load_psm_quick(const char *filename, int subsong);
+DUH *dumb_load_old_psm_quick(const char * filename);
+DUH *dumb_load_mtm_quick(const char *filename);
+DUH *dumb_load_riff_quick(const char *filename);
+DUH *dumb_load_asy_quick(const char *filename);
+
+DUH *dumb_read_it_quick(DUMBFILE *f);
+DUH *dumb_read_xm_quick(DUMBFILE *f);
+DUH *dumb_read_s3m_quick(DUMBFILE *f);
+DUH *dumb_read_stm_quick(DUMBFILE *f);
+DUH *dumb_read_mod_quick(DUMBFILE *f, int restr);
+DUH *dumb_read_ptm_quick(DUMBFILE *f);
+DUH *dumb_read_669_quick(DUMBFILE *f);
+DUH *dumb_read_psm_quick(DUMBFILE *f, int subsong);
+DUH *dumb_read_old_psm_quick(DUMBFILE *f);
+DUH *dumb_read_mtm_quick(DUMBFILE *f);
+DUH *dumb_read_riff_quick(DUMBFILE *f);
+DUH *dumb_read_asy_quick(DUMBFILE *f);
+
+long dumb_it_build_checkpoints(DUMB_IT_SIGDATA *sigdata, int startorder);
+void dumb_it_do_initial_runthrough(DUH *duh);
+
+int dumb_get_psm_subsong_count(DUMBFILE *f);
+
+const unsigned char *dumb_it_sd_get_song_message(DUMB_IT_SIGDATA *sd);
+
+int dumb_it_sd_get_n_orders(DUMB_IT_SIGDATA *sd);
+int dumb_it_sd_get_n_samples(DUMB_IT_SIGDATA *sd);
+int dumb_it_sd_get_n_instruments(DUMB_IT_SIGDATA *sd);
+
+const unsigned char *dumb_it_sd_get_sample_name(DUMB_IT_SIGDATA *sd, int i);
+const unsigned char *dumb_it_sd_get_sample_filename(DUMB_IT_SIGDATA *sd, int i);
+const unsigned char *dumb_it_sd_get_instrument_name(DUMB_IT_SIGDATA *sd, int i);
+const unsigned char *dumb_it_sd_get_instrument_filename(DUMB_IT_SIGDATA *sd, int i);
+
+int dumb_it_sd_get_initial_global_volume(DUMB_IT_SIGDATA *sd);
+void dumb_it_sd_set_initial_global_volume(DUMB_IT_SIGDATA *sd, int gv);
+
+int dumb_it_sd_get_mixing_volume(DUMB_IT_SIGDATA *sd);
+void dumb_it_sd_set_mixing_volume(DUMB_IT_SIGDATA *sd, int mv);
+
+int dumb_it_sd_get_initial_speed(DUMB_IT_SIGDATA *sd);
+void dumb_it_sd_set_initial_speed(DUMB_IT_SIGDATA *sd, int speed);
+
+int dumb_it_sd_get_initial_tempo(DUMB_IT_SIGDATA *sd);
+void dumb_it_sd_set_initial_tempo(DUMB_IT_SIGDATA *sd, int tempo);
+
+int dumb_it_sd_get_initial_channel_volume(DUMB_IT_SIGDATA *sd, int channel);
+void dumb_it_sd_set_initial_channel_volume(DUMB_IT_SIGDATA *sd, int channel, int volume);
+
+int dumb_it_sr_get_current_order(DUMB_IT_SIGRENDERER *sr);
+int dumb_it_sr_get_current_row(DUMB_IT_SIGRENDERER *sr);
+
+int dumb_it_sr_get_global_volume(DUMB_IT_SIGRENDERER *sr);
+void dumb_it_sr_set_global_volume(DUMB_IT_SIGRENDERER *sr, int gv);
+
+int dumb_it_sr_get_tempo(DUMB_IT_SIGRENDERER *sr);
+void dumb_it_sr_set_tempo(DUMB_IT_SIGRENDERER *sr, int tempo);
+
+int dumb_it_sr_get_speed(DUMB_IT_SIGRENDERER *sr);
+void dumb_it_sr_set_speed(DUMB_IT_SIGRENDERER *sr, int speed);
+
+#define DUMB_IT_N_CHANNELS 64
+#define DUMB_IT_N_NNA_CHANNELS 192
+#define DUMB_IT_TOTAL_CHANNELS (DUMB_IT_N_CHANNELS + DUMB_IT_N_NNA_CHANNELS)
+
+/* Channels passed to any of these functions are 0-based */
+int dumb_it_sr_get_channel_volume(DUMB_IT_SIGRENDERER *sr, int channel);
+void dumb_it_sr_set_channel_volume(DUMB_IT_SIGRENDERER *sr, int channel, int volume);
+
+int dumb_it_sr_get_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel);
+void dumb_it_sr_set_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel, int muted);
+
+int dumb_it_sr_get_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel);
+void dumb_it_sr_set_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel, int muted);
+
+typedef struct DUMB_IT_CHANNEL_STATE DUMB_IT_CHANNEL_STATE;
+
+struct DUMB_IT_CHANNEL_STATE
+{
+	int channel; /* 0-based; meaningful for NNA channels */
+	int sample; /* 1-based; 0 if nothing playing, then other fields undef */
+	int freq; /* in Hz */
+	float volume; /* 1.0 maximum; affected by ALL factors, inc. mixing vol */
+	unsigned char pan; /* 0-64, 100 for surround */
+	signed char subpan; /* use (pan + subpan/256.0f) or ((pan<<8)+subpan) */
+	unsigned char filter_cutoff; /* 0-127 cutoff=127 AND resonance=0 */
+	unsigned char filter_subcutoff; /* 0-255 -> no filters (subcutoff */
+	unsigned char filter_resonance; /* 0-127 always 0 in this case) */
+	/* subcutoff only changes from zero if filter envelopes are in use. The
+	 * calculation (filter_cutoff + filter_subcutoff/256.0f) gives a more
+	 * accurate filter cutoff measurement as a float. It would often be more
+	 * useful to use a scaled int such as ((cutoff<<8) + subcutoff).
+	 */
+};
+
+/* Values of 64 or more will access NNA channels here. */
+void dumb_it_sr_get_channel_state(DUMB_IT_SIGRENDERER *sr, int channel, DUMB_IT_CHANNEL_STATE *state);
+
+
+/* Signal Design Helper Values */
+
+/* Use pow(DUMB_SEMITONE_BASE, n) to get the 'delta' value to transpose up by
+ * n semitones. To transpose down, use negative n.
+ */
+#define DUMB_SEMITONE_BASE 1.059463094359295309843105314939748495817
+
+/* Use pow(DUMB_QUARTERTONE_BASE, n) to get the 'delta' value to transpose up
+ * by n quartertones. To transpose down, use negative n.
+ */
+#define DUMB_QUARTERTONE_BASE 1.029302236643492074463779317738953977823
+
+/* Use pow(DUMB_PITCH_BASE, n) to get the 'delta' value to transpose up by n
+ * units. In this case, 256 units represent one semitone; 3072 units
+ * represent one octave. These units are used by the sequence signal (SEQU).
+ */
+#define DUMB_PITCH_BASE 1.000225659305069791926712241547647863626
+
+
+/* Signal Design Function Types */
+
+typedef void sigdata_t;
+typedef void sigrenderer_t;
+
+typedef sigdata_t *(*DUH_LOAD_SIGDATA)(DUH *duh, DUMBFILE *file);
+
+typedef sigrenderer_t *(*DUH_START_SIGRENDERER)(
+	DUH *duh,
+	sigdata_t *sigdata,
+	int n_channels,
+	long pos
+);
+
+typedef void (*DUH_SIGRENDERER_SET_SIGPARAM)(
+	sigrenderer_t *sigrenderer,
+	unsigned char id, long value
+);
+
+typedef long (*DUH_SIGRENDERER_GENERATE_SAMPLES)(
+	sigrenderer_t *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+);
+
+typedef void (*DUH_SIGRENDERER_GET_CURRENT_SAMPLE)(
+	sigrenderer_t *sigrenderer,
+	float volume,
+	sample_t *samples
+);
+
+typedef void (*DUH_END_SIGRENDERER)(sigrenderer_t *sigrenderer);
+
+typedef void (*DUH_UNLOAD_SIGDATA)(sigdata_t *sigdata);
+
+
+/* Signal Design Function Registration */
+
+typedef struct DUH_SIGTYPE_DESC
+{
+	long type;
+	DUH_LOAD_SIGDATA load_sigdata;
+	DUH_START_SIGRENDERER start_sigrenderer;
+	DUH_SIGRENDERER_SET_SIGPARAM sigrenderer_set_sigparam;
+	DUH_SIGRENDERER_GENERATE_SAMPLES sigrenderer_generate_samples;
+	DUH_SIGRENDERER_GET_CURRENT_SAMPLE sigrenderer_get_current_sample;
+	DUH_END_SIGRENDERER end_sigrenderer;
+	DUH_UNLOAD_SIGDATA unload_sigdata;
+}
+DUH_SIGTYPE_DESC;
+
+void dumb_register_sigtype(DUH_SIGTYPE_DESC *desc);
+
+
+// Decide where to put these functions; new heading?
+
+sigdata_t *duh_get_raw_sigdata(DUH *duh, int sig, long type);
+
+DUH_SIGRENDERER *duh_encapsulate_raw_sigrenderer(sigrenderer_t *vsigrenderer, DUH_SIGTYPE_DESC *desc, int n_channels, long pos);
+sigrenderer_t *duh_get_raw_sigrenderer(DUH_SIGRENDERER *sigrenderer, long type);
+
+
+/* Standard Signal Types */
+
+//void dumb_register_sigtype_sample(void);
+
+
+/* Sample Buffer Allocation Helpers */
+
+#ifdef DUMB_DECLARE_DEPRECATED
+sample_t **create_sample_buffer(int n_channels, long length) DUMB_DEPRECATED;
+/* DUMB has been changed to interleave stereo samples. Use
+ * allocate_sample_buffer() instead, and see the comments for
+ * duh_sigrenderer_set_analyser_callback().
+ */
+#endif
+sample_t **allocate_sample_buffer(int n_channels, long length);
+void destroy_sample_buffer(sample_t **samples);
+
+
+/* Sample Buffer Allocation Helpers */
+
+#ifdef DUMB_DECLARE_DEPRECATED
+sample_t **create_sample_buffer(int n_channels, long length) DUMB_DEPRECATED;
+/* DUMB has been changed to interleave stereo samples. Use
+ * allocate_sample_buffer() instead, and see the comments for
+ * duh_sigrenderer_set_analyser_callback().
+ */
+#endif
+sample_t **allocate_sample_buffer(int n_channels, long length);
+void destroy_sample_buffer(sample_t **samples);
+
+
+/* Silencing Helper */
+
+void dumb_silence(sample_t *samples, long length);
+
+
+/* Click Removal Helpers */
+
+typedef struct DUMB_CLICK_REMOVER DUMB_CLICK_REMOVER;
+
+DUMB_CLICK_REMOVER *dumb_create_click_remover(void);
+void dumb_record_click(DUMB_CLICK_REMOVER *cr, long pos, sample_t step);
+void dumb_remove_clicks(DUMB_CLICK_REMOVER *cr, sample_t *samples, long length, int step, float halflife);
+sample_t dumb_click_remover_get_offset(DUMB_CLICK_REMOVER *cr);
+void dumb_destroy_click_remover(DUMB_CLICK_REMOVER *cr);
+
+DUMB_CLICK_REMOVER **dumb_create_click_remover_array(int n);
+void dumb_record_click_array(int n, DUMB_CLICK_REMOVER **cr, long pos, sample_t *step);
+void dumb_record_click_negative_array(int n, DUMB_CLICK_REMOVER **cr, long pos, sample_t *step);
+void dumb_remove_clicks_array(int n, DUMB_CLICK_REMOVER **cr, sample_t **samples, long length, float halflife);
+void dumb_click_remover_get_offset_array(int n, DUMB_CLICK_REMOVER **cr, sample_t *offset);
+void dumb_destroy_click_remover_array(int n, DUMB_CLICK_REMOVER **cr);
+
+
+/* Resampling Helpers */
+
+#define DUMB_RQ_ALIASING 0
+#define DUMB_RQ_LINEAR 1
+#define DUMB_RQ_CUBIC 2
+#define DUMB_RQ_N_LEVELS 3
+extern int dumb_resampling_quality;
+
+typedef struct DUMB_RESAMPLER DUMB_RESAMPLER;
+
+typedef struct DUMB_VOLUME_RAMP_INFO DUMB_VOLUME_RAMP_INFO;
+
+typedef void (*DUMB_RESAMPLE_PICKUP)(DUMB_RESAMPLER *resampler, void *data);
+
+struct DUMB_RESAMPLER
+{
+	void *src;
+	long pos;
+	int subpos;
+	long start, end;
+	int dir;
+	DUMB_RESAMPLE_PICKUP pickup;
+	void *pickup_data;
+	int quality;
+	/* Everything below this point is internal: do not use. */
+	union {
+		sample_t x24[3*2];
+		short x16[3*2];
+		signed char x8[3*2];
+	} x;
+	int overshot;
+};
+
+struct DUMB_VOLUME_RAMP_INFO
+{
+	float volume;
+	float delta;
+	float target;
+	float mix;
+};
+
+void dumb_reset_resampler(DUMB_RESAMPLER *resampler, sample_t *src, int src_channels, long pos, long start, long end, int quality);
+DUMB_RESAMPLER *dumb_start_resampler(sample_t *src, int src_channels, long pos, long start, long end, int quality);
+long dumb_resample_1_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume, float delta);
+long dumb_resample_1_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_2_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_2_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+void dumb_resample_get_current_sample_1_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume, sample_t *dst);
+void dumb_resample_get_current_sample_1_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_2_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_2_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_end_resampler(DUMB_RESAMPLER *resampler);
+
+void dumb_reset_resampler_16(DUMB_RESAMPLER *resampler, short *src, int src_channels, long pos, long start, long end, int quality);
+DUMB_RESAMPLER *dumb_start_resampler_16(short *src, int src_channels, long pos, long start, long end, int quality);
+long dumb_resample_16_1_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume, float delta);
+long dumb_resample_16_1_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_16_2_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_16_2_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+void dumb_resample_get_current_sample_16_1_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume, sample_t *dst);
+void dumb_resample_get_current_sample_16_1_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_16_2_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_16_2_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_end_resampler_16(DUMB_RESAMPLER *resampler);
+
+void dumb_reset_resampler_8(DUMB_RESAMPLER *resampler, signed char *src, int src_channels, long pos, long start, long end, int quality);
+DUMB_RESAMPLER *dumb_start_resampler_8(signed char *src, int src_channels, long pos, long start, long end, int quality);
+long dumb_resample_8_1_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume, float delta);
+long dumb_resample_8_1_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_8_2_1(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_8_2_2(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+void dumb_resample_get_current_sample_8_1_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume, sample_t *dst);
+void dumb_resample_get_current_sample_8_1_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_8_2_1(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_8_2_2(DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_end_resampler_8(DUMB_RESAMPLER *resampler);
+
+
+void dumb_reset_resampler_n(int n, DUMB_RESAMPLER *resampler, void *src, int src_channels, long pos, long start, long end, int quality);
+DUMB_RESAMPLER *dumb_start_resampler_n(int n, void *src, int src_channels, long pos, long start, long end, int quality);
+long dumb_resample_n_1_1(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume, float delta);
+long dumb_resample_n_1_2(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_n_2_1(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+long dumb_resample_n_2_2(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta);
+void dumb_resample_get_current_sample_n_1_1(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume, sample_t *dst);
+void dumb_resample_get_current_sample_n_1_2(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_n_2_1(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_resample_get_current_sample_n_2_2(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst);
+void dumb_end_resampler_n(int n, DUMB_RESAMPLER *resampler);
+
+
+/* DUH Construction */
+
+DUH *make_duh(
+	long length,
+	int n_tags,
+	const char *const tag[][2],
+	int n_signals,
+	DUH_SIGTYPE_DESC *desc[],
+	sigdata_t *sigdata[]
+);
+
+void duh_set_length(DUH *duh, long length);
+
+void duh_set_length(DUH *duh, long length);
+
+
+#ifdef __cplusplus
+	}
+#endif
+
+
+#endif /* DUMB_H */

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/aldumb.h Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * internal/aldumb.h - The internal header file / / \ \
+ * for DUMB with Allegro. | < / \_
+ * | \/ /\ /
+ * This header file provides access to the \_ / > /
+ * internal structure of DUMB, and is liable | \ / /
+ * to change, mutate or cease to exist at any | ' /
+ * moment. Include it at your own peril. \__/
+ *
+ * ...
+ *
+ * Seriously. You don't need access to anything in this file. All right, you
+ * probably do actually. But if you use it, you will be relying on a specific
+ * version of DUMB, so please check DUMB_VERSION defined in dumb.h. Please
+ * contact the authors so that we can provide a public API for what you need.
+ */
+
+#ifndef INTERNAL_ALDUMB_H
+#define INTERNAL_ALDUMB_H
+
+
+void _dat_unload_duh(void *duh);
+
+
+#endif /* INTERNAL_DUMB_H */

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/barray.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/dumb.h Added

@@ -0,0 +1,61 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * internal/dumb.h - DUMB's internal declarations. / / \ \
+ * | < / \_
+ * This header file provides access to the | \/ /\ /
+ * internal structure of DUMB, and is liable \_ / > /
+ * to change, mutate or cease to exist at any | \ / /
+ * moment. Include it at your own peril. | ' /
+ * \__/
+ * ...
+ *
+ * Seriously. You don't need access to anything in this file. All right, you
+ * probably do actually. But if you use it, you will be relying on a specific
+ * version of DUMB, so please check DUMB_VERSION defined in dumb.h. Please
+ * contact the authors so that we can provide a public API for what you need.
+ */
+
+#ifndef INTERNAL_DUMB_H
+#define INTERNAL_DUMB_H
+
+
+typedef struct DUH_SIGTYPE_DESC_LINK
+{
+	struct DUH_SIGTYPE_DESC_LINK *next;
+	DUH_SIGTYPE_DESC *desc;
+}
+DUH_SIGTYPE_DESC_LINK;
+
+
+typedef struct DUH_SIGNAL
+{
+	sigdata_t *sigdata;
+	DUH_SIGTYPE_DESC *desc;
+}
+DUH_SIGNAL;
+
+
+struct DUH
+{
+	long length;
+
+	int n_tags;
+	char *(*tag)[2];
+
+	int n_signals;
+	DUH_SIGNAL **signal;
+};
+
+
+DUH_SIGTYPE_DESC *_dumb_get_sigtype_desc(long type);
+
+
+#endif /* INTERNAL_DUMB_H */

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/it.h Added

@@ -0,0 +1,892 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * internal/it.h - Internal stuff for IT playback / / \ \
+ * and MOD/XM/S3M conversion. | < / \_
+ * | \/ /\ /
+ * This header file provides access to the \_ / > /
+ * internal structure of DUMB, and is liable | \ / /
+ * to change, mutate or cease to exist at any | ' /
+ * moment. Include it at your own peril. \__/
+ *
+ * ...
+ *
+ * Seriously. You don't need access to anything in this file. All right, you
+ * probably do actually. But if you use it, you will be relying on a specific
+ * version of DUMB, so please check DUMB_VERSION defined in dumb.h. Please
+ * contact the authors so that we can provide a public API for what you need.
+ */
+
+#ifndef INTERNAL_IT_H
+#define INTERNAL_IT_H
+
+
+#define BIT_ARRAY_BULLSHIT
+
+#include <stddef.h>
+
+#include "barray.h"
+
+
+/** TO DO: THINK ABOUT THE FOLLOWING:
+
+sigdata->flags & IT_COMPATIBLE_GXX
+
+ Bit 5: On = Link Effect G's memory with Effect E/F. Also
+ Gxx with an instrument present will cause the
+ envelopes to be retriggered. If you change a
+ sample on a row with Gxx, it'll adjust the
+ frequency of the current note according to:
+
+ NewFrequency = OldFrequency * NewC5 / OldC5;
+*/
+
+
+
+/* These #defines are TEMPORARY. They are used to write alternative code to
+ * handle ambiguities in the format specification. The correct code in each
+ * case will be determined most likely by experimentation.
+ */
+#define STEREO_SAMPLES_COUNT_AS_TWO
+#define INVALID_ORDERS_END_SONG
+#define INVALID_NOTES_CAUSE_NOTE_CUT
+#define SUSTAIN_LOOP_OVERRIDES_NORMAL_LOOP
+#define VOLUME_OUT_OF_RANGE_SETS_MAXIMUM
+
+
+
+#define SIGTYPE_IT DUMB_ID('I', 'T', ' ', ' ')
+
+#define IT_SIGNATURE DUMB_ID('I', 'M', 'P', 'M')
+#define IT_INSTRUMENT_SIGNATURE DUMB_ID('I', 'M', 'P', 'I')
+#define IT_SAMPLE_SIGNATURE DUMB_ID('I', 'M', 'P', 'S')
+
+// olivier sux
+#define IT_MPTX_SIGNATURE DUMB_ID('X', 'T', 'P', 'M')
+#define IT_INSM_SIGNATURE DUMB_ID('M', 'S', 'N', 'I')
+
+
+/* 1 minute per 4 rows, each row 6 ticks; this is divided by the tempo to get
+ * the interval between ticks.
+ */
+#define TICK_TIME_DIVIDEND ((65536 * 60) / (4 * 6))
+
+
+
+/* I'm not going to try to explain this, because I didn't derive it very
+ * formally ;)
+ */
+/* #define AMIGA_DIVISOR ((float)(4.0 * 14317056.0)) */
+/* I believe the following one to be more accurate. */
+//#define AMIGA_DIVISOR ((float)(8.0 * 7159090.5))
+#define AMIGA_CLOCK 3546895
+#define AMIGA_DIVISOR ((float)(16.0 * AMIGA_CLOCK))
+
+
+
+typedef struct IT_MIDI IT_MIDI;
+typedef struct IT_FILTER_STATE IT_FILTER_STATE;
+typedef struct IT_ENVELOPE IT_ENVELOPE;
+typedef struct IT_INSTRUMENT IT_INSTRUMENT;
+typedef struct IT_SAMPLE IT_SAMPLE;
+typedef struct IT_ENTRY IT_ENTRY;
+typedef struct IT_PATTERN IT_PATTERN;
+typedef struct IT_PLAYING_ENVELOPE IT_PLAYING_ENVELOPE;
+typedef struct IT_PLAYING IT_PLAYING;
+typedef struct IT_CHANNEL IT_CHANNEL;
+typedef struct IT_CHECKPOINT IT_CHECKPOINT;
+typedef struct IT_CALLBACKS IT_CALLBACKS;
+
+
+
+struct IT_MIDI
+{
+	unsigned char SFmacro[16][16]; // read these from 0x120
+	unsigned char SFmacrolen[16];
+	unsigned short SFmacroz[16]; /* Bitfield; bit 0 set = z in first position */
+	unsigned char Zmacro[128][16]; // read these from 0x320
+	unsigned char Zmacrolen[128];
+};
+
+
+
+struct IT_FILTER_STATE
+{
+	sample_t currsample, prevsample;
+};
+
+
+
+#define IT_ENVELOPE_ON 1
+#define IT_ENVELOPE_LOOP_ON 2
+#define IT_ENVELOPE_SUSTAIN_LOOP 4
+#define IT_ENVELOPE_CARRY 8
+#define IT_ENVELOPE_PITCH_IS_FILTER 128
+
+struct IT_ENVELOPE
+{
+	unsigned char flags;
+	unsigned char n_nodes;
+	unsigned char loop_start;
+	unsigned char loop_end;
+	unsigned char sus_loop_start;
+	unsigned char sus_loop_end;
+	signed char node_y[25];
+	unsigned short node_t[25];
+};
+
+
+
+#define NNA_NOTE_CUT 0
+#define NNA_NOTE_CONTINUE 1
+#define NNA_NOTE_OFF 2
+#define NNA_NOTE_FADE 3
+
+#define DCT_OFF 0
+#define DCT_NOTE 1
+#define DCT_SAMPLE 2
+#define DCT_INSTRUMENT 3
+
+#define DCA_NOTE_CUT 0
+#define DCA_NOTE_OFF 1
+#define DCA_NOTE_FADE 2
+
+struct IT_INSTRUMENT
+{
+	unsigned char name[27];
+	unsigned char filename[14];
+
+	int fadeout;
+
+	IT_ENVELOPE volume_envelope;
+	IT_ENVELOPE pan_envelope;
+	IT_ENVELOPE pitch_envelope;
+
+	unsigned char new_note_action;
+	unsigned char dup_check_type;
+	unsigned char dup_check_action;
+	signed char pp_separation;
+	unsigned char pp_centre;
+	unsigned char global_volume;
+	unsigned char default_pan;
+	unsigned char random_volume;
+	unsigned char random_pan;
+
+	unsigned char filter_cutoff;
+	unsigned char filter_resonance;
+
+	unsigned char map_note[120];
+	unsigned short map_sample[120];
+
+	//int output;
+};
+
+
+
+#define IT_SAMPLE_EXISTS 1
+#define IT_SAMPLE_16BIT 2
+#define IT_SAMPLE_STEREO 4
+#define IT_SAMPLE_LOOP 16
+#define IT_SAMPLE_SUS_LOOP 32
+#define IT_SAMPLE_PINGPONG_LOOP 64
+#define IT_SAMPLE_PINGPONG_SUS_LOOP 128
+
+#define IT_VIBRATO_SINE 0
+#define IT_VIBRATO_SAWTOOTH 1
+#define IT_VIBRATO_SQUARE 2
+#define IT_VIBRATO_RANDOM 3
+#define IT_VIBRATO_XM_SQUARE 4
+#define IT_VIBRATO_RAMP_DOWN 5
+#define IT_VIBRATO_RAMP_UP 6
+
+struct IT_SAMPLE
+{
+	unsigned char name[35];
+	unsigned char filename[14];
+	unsigned char flags;
+	unsigned char global_volume;
+	unsigned char default_volume;
+	unsigned char default_pan;
+	/* default_pan:
+	 * 0-255 for XM
+	 * ignored for MOD
+	 * otherwise, 0-64, and add 128 to enable
+	 */
+
+	long length;
+	long loop_start;
+	long loop_end;
+	long C5_speed;
+	long sus_loop_start;
+	long sus_loop_end;
+
+	unsigned char vibrato_speed;
+	unsigned char vibrato_depth;
+	unsigned char vibrato_rate;
+	unsigned char vibrato_waveform;
+
+	signed short finetune;
+
+	void *data;
+
+	int max_resampling_quality;
+};
+
+
+
+#define IT_ENTRY_NOTE 1
+#define IT_ENTRY_INSTRUMENT 2
+#define IT_ENTRY_VOLPAN 4
+#define IT_ENTRY_EFFECT 8
+
+#define IT_SET_END_ROW(entry) ((entry)->channel = 255)
+#define IT_IS_END_ROW(entry) ((entry)->channel >= DUMB_IT_N_CHANNELS)
+
+#define IT_NOTE_OFF 255
+#define IT_NOTE_CUT 254
+
+#define IT_ENVELOPE_SHIFT 8
+
+#define IT_SURROUND 100
+#define IT_IS_SURROUND(pan) ((pan) > 64)
+#define IT_IS_SURROUND_SHIFTED(pan) ((pan) > 64 << IT_ENVELOPE_SHIFT)
+
+#define IT_SET_SPEED 1
+#define IT_JUMP_TO_ORDER 2
+#define IT_BREAK_TO_ROW 3
+#define IT_VOLUME_SLIDE 4
+#define IT_PORTAMENTO_DOWN 5
+#define IT_PORTAMENTO_UP 6
+#define IT_TONE_PORTAMENTO 7
+#define IT_VIBRATO 8
+#define IT_TREMOR 9
+#define IT_ARPEGGIO 10
+#define IT_VOLSLIDE_VIBRATO 11
+#define IT_VOLSLIDE_TONEPORTA 12
+#define IT_SET_CHANNEL_VOLUME 13
+#define IT_CHANNEL_VOLUME_SLIDE 14
+#define IT_SET_SAMPLE_OFFSET 15
+#define IT_PANNING_SLIDE 16
+#define IT_RETRIGGER_NOTE 17
+#define IT_TREMOLO 18
+#define IT_S 19
+#define IT_SET_SONG_TEMPO 20
+#define IT_FINE_VIBRATO 21
+#define IT_SET_GLOBAL_VOLUME 22
+#define IT_GLOBAL_VOLUME_SLIDE 23
+#define IT_SET_PANNING 24
+#define IT_PANBRELLO 25
+#define IT_MIDI_MACRO 26 //see MIDI.TXT
+
+/* Some effects needed for XM compatibility */
+#define IT_XM_PORTAMENTO_DOWN 27
+#define IT_XM_PORTAMENTO_UP 28
+#define IT_XM_FINE_VOLSLIDE_DOWN 29
+#define IT_XM_FINE_VOLSLIDE_UP 30
+#define IT_XM_RETRIGGER_NOTE 31
+#define IT_XM_KEY_OFF 32
+#define IT_XM_SET_ENVELOPE_POSITION 33
+
+/* More effects needed for PTM compatibility */
+#define IT_PTM_NOTE_SLIDE_DOWN 34
+#define IT_PTM_NOTE_SLIDE_UP 35
+#define IT_PTM_NOTE_SLIDE_DOWN_RETRIG 36
+#define IT_PTM_NOTE_SLIDE_UP_RETRIG 37
+#define IT_MIDI_MACRO 26 //see MIDI.TXT
+
+/* Some effects needed for XM compatibility */
+#define IT_XM_PORTAMENTO_DOWN 27
+#define IT_XM_PORTAMENTO_UP 28
+#define IT_XM_FINE_VOLSLIDE_DOWN 29
+#define IT_XM_FINE_VOLSLIDE_UP 30
+#define IT_XM_RETRIGGER_NOTE 31
+#define IT_XM_KEY_OFF 32
+#define IT_XM_SET_ENVELOPE_POSITION 33
+
+#define IT_N_EFFECTS 38
+
+/* These represent the top nibble of the command value. */
+#define IT_S_SET_FILTER 0 /* Greyed out in IT... */
+#define IT_S_SET_GLISSANDO_CONTROL 1 /* Greyed out in IT... */
+#define IT_S_FINETUNE 2 /* Greyed out in IT... */
+#define IT_S_SET_VIBRATO_WAVEFORM 3
+#define IT_S_SET_TREMOLO_WAVEFORM 4
+#define IT_S_SET_PANBRELLO_WAVEFORM 5
+#define IT_S_FINE_PATTERN_DELAY 6
+#define IT_S7 7
+#define IT_S_SET_PAN 8
+#define IT_S_SET_SURROUND_SOUND 9
+#define IT_S_SET_HIGH_OFFSET 10
+#define IT_S_PATTERN_LOOP 11
+#define IT_S_DELAYED_NOTE_CUT 12
+#define IT_S_NOTE_DELAY 13
+#define IT_S_PATTERN_DELAY 14
+#define IT_S_SET_MIDI_MACRO 15
+
+/*
+S0x Set filter
+S1x Set glissando control
+S2x Set finetune
+
+
+S3x Set vibrato waveform to type x
+S4x Set tremelo waveform to type x
+S5x Set panbrello waveform to type x
+ Waveforms for commands S3x, S4x and S5x:
+ 0: Sine wave
+ 1: Ramp down
+ 2: Square wave
+ 3: Random wave
+S6x Pattern delay for x ticks
+S70 Past note cut
+S71 Past note off
+S72 Past note fade
+S73 Set NNA to note cut
+S74 Set NNA to continue
+S75 Set NNA to note off
+S76 Set NNA to note fade
+S77 Turn off volume envelope
+S78 Turn on volume envelope
+S79 Turn off panning envelope
+S7A Turn on panning envelope
+S7B Turn off pitch envelope
+S7C Turn on pitch envelope
+S8x Set panning position
+S91 Set surround sound
+SAy Set high value of sample offset yxx00h
+SB0 Set loopback point
+SBx Loop x times to loopback point
+SCx Note cut after x ticks
+SDx Note delay for x ticks
+SEx Pattern delay for x rows
+SFx Set parameterised MIDI Macro
+*/
+
+struct IT_ENTRY
+{
+	unsigned char channel; /* End of row if channel >= DUMB_IT_N_CHANNELS */
+	unsigned char mask;
+	unsigned char note;
+	unsigned char instrument;
+	unsigned char volpan;
+	unsigned char effect;
+	unsigned char effectvalue;
+};
+
+
+
+struct IT_PATTERN
+{
+	int n_rows;
+	int n_entries;
+	IT_ENTRY *entry;
+};
+
+
+
+#define IT_STEREO 1
+#define IT_USE_INSTRUMENTS 4
+#define IT_LINEAR_SLIDES 8 /* If not set, use Amiga slides */
+#define IT_OLD_EFFECTS 16
+#define IT_COMPATIBLE_GXX 32
+
+/* Make sure IT_WAS_AN_XM and IT_WAS_A_MOD aren't set accidentally */
+#define IT_REAL_FLAGS 63
+
+#define IT_WAS_AN_XM 64 /* Set for both XMs and MODs */
+#define IT_WAS_A_MOD 128
+
+#define IT_WAS_AN_S3M 256
+
+#define IT_WAS_A_PTM 512
+
+#define IT_WAS_A_669 1024
+
+#define IT_ORDER_END 255
+#define IT_ORDER_SKIP 254
+
+struct DUMB_IT_SIGDATA
+{
+	unsigned char name[65];
+
+	unsigned char *song_message;
+
+	int n_orders;
+	int n_instruments;
+	int n_samples;
+	int n_patterns;
+	int n_pchannels;
+
+	int flags;
+
+	int global_volume;
+	int mixing_volume;
+	int speed;
+	int tempo;
+	int pan_separation;
+
+	unsigned char channel_pan[DUMB_IT_N_CHANNELS];
+	unsigned char channel_volume[DUMB_IT_N_CHANNELS];
+
+	unsigned char *order;
+	unsigned char restart_position; /* for XM compatiblity */
+
+	IT_INSTRUMENT *instrument;
+	IT_SAMPLE *sample;
+	IT_PATTERN *pattern;
+
+	IT_MIDI *midi;
+
+	IT_CHECKPOINT *checkpoint;
+};
+
+
+
+struct IT_PLAYING_ENVELOPE
+{
+	int next_node;
+	int tick;
+	int value;
+};
+
+
+
+#define IT_PLAYING_BACKGROUND 1
+#define IT_PLAYING_SUSTAINOFF 2
+#define IT_PLAYING_FADING 4
+#define IT_PLAYING_DEAD 8
+
+struct IT_PLAYING
+{
+	int flags;
+
+	int resampling_quality;
+
+	IT_CHANNEL *channel;
+	IT_SAMPLE *sample;
+	IT_INSTRUMENT *instrument;
+	IT_INSTRUMENT *env_instrument;
+
+	unsigned short sampnum;
+	unsigned char instnum;
+
+	unsigned char declick_stage;
+	float declick_volume;
+
+	float float_volume[2];
+	float ramp_volume[2];
+	float ramp_delta[2];
+
+	unsigned char channel_volume;
+
+	unsigned char volume;
+	unsigned short pan;
+
+	signed char volume_offset, panning_offset;
+
+	unsigned char note;
+
+	unsigned char enabled_envelopes;
+
+	unsigned char filter_cutoff;
+	unsigned char filter_resonance;
+
+	unsigned short true_filter_cutoff; /* These incorporate the filter envelope, and will not */
+	unsigned char true_filter_resonance; /* be changed if they would be set to 127<<8 and 0. */
+
+	unsigned char vibrato_speed;
+	unsigned char vibrato_depth;
+	unsigned char vibrato_n; /* May be specified twice: volpan & effect. */
+	unsigned char vibrato_time;
+	unsigned char vibrato_waveform;
+
+	unsigned char tremolo_speed;
+	unsigned char tremolo_depth;
+	unsigned char tremolo_time;
+	unsigned char tremolo_waveform;
+
+	unsigned char panbrello_speed;
+	unsigned char panbrello_depth;
+	unsigned char panbrello_time;
+	unsigned char panbrello_waveform;
+	signed char panbrello_random;
+
+	unsigned char sample_vibrato_time;
+	unsigned char sample_vibrato_waveform;
+	int sample_vibrato_depth; /* Starts at rate?0:depth, increases by rate */
+
+	int slide;
+	float delta;
+	int finetune;
+
+	IT_PLAYING_ENVELOPE volume_envelope;
+	IT_PLAYING_ENVELOPE pan_envelope;
+	IT_PLAYING_ENVELOPE pitch_envelope;
+
+	int fadeoutcount;
+
+	IT_FILTER_STATE filter_state[2]; /* Left and right */
+
+	DUMB_RESAMPLER resampler;
+
+	/* time_lost is used to emulate Impulse Tracker's sample looping
+	 * characteristics. When time_lost is added to pos, the result represents
+	 * the position in the theoretical version of the sample where all loops
+	 * have been expanded. If this is stored, the resampling helpers will
+	 * safely convert it for use with new loop boundaries. The situation is
+	 * slightly more complicated if dir == -1 when the change takes place; we
+	 * must reflect pos off the loop end point and set dir to 1 before
+	 * proceeding.
+	 */
+	long time_lost;
+
+	//int output;
+};
+
+
+
+#define IT_CHANNEL_MUTED 1
+
+#define IT_ENV_VOLUME 1
+#define IT_ENV_PANNING 2
+#define IT_ENV_PITCH 4
+
+struct IT_CHANNEL
+{
+	int flags;
+
+	unsigned char volume;
+	signed char volslide;
+	signed char xm_volslide;
+	signed char panslide;
+
+	/* xm_volslide is used for volume slides done in the volume column in an
+	 * XM file, since it seems the volume column slide is applied first,
+	 * followed by clamping, followed by the effects column slide. IT does
+	 * not exhibit this behaviour, so xm_volslide is maintained at zero.
+	 */
+
+	unsigned char pan;
+	unsigned short truepan;
+
+	unsigned char channelvolume;
+	signed char channelvolslide;
+
+	unsigned char instrument;
+	unsigned char note;
+
+	unsigned char SFmacro;
+
+	unsigned char filter_cutoff;
+	unsigned char filter_resonance;
+
+	unsigned char key_off_count;
+	unsigned char note_cut_count;
+	unsigned char note_delay_count;
+	IT_ENTRY *note_delay_entry;
+
+	unsigned char new_note_action;
+
+	int arpeggio;
+	unsigned char retrig;
+	unsigned char xm_retrig;
+	int retrig_tick;
+
+	unsigned char tremor;
+	unsigned char tremor_time; /* Bit 6 set if note on; bit 7 set if tremor active. */
+
+	unsigned char vibrato_waveform;
+	unsigned char tremolo_waveform;
+	unsigned char panbrello_waveform;
+
+	int portamento;
+	int toneporta;
+	int toneslide;
+	unsigned char toneslide_tick, last_toneslide_tick, ptm_toneslide, ptm_last_toneslide;
+	unsigned char destnote;
+	unsigned char toneslide_retrig;
+
+	unsigned char glissando;
+
+	/** WARNING - for neatness, should one or both of these be in the IT_PLAYING struct? */
+	unsigned short sample;
+	unsigned char truenote;
+
+	unsigned char midi_state;
+
+	signed char lastvolslide;
+	unsigned char lastDKL;
+	unsigned char lastEF; /* Doubles as last portamento up for XM files */
+	unsigned char lastG;
+	unsigned char lastHspeed;
+	unsigned char lastHdepth;
+	unsigned char lastRspeed;
+	unsigned char lastRdepth;
+	unsigned char lastYspeed;
+	unsigned char lastYdepth;
+	unsigned char lastI;
+	unsigned char lastJ; /* Doubles as last portamento down for XM files */
+	unsigned char lastN;
+	unsigned char lastO;
+	unsigned char high_offset;
+	unsigned char lastP;
+	unsigned char lastQ;
+	unsigned char lastS;
+	unsigned char pat_loop_row;
+	unsigned char pat_loop_count;
+	unsigned char pat_loop_end_row; /* Used to catch infinite pattern loops */
+	unsigned char lastW;
+
+	unsigned char xm_lastE1;
+	unsigned char xm_lastE2;
+	unsigned char xm_lastEA;
+	unsigned char xm_lastEB;
+	unsigned char xm_lastX1;
+	unsigned char xm_lastX2;
+
+	IT_PLAYING *playing;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	void * played_patjump;
+	int played_patjump_order;
+#endif
+
+	//int output;
+};
+
+
+
+struct DUMB_IT_SIGRENDERER
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int n_channels;
+
+	int resampling_quality;
+
+	unsigned char globalvolume;
+	signed char globalvolslide;
+
+	int tempo;
+	signed char temposlide;
+
+	IT_CHANNEL channel[DUMB_IT_N_CHANNELS];
+
+	IT_PLAYING *playing[DUMB_IT_N_NNA_CHANNELS];
+
+	int tick;
+	int speed;
+	int rowcount;
+
+	int order; /* Set to -1 if the song is terminated by a callback. */
+	int row;
+	int processorder;
+	int processrow;
+	int breakrow;
+
+	int restart_position;
+
+	int n_rows;
+
+	IT_ENTRY *entry_start;
+	IT_ENTRY *entry;
+	IT_ENTRY *entry_end;
+
+	long time_left; /* Time before the next tick is processed */
+	int sub_time_left;
+
+	DUMB_CLICK_REMOVER **click_remover;
+
+	IT_CALLBACKS *callbacks;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	/* bit array, which rows are played, only checked by pattern break or loop commands */
+	void * played;
+#endif
+
+	long gvz_time;
+	int gvz_sub_time;
+
+	int ramp_style;
+
+	//int max_output;
+};
+
+
+
+struct IT_CHECKPOINT
+{
+	IT_CHECKPOINT *next;
+	long time;
+	DUMB_IT_SIGRENDERER *sigrenderer;
+};
+
+
+
+struct IT_CALLBACKS
+{
+	int (*loop)(void *data);
+	void *loop_data;
+	/* Return 1 to prevent looping; the music will terminate abruptly. If you
+	 * want to make the music stop but allow samples to fade (beware, as they
+	 * might not fade at all!), use dumb_it_sr_set_speed() and set the speed
+	 * to 0. Note that xm_speed_zero() will not be called if you set the
+	 * speed manually, and also that this will work for IT and S3M files even
+	 * though the music can't stop in this way by itself.
+	 */
+
+	int (*xm_speed_zero)(void *data);
+	void *xm_speed_zero_data;
+	/* Return 1 to terminate the mod, without letting samples fade. */
+
+	int (*midi)(void *data, int channel, unsigned char byte);
+	void *midi_data;
+	/* Return 1 to prevent DUMB from subsequently interpreting the MIDI bytes
+	 * itself. In other words, return 1 if the Zxx macros in an IT file are
+	 * controlling filters and shouldn't be.
+	 */
+
+	int (*global_volume_zero)(void *data);
+	void *global_volume_zero_data;
+	/* Return 1 to terminate the module when global volume is set to zero. */
+};
+
+
+
+void _dumb_it_end_sigrenderer(sigrenderer_t *sigrenderer);
+void _dumb_it_unload_sigdata(sigdata_t *vsigdata);
+
+extern DUH_SIGTYPE_DESC _dumb_sigtype_it;
+
+
+
+#define XM_APPREGIO 0
+#define XM_PORTAMENTO_UP 1
+#define XM_PORTAMENTO_DOWN 2
+#define XM_TONE_PORTAMENTO 3
+#define XM_VIBRATO 4
+#define XM_VOLSLIDE_TONEPORTA 5
+#define XM_VOLSLIDE_VIBRATO 6
+#define XM_TREMOLO 7
+#define XM_SET_PANNING 8
+#define XM_SAMPLE_OFFSET 9
+#define XM_VOLUME_SLIDE 10 /* A */
+#define XM_POSITION_JUMP 11 /* B */
+#define XM_SET_CHANNEL_VOLUME 12 /* C */
+#define XM_PATTERN_BREAK 13 /* D */
+#define XM_E 14 /* E */
+#define XM_SET_TEMPO_BPM 15 /* F */
+#define XM_SET_GLOBAL_VOLUME 16 /* G */
+#define XM_GLOBAL_VOLUME_SLIDE 17 /* H */
+#define XM_KEY_OFF 20 /* K (undocumented) */
+#define XM_SET_ENVELOPE_POSITION 21 /* L */
+#define XM_PANNING_SLIDE 25 /* P */
+#define XM_MULTI_RETRIG 27 /* R */
+#define XM_TREMOR 29 /* T */
+#define XM_X 33 /* X */
+#define XM_N_EFFECTS (10+26)
+
+#define XM_E_SET_FILTER 0x0
+#define XM_E_FINE_PORTA_UP 0x1
+#define XM_E_FINE_PORTA_DOWN 0x2
+#define XM_E_SET_GLISSANDO_CONTROL 0x3
+#define XM_E_SET_VIBRATO_CONTROL 0x4
+#define XM_E_SET_FINETUNE 0x5
+#define XM_E_SET_LOOP 0x6
+#define XM_E_SET_TREMOLO_CONTROL 0x7
+#define XM_E_SET_PANNING 0x8
+#define XM_E_RETRIG_NOTE 0x9
+#define XM_E_FINE_VOLSLIDE_UP 0xA
+#define XM_E_FINE_VOLSLIDE_DOWN 0xB
+#define XM_E_NOTE_CUT 0xC
+#define XM_E_NOTE_DELAY 0xD
+#define XM_E_PATTERN_DELAY 0xE
+
+#define XM_X_EXTRAFINE_PORTA_UP 1
+#define XM_X_EXTRAFINE_PORTA_DOWN 2
+
+/* To make my life a bit simpler during conversion, effect E:xy is converted
+ * to effect number EBASE+x:y. The same applies to effect X, and IT's S. That
+ * way, these effects can be manipulated like regular effects.
+ */
+#define EBASE (XM_N_EFFECTS)
+#define XBASE (EBASE+16)
+#define SBASE (IT_N_EFFECTS)
+
+#define EFFECT_VALUE(x, y) (((x)<<4)|(y))
+#define HIGH(v) ((v)>>4)
+#define LOW(v) ((v)&0x0F)
+#define SET_HIGH(v, x) v = (((x)<<4)|((v)&0x0F))
+#define SET_LOW(v, y) v = (((v)&0xF0)|(y))
+#define BCD_TO_NORMAL(v) (HIGH(v)*10+LOW(v))
+
+
+
+#if 0
+unsigned char **_dumb_malloc2(int w, int h);
+void _dumb_free2(unsigned char **line);
+#endif
+
+void _dumb_it_xm_convert_effect(int effect, int value, IT_ENTRY *entry, int mod);
+int _dumb_it_fix_invalid_orders(DUMB_IT_SIGDATA *sigdata);
+
+
+#define PTM_APPREGIO 0
+#define PTM_PORTAMENTO_UP 1
+#define PTM_PORTAMENTO_DOWN 2
+#define PTM_TONE_PORTAMENTO 3
+#define PTM_VIBRATO 4
+#define PTM_VOLSLIDE_TONEPORTA 5
+#define PTM_VOLSLIDE_VIBRATO 6
+#define PTM_TREMOLO 7
+#define PTM_SAMPLE_OFFSET 9
+#define PTM_VOLUME_SLIDE 10 /* A */
+#define PTM_POSITION_JUMP 11 /* B */
+#define PTM_SET_CHANNEL_VOLUME 12 /* C */
+#define PTM_PATTERN_BREAK 13 /* D */
+#define PTM_E 14 /* E */
+#define PTM_SET_TEMPO_BPM 15 /* F */
+#define PTM_SET_GLOBAL_VOLUME 16 /* G */
+#define PTM_RETRIGGER 17 /* H */
+#define PTM_FINE_VIBRATO 18 /* I */
+#define PTM_NOTE_SLIDE_UP 19 /* J */
+#define PTM_NOTE_SLIDE_DOWN 20 /* K */
+#define PTM_NOTE_SLIDE_UP_RETRIG 21 /* L */
+#define PTM_NOTE_SLIDE_DOWN_RETRIG 22 /* M */
+#define PTM_N_EFFECTS 23
+
+#define PTM_E_FINE_PORTA_DOWN 0x1
+#define PTM_E_FINE_PORTA_UP 0x2
+#define PTM_E_SET_VIBRATO_CONTROL 0x4
+#define PTM_E_SET_FINETUNE 0x5
+#define PTM_E_SET_LOOP 0x6
+#define PTM_E_SET_TREMOLO_CONTROL 0x7
+#define PTM_E_SET_PANNING 0x8
+#define PTM_E_RETRIG_NOTE 0x9
+#define PTM_E_FINE_VOLSLIDE_UP 0xA
+#define PTM_E_FINE_VOLSLIDE_DOWN 0xB
+#define PTM_E_NOTE_CUT 0xC
+#define PTM_E_NOTE_DELAY 0xD
+#define PTM_E_PATTERN_DELAY 0xE
+
+/* To make my life a bit simpler during conversion, effect E:xy is converted
+ * to effect number EBASE+x:y. The same applies to effect X, and IT's S. That
+ * way, these effects can be manipulated like regular effects.
+ */
+#define PTM_EBASE (PTM_N_EFFECTS)
+
+void _dumb_it_ptm_convert_effect(int effect, int value, IT_ENTRY *entry);
+
+long _dumb_it_read_sample_data_adpcm4(IT_SAMPLE *sample, DUMBFILE *f);
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+#endif /* INTERNAL_IT_H */

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/riff.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/licence.txt Added

@@ -0,0 +1,77 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * licence.txt - Conditions for use of DUMB. / / \ \
+ * | < / \_
+ * If you do not agree to these terms, please | \/ /\ /
+ * do not use DUMB. \_ / > /
+ * | \ / /
+ * Information in [brackets] is provided to aid | ' /
+ * interpretation of the licence. \__/
+ */
+
+
+Dynamic Universal Music Bibliotheque, Version 0.9.3
+
+Copyright (C) 2001-2005 Ben Davis, Robert J Ohannessian and Julien Cugniere
+
+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.
+
+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, you are requested to acknowledge its use in the product
+ documentation, along with details on where to get an unmodified version of
+ this software, but this is not a strict requirement.
+
+ [Note that the above point asks for a link to DUMB, not just a mention.
+ Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".]
+
+ [The link was originally strictly required. This was changed for two
+ reasons. Firstly, if many projects request an acknowledgement, the list of
+ acknowledgements can become quite unmanageable. Secondly, DUMB was placing
+ a restriction on the code using it, preventing people from using the GNU
+ General Public Licence which disallows any such restrictions. See
+ http://www.gnu.org/philosophy/bsd.html for more information on this
+ subject. However, if DUMB plays a significant part in your project, we do
+ urge you to acknowledge its use.]
+
+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 from or altered in any source distribution.
+
+4. If you are using the Program in someone else's bedroom on any Monday at
+ 3:05 pm, you are not allowed to modify the Program for ten minutes. [This
+ clause provided by Inphernic; every licence should contain at least one
+ clause, the reasoning behind which is far from obvious.]
+
+5. Users who wish to use DUMB for the specific purpose of playing music are
+ required to feed their dog on every full moon (if deemed appropriate).
+ [This clause provided by Allefant, who couldn't remember what Inphernic's
+ clause was.]
+
+6. No clause in this licence shall prevent this software from being depended
+ upon by a product licensed under the GNU General Public Licence. If such a
+ clause is deemed to exist, Debian, then it shall be respected in spirit as
+ far as possible and all other clauses shall continue to apply in full
+ force.
+
+We regret that we cannot provide any warranty, not even the implied warranty
+of merchantability or fitness for a particular purpose.
+
+Some files generated or copied by automake, autoconf and friends are
+available in an extra download. These fall under separate licences but are
+all free to distribute. Please check their licences as necessary.

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/readme.txt Added

@@ -0,0 +1,545 @@
+NOTICE: this is not the original DUMB-0.9.3,
+it is a modified code based on DUMB-0.9.2 fork from http://kode54.foobar2000.org/
+relevant parts of DUMB-0.9.3 (including new license) had been merged on top of that by Alexey Yakovenko <waker@users.sf.net>
+
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readme.txt - General information on DUMB. / / \ \
+ * | < / \_
+ * | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+********************
+*** Introduction ***
+********************
+
+
+Thank you for downloading DUMB v0.9.3! You should have the following
+documentation:
+
+ readme.txt - This file
+ licence.txt - Conditions for the use of this software
+ release.txt - Release notes and changes for this and past releases
+ docs/
+ howto.txt - Step-by-step instructions on adding DUMB to your project
+ faq.txt - Frequently asked questions and answers to them
+ dumb.txt - DUMB library reference
+ deprec.txt - Information about deprecated parts of the API
+ ptr.txt - Quick introduction to pointers for those who need it
+ fnptr.txt - Explanation of function pointers for those who need it
+ modplug.txt - Our official position regarding ModPlug Tracker
+
+This file will help you get DUMB set up. If you have not yet done so, please
+read licence.txt and release.txt before proceeding. After you've got DUMB set
+up, please refer to the files in the docs/ directory at your convenience. I
+recommend you start with howto.txt.
+
+
+****************
+*** Features ***
+****************
+
+
+Here is the statutory feature list:
+
+- Freeware
+
+- Supports playback of IT, XM, S3M and MOD files
+
+- Faithful to the original trackers, especially IT; if it plays your module
+ wrongly, please tell me so I can fix the bug! (But please don't complain
+ about differences between DUMB and ModPlug Tracker; see docs/modplug.txt)
+
+- Accurate support for low-pass resonant filters for IT files
+
+- Very accurate timing and pitching; completely deterministic playback
+
+- Click removal
+
+- Facility to embed music files in other files (e.g. Allegro datafiles)
+
+- Three resampling quality settings: aliasing, linear interpolation and cubic
+ interpolation
+
+- Number of samples playing at once can be limited to reduce processor usage,
+ but samples will come back in when other louder ones stop
+
+- All notes will be present and correct even if you start a piece of music in
+ the middle
+
+- Option to take longer loading but seek fast to any point before the music
+ first loops (seeking time increases beyond this point)
+
+- Audio generated can be used in any way; DUMB does not necessarily send it
+ straight to a sound output system
+
+- Can be used with Allegro, can be used without (if you'd like to help make
+ DUMB more approachable to people who aren't using Allegro, please contact
+ me)
+
+- Makefile provided for DJGPP, MinGW, Linux, BeOS and Mac OS X
+
+- Project files provided for MSVC 6
+
+- Autotools-based configure script available as a separate download for
+ masochists
+
+- Code should port anywhere that has a 32-bit C compiler; instructions on
+ compiling it manually are available further down
+
+
+*********************
+*** What you need ***
+*********************
+
+
+To use DUMB, you need a 32-bit C compiler (GCC and MSVC are fine). If you
+have Allegro, DUMB can integrate with its audio streams and datafiles, making
+your life easier. If you do not wish to use Allegro, you will have to do some
+work to get music playing back. The 'dumbplay' example program requires
+Allegro.
+
+ Allegro - http://alleg.sf.net/
+
+
+**********************************************
+*** How to set DUMB up with DJGPP or MinGW ***
+**********************************************
+
+
+You should have got the .zip version. If for some reason you got the .tar.gz
+version instead, you may have to convert make/config.bat to DOS text file
+format. WinZip does this automatically by default. Otherwise, loading it into
+MS EDIT and saving it again should do the trick (but do not do this to the
+Makefiles as it destroys tabs). You will have to do the same for any files
+you want to view in Windows Notepad. If you have problems, just go and
+download the .zip instead.
+
+Make sure you preserved the directory structure when you extracted DUMB from
+the archive. Most unzipping programs will do this by default, but pkunzip
+requires you to pass -d. If not, please delete DUMB and extract it again
+properly.
+
+If you are using Windows, open an MS-DOS Prompt or a Windows Command Line.
+Change to the directory into which you unzipped DUMB.
+
+If you are using MinGW (and you haven't renamed 'mingw32-make'), type:
+
+ mingw32-make
+
+Otherwise, type the following:
+
+ make
+
+DUMB will ask you whether you wish to compile for DJGPP or MinGW. Then it
+will ask you whether you want support for Allegro. (You have to have made and
+installed Allegro's optimised library for this to work.) Finally, it will
+compile optimised and debugging builds of DUMB, along with the example
+programs. When it has finished, run one of the following to install the
+libraries:
+
+ make install
+ mingw32-make install
+
+All done! If you ever need the configuration again (e.g. if you compiled for
+DJGPP before and you want to compile for MinGW now), run one of the
+following:
+
+ make config
+ mingw32-make config
+
+See the comments in the Makefile for other targets.
+
+Note: the Makefile will only work properly if you have COMSPEC or ComSpec set
+to point to command.com or cmd.exe. If you set it to point to a Unix-style
+shell, the Makefile won't work.
+
+Please let me know if you have any trouble.
+
+As an alternative, MSYS users may attempt to use the configure script,
+available in dumb-0.9.3-autotools.tar.gz. This has been found to work without
+Allegro, and is untested with Allegro. I should appreciate feedback from
+anyone else who tries this. I do not recommend its use, partly because it
+creates dynamically linked libraries and I don't know how to stop it from
+doing that (see the section on compiling DUMB manually), and partly because
+autotools are plain evil.
+
+Scroll down for information on the example programs. Refer to docs/howto.txt
+when you are ready to start programming with DUMB. If you use DUMB in a game,
+let me know - I might decide to place a link to your game on DUMB's website!
+
+
+******************************************************
+*** How to set DUMB up with Microsoft Visual C++ 6 ***
+******************************************************
+
+
+If you have a newer version of Microsoft Visual C++ or Visual Something that
+supports C++, please try these instructions and let me know if it works.
+
+You should have got the .zip version. If for some reason you got the .tar.gz
+version instead, you may have to convert some files to DOS text file format.
+WinZip does this automatically by default. Otherwise, loading such files into
+MS EDIT and saving them again should do the trick. You will have to do this
+for any files you want to view in Windows Notepad. If you have problems, just
+go and download the .zip instead.
+
+Make sure you preserved the directory structure when you extracted DUMB from
+the archive. Most unzipping programs will do this by default, but pkunzip
+requires you to pass -d. If not, please delete DUMB and extract it again
+properly.
+
+DUMB comes with a workspace Microsoft Visual C++ 6, containing projects for
+the DUMB core, the Allegro interface library and each of the examples. The
+first thing you might want to do is load the workspace up and have a look
+around. You will find it in the dumb\vc6 directory under the name dumb.dsw.
+Note that the aldumb and dumbplay projects require Allegro, so they won't
+work if you don't have Allegro. Nevertheless, dumbplay is the best-commented
+of the examples, so do have a look.
+
+When you are ready to add DUMB to your project, follow these instructions:
+
+1. Open your project in VC++.
+2. Select Project|Insert Project into Workspace...
+3. Navigate to the dumb\vc6\dumb directory and select dumb.dsp.
+ Alternatively, if you know that you are statically linking with a library
+ that uses the statically linked multithreaded runtime (/MT), you may wish
+ to select dumb_static.dsp in the dumb_static subdirectory instead.
+4. Select Build|Set Active Configuration..., and reselect one of your
+ project's configurations.
+5. Select Project|Dependencies... and ensure your project is dependent on
+ DUMB.
+6. Select Project|Settings..., Settings for: All Configurations, C/C++ tab,
+ Preprocessor category. Add the DUMB include directory to the Additional
+ Include Directories box.
+7. Ensure that for all the projects in the workspace (or more likely just all
+ the projects in a particular dependency chain) the run-time libraries are
+ the same. That's in Project|Settings, C/C++ tab, Code generation category,
+ Use run-time library dropdown. The settings for Release and Debug are
+ separate, so you'll have to change them one at a time. Exactly which run-
+ time library you use will depend on what you need; it doesn't appear that
+ DUMB has any particular requirements, so set it to whatever you're using
+ now. (It will have to be /MD, the multithreaded DLL library, if you are
+ statically linking with Allegro. If you are dynamically linking with
+ Allegro than it doesn't matter.)
+8. If you are using Allegro, do some or all of the above for the aldumb.dsp
+ project in the aldumb directory too.
+
+Good thing you only have to do all that once ... or twice ...
+
+If you have the Intel compiler installed, it will - well, should - be used to
+compile DUMB. The only setting I [Tom Seddon] added is /QxiM. This allows the
+compiler to use PPro and MMX instructions, and so when compiling with Intel
+the resultant EXE will require a Pentium II or greater. I don't think this is
+unreasonable. After all, it is 2003 :)
+
+[Note from Ben: the Intel compiler is evil! It makes AMD processors look bad!
+Patch it or boycott it or something!]
+
+If you don't have the Intel compiler, VC will compile DUMB as normal.
+
+This project file and these instructions were provided by Tom Seddon (I hope
+I got his name right; I had to guess it from his e-mail address!). Chad
+Austin has since changed the project files around, and I've just attempted to
+hack them to incorporate new source files. I've also tried to update the
+instructions using guesswork and some knowledge of Visual J++ (you heard me).
+The instructions and the project files are to this day untested by me. If you
+have problems, check the download page at http://dumb.sf.net/ to see if they
+are addressed; failing that, direct queries to me and I'll try to figure them
+out.
+
+If you have any comments at all on how the VC6 projects are laid out, or how
+the instructions could be improved, I should be really grateful to hear them.
+I am a perfectionist, after all. :)
+
+Scroll down for information on the example programs. When you are ready to
+start using DUMB, refer to docs/howto.txt. If you use DUMB in a game, let me
+know - I might decide to place a link to your game on DUMB's website!
+
+
+******************************************************
+*** How to set DUMB up on Linux, BeOS and Mac OS X ***
+******************************************************
+
+
+You should have got the .tar.gz version. If for some reason you got the .zip
+version instead, you may have to strip all characters with ASCII code 13 from
+some of the text files. If you have problems, just go and download the
+.tar.gz instead.
+
+You have two options. There is a Makefile which should cope with most
+systems. The first option is to use this default Makefile, and the procedure
+is explained below. The second option is to download
+dumb-0.9.3-autotools.tar.gz, extract it over the installation, run
+./configure and use the generated Makefile. Users who choose to do this are
+left to their own devices but advised to read the information at the end of
+this section. I strongly recommend the first option.
+
+If you are not using the configure script, the procedure is as follows.
+
+First, run the following command as a normal user:
+
+ make
+
+You will be asked whether you want Allegro support. Then, unless you are on
+BeOS, you will be asked where you'd like DUMB to install its headers,
+libraries and examples (which will go in the include/, lib/ and bin/
+subdirectories of the prefix you specify). BeOS has fixed locations for these
+files. You may use shell variables here, e.g. $HOME or ${HOME}, but ~ will
+not work. Once you have specified these pieces of information, the optimised
+and debugging builds of DUMB will be compiled, along with the examples. When
+it has finished, you can install them with:
+
+ make install
+
+You may need to be root for this to work. It depends on the prefix you chose.
+
+Note: the Makefile will only work if COMSPEC and ComSpec are both undefined.
+If either of these is defined, the Makefile will try to build for a Windows
+system, and will fail.
+
+Please let me know if you have any trouble.
+
+Scroll down for information on the example programs. Refer to docs/howto.txt
+when you are ready to start programming with DUMB. If you use DUMB in a game,
+let me know - I might decide to place a link to your game on DUMB's website!
+
+Important information for users of the configure script follows.
+
+The Makefile generated by the configure script creates dynamically linked
+libraries, and I don't know how to stop it from doing so. See the section
+below on building DUMB manually for why I recommend linking DUMB statically.
+However, if you choose to use the configure script, note the following.
+
+The default Makefile is a copy of Makefile.rdy (short for 'ready'), and it
+must exist with the name Makefile.rdy in order to work. The configure script
+will overwrite Makefile, so if you want the default Makefile back, just run:
+
+ cp Makefile.rdy Makefile
+
+Do not use a symlink, as that would result in Makefile.rdy getting
+overwritten next time the configure script is run!
+
+You can also access the usual build system by passing '-f Makefile.rdy' to
+Make.
+
+
+********************************************************
+*** How to build DUMB manually if nothing else works ***
+********************************************************
+
+
+Those porting to platforms without floating point support should be aware
+that DUMB does use floating point operations but not in the inner loops. They
+are used for volume and note pitch calculations, and they are used when
+initialising the filter algorithm for given cut-off and resonance values.
+Please let me know if this is a problem for you. If there is enough demand, I
+may be able to eliminate one or both of these cases.
+
+All of the library source code may be found in the src/ subdirectory. There
+are headers in the include/ subdirectory, and src/helpers/resample.c also
+#includes some .inc files in its own directory.
+
+There are four subdirectories under src/. For projects not using Allegro, you
+will need all the files in src/core/, src/helpers/ and src/it/. If you are
+using Allegro, you will want the src/allegro/ subdirectory too. For
+consistency with the other build systems, the contents of src/allegro/ should
+be compiled into a separate library.
+
+I recommend static-linking DUMB, since the version information is done via
+macros and the API has a tendency to change. If you static-link, then once
+your program is in binary form, you can be sure that changes to the installed
+version of DUMB won't cause it to malfuction. It is my fault that the API has
+been so unstable. Sorry!
+
+Compile each .c file separately. As mentioned above, you will need to specify
+two places to look for #include files: the include/ directory and the source
+file's own directory. You will also need to define the symbol
+DUMB_DECLARE_DEPRECATED on the command line.
+
+Do not compile the .inc files separately.
+
+You may need to edit dumb.h and add your own definition for LONG_LONG. It
+should be a 64-bit integer. If you do this, please see if you can add a check
+for your compiler so that it still works with other compilers.
+
+DUMB has two build modes. If you define the symbol DEBUGMODE, some checks for
+programmer error will be incorporated into the library. Otherwise it will be
+built without any such checks. (DUMB will however always thoroughly check the
+validity of files it is loading. If you ever find a module file that crashes
+DUMB, please let me know!)
+
+I recommend building two versions of the library, one with DEBUGMODE defined
+and debugging information included, and the other with compiler optimisation
+enabled. If you can install DUMB system-wide so that your projects, and other
+people's, can simply #include <dumb.h> or <aldumb.h> and link with libraries
+by simple name with no path, then that is ideal.
+
+If you successfully port DUMB to a new platform, please let me know!
+
+
+****************************
+*** The example programs ***
+****************************
+
+
+Three example programs are provided. On DOS and Windows, you can find them in
+the examples subdirectory. On other systems they will be installed system-
+wide.
+
+dumbplay
+ This program will only be built if you have Allegro. Pass it the filename
+ of an IT, XM, S3M or MOD file, and it will play it. It's not a polished
+ player with real-time threading or anything - so don't complain about it
+ stuttering while you use other programs - but it does show DUMB's fidelity
+ nicely. You can control the playback quality by editing dumb.ini, which
+ must be in the current working directory. (This is a flaw for systems
+ where the program is installed system-wide, but it is non-fatal.) Have a
+ look at the examples/dumb.ini file for further information.
+
+dumbout
+ This program does not need Allegro. You can use it to stream an IT, XM,
+ S3M or MOD file to raw PCM. This can be used as input to an encoder like
+ oggenc (with appropriate command-line options), or it can be sent to a
+ .pcm file which can be read by any respectable waveform editor. This
+ program is also convenient for timing DUMB. Compare the time it takes to
+ render a module with the module's playing time! dumbout doesn't try to
+ read any configuration file; the options are set on the command line.
+
+dumb2wav
+ This program is much the same as dumbout, but it writes a .wav file with
+ the appropriate header. Thanks go to Chad Austin for this useful tool.
+
+
+*********************************************
+*** Downloading music or writing your own ***
+*********************************************
+
+
+If you would like to compose your own music modules, then this section should
+help get you started.
+
+The best programs for the job are the trackers that pioneered the file
+formats:
+
+ Impulse Tracker - IT files - http://www.lim.com.au/ImpulseTracker/
+ Fast Tracker II - XM files - http://www.fasttracker2.com/
+ Scream Tracker 3 - S3M files - No official site known, please use Google
+
+MOD files come from the Amiga; I do not know what PC tracker to recommend for
+editing these. If you know of one, let me know! In the meantime, I would
+recommend using a more advanced file format. However, don't convert your
+existing MODs just for the sake of it.
+
+Fast Tracker II is Shareware. It offers a very flashy interface and has a
+game embedded, but the IT file format is more powerful and better defined. By
+all means try them both and see which you prefer; it is largely a matter of
+taste (and, in some cases, religion). Impulse Tracker and Scream Tracker 3
+are Freeware, although you can donate to Impulse Tracker and receive a
+slightly upgraded version. DUMB is likely to be at its best with IT files.
+
+These editors are DOS programs. Users of DOS-incapable operating systems may
+like to try ModPlug Tracker, but should read docs/modplug.txt before using it
+for any serious work. If you use a different operating system, or if you know
+of any module editors for Windows that are more faithful to the original
+trackers' playback, please give me some links so I can put them here!
+
+ ModPlug Tracker - http://www.modplug.com/
+
+If you have an x86 Linux system with VGA-compatible hardware (which covers
+all PC graphics cards I've ever seen), you should be able to get Impulse
+Tracker running with DOSEMU. You will have to give it access to the VGA ports
+and run it in a true console, as it will not work with the X-based VGA
+emulation. I personally added the SB16 emulation to DOSEMU, so you can even
+use filters! However, it corrupts samples alarmingly often when saving on my
+system - probably a DOSEMU issue. If you set this up, I am curious to know
+whether it works for you.
+
+ DOSEMU - http://www.dosemu.org/
+
+BEWARE OF WINAMP! Although it's excellent for MP3s, it is notorious for being
+one of the worst module players in existence; very many modules play wrongly
+with it. There are plug-ins available to improve Winamp's module support, for
+example WSP.
+
+ Winamp - http://www.winamp.com/
+ WSP - http://www.spytech.cz/index.php?sec=demo
+
+(There is a Winamp plug-in that uses DUMB, but it is unreliable. If anyone
+would like to work on it, please get in touch.)
+
+While I am at it I should also point out that Winamp is notorious for
+containing security flaws. Install it at your own risk, and if it is your
+work computer, check with your boss first!
+
+Samples and instruments are the building blocks of music modules. You can
+download samples at
+
+ http://www.tump.net/
+
+If you would like to download module files composed by other people, check
+the following sites:
+
+ http://www.modarchive.com/
+ http://www.scene.org/
+ http://www.tump.net/
+ http://www.homemusic.cc/main.php
+ http://www.modplug.com/
+
+Once again, if you know of more sites where samples or module files are
+available for download, please let me know.
+
+If you wish to use someone's music in your game, please respect the
+composer's wishes. In general, you should ask the composer. Music that has
+been placed in the Public Domain can be used by anyone for anything, but it
+wouldn't do any harm to ask anyway if you know who the author is. In many
+cases the author will be thrilled, so don't hesitate!
+
+A note about converting modules from one format to another, or converting
+from MIDI: don't do it, unless you are a musician and are prepared to go
+through the file and make sure everything sounds the way it should! The
+module formats are all slightly different, and MIDI is very different;
+converting from one format to another will usually do some damage.
+
+Instead, it is recommended that you allow DUMB to interpret the original file
+as it sees fit. DUMB may make mistakes (it does a lot of conversion on
+loading), but future versions of DUMB will be able to rectify these mistakes.
+On the other hand, if you convert the file, the damage is permanent.
+
+
+***********************
+*** Contact details ***
+***********************
+
+
+If you have trouble with DUMB, or want to contact me for any other reason, my
+e-mail address is given below. Please do get in touch, even if I appear to
+have disappeared!
+
+If you wish to chat online about something, perhaps on IRC, that can most
+likely be arranged. Send me an e-mail.
+
+
+******************
+*** Conclusion ***
+******************
+
+
+This is the conclusion.
+
+
+Ben Davis
+entheh@users.sf.net

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/release.txt Added

@@ -0,0 +1,623 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * release.txt - Release notes for DUMB. / / \ \
+ * | < / \_
+ * | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+*******************************************
+*** DUMB v0.9.3, released 7 August 2005 ***
+*******************************************
+
+Hello! Welcome to a long-awaited-or-probably-just-given-up-on-by-everybody
+release! New to this release are lower memory usage, faster mixing loops,
+loading of text fields in the module files, and faster load functions for
+projects that don't need to seek within the module or know its length.
+Additionally, Chad Austin has contributed a dumb2wav tool for converting
+modules to .wav files and updated the Visual Studio 6 project files to
+compile all the examples as well as the library. Users of Unix-like systems
+will be pleased to know that on Chad's suggestion I have made the build
+system cope with variables such as $HOME or ${HOME} in the prefix.
+
+Chad has also contributed an Autotools build system, but neither of us
+recommends its use. The Autotools are an evil black box, we haven't quite
+managed to get it right, and goodness help you if it happens not to work for
+you. The files are available in a separate download if you absolutely need
+them. Notice that that download is almost twice as large as the rest of DUMB!
+
+Maybe we'll do SCons next time.
+
+Thanks to Chad for all his work. Chad is the author of Audiere, a portable
+sound library which has started using DUMB for its module playback! Wahoo!
+
+ http://audiere.sf.net/
+
+There are three main optimisations that went into the mixing loops.
+
+First, I downloaded ModPlugXMMS and had a peek at the mixing code, which is
+Public Domain. It uses look-up tables for the cubic mixing. I pinched the
+idea, and that sped DUMB's cubic (best quality) resamplers up by a factor of
+two or three.
+
+Secondly, the samples loaded from the file are now kept in 8-bit or 16-bit
+format, whereas previously they were being converted to 24-bit-in-32-bit on
+loading. This means the samples occupy a half or a quarter of the memory they
+used to occupy. It also had the side-effect of speeding up the mixing loops,
+but it meant I had to duplicate the resampling code. (It is all done with
+macros in the source code, but it becomes two copies on the binary level.)
+
+Secondly, stereo samples and stereo mixing buffers are now kept in
+interleaved format, where previously the two channels were done separately to
+keep the code simpler. This change has made the library quite a bit bigger,
+but has made the code run almost twice as fast for stereo output (tested for
+modules whose samples are mostly mono)!
+
+DUMB is now as fast as ModPlugXMMS on my system.
+
+Some people have also commented that DUMB seems to take a long time loading
+files. This is because immediately upon loading the file it runs the playback
+engine over it up as far as the point of first loop, taking snapshots at 30-
+second intervals to be used as references for fast seeking and finally
+storing the playback time. Of course, most games don't need this. You can now
+skip it by calling the _quick versions of the dumb_load_*(), dumb_read_*() or
+dumb_register_dat_*() functions. Should you need the data later, you can call
+dumb_it_do_initial_runthrough() to calculate it. Please note that this cannot
+currently be done safely from a concurrent thread while the music is playing.
+
+As mentioned, DUMB loads the text fields in module files now. You can
+retrieve the song title with duh_get_tag(). Sample names and file names and
+instrument names and filenames, and the song message for IT files, are
+available with a call to duh_get_it_sigdata() and various dumb_it_sd_*()
+functions. Please note that text fields added as extensions by ModPlug
+Tracker are not supported.
+
+DUMB's timing is ever so slightly more accurate. This is hardly noticeable,
+but it has meant that the length computed will increase very slightly.
+
+There are many small playback fixes in this release:
+
+* The Lxx effect in XM files (set envelope position) is now supported.
+
+* Pattern looping is now correct for XM files. Bizarrely, an ordinary pattern
+ loop whose start point isn't the first row seems to cause the next pattern
+ to start at the row corresponding to the loop start point. That must have
+ been a headache for people creating XM files! Nevertheless, DUMB now
+ emulates this behaviour. If you have an XM file that was written in a
+ tracker other than Fast Tracker II and breaks in DUMB, you can get around
+ it by putting a D00 effect (break to row 0) right at the end of the pattern
+ containing the loop.
+
+* XM pattern looping can be infinite. DUMB should detect this and call the
+ loop callback when it happens. Specifically, it has a loop counter for each
+ channel, so each time it sets or decrements that counter, it remembers the
+ loop end point for that channel. When the loop terminates, the loop end
+ point is reset to 0. If the loop end point ever decreases during a loop,
+ the loop callback is called. If anyone manages to get around this check and
+ prevent DUMB from calling the callback, please let me know and send me an
+ illustrative XM file!
+
+* For IT files, notes are now removed from channels if they have faded out,
+ even if they are still in the foreground. After this has happened, a row
+ with a note and Gxx (tone portamento) specified will cause a new note to
+ start playing, which is what Impulse Tracker does in this scenario.
+ (Normally, Gxx prevents the new note from playing and instead causes the
+ old note to start sliding towards the new note.)
+
+* If a tone portamento command occurred when no note was playing, the effect
+ value wasn't stored. This has been fixed. Thanks to Maim from #trax on
+ EFnet for discovering this bug.
+
+* DUMB now treats the parameter to the undocumented XM key off effect Kxx as
+ a delay, consistent with Fast Tracker II's behaviour. It has also been made
+ not to clear the note, so a subsequent volume command will restore it, as
+ in Fast Tracker II.
+
+* DUMB used to process the first row when you created the
+ DUMB_IT_SIGRENDERER. This happened before you had a chance to install any
+ callbacks. If an F00 effect occurred on the first row, the music would stop
+ immediately and the xm_speed_zero callback would be called if it were
+ present. Unfortunately, it wasn't present, and the algorithm for
+ calculating the length subsequently went into an endless loop while waiting
+ for it. Worse still, the same algorithm accumulated data for fast seeking,
+ and never stopped, so it pretty quickly consumed all the resources. DUMB
+ will now not process the first row until you first request some samples,
+ provided you pass zero for pos. Of course, any MOD or XM file with F00 in
+ the very first row won't do much anyway, but such files won't crash the
+ library now.
+
+* There was a subtle bug that affected a few XM files. For instruments with
+ no associated samples, the array mapping notes to samples is uninitialised.
+ This became a problem if such instruments were then used, which does happen
+ sometimes. On many systems, memory is initialised to zero when first given
+ to a program (for security reasons), so the problem didn't come up most of
+ the time. However, on platforms like DOS where memory isn't initialised, or
+ in programs that reuse memory later on (this includes the XMMS plug-in with
+ which I discovered the bug), a rogue note would occasionally play. This has
+ now been fixed.
+
+* DUMB's envelope handling for IT files was subtly wrong. Upon note off, it
+ stopped obeying the sustain loop points one tick too early. Notes were
+ often shorter than they should have been, and in pathological cases a whole
+ extra iteration of the sustain loop section might have been skipped. The
+ envelope code has now been rewritten. Thanks go to Allefant for Valgrinding
+ the new code!
+
+Finally, there were two build problems in the last version, which were fixed
+in the download marked with -fixed. They are of course correct in this
+version. For the record:
+
+* The make/config.bat file, responsible for generating make/config.txt, wrote
+ a crucial line to the wrong place, causing it to be left out of the file.
+ As a result, the makefile would fail to install everything for Allegro
+ users, and enter infinite recursion for other users. This applied to people
+ using DJGPP and MinGW.
+
+* DUMB's Makefile was supposed to install the example programs on Unix-based
+ platforms, but it wasn't doing. The fix was to edit Makefile and change the
+ one occurrence of $COMSPEC to $(COMSPEC).
+
+That's it! I hope you enjoy this long-awaited-or-probably-just-given-up-on-
+by-everybody release of DUMB!
+
+
+******************************************
+*** DUMB v
+******************************************
+
+Pattern loop stuff improved; not quite right for XM files, but better than
+before
+
+say where ModPlug's source can be obtained
+
+Notes now cease to exist if they have faded out, even if they are still in
+the foreground. This means a new note will be started even if a Gxx occurs
+on the same row, as Impulse Tracker does in this scenario.
+
+XM key off fixed more: now the effect value acts as a delay, matching FT2
+
+Added dumb2wav example to convert mod files to WAV files. (Chad
+Austin)
+
+Major update to VC6 build. It builds every example as well as both
+dumb.lib and aldumb.lib. (Chad Austin)
+
+Added first pass of the automake build. Unix users can compile and
+install dumb with the standard "./configure && make && make install"
+dance. Caveats: Allegro isn't searched for at configuration time, so
+the examples don't build. The build also does not attempt to install
+aldumb.h. (Chad Austin)
+
+For IT files, tone portamento didn't work properly when no note was playing.
+The effect value wasn't stored. Thanks to Maim from #trax on EFnet for
+discovering this bug.
+
+XM key off fixed - doesn't overwrite note any more
+
+tagging system added - title
+sample/instrument names/filenames
+more functions (n_samples n_instruments)
+
+made timing more accurate; this may affect length by a second or two ...
+
+Thanks to networm for valgrinding the new envelope handling code
+
+DUMB used to process the first row when you created the DUMB_IT_SIGRENDERER.
+This happened before you had a chance to install any callbacks. If an F00
+effect occurred on the first row, the music would stop immediately and the
+xm_speed_zero callback would be called if it were present. Unfortunately, it
+wasn't present, and the algorithm for calculating the length subsequently
+went into an endless loop while waiting for it. Worse still, the same
+algorithm accumulated data for fast seeking, and never stopped, so it pretty
+quickly consumed all the resources.
+
+DUMB will now not process the first row until you first request some samples,
+provided you pass zero for pos. Ironically, any MOD or XM file with F00 in
+the very first row won't play anyway! But at least such files won't crash the
+library now.
+
+ * The make/config.bat file, responsible for generating make/config.txt, wrote a crucial line to the wrong place, causing it to be left out of the file. As a result, the makefile would fail to install everything for Allegro users, and enter infinite recursion for other users. If you are trying to compile with DJGPP or MinGW, please download dumb-0.9.2-fixed.zip (linked below, and incidentally including the fix for the bug detailed in the next point).
+ * DUMB's makefile doesn't install the example programs on any platforms. (It is supposed to install them on all platforms except DOS and Windows.) You can fix this by editing Makefile and changing the one occurrence of $COMSPEC to $(COMSPEC). Alternatively you can run the example programs from the examples directory.
+ * There is a subtle bug that affects a few XM files. For instruments with no associated samples, the array mapping notes to samples is uninitialised. This becomes a problem if such instruments are then used, which does happen sometimes. On many systems, memory is initialised to zero when first given to a program (for security reasons), so the problem won't come up most of the time. However, on platforms like DOS where memory isn't initialised, or in programs that reuse memory later on (this includes the XMMS plug-in), a rogue note will occasionally play. If you are worried that this might happen to you, then use DUMB CVS or wait for the next release (which won't be for a while). If you have access to an i386 Linux system, you can use Valgrind on the 'dumbout' example program to determine whether your XM file causes DUMB to use uninitialised values.
+ * For IT files, DUMB breaks out of single-point envelope sustain loops one tick too early. The correct behaviour for multi-point sustain loops is yet to be determined. The worst that can happen is that notes may seem to be ever so slightly shorter than they should be, except in pathological cases. This bug has not yet been fixed in CVS.
+
+
+
+******************************************
+*** DUMB v0.9.2, released 2 April 2003 ***
+******************************************
+
+Yes, there really has been a release. This is not a day-late April fools'
+joke.
+
+DUMB's full name has changed! The old "Dedicated Universal Music
+Bastardisation" was rather silly, and not much more than a forced attempt at
+finding words beginning with D, U, M and B. I spent weeks and weeks browsing
+dictionaries and hopelessly asking others for bright ideas, until the
+brilliant Chris "Kitty Cat" Robinson came up with "Dynamic". I decided to
+keep the U as Universal, since a DUH struct can hold digital music in any
+format. Now all that remained was the B, but it didn't take me long to come
+up with Bibliotheque, which, despite looking French, is indeed considered an
+English word by Oxford English Dictionary Online, to which my university has
+a subscription. So there you have it - the name now makes sense.
+
+The two most significant additions to the project would have to be the new
+thread safety (with an important restriction, detailed in docs/dumb.txt), and
+the new build system. The silly 'makeall' and 'makecore' scripts are gone. If
+you are a GCC user, all you need do now is run 'make' and 'make install', as
+for other projects. You don't even have to run a 'fix' script any more! There
+are some caveats, which are covered in readme.txt. If you use Microsoft
+Visual C++ 6, you no longer need to obtain GCC and GNU Make - there is a
+project file just for you.
+
+Huge thanks go to Steve Terry for testing on Windows XP - about five times -
+and to lillo for testing on BeOS and Mac OS X. Thanks also to X-G for testing
+on a Windows system that has consistently posed problems for DUMB's old
+makefiles.
+
+There was a bug whereby al_poll_duh() would sometimes cause the music to
+resume playing if you called it after al_pause_duh(). Whether this was DUMB's
+fault for misusing Allegro's API, or a bug in Allegro, is unclear, but this
+release makes it work.
+
+In one of my projects, I found that my AL_DUH_PLAYER stopped playing when
+there were lots of other sound effects. In order to fix this, I programmed
+DUMB to set the priority of the stream's voice to 255, the maximum. I also
+added al_duh_set_priority(), so you can set the priority yourself if you need
+to.
+
+The resampling code has undergone a transformation. The bad news is that the
+linear average code is no longer in use. The good news is that where DUMB's
+resamplers used to require three extra samples' worth of memory to be
+allocated and initialised, it now copes with just the sample data. And it
+does a very good job at bouncing off loop points and otherwise hurtling
+around the sample. The resampling code is considerably more complicated, but
+the code that uses the resamplers is considerably simpler - and if you
+noticed a slight click in some bidirectionally looping samples, you'll be
+pleased to know that that click is gone!
+
+I have also devoted some effort to optimisation. It seemed hopeless for a
+while, but then I actually figured out a way of making it faster AND more
+accurate at the same time! DUMB is now quite a bit faster than it was, and it
+mixes not with 16-bit precision, but with 24-bit precision. (It used 32-bit
+integers all along, but the difference is that it now makes use of 256 times
+as much of the integer's range.)
+
+There have been the usual improvements to playback. The last release occurred
+rather too soon after I had fixed the XM effect memories; EAx and EBx, fine
+volume ramps, had been neglected. These are now handled properly.
+
+In previous versions of DUMB, muted channels in IT were actually played with
+surround sound panning (where the right-hand channel is inverted). This has
+been fixed, so muted channels will really be muted now.
+
+There were also some subtle problems with the way DUMB handled New Note
+Actions for IT files. It turned out that, in all releases of DUMB so far,
+pitch, filter and panning envelopes and sample vibrato were not being
+processed for any note that was forced into the background by a new note on
+the same channel! This only affected IT files. Not only has this been fixed,
+but envelope interpolation is much more accurate. Long trailing envelope-
+driven fade-outs sound a lot better now!
+
+Since panning and filter envelopes are more precise, extra fields have been
+added to the DUMB_IT_CHANNEL_STATE struct, used by
+dumb_it_sr_get_channel_state(). These fields hold the 'decimal' parts of the
+pan and filter cut-off. See dumb.txt for details.
+
+Mxx (set channel volume) now correctly only modifies the last note played on
+the channel, not any previous notes that have been forced into the background
+by New Note Actions, and filter effect processing is now closer to what
+Impulse Tracker does.
+
+The XM loader was slightly flawed and could crash on files containing samples
+with out-of-range loop points. One such file was given to me. This has been
+fixed.
+
+Finally, the legal stuff. Julien Cugniere has been added to the list of
+copyright owners. He deserves it, for all the work he did on the XM support!
+And the licence has been changed. You are no longer required to include a
+link to DUMB in a project that uses DUMB; the reasons for this relaxation are
+explained in licence.txt. However, the request is still there ...
+
+As usual, enjoy!
+
+
+**********************************************
+*** DUMB v0.9.1, released 19 December 2002 ***
+**********************************************
+
+Hi again! Lots to say this time, so I shall cut right to the chase.
+
+DUMB now supports Impulse Tracker's low-pass resonant filters! Huge thanks go
+to Jeffrey Lim, author of Impulse Tracker, for giving me what information he
+still had regarding the algorithm; to cut a long story short, modifying
+ModPlug Tracker's source code (which is in the Public Domain) led to an
+algorithm whose output matched Impulse Tracker's perfectly.
+
+Please note that ModPlug Tracker's filters as they stand do not match Impulse
+Tracker's, and I have no interest in supporting ModPlug Tracker's variant
+(especially not the integer rounding problems). Please see docs/modplug.txt,
+new in this release, for details.
+
+Thanks also go to Fatso Huuskonen for motivating me to add filter support,
+and providing me with several great IT files to test it with!
+
+The other important feature added for this release is click removal. Up until
+now, DUMB has generated clicks when cutting notes, starting samples in the
+middle, and so on. This version of DUMB will remove any such clicks. Note
+that DUMB does not use volume ramps to accomplish this; the algorithm will
+not take the bite out of the music!
+
+In other news, DUMB now supports sample vibrato for IT files, and instrument
+vibrato for XM files. A slight bug in New Note Action handling for IT files
+has been fixed; Note Fade will not break the sustain loops of the sample and
+envelope, as it did before. Tremor handling (Ixy) had a strange bug in it,
+which has been fixed.
+
+Support for XM files has been greatly enhanced. The XM envelope handling new
+in the last release contained a huge bug, resulting in notes seeming not to
+stop when they should; this has been fixed. Some XM files crashed DUMB, while
+others failed to load; these problems have been solved. Effect memories now
+work properly for XM and MOD files, to the best of my knowledge. Some other
+differences between IT and XM have been accounted for, most notably the
+Retrigger Note effects, Rxy and E9x.
+
+DUMB's sound quality and accuracy are not the only areas that have been
+enhanced. The API has been expanded, at last. You can now detect when a
+module loops, or make it play through just once. You can ask DUMB to inform
+you every time it generates some samples; this is useful for visualisation.
+For IT files, you can intercept the MIDI messages generated by Zxx macros,
+enabling you to synchronise your game with the music to some extent. (There
+is no such method for XM, S3M or MOD files yet; sorry. Also note that the
+function will be called before you actually hear the sound; I cannot improve
+this until DUMB has its own sound drivers, which won't be for a while.) You
+can query the current order and row. Finally, operations like changing the
+speed and tempo are now possible, and you can query the playback state on
+each channel.
+
+Some parts of DUMB's API have been deprecated. Simple programs that use
+Allegro will be unaffected, but if you get some compiler warnings or errors,
+please review docs/deprec.txt. This file explains why those parts of the API
+were deprecated, and tells you how to adapt your code; the changes you need
+to make are straightforward. Sorry for the inconvenience.
+
+For various reasons, I have made DUMB's makefiles use different compiler
+flags depending on your GCC version (unless you are using MSVC). There is no
+elegant way of getting the makefiles to detect when GCC is upgraded. If you
+upgrade GCC, you should execute 'make clean' in order to make DUMB detect the
+GCC version again. Otherwise you may get some annoying error messages. (It is
+wise to do this in any case, so that all the object files are built with the
+same GCC version.)
+
+DUMB's example players have been unified into a single player called
+'dumbplay'. The player has been enhanced to display messages when the music
+loops, and when XM and MOD files freeze (effect F00; more information on this
+in docs/howto.txt).
+
+Finally, as noted on DUMB's website, the release notes from the last release
+were inaccurate. It has been verified that DUMBOGG v0.5 does still work with
+that release, and still works with this release. The esoteric DUMBOGG v0.6
+has not been created yet, since DUMBOGG v0.5 still works.
+
+Please scroll down and read through the indented paragraphs in the notes for
+the last release; they are relevant for this release too.
+
+That's all folks! Until next time.
+
+
+*******************************************
+*** DUMB v0.9, released 16 October 2002 ***
+*******************************************
+
+MOD support is here! DUMB now supports all four of the common module formats.
+As usual, there have also been some improvements to the way modules are
+played back. Most notably, handling of tone portamento in IT files has been
+improved a lot, and XM envelopes are now processed correctly.
+
+The other major change is that DUMB now does a dummy run through each module
+on loading. It stores the playback state at thirty-second intervals. It stops
+when the module first loops, and then stores the playback time. This results
+in a slightly longer load time and a greater memory overhead, but seeking is
+faster (to any point before the module first loops) and the length is
+calculated! duh_get_length() will return this and is now documented in
+docs/howto.txt and docs/dumb.txt.
+
+DUMB's build process has been changed to use 'mingw' wherever it used
+'mingw32' before; some directories have been renamed, and the 'fix' command
+you had to run for MinGW has been changed from 'fix mingw32' to 'fix mingw'.
+
+Last time, I directed you to scroll down and read the notes from a past
+release, but ignore this point, and that point applies to something else, and
+so on. Did anyone do so? Well, if you're reading this at all, you probably
+did. Nevertheless, this time I shall be much less confusing and restate any
+relevant information. So the least you can do is read it!
+
+- If your program ever aborts with exit code 37 while loading an IT file,
+ PLEASE LET ME KNOW! The IT file in question has a stereo compressed sample
+ in it, and the format is unspecified for this case (Impulse Tracker itself
+ doesn't use stereo samples at all). I will need the IT file in question,
+ and any information you can give me about how the IT file was created (e.g.
+ what program). (If you don't get to see an exit code, let me know anyway.)
+
+- If your program ever outputs a line resembling "Inst 01 Env: 0,64 8,32
+ 15,48" to stderr while loading an IT file, PLEASE LET ME KNOW! You have an
+ old IT file (saved by an Impulse Tracker version older than 2.00), and
+ support for such files is STILL untested.
+
+- Not all parts of DUMB's API are documented yet. You will find some
+ functions in dumb.h which are not listed in docs/dumb.txt; the reason is
+ that these functions still need work and will probably change. If you
+ really, really want to use them, talk to me first (IRC EFnet #dumb is a
+ good place for this; see readme.txt for details on using IRC). I intend to
+ finalise and document the whole of DUMB's API for Version 1.0.
+
+There have been some changes to the naming conventions in DUMB's undocumented
+API. DUMBOGG v0.5 will not work with this and subsequent releases of DUMB;
+please upgrade to DUMBOGG v0.6. These changes should not break anything in
+your own code, since you didn't use those parts of the API, did you ;)
+
+There is still a great deal of work to be done before DUMB's API can be
+finalised, and thus it will be a while before DUMB v1.0 comes out. It should
+be worth the wait. In the meantime, there will be 0.9.x releases with
+additional functionality, improved playback, and possibly support for some
+extra file formats.
+
+Finally I should like to offer an apology; there is a strong possibility that
+some of DUMB's official API will change in the near future. There will not be
+any drastic changes, and the corresponding changes to your source code will
+be simple enough. If I didn't make these changes, DUMB's API would start to
+become limited, or messy, or both, so it's for the better. I apologise in
+advance for this.
+
+Now scroll down and read the notes for the first r... oh wait, we already did
+that. I guess that's it then. You can stop reading now.
+
+Right after you've read this.
+
+And this.
+
+Off you go.
+
+Bye.
+
+
+********************************************
+*** DUMB v0.8.1, released 11 August 2002 ***
+********************************************
+
+This is a minor release that fixes a few bugs. One of these bugs, however,
+was pretty serious. dumb_register_dat_xm() was never coded! It was prototyped
+in aldumb.h, so code would compile, but there would be an unresolved symbol
+at the linking stage. This has been fixed.
+
+Platforms other than Unix did not have a working 'make veryclean' target;
+this has been fixed. In addition, the makefiles now use 'xcopy' instead of
+'copy', since on some systems GNU Make seems to have trouble calling commands
+built in to the shell.
+
+Contrary to the errata that was on the DUMB website, the makeall.sh and
+makecore.sh scripts actually DID install in /usr. This has now been
+corrected, and regardless of whether you use these scripts or call make
+directly, the files will now be installed to /usr/local by default.
+
+The XM loader used to treat stereo samples as mono samples with the data for
+the right channel positioned after the data for the left channel. This
+generally resulted in an unwanted echo effect. This has been fixed.
+
+When playing XM files, specifying an invalid instrument would cause an old
+note on that channel to come back (roughly speaking). Fast Tracker 2 does not
+exhibit this behaviour. This has been fixed.
+
+The GCC makefiles used -mpentium, which is deprecated in gcc 3.x. This was
+generating warnings, and has now been fixed.
+
+In XM files, the length of a sample is stored in bytes. DUMB was assuming
+that the length of a 16-bit sample would be even. I had two XM files where
+this was not the case, and DUMB was unable to load them. This has been fixed.
+
+In order to accommodate the extra part of the version number,
+DUMB_REVISION_VERSION has been added. DUMB_VERSION has also been added in
+order to facilitate checking if the version of DUMB installed is sufficient.
+See docs/dumb.txt for details.
+
+As a last-minute fix, the XM "Break to row" effect is now loaded properly. It
+was necessary to convert from binary-coded decimal to hexadecimal (those who
+have experience with Fast Tracker 2 will know what I mean). In short, this
+means the effect will now work properly when breaking to row 10 or greater.
+
+DUMB v0.8 had faulty release date constants; DUMB_MONTH and DUMB_DAY were
+swapped! For this reason, DUMB_DATE should not be compared against any date
+in 2002. This note has been added to docs/dumb.txt and also to dumb.h.
+
+Please scroll to the end and read the release notes for the first version,
+DUMB v0.7. Most of them apply equally to this release. However, the
+non-portable code was rewritten for DUMB v0.8, so that point does not apply.
+The point about length not being calculated also applies to XM files.
+
+Enjoy :)
+
+
+****************************************
+*** DUMB v0.8, released 14 June 2002 ***
+****************************************
+
+Welcome to the second release of DUMB!
+
+In addition to these notes, please read below the release notes for the
+previous version, DUMB v0.7. Most of them apply equally to this release.
+However, the non-portable code has been rewritten; DUMB should now port to
+big-endian platforms.
+
+The main improvement in this release of DUMB is the support for XM files.
+Enormous thanks go to Julien Cugniere for working on this while I had to
+revise for my exams!
+
+There was a mistake in the makefiles in the last release. The debugging
+Allegro interface library was mistakenly named libaldmbd.a instead of
+libaldmd.a, meaning you had to compile with -laldmbd, contrary to what the
+docs said. Apologies to everyone who lost sleep trying to work out what was
+wrong! The reason for using libaldmd.a is to maintain compatibility with
+plain DOS, where filenames are limited to eight characters (plus a three-
+letter extension). The makefiles have now been changed to match the
+information in the docs, so you may have to alter your project files
+accordingly.
+
+The example programs were faulty, and crashed on Windows if they were unable
+to load the file. It was also difficult to work out how to exit them (you had
+to click the taskbar button that didn't have a window, then press a key).
+They have been improved in both these respects.
+
+I have now added a docs/faq.txt file (Frequently Asked Questions), which is
+based on problems and misconceptions people have had with the first release.
+Please refer to it before contacting me with problems.
+
+Thanks to networm for touching up the Unix makefile and writing the
+instructions on using it.
+
+Incidentally, today (Friday 14 June) is the Robinson College May Ball at
+Cambridge Uni. God knows why it's called a May Ball if it's in June. I'm not
+going myself (72 GBP, and I'd have to wear a suit, ugh), but with all the
+noise outside I shall enjoy pumping up the speakers tonight!
+
+
+****************************************
+*** DUMB v0.7, released 2 March 2002 ***
+****************************************
+
+This is the first release of DUMB, and parts of the library are not
+crystallised. Don't let this put you off! Provided you don't try to use any
+features that aren't documented in docs/dumb.txt, the library should be rock
+solid and you should be able to upgrade more or less without problems.
+
+Here are some notes on this release:
+
+- There is some non-portable code in this release of DUMB. It is likely that
+ the library will fail to load IT files with compressed samples on
+ big-endian machines such as the Apple Macintosh.
+
+- If your program ever aborts with exit code 37 while loading an IT file,
+ PLEASE LET ME KNOW! The IT file in question has a stereo compressed sample
+ in it, and the format is unspecified for this case (Impulse Tracker itself
+ doesn't use stereo samples at all). I will need the IT file in question,
+ and any information you can give me about how the IT file was created (e.g.
+ what program). (If you don't get to see an exit code, let me know anyway.)
+
+- If your program ever outputs a line resembling "Inst 01 Env: 0,64 8,32
+ 15,48" to stderr while loading an IT file, PLEASE LET ME KNOW! You have an
+ old IT file (saved by an Impulse Tracker version older than 2.00), and
+ support for such files is untested.
+
+- The length of IT and S3M files is not currently calculated. It is just set
+ to ten minutes.

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/atexit.c Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/duhlen.c Added

@@ -0,0 +1,45 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * duhlen.c - Functions to set and return the / / \ \
+ * length of a DUH. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * Note that the length of a DUH is a constant | ' /
+ * stored in the DUH struct and in the DUH disk \__/
+ * format. It will be calculated on loading for
+ * other formats in which the length is not explicitly stored. Also note that
+ * it does not necessarily correspond to the length of time for which the DUH
+ * will generate samples. Rather it represents a suitable point for a player
+ * such as Winamp to stop, and in any good DUH it will allow for any final
+ * flourish to fade out and be appreciated.
+ */
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+long duh_get_length(DUH *duh)
+{
+	return duh ? duh->length : 0;
+}
+
+
+
+void duh_set_length(DUH *duh, long length)
+{
+	if (duh)
+		duh->length = length;
+}
+
+
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/duhtag.c Added

@@ -0,0 +1,38 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * duhtag.c - Function to return the tags stored / / \ \
+ * in a DUH struct (typically author | < / \_
+ * information). | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+const char *duh_get_tag(DUH *duh, const char *key)
+{
+	int i;
+	ASSERT(key);
+	if (!duh || !duh->tag) return NULL;
+
+	for (i = 0; i < duh->n_tags; i++)
+		if (strcmp(key, duh->tag[i][0]) == 0)
+			return duh->tag[i][1];
+
+	return NULL;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/dumbfile.c Added

@@ -0,0 +1,401 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * dumbfile.c - Hookable, strictly sequential / / \ \
+ * file input functions. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+
+
+
+static DUMBFILE_SYSTEM *the_dfs = NULL;
+
+
+
+void register_dumbfile_system(DUMBFILE_SYSTEM *dfs)
+{
+	ASSERT(dfs);
+	ASSERT(dfs->open);
+	ASSERT(dfs->getc);
+	ASSERT(dfs->close);
+	the_dfs = dfs;
+}
+
+
+
+struct DUMBFILE
+{
+	DUMBFILE_SYSTEM *dfs;
+	void *file;
+	long pos;
+};
+
+
+
+DUMBFILE *dumbfile_open(const char *filename)
+{
+	DUMBFILE *f;
+
+	ASSERT(the_dfs);
+
+	f = malloc(sizeof(*f));
+
+	if (!f)
+		return NULL;
+
+	f->dfs = the_dfs;
+
+	f->file = (*the_dfs->open)(filename);
+
+	if (!f->file) {
+		free(f);
+		return NULL;
+	}
+
+	f->pos = 0;
+
+	return f;
+}
+
+
+
+DUMBFILE *dumbfile_open_ex(void *file, DUMBFILE_SYSTEM *dfs)
+{
+	DUMBFILE *f;
+
+	ASSERT(dfs);
+	ASSERT(dfs->getc);
+	ASSERT(file);
+
+	f = malloc(sizeof(*f));
+
+	if (!f) {
+		if (dfs->close)
+			(*dfs->close)(file);
+		return NULL;
+	}
+
+	f->dfs = dfs;
+	f->file = file;
+
+	f->pos = 0;
+
+	return f;
+}
+
+
+
+long dumbfile_pos(DUMBFILE *f)
+{
+	ASSERT(f);
+
+	return f->pos;
+}
+
+
+
+int dumbfile_skip(DUMBFILE *f, long n)
+{
+	int rv;
+
+	ASSERT(f);
+	ASSERT(n >= 0);
+
+	if (f->pos < 0)
+		return -1;
+
+	f->pos += n;
+
+	if (f->dfs->skip) {
+		rv = (*f->dfs->skip)(f->file, n);
+		if (rv) {
+			f->pos = -1;
+			return rv;
+		}
+	} else {
+		while (n) {
+			rv = (*f->dfs->getc)(f->file);
+			if (rv < 0) {
+				f->pos = -1;
+				return rv;
+			}
+			n--;
+		}
+	}
+
+	return 0;
+}
+
+
+
+int dumbfile_getc(DUMBFILE *f)
+{
+	int rv;
+
+	ASSERT(f);
+
+	if (f->pos < 0)
+		return -1;
+
+	rv = (*f->dfs->getc)(f->file);
+
+	if (rv < 0) {
+		f->pos = -1;
+		return rv;
+	}
+
+	f->pos++;
+
+	return rv;
+}
+
+
+
+int dumbfile_igetw(DUMBFILE *f)
+{
+	int l, h;
+
+	ASSERT(f);
+
+	if (f->pos < 0)
+		return -1;
+
+	l = (*f->dfs->getc)(f->file);
+	if (l < 0) {
+		f->pos = -1;
+		return l;
+	}
+
+	h = (*f->dfs->getc)(f->file);
+	if (h < 0) {
+		f->pos = -1;
+		return h;
+	}
+
+	f->pos += 2;
+
+	return l | (h << 8);
+}
+
+
+
+int dumbfile_mgetw(DUMBFILE *f)
+{
+	int l, h;
+
+	ASSERT(f);
+
+	if (f->pos < 0)
+		return -1;
+
+	h = (*f->dfs->getc)(f->file);
+	if (h < 0) {
+		f->pos = -1;
+		return h;
+	}
+
+	l = (*f->dfs->getc)(f->file);
+	if (l < 0) {
+		f->pos = -1;
+		return l;
+	}
+
+	f->pos += 2;
+
+	return l | (h << 8);
+}
+
+
+
+long dumbfile_igetl(DUMBFILE *f)
+{
+	unsigned long rv, b;
+
+	ASSERT(f);
+
+	if (f->pos < 0)
+		return -1;
+
+	rv = (*f->dfs->getc)(f->file);
+	if ((signed long)rv < 0) {
+		f->pos = -1;
+		return rv;
+	}
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b << 8;
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b << 16;
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b << 24;
+
+	f->pos += 4;
+
+	return rv;
+}
+
+
+
+long dumbfile_mgetl(DUMBFILE *f)
+{
+	unsigned long rv, b;
+
+	ASSERT(f);
+
+	if (f->pos < 0)
+		return -1;
+
+	rv = (*f->dfs->getc)(f->file);
+	if ((signed long)rv < 0) {
+		f->pos = -1;
+		return rv;
+	}
+	rv <<= 24;
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b << 16;
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b << 8;
+
+	b = (*f->dfs->getc)(f->file);
+	if ((signed long)b < 0) {
+		f->pos = -1;
+		return b;
+	}
+	rv |= b;
+
+	f->pos += 4;
+
+	return rv;
+}
+
+
+
+unsigned long dumbfile_cgetul(DUMBFILE *f)
+{
+	unsigned long rv = 0;
+	int v;
+
+	do {
+		v = dumbfile_getc(f);
+
+		if (v < 0)
+			return v;
+
+		rv <<= 7;
+		rv |= v & 0x7F;
+	} while (v & 0x80);
+
+	return rv;
+}
+
+
+
+signed long dumbfile_cgetsl(DUMBFILE *f)
+{
+	unsigned long rv = dumbfile_cgetul(f);
+
+	if (f->pos < 0)
+		return rv;
+
+	return (rv >> 1) | (rv << 31);
+}
+
+
+
+long dumbfile_getnc(char *ptr, long n, DUMBFILE *f)
+{
+	long rv;
+
+	ASSERT(f);
+	ASSERT(n >= 0);
+
+	if (f->pos < 0)
+		return -1;
+
+	if (f->dfs->getnc) {
+		rv = (*f->dfs->getnc)(ptr, n, f->file);
+		if (rv < n) {
+			f->pos = -1;
+			return MAX(rv, 0);
+		}
+	} else {
+		for (rv = 0; rv < n; rv++) {
+			int c = (*f->dfs->getc)(f->file);
+			if (c < 0) {
+				f->pos = -1;
+				return rv;
+			}
+			*ptr++ = c;
+		}
+	}
+
+	f->pos += rv;
+
+	return rv;
+}
+
+
+
+int dumbfile_error(DUMBFILE *f)
+{
+	ASSERT(f);
+
+	return f->pos < 0;
+}
+
+
+
+int dumbfile_close(DUMBFILE *f)
+{
+	int rv;
+
+	ASSERT(f);
+
+	rv = f->pos < 0;
+
+	if (f->dfs->close)
+		(*f->dfs->close)(f->file);
+
+	free(f);
+
+	return rv;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/loadduh.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadduh.c - Code to read a DUH from a file, / / \ \
+ * opening and closing the file for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+/* load_duh(): loads a .duh file, returning a pointer to a DUH struct.
+ * When you have finished with it, you must pass the pointer to unload_duh()
+ * so that the memory can be freed.
+ */
+DUH *load_duh(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = read_duh(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/makeduh.c Added

@@ -0,0 +1,135 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * makeduh.c - Function to construct a DUH from / / \ \
+ * its components. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+static DUH_SIGNAL *make_signal(DUH_SIGTYPE_DESC *desc, sigdata_t *sigdata)
+{
+	DUH_SIGNAL *signal;
+
+	ASSERT((desc->start_sigrenderer && desc->end_sigrenderer) || (!desc->start_sigrenderer && !desc->end_sigrenderer));
+	ASSERT(desc->sigrenderer_generate_samples && desc->sigrenderer_get_current_sample);
+
+	signal = malloc(sizeof(*signal));
+
+	if (!signal) {
+		if (desc->unload_sigdata)
+			if (sigdata)
+				(*desc->unload_sigdata)(sigdata);
+		return NULL;
+	}
+
+	signal->desc = desc;
+	signal->sigdata = sigdata;
+
+	return signal;
+}
+
+
+
+DUH *make_duh(
+	long length,
+	int n_tags,
+	const char *const tags[][2],
+	int n_signals,
+	DUH_SIGTYPE_DESC *desc[],
+	sigdata_t *sigdata[]
+)
+{
+	DUH *duh = malloc(sizeof(*duh));
+	int i;
+	int fail;
+
+	if (duh) {
+		duh->n_signals = n_signals;
+
+		duh->signal = malloc(n_signals * sizeof(*duh->signal));
+
+		if (!duh->signal) {
+			free(duh);
+			duh = NULL;
+		}
+	}
+
+	if (!duh) {
+		for (i = 0; i < n_signals; i++)
+			if (desc[i]->unload_sigdata)
+				if (sigdata[i])
+					(*desc[i]->unload_sigdata)(sigdata[i]);
+		return NULL;
+	}
+
+	duh->n_tags = 0;
+	duh->tag = NULL;
+
+	duh->n_tags = 0;
+	duh->tag = NULL;
+
+	fail = 0;
+
+	for (i = 0; i < n_signals; i++) {
+		duh->signal[i] = make_signal(desc[i], sigdata[i]);
+		if (!duh->signal[i])
+			fail = 1;
+	}
+
+	if (fail) {
+		unload_duh(duh);
+		return NULL;
+	}
+
+	duh->length = length;
+
+	{
+		int mem = n_tags * 2; /* account for NUL terminators here */
+		char *ptr;
+
+		for (i = 0; i < n_tags; i++)
+			mem += strlen(tags[i][0]) + strlen(tags[i][1]);
+
+		if (mem <= 0) return duh;
+
+		duh->tag = malloc(n_tags * sizeof(*duh->tag));
+		if (!duh->tag) return duh;
+		duh->tag[0][0] = malloc(mem);
+		if (!duh->tag[0][0]) {
+			free(duh->tag);
+			duh->tag = NULL;
+			return duh;
+		}
+		duh->n_tags = n_tags;
+		ptr = duh->tag[0][0];
+		for (i = 0; i < n_tags; i++) {
+			duh->tag[i][0] = ptr;
+			strcpy(ptr, tags[i][0]);
+			ptr += strlen(tags[i][0]) + 1;
+			duh->tag[i][1] = ptr;
+			strcpy(ptr, tags[i][1]);
+			ptr += strlen(tags[i][1]) + 1;
+		}
+	}
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/rawsig.c Added

@@ -0,0 +1,44 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * rawsig.c - Function to retrieve raw signal / / \ \
+ * data from a DUH provided you know | < / \_
+ * what type of signal it is. | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+/* You have to specify the type of sigdata, proving you know what to do with
+ * the pointer. If you get it wrong, you can expect NULL back.
+ */
+sigdata_t *duh_get_raw_sigdata(DUH *duh, int sig, long type)
+{
+	DUH_SIGNAL *signal;
+
+	if (!duh) return NULL;
+
+	if ((unsigned int)sig >= (unsigned int)duh->n_signals) return NULL;
+
+	signal = duh->signal[sig];
+
+	if (signal && signal->desc->type == type)
+		return signal->sigdata;
+
+	return NULL;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/readduh.c Added

@@ -0,0 +1,107 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readduh.c - Code to read a DUH from an open / / \ \
+ * file. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+static DUH_SIGNAL *read_signal(DUH *duh, DUMBFILE *f)
+{
+	DUH_SIGNAL *signal;
+	long type;
+
+	signal = malloc(sizeof(*signal));
+
+	if (!signal)
+		return NULL;
+
+	type = dumbfile_mgetl(f);
+	if (dumbfile_error(f)) {
+		free(signal);
+		return NULL;
+	}
+
+	signal->desc = _dumb_get_sigtype_desc(type);
+	if (!signal->desc) {
+		free(signal);
+		return NULL;
+	}
+
+	if (signal->desc->load_sigdata) {
+		signal->sigdata = (*signal->desc->load_sigdata)(duh, f);
+		if (!signal->sigdata) {
+			free(signal);
+			return NULL;
+		}
+	} else
+		signal->sigdata = NULL;
+
+	return signal;
+}
+
+
+
+/* read_duh(): reads a DUH from an already open DUMBFILE, and returns its
+ * pointer, or null on error. The file is not closed.
+ */
+DUH *read_duh(DUMBFILE *f)
+{
+	DUH *duh;
+	int i;
+
+	if (dumbfile_mgetl(f) != DUH_SIGNATURE)
+		return NULL;
+
+	duh = malloc(sizeof(*duh));
+	if (!duh)
+		return NULL;
+
+	duh->length = dumbfile_igetl(f);
+	if (dumbfile_error(f) || duh->length <= 0) {
+		free(duh);
+		return NULL;
+	}
+
+	duh->n_signals = dumbfile_igetl(f);
+	if (dumbfile_error(f) || duh->n_signals <= 0) {
+		free(duh);
+		return NULL;
+	}
+
+	duh->signal = malloc(sizeof(*duh->signal) * duh->n_signals);
+	if (!duh->signal) {
+		free(duh);
+		return NULL;
+	}
+
+	for (i = 0; i < duh->n_signals; i++)
+		duh->signal[i] = NULL;
+
+	for (i = 0; i < duh->n_signals; i++) {
+		if (!(duh->signal[i] = read_signal(duh, f))) {
+			unload_duh(duh);
+			return NULL;
+		}
+	}
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/register.c Added

@@ -0,0 +1,104 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * register.c - Signal type registration. / / \ \
+ * | < / \_
+ * By entheh. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+static DUH_SIGTYPE_DESC_LINK *sigtype_desc = NULL;
+static DUH_SIGTYPE_DESC_LINK **sigtype_desc_tail = &sigtype_desc;
+
+
+
+/* destroy_sigtypes(): frees all memory allocated while registering signal
+ * types. This function is set up to be called by dumb_exit().
+ */
+static void destroy_sigtypes(void)
+{
+	DUH_SIGTYPE_DESC_LINK *desc_link = sigtype_desc, *next;
+	sigtype_desc = NULL;
+	sigtype_desc_tail = &sigtype_desc;
+
+	while (desc_link) {
+		next = desc_link->next;
+		free(desc_link);
+		desc_link = next;
+	}
+}
+
+
+
+/* dumb_register_sigtype(): registers a new signal type with DUMB. The signal
+ * type is identified by a four-character string (e.g. "WAVE"), which you can
+ * encode using the the DUMB_ID() macro (e.g. DUMB_ID('W','A','V','E')). The
+ * signal's behaviour is defined by four functions, whose pointers you pass
+ * here. See the documentation for details.
+ *
+ * If a DUH tries to use a signal that has not been registered using this
+ * function, then the library will fail to load the DUH.
+ */
+void dumb_register_sigtype(DUH_SIGTYPE_DESC *desc)
+{
+	DUH_SIGTYPE_DESC_LINK *desc_link = sigtype_desc;
+
+	ASSERT((desc->load_sigdata && desc->unload_sigdata) || (!desc->load_sigdata && !desc->unload_sigdata));
+	ASSERT((desc->start_sigrenderer && desc->end_sigrenderer) || (!desc->start_sigrenderer && !desc->end_sigrenderer));
+	ASSERT(desc->sigrenderer_generate_samples && desc->sigrenderer_get_current_sample);
+
+	if (desc_link) {
+		do {
+			if (desc_link->desc->type == desc->type) {
+				desc_link->desc = desc;
+				return;
+			}
+			desc_link = desc_link->next;
+		} while (desc_link);
+	} else
+		dumb_atexit(&destroy_sigtypes);
+
+	desc_link = *sigtype_desc_tail = malloc(sizeof(DUH_SIGTYPE_DESC_LINK));
+
+	if (!desc_link)
+		return;
+
+	desc_link->next = NULL;
+	sigtype_desc_tail = &desc_link->next;
+
+	desc_link->desc = desc;
+}
+
+
+
+/* _dumb_get_sigtype_desc(): searches the registered functions for a signal
+ * type matching the parameter. If such a sigtype is found, it returns a
+ * pointer to a sigtype descriptor containing the necessary functions to
+ * manage the signal. If none is found, it returns NULL.
+ */
+DUH_SIGTYPE_DESC *_dumb_get_sigtype_desc(long type)
+{
+	DUH_SIGTYPE_DESC_LINK *desc_link = sigtype_desc;
+
+	while (desc_link && desc_link->desc->type != type)
+		desc_link = desc_link->next;
+
+	return desc_link ? desc_link->desc : NULL;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/rendduh.c Added

@@ -0,0 +1,184 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * rendduh.c - Functions for rendering a DUH into / / \ \
+ * an end-user sample format. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <limits.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+/* On the x86, we can use some tricks to speed stuff up */
+#if (defined _MSC_VER) || (defined __DJGPP__) || (defined __MINGW__)
+// Can't we detect Linux and other x86 platforms here? :/
+
+#define FAST_MID(var, min, max) { \
+	var -= (min); \
+	var &= (~var) >> (sizeof(var) * CHAR_BIT - 1); \
+	var += (min); \
+	var -= (max); \
+	var &= var >> (sizeof(var) * CHAR_BIT - 1); \
+	var += (max); \
+}
+
+#define CONVERT8(src, pos, signconv) { \
+	signed int f = (src + 0x8000) >> 16; \
+	FAST_MID(f, -128, 127); \
+	((char*)sptr)[pos] = (char)f ^ signconv; \
+}
+
+#define CONVERT16(src, pos, signconv) { \
+	signed int f = (src + 0x80) >> 8; \
+	FAST_MID(f, -32768, 32767); \
+	((short*)sptr)[pos] = (short)(f ^ signconv); \
+}
+
+#else
+
+#define CONVERT8(src, pos, signconv)		 \
+{											 \
+	signed int f = (src + 0x8000) >> 16;	 \
+	f = MID(-128, f, 127);					 \
+	((char *)sptr)[pos] = (char)f ^ signconv; \
+}
+
+
+
+#define CONVERT16(src, pos, signconv)			 \
+{												 \
+	signed int f = (src + 0x80) >> 8;			 \
+	f = MID(-32768, f, 32767);					 \
+	((short *)sptr)[pos] = (short)(f ^ signconv); \
+}
+
+#endif
+
+
+
+/* DEPRECATED */
+DUH_SIGRENDERER *duh_start_renderer(DUH *duh, int n_channels, long pos)
+{
+	return duh_start_sigrenderer(duh, 0, n_channels, pos);
+}
+
+
+
+long duh_render(
+	DUH_SIGRENDERER *sigrenderer,
+	int bits, int unsign,
+	float volume, float delta,
+	long size, void *sptr
+)
+{
+	long n;
+
+	sample_t **sampptr;
+
+	int n_channels;
+
+	ASSERT(bits == 8 || bits == 16);
+	ASSERT(sptr);
+
+	if (!sigrenderer)
+		return 0;
+
+	n_channels = duh_sigrenderer_get_n_channels(sigrenderer);
+
+	ASSERT(n_channels > 0);
+	/* This restriction will be removed when need be. At the moment, tightly
+	 * optimised loops exist for exactly one or two channels.
+	 */
+	ASSERT(n_channels <= 2);
+
+	sampptr = allocate_sample_buffer(n_channels, size);
+
+	if (!sampptr)
+		return 0;
+
+	dumb_silence(sampptr[0], n_channels * size);
+
+	size = duh_sigrenderer_generate_samples(sigrenderer, volume, delta, size, sampptr);
+
+	if (bits == 16) {
+		int signconv = unsign ? 0x8000 : 0x0000;
+
+		for (n = 0; n < size * n_channels; n++) {
+			CONVERT16(sampptr[0][n], n, signconv);
+		}
+	} else {
+		char signconv = unsign ? 0x80 : 0x00;
+
+		for (n = 0; n < size * n_channels; n++) {
+			CONVERT8(sampptr[0][n], n, signconv);
+		}
+	}
+
+	destroy_sample_buffer(sampptr);
+
+	return size;
+}
+
+
+
+/* DEPRECATED */
+int duh_renderer_get_n_channels(DUH_SIGRENDERER *dr)
+{
+	return duh_sigrenderer_get_n_channels(dr);
+}
+
+
+
+/* DEPRECATED */
+long duh_renderer_get_position(DUH_SIGRENDERER *dr)
+{
+	return duh_sigrenderer_get_position(dr);
+}
+
+
+
+/* DEPRECATED */
+void duh_end_renderer(DUH_SIGRENDERER *dr)
+{
+	duh_end_sigrenderer(dr);
+}
+
+
+
+/* DEPRECATED */
+DUH_SIGRENDERER *duh_renderer_encapsulate_sigrenderer(DUH_SIGRENDERER *sigrenderer)
+{
+	return sigrenderer;
+}
+
+
+
+/* DEPRECATED */
+DUH_SIGRENDERER *duh_renderer_get_sigrenderer(DUH_SIGRENDERER *dr)
+{
+	return dr;
+}
+
+
+
+/* DEPRECATED */
+DUH_SIGRENDERER *duh_renderer_decompose_to_sigrenderer(DUH_SIGRENDERER *dr)
+{
+	return dr;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/rendsig.c Added

@@ -0,0 +1,346 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * rendsig.c - Wrappers to render samples from / / \ \
+ * the signals in a DUH. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+struct DUH_SIGRENDERER
+{
+	DUH_SIGTYPE_DESC *desc;
+
+	sigrenderer_t *sigrenderer;
+
+	int n_channels;
+
+	long pos;
+	int subpos;
+
+	DUH_SIGRENDERER_SAMPLE_ANALYSER_CALLBACK callback;
+	void *callback_data;
+};
+
+
+
+DUH_SIGRENDERER *duh_start_sigrenderer(DUH *duh, int sig, int n_channels, long pos)
+{
+	DUH_SIGRENDERER *sigrenderer;
+
+	DUH_SIGNAL *signal;
+	DUH_START_SIGRENDERER proc;
+
+	if (!duh)
+		return NULL;
+
+	if ((unsigned int)sig >= (unsigned int)duh->n_signals)
+		return NULL;
+
+	signal = duh->signal[sig];
+	if (!signal)
+		return NULL;
+
+	sigrenderer = malloc(sizeof(*sigrenderer));
+	if (!sigrenderer)
+		return NULL;
+
+	sigrenderer->desc = signal->desc;
+
+	proc = sigrenderer->desc->start_sigrenderer;
+
+	if (proc) {
+		duh->signal[sig] = NULL;
+		sigrenderer->sigrenderer = (*proc)(duh, signal->sigdata, n_channels, pos);
+		duh->signal[sig] = signal;
+
+		if (!sigrenderer->sigrenderer) {
+			free(sigrenderer);
+			return NULL;
+		}
+	} else
+		sigrenderer->sigrenderer = NULL;
+
+	sigrenderer->n_channels = n_channels;
+
+	sigrenderer->pos = pos;
+	sigrenderer->subpos = 0;
+
+	sigrenderer->callback = NULL;
+
+	return sigrenderer;
+}
+
+
+
+#include <stdio.h>
+void duh_sigrenderer_set_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_CALLBACK callback, void *data
+)
+{
+	(void)sigrenderer;
+	(void)callback;
+	(void)data;
+	/*fprintf(stderr,
+		"Call to deprecated function duh_sigrenderer_set_callback(). The callback\n"
+		"was not installed. See dumb/docs/deprec.txt for how to fix this.\n");*/
+}
+
+
+
+void duh_sigrenderer_set_analyser_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_ANALYSER_CALLBACK callback, void *data
+)
+{
+	(void)sigrenderer;
+	(void)callback;
+	(void)data;
+	fprintf(stderr,
+		"Call to deprecated function duh_sigrenderer_set_analyser_callback(). The\n"
+		"callback was not installed. See dumb/docs/deprec.txt for how to fix this.\n");
+}
+
+
+
+void duh_sigrenderer_set_sample_analyser_callback(
+	DUH_SIGRENDERER *sigrenderer,
+	DUH_SIGRENDERER_SAMPLE_ANALYSER_CALLBACK callback, void *data
+)
+{
+	(void)sigrenderer;
+	(void)callback;
+	(void)data;
+	fprintf(stderr,
+		"Call to deprecated function duh_sigrenderer_set_analyser_callback(). The\n"
+		"callback was not installed. See dumb/docs/deprec.txt for how to fix this.\n");
+}
+
+
+
+int duh_sigrenderer_get_n_channels(DUH_SIGRENDERER *sigrenderer)
+{
+	return sigrenderer ? sigrenderer->n_channels : 0;
+}
+
+
+
+long duh_sigrenderer_get_position(DUH_SIGRENDERER *sigrenderer)
+{
+	return sigrenderer ? sigrenderer->pos : -1;
+}
+
+
+
+void duh_sigrenderer_set_sigparam(
+	DUH_SIGRENDERER *sigrenderer,
+	unsigned char id, long value
+)
+{
+	DUH_SIGRENDERER_SET_SIGPARAM proc;
+
+	if (!sigrenderer) return;
+
+	proc = sigrenderer->desc->sigrenderer_set_sigparam;
+	if (proc)
+		(*proc)(sigrenderer->sigrenderer, id, value);
+	else
+		TRACE("Parameter #%d = %ld for signal %c%c%c%c, which does not take parameters.\n",
+			(int)id,
+			value,
+			(int)(sigrenderer->desc->type >> 24),
+			(int)(sigrenderer->desc->type >> 16),
+			(int)(sigrenderer->desc->type >> 8),
+			(int)(sigrenderer->desc->type));
+}
+
+
+
+long duh_sigrenderer_generate_samples(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+)
+{
+	long rendered;
+	LONG_LONG t;
+
+	if (!sigrenderer) return 0;
+
+	rendered = (*sigrenderer->desc->sigrenderer_generate_samples)
+				(sigrenderer->sigrenderer, volume, delta, size, samples);
+
+	if (rendered) {
+		if (sigrenderer->callback)
+			(*sigrenderer->callback)(sigrenderer->callback_data,
+				(const sample_t *const *)samples, sigrenderer->n_channels, rendered);
+
+		t = sigrenderer->subpos + (LONG_LONG)(delta * 65536.0 + 0.5) * rendered;
+
+		sigrenderer->pos += (long)(t >> 16);
+		sigrenderer->subpos = (int)t & 65535;
+	}
+
+	return rendered;
+}
+
+
+
+/* DEPRECATED */
+long duh_sigrenderer_get_samples(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+)
+{
+	sample_t **s;
+	long rendered;
+	long i;
+	int j;
+	if (!samples) return duh_sigrenderer_generate_samples(sigrenderer, volume, delta, size, NULL);
+	s = allocate_sample_buffer(sigrenderer->n_channels, size);
+	if (!s) return 0;
+	dumb_silence(s[0], sigrenderer->n_channels * size);
+	rendered = duh_sigrenderer_generate_samples(sigrenderer, volume, delta, size, s);
+	for (j = 0; j < sigrenderer->n_channels; j++)
+		for (i = 0; i < rendered; i++)
+			samples[j][i] += s[0][i*sigrenderer->n_channels+j];
+	destroy_sample_buffer(s);
+	return rendered;
+}
+
+
+
+/* DEPRECATED */
+long duh_render_signal(
+	DUH_SIGRENDERER *sigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+)
+{
+	sample_t **s;
+	long rendered;
+	long i;
+	int j;
+	if (!samples) return duh_sigrenderer_generate_samples(sigrenderer, volume, delta, size, NULL);
+	s = allocate_sample_buffer(sigrenderer->n_channels, size);
+	if (!s) return 0;
+	dumb_silence(s[0], sigrenderer->n_channels * size);
+	rendered = duh_sigrenderer_generate_samples(sigrenderer, volume, delta, size, s);
+	for (j = 0; j < sigrenderer->n_channels; j++)
+		for (i = 0; i < rendered; i++)
+			samples[j][i] += s[0][i*sigrenderer->n_channels+j] >> 8;
+	destroy_sample_buffer(s);
+	return rendered;
+}
+
+
+
+void duh_sigrenderer_get_current_sample(DUH_SIGRENDERER *sigrenderer, float volume, sample_t *samples)
+{
+	if (sigrenderer)
+		(*sigrenderer->desc->sigrenderer_get_current_sample)(sigrenderer->sigrenderer, volume, samples);
+}
+
+
+
+void duh_end_sigrenderer(DUH_SIGRENDERER *sigrenderer)
+{
+	if (sigrenderer) {
+		if (sigrenderer->desc->end_sigrenderer)
+			if (sigrenderer->sigrenderer)
+				(*sigrenderer->desc->end_sigrenderer)(sigrenderer->sigrenderer);
+
+		free(sigrenderer);
+	}
+}
+
+
+
+DUH_SIGRENDERER *duh_encapsulate_raw_sigrenderer(sigrenderer_t *vsigrenderer, DUH_SIGTYPE_DESC *desc, int n_channels, long pos)
+{
+	DUH_SIGRENDERER *sigrenderer;
+
+	if (desc->start_sigrenderer && !vsigrenderer) return NULL;
+
+	sigrenderer = malloc(sizeof(*sigrenderer));
+	if (!sigrenderer) {
+		if (desc->end_sigrenderer)
+			if (vsigrenderer)
+				(*desc->end_sigrenderer)(vsigrenderer);
+		return NULL;
+	}
+
+	sigrenderer->desc = desc;
+	sigrenderer->sigrenderer = vsigrenderer;
+
+	sigrenderer->n_channels = n_channels;
+
+	sigrenderer->pos = pos;
+	sigrenderer->subpos = 0;
+
+	sigrenderer->callback = NULL;
+
+	return sigrenderer;
+}
+
+
+
+sigrenderer_t *duh_get_raw_sigrenderer(DUH_SIGRENDERER *sigrenderer, long type)
+{
+	if (sigrenderer && sigrenderer->desc->type == type)
+		return sigrenderer->sigrenderer;
+
+	return NULL;
+}
+
+
+
+#if 0
+// This function is disabled because we don't know whether we want to destroy
+// the sigrenderer if the type doesn't match. We don't even know if we need
+// the function at all. Who would want to keep an IT_SIGRENDERER (for
+// instance) without keeping the DUH_SIGRENDERER?
+sigrenderer_t *duh_decompose_to_raw_sigrenderer(DUH_SIGRENDERER *sigrenderer, long type)
+{
+	if (sigrenderer && sigrenderer->desc->type == type) {
+
+
+
+	if (sigrenderer) {
+		if (sigrenderer->desc->end_sigrenderer)
+			if (sigrenderer->sigrenderer)
+				(*sigrenderer->desc->end_sigrenderer)(sigrenderer->sigrenderer);
+
+		free(sigrenderer);
+	}
+
+
+
+
+
+
+		return sigrenderer->sigrenderer;
+	}
+
+	return NULL;
+}
+#endif

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/unload.c Added

@@ -0,0 +1,64 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * unload.c - Code to free a DUH from memory. / / \ \
+ * | < / \_
+ * By entheh. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+
+
+
+static void destroy_signal(DUH_SIGNAL *signal)
+{
+	if (signal) {
+		if (signal->desc)
+			if (signal->desc->unload_sigdata)
+				if (signal->sigdata)
+					(*signal->desc->unload_sigdata)(signal->sigdata);
+
+		free(signal);
+	}
+}
+
+
+
+/* unload_duh(): destroys a DUH struct. You must call this for every DUH
+ * struct created, when you've finished with it.
+ */
+void unload_duh(DUH *duh)
+{
+	int i;
+
+	if (duh) {
+		if (duh->signal) {
+			for (i = 0; i < duh->n_signals; i++)
+				destroy_signal(duh->signal[i]);
+
+			free(duh->signal);
+		}
+
+		if (duh->tag) {
+			if (duh->tag[0][0])
+				free(duh->tag[0][0]);
+			free(duh->tag);
+		}
+
+		free(duh);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/barray.c Added

@@ -0,0 +1,159 @@
+#include "internal/barray.h"
+
+#include <string.h>
+
+
+void * bit_array_create(size_t size)
+{
+	size_t bsize = ((size + 7) >> 3) + sizeof(size_t);
+	void * ret = calloc(1, bsize);
+	if (ret) *(size_t *)ret = size;
+	return ret;
+}
+
+void bit_array_destroy(void * array)
+{
+	if (array) free(array);
+}
+
+void * bit_array_dup(void * array)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		size_t bsize = ((*size + 7) >> 3) + sizeof(*size);
+		void * ret = malloc(bsize);
+		if (ret) memcpy(ret, array, bsize);
+		return ret;
+	}
+	return NULL;
+}
+
+void bit_array_reset(void * array)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		size_t bsize = (*size + 7) >> 3;
+		memset(size + 1, 0, bsize);
+	}
+}
+
+
+void bit_array_set(void * array, size_t bit)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		if (bit < *size)
+		{
+			unsigned char * ptr = (unsigned char *)(size + 1);
+			ptr[bit >> 3] |= (1U << (bit & 7));
+		}
+	}
+}
+
+int bit_array_test(void * array, size_t bit)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		if (bit < *size)
+		{
+			unsigned char * ptr = (unsigned char *)(size + 1);
+			if (ptr[bit >> 3] & (1U << (bit & 7)))
+			{
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+int bit_array_test_range(void * array, size_t bit, size_t count)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		if (bit < *size)
+		{
+			unsigned char * ptr = (unsigned char *)(size + 1);
+			if ((bit & 7) && (count > 8))
+			{
+				while ((bit < *size) && count && (bit & 7))
+				{
+					if (ptr[bit >> 3] & (1U << (bit & 7))) return 1;
+					bit++;
+					count--;
+				}
+			}
+			if (!(bit & 7))
+			{
+				while (((*size - bit) >= 8) && (count >= 8))
+				{
+					if (ptr[bit >> 3]) return 1;
+					bit += 8;
+					count -= 8;
+				}
+			}
+			while ((bit < *size) && count)
+			{
+				if (ptr[bit >> 3] & (1U << (bit & 7))) return 1;
+				bit++;
+				count--;
+			}
+		}
+	}
+	return 0;
+}
+
+void bit_array_clear(void * array, size_t bit)
+{
+	if (array)
+	{
+		size_t * size = (size_t *) array;
+		if (bit < *size)
+		{
+			unsigned char * ptr = (unsigned char *)(size + 1);
+			ptr[bit >> 3] &= ~(1U << (bit & 7));
+		}
+	}
+}
+
+void bit_array_merge(void * dest, void * source, size_t offset)
+{
+	if (dest && source)
+	{
+		size_t * dsize = (size_t *) dest;
+		size_t * ssize = (size_t *) source;
+		size_t soffset = 0;
+		while (offset < *dsize && soffset < *ssize)
+		{
+			if (bit_array_test(source, soffset))
+			{
+				bit_array_set(dest, offset);
+			}
+			soffset++;
+			offset++;
+		}
+	}
+}
+
+void bit_array_mask(void * dest, void * source, size_t offset)
+{
+	if (dest && source)
+	{
+		size_t * dsize = (size_t *) dest;
+		size_t * ssize = (size_t *) source;
+		size_t soffset = 0;
+		while (offset < *dsize && soffset < *ssize)
+		{
+			if (bit_array_test(source, soffset))
+			{
+				bit_array_clear(dest, offset);
+			}
+			soffset++;
+			offset++;
+		}
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/clickrem.c Added

@@ -0,0 +1,281 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * clickrem.c - Click removal helpers. / / \ \
+ * | < / \_
+ * By entheh. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <math.h>
+#include "dumb.h"
+
+
+
+typedef struct DUMB_CLICK DUMB_CLICK;
+
+
+struct DUMB_CLICK_REMOVER
+{
+	DUMB_CLICK *click;
+	int n_clicks;
+
+	int offset;
+};
+
+
+struct DUMB_CLICK
+{
+	DUMB_CLICK *next;
+	long pos;
+	sample_t step;
+};
+
+
+
+DUMB_CLICK_REMOVER *dumb_create_click_remover(void)
+{
+	DUMB_CLICK_REMOVER *cr = malloc(sizeof(*cr));
+	if (!cr) return NULL;
+
+	cr->click = NULL;
+	cr->n_clicks = 0;
+
+	cr->offset = 0;
+
+	return cr;
+}
+
+
+
+void dumb_record_click(DUMB_CLICK_REMOVER *cr, long pos, sample_t step)
+{
+	DUMB_CLICK *click;
+
+	ASSERT(pos >= 0);
+
+	if (!cr || !step) return;
+
+	if (pos == 0) {
+		cr->offset -= step;
+		return;
+	}
+
+	click = malloc(sizeof(*click));
+	if (!click) return;
+
+	click->pos = pos;
+	click->step = step;
+
+	click->next = cr->click;
+	cr->click = click;
+	cr->n_clicks++;
+}
+
+
+
+static DUMB_CLICK *dumb_click_mergesort(DUMB_CLICK *click, int n_clicks)
+{
+	int i;
+	DUMB_CLICK *c1, *c2, **cp;
+
+	if (n_clicks <= 1) return click;
+
+	/* Split the list into two */
+	c1 = click;
+	cp = &c1;
+	for (i = 0; i < n_clicks; i += 2) cp = &(*cp)->next;
+	c2 = *cp;
+	*cp = NULL;
+
+	/* Sort the sublists */
+	c1 = dumb_click_mergesort(c1, (n_clicks + 1) >> 1);
+	c2 = dumb_click_mergesort(c2, n_clicks >> 1);
+
+	/* Merge them */
+	cp = &click;
+	while (c1 && c2) {
+		if (c1->pos > c2->pos) {
+			*cp = c2;
+			c2 = c2->next;
+		} else {
+			*cp = c1;
+			c1 = c1->next;
+		}
+		cp = &(*cp)->next;
+	}
+	if (c2)
+		*cp = c2;
+	else
+		*cp = c1;
+
+	return click;
+}
+
+
+
+void dumb_remove_clicks(DUMB_CLICK_REMOVER *cr, sample_t *samples, long length, int step, float halflife)
+{
+	DUMB_CLICK *click;
+	long pos = 0;
+	int offset;
+	int factor;
+
+	if (!cr) return;
+
+	factor = (int)floor(pow(0.5, 1.0/halflife) * (1U << 31));
+
+	click = dumb_click_mergesort(cr->click, cr->n_clicks);
+	cr->click = NULL;
+	cr->n_clicks = 0;
+
+	length *= step;
+
+	while (click) {
+		DUMB_CLICK *next = click->next;
+		int end = click->pos * step;
+		ASSERT(end <= length);
+		offset = cr->offset;
+		if (offset < 0) {
+			offset = -offset;
+			while (pos < end) {
+				samples[pos] -= offset;
+				offset = (int)(((LONG_LONG)(offset << 1) * factor) >> 32);
+				pos += step;
+			}
+			offset = -offset;
+		} else {
+			while (pos < end) {
+				samples[pos] += offset;
+				offset = (int)(((LONG_LONG)(offset << 1) * factor) >> 32);
+				pos += step;
+			}
+		}
+		cr->offset = offset - click->step;
+		free(click);
+		click = next;
+	}
+
+	offset = cr->offset;
+	if (offset < 0) {
+		offset = -offset;
+		while (pos < length) {
+			samples[pos] -= offset;
+			offset = (int)((LONG_LONG)(offset << 1) * factor >> 32);
+			pos += step;
+		}
+		offset = -offset;
+	} else {
+		while (pos < length) {
+			samples[pos] += offset;
+			offset = (int)((LONG_LONG)(offset << 1) * factor >> 32);
+			pos += step;
+		}
+	}
+	cr->offset = offset;
+}
+
+
+
+sample_t dumb_click_remover_get_offset(DUMB_CLICK_REMOVER *cr)
+{
+	return cr ? cr->offset : 0;
+}
+
+
+
+void dumb_destroy_click_remover(DUMB_CLICK_REMOVER *cr)
+{
+	if (cr) {
+		DUMB_CLICK *click = cr->click;
+		while (click) {
+			DUMB_CLICK *next = click->next;
+			free(click);
+			click = next;
+		}
+		free(cr);
+	}
+}
+
+
+
+DUMB_CLICK_REMOVER **dumb_create_click_remover_array(int n)
+{
+	int i;
+	DUMB_CLICK_REMOVER **cr;
+	if (n <= 0) return NULL;
+	cr = malloc(n * sizeof(*cr));
+	if (!cr) return NULL;
+	for (i = 0; i < n; i++) cr[i] = dumb_create_click_remover();
+	return cr;
+}
+
+
+
+void dumb_record_click_array(int n, DUMB_CLICK_REMOVER **cr, long pos, sample_t *step)
+{
+	if (cr) {
+		int i;
+		for (i = 0; i < n; i++)
+			dumb_record_click(cr[i], pos, step[i]);
+	}
+}
+
+
+
+void dumb_record_click_negative_array(int n, DUMB_CLICK_REMOVER **cr, long pos, sample_t *step)
+{
+	if (cr) {
+		int i;
+		for (i = 0; i < n; i++)
+			dumb_record_click(cr[i], pos, -step[i]);
+	}
+}
+
+
+
+void dumb_remove_clicks_array(int n, DUMB_CLICK_REMOVER **cr, sample_t **samples, long length, float halflife)
+{
+	if (cr) {
+		int i;
+		for (i = 0; i < n >> 1; i++) {
+			dumb_remove_clicks(cr[i << 1], samples[i], length, 2, halflife);
+			dumb_remove_clicks(cr[(i << 1) + 1], samples[i] + 1, length, 2, halflife);
+		}
+		if (n & 1)
+			dumb_remove_clicks(cr[i << 1], samples[i], length, 1, halflife);
+	}
+}
+
+
+
+void dumb_click_remover_get_offset_array(int n, DUMB_CLICK_REMOVER **cr, sample_t *offset)
+{
+	if (cr) {
+		int i;
+		for (i = 0; i < n; i++)
+			if (cr[i]) offset[i] += cr[i]->offset;
+	}
+}
+
+
+
+void dumb_destroy_click_remover_array(int n, DUMB_CLICK_REMOVER **cr)
+{
+	if (cr) {
+		int i;
+		for (i = 0; i < n; i++) dumb_destroy_click_remover(cr[i]);
+		free(cr);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/memfile.c Added

@@ -0,0 +1,96 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * memfile.c - Module for reading data from / / \ \
+ * memory using a DUMBFILE. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+
+
+
+typedef struct MEMFILE MEMFILE;
+
+struct MEMFILE
+{
+	const char *ptr;
+	long left;
+};
+
+
+
+static int dumb_memfile_skip(void *f, long n)
+{
+	MEMFILE *m = f;
+	if (n > m->left) return -1;
+	m->ptr += n;
+	m->left -= n;
+	return 0;
+}
+
+
+
+static int dumb_memfile_getc(void *f)
+{
+	MEMFILE *m = f;
+	if (m->left <= 0) return -1;
+	m->left--;
+	return *(const unsigned char *)m->ptr++;
+}
+
+
+
+static long dumb_memfile_getnc(char *ptr, long n, void *f)
+{
+	MEMFILE *m = f;
+	if (n > m->left) n = m->left;
+	memcpy(ptr, m->ptr, n);
+	m->ptr += n;
+	m->left -= n;
+	return n;
+}
+
+
+
+static void dumb_memfile_close(void *f)
+{
+	free(f);
+}
+
+
+
+static const DUMBFILE_SYSTEM memfile_dfs = {
+	NULL,
+	&dumb_memfile_skip,
+	&dumb_memfile_getc,
+	&dumb_memfile_getnc,
+	&dumb_memfile_close
+};
+
+
+
+DUMBFILE *dumbfile_open_memory(const char *data, long size)
+{
+	MEMFILE *m = malloc(sizeof(*m));
+	if (!m) return NULL;
+
+	m->ptr = data;
+	m->left = size;
+
+	return dumbfile_open_ex(m, &memfile_dfs);
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp2.inc Added

@@ -0,0 +1,160 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * resamp2.inc - Resampling helper template. / / \ \
+ * | < / \_
+ * By Bob and entheh. | \/ /\ /
+ * \_ / > /
+ * In order to find a good trade-off between | \ / /
+ * speed and accuracy in this code, some tests | ' /
+ * were carried out regarding the behaviour of \__/
+ * long long ints with gcc. The following code
+ * was tested:
+ *
+ * int a, b, c;
+ * c = ((long long)a * b) >> 16;
+ *
+ * DJGPP GCC Version 3.0.3 generated the following assembly language code for
+ * the multiplication and scaling, leaving the 32-bit result in EAX.
+ *
+ * movl -8(%ebp), %eax ; read one int into EAX
+ * imull -4(%ebp) ; multiply by the other; result goes in EDX:EAX
+ * shrdl $16, %edx, %eax ; shift EAX right 16, shifting bits in from EDX
+ *
+ * Note that a 32*32->64 multiplication is performed, allowing for high
+ * accuracy. On the Pentium 2 and above, shrdl takes two cycles (generally),
+ * so it is a minor concern when four multiplications are being performed
+ * (the cubic resampler). On the Pentium MMX and earlier, it takes four or
+ * more cycles, so this method is unsuitable for use in the low-quality
+ * resamplers.
+ *
+ * Since "long long" is a gcc-specific extension, we use LONG_LONG instead,
+ * defined in dumb.h. We may investigate later what code MSVC generates, but
+ * if it seems too slow then we suggest you use a good compiler.
+ *
+ * FIXME: these comments are somewhat out of date now.
+ */
+
+
+
+#define SUFFIX3 _1
+
+/* For convenience, returns nonzero on stop. */
+static int process_pickup(DUMB_RESAMPLER *resampler)
+{
+	if (resampler->overshot < 0) {
+		resampler->overshot = 0;
+		dumb_resample(resampler, NULL, 2, MONO_DEST_VOLUME_ZEROS, 1.0f); /* Doesn't matter which SUFFIX3. */
+		COPYSRC(resampler->X, 0, resampler->X, 1);
+	}
+
+	for (;;) {
+		SRCTYPE *src = resampler->src;
+
+		if (resampler->dir < 0) {
+			if (resampler->overshot >= 3 && resampler->pos+3 >= resampler->start) COPYSRC(resampler->X, 0, src, resampler->pos+3);
+			if (resampler->overshot >= 2 && resampler->pos+2 >= resampler->start) COPYSRC(resampler->X, 1, src, resampler->pos+2);
+			if (resampler->overshot >= 1 && resampler->pos+1 >= resampler->start) COPYSRC(resampler->X, 2, src, resampler->pos+1);
+			resampler->overshot = resampler->start - resampler->pos - 1;
+		} else {
+			if (resampler->overshot >= 3 && resampler->pos-3 < resampler->end) COPYSRC(resampler->X, 0, src, resampler->pos-3);
+			if (resampler->overshot >= 2 && resampler->pos-2 < resampler->end) COPYSRC(resampler->X, 1, src, resampler->pos-2);
+			if (resampler->overshot >= 1 && resampler->pos-1 < resampler->end) COPYSRC(resampler->X, 2, src, resampler->pos-1);
+			resampler->overshot = resampler->pos - resampler->end;
+		}
+
+		if (resampler->overshot < 0) {
+			resampler->overshot = 0;
+			return 0;
+		}
+
+		if (!resampler->pickup) {
+			resampler->dir = 0;
+			return 1;
+		}
+		(*resampler->pickup)(resampler, resampler->pickup_data);
+		if (resampler->dir == 0) return 1;
+		ASSERT(resampler->dir == -1 || resampler->dir == 1);
+	}
+}
+
+
+
+/* Create mono destination resampler. */
+/* SUFFIX3 was set above. */
+#define VOLUME_PARAMETERS MONO_DEST_VOLUME_PARAMETERS
+#define VOLUME_VARIABLES MONO_DEST_VOLUME_VARIABLES
+#define SET_VOLUME_VARIABLES SET_MONO_DEST_VOLUME_VARIABLES
+#define RETURN_VOLUME_VARIABLES RETURN_MONO_DEST_VOLUME_VARIABLES
+#define VOLUMES_ARE_ZERO MONO_DEST_VOLUMES_ARE_ZERO
+#define MIX_ALIAS(op, upd, offset) MONO_DEST_MIX_ALIAS(op, upd, offset)
+#define MIX_LINEAR(op, upd, o0, o1) MONO_DEST_MIX_LINEAR(op, upd, o0, o1)
+#define MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) MONO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3)
+#define MIX_ZEROS(op) *dst++ op 0
+#include "resamp3.inc"
+
+/* Create stereo destination resampler. */
+#define SUFFIX3 _2
+#define VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right
+#define VOLUME_VARIABLES lvol=0, lvolr=0, lvold=0, lvolt=0, lvolm=0, rvol=0, rvolr=0, rvold=0, rvolt=0, rvolm=0
+#define SET_VOLUME_VARIABLES { \
+	if ( volume_left ) { \
+		lvolr = (int)(volume_left->volume * 16777216.0); \
+		lvold = (int)(volume_left->delta * 16777216.0); \
+		lvolt = (int)(volume_left->target * 16777216.0); \
+		lvolm = (int)(volume_left->mix * 16777216.0); \
+		lvol = MULSCV( lvolr, lvolm ); \
+		if ( lvolr == lvolt ) volume_left = NULL; \
+	} else { \
+		lvol = 0; \
+		lvolt = 0; \
+	} \
+	if ( volume_right ) { \
+		rvolr = (int)(volume_right->volume * 16777216.0); \
+		rvold = (int)(volume_right->delta * 16777216.0); \
+		rvolt = (int)(volume_right->target * 16777216.0); \
+		rvolm = (int)(volume_right->mix * 16777216.0); \
+		rvol = MULSCV( rvolr, rvolm ); \
+		if ( rvolr == rvolt ) volume_right = NULL; \
+	} else { \
+		rvol = 0; \
+		rvolt = 0; \
+	} \
+}
+#define RETURN_VOLUME_VARIABLES { \
+	if ( volume_left ) volume_left->volume = (float)lvolr / 16777216.0f; \
+	if ( volume_right ) volume_right->volume = (float)rvolr / 16777216.0f; \
+}
+#define VOLUMES_ARE_ZERO (lvol == 0 && lvolt == 0 && rvol == 0 && rvolt == 0)
+#define MIX_ALIAS(op, upd, offset) STEREO_DEST_MIX_ALIAS(op, upd, offset)
+#define MIX_LINEAR(op, upd, o0, o1) STEREO_DEST_MIX_LINEAR(op, upd, o0, o1)
+#define MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) STEREO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3)
+#define MIX_ZEROS(op) { *dst++ op 0; *dst++ op 0; }
+#include "resamp3.inc"
+
+
+
+#undef STEREO_DEST_MIX_CUBIC
+#undef MONO_DEST_MIX_CUBIC
+#undef STEREO_DEST_MIX_LINEAR
+#undef MONO_DEST_MIX_LINEAR
+#undef STEREO_DEST_MIX_ALIAS
+#undef MONO_DEST_MIX_ALIAS
+#undef MONO_DEST_VOLUMES_ARE_ZERO
+#undef SET_MONO_DEST_VOLUME_VARIABLES
+#undef RETURN_MONO_DEST_VOLUME_VARIABLES
+#undef MONO_DEST_VOLUME_ZEROS
+#undef MONO_DEST_VOLUME_VARIABLES
+#undef MONO_DEST_VOLUME_PARAMETERS
+#undef COPYSRC2
+#undef COPYSRC
+#undef DIVIDE_BY_SRC_CHANNELS
+#undef SRC_CHANNELS
+#undef SUFFIX2

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp3.inc Added

@@ -0,0 +1,376 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * resamp3.inc - Resampling helper template. / / \ \
+ * | < / \_
+ * By Bob and entheh. | \/ /\ /
+ * \_ / > /
+ * In order to find a good trade-off between | \ / /
+ * speed and accuracy in this code, some tests | ' /
+ * were carried out regarding the behaviour of \__/
+ * long long ints with gcc. The following code
+ * was tested:
+ *
+ * int a, b, c;
+ * c = ((long long)a * b) >> 16;
+ *
+ * DJGPP GCC Version 3.0.3 generated the following assembly language code for
+ * the multiplication and scaling, leaving the 32-bit result in EAX.
+ *
+ * movl -8(%ebp), %eax ; read one int into EAX
+ * imull -4(%ebp) ; multiply by the other; result goes in EDX:EAX
+ * shrdl $16, %edx, %eax ; shift EAX right 16, shifting bits in from EDX
+ *
+ * Note that a 32*32->64 multiplication is performed, allowing for high
+ * accuracy. On the Pentium 2 and above, shrdl takes two cycles (generally),
+ * so it is a minor concern when four multiplications are being performed
+ * (the cubic resampler). On the Pentium MMX and earlier, it takes four or
+ * more cycles, so this method is unsuitable for use in the low-quality
+ * resamplers.
+ *
+ * Since "long long" is a gcc-specific extension, we use LONG_LONG instead,
+ * defined in dumb.h. We may investigate later what code MSVC generates, but
+ * if it seems too slow then we suggest you use a good compiler.
+ *
+ * FIXME: these comments are somewhat out of date now.
+ */
+
+
+
+long dumb_resample(DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, VOLUME_PARAMETERS, float delta)
+{
+	int dt;
+	int VOLUME_VARIABLES;
+	long done;
+	long todo;
+	LONG_LONG todo64;
+	int quality;
+
+	if (!resampler || resampler->dir == 0) return 0;
+	ASSERT(resampler->dir == -1 || resampler->dir == 1);
+
+	done = 0;
+	dt = (int)(delta * 65536.0 + 0.5);
+	if (dt == 0) return 0;
+	SET_VOLUME_VARIABLES;
+
+	if (VOLUMES_ARE_ZERO) dst = NULL;
+
+	init_cubic();
+
+	quality = resampler->quality;
+
+	while (done < dst_size) {
+		if (process_pickup(resampler)) {
+			RETURN_VOLUME_VARIABLES;
+			return done;
+		}
+
+		if ((resampler->dir ^ dt) < 0)
+			dt = -dt;
+
+		if (resampler->dir < 0)
+			todo64 = ((((LONG_LONG)(resampler->pos - resampler->start) << 16) + resampler->subpos - dt) / -dt);
+		else
+			todo64 = ((((LONG_LONG)(resampler->end - resampler->pos) << 16) - resampler->subpos - 1 + dt) / dt);
+
+		if (todo64 < 0)
+			todo = 0;
+		else if (todo64 > dst_size - done)
+			todo = dst_size - done;
+		else
+			todo = (long) todo64;
+
+		done += todo;
+
+		{
+			SRCTYPE *src = resampler->src;
+			long pos = resampler->pos;
+			int subpos = resampler->subpos;
+			long diff = pos;
+			long overshot;
+			if (resampler->dir < 0) {
+				if (!dst) {
+					/* Silence or simulation */
+					LONG_LONG new_subpos = subpos + (LONG_LONG)dt * todo;
+					pos += (long)(new_subpos >> 16);
+					subpos = (long)new_subpos & 65535;
+				} else if (quality <= DUMB_RQ_ALIASING) {
+					/* Aliasing, backwards */
+					SRCTYPE xbuf[2*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[0];
+					SRCTYPE *xstart;
+					COPYSRC(xbuf, 0, resampler->X, 1);
+					COPYSRC(xbuf, 1, resampler->X, 2);
+					while (todo && x < &xbuf[2*SRC_CHANNELS]) {
+						// TODO: check what happens when multiple tempo slides occur per row
+						HEAVYASSERT(pos >= resampler->start);
+						MIX_ALIAS(+=, 1, 0);
+						subpos += dt;
+						pos += subpos >> 16;
+						x -= (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					x = xstart = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						MIX_ALIAS(+=, 1, 2);
+						subpos += dt;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+					pos += DIVIDE_BY_SRC_CHANNELS(x - xstart);
+				} else if (quality <= DUMB_RQ_LINEAR) {
+					/* Linear interpolation, backwards */
+					SRCTYPE xbuf[3*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[1*SRC_CHANNELS];
+					COPYSRC(xbuf, 0, resampler->X, 1);
+					COPYSRC(xbuf, 1, resampler->X, 2);
+					COPYSRC(xbuf, 2, src, pos);
+					while (todo && x < &xbuf[3*SRC_CHANNELS]) {
+						HEAVYASSERT(pos >= resampler->start);
+						MIX_LINEAR(+=, 1, 0, -1);
+						subpos += dt;
+						pos += subpos >> 16;
+						x -= (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					// TODO: use xstart for others too
+					x = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						HEAVYASSERT(pos >= resampler->start);
+						MIX_LINEAR(+=, 1, 1, 2);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+				} else {
+					/* Cubic interpolation, backwards */
+					SRCTYPE xbuf[6*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[3*SRC_CHANNELS];
+					COPYSRC(xbuf, 0, resampler->X, 0);
+					COPYSRC(xbuf, 1, resampler->X, 1);
+					COPYSRC(xbuf, 2, resampler->X, 2);
+					COPYSRC(xbuf, 3, src, pos);
+					if (pos-1 >= resampler->start) COPYSRC(xbuf, 4, src, pos-1);
+					if (pos-2 >= resampler->start) COPYSRC(xbuf, 5, src, pos-2);
+					while (todo && x < &xbuf[6*SRC_CHANNELS]) {
+						HEAVYASSERT(pos >= resampler->start);
+						MIX_CUBIC(+=, 1, x, x, 0, -1, -2, -3);
+						subpos += dt;
+						pos += subpos >> 16;
+						x -= (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					x = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						HEAVYASSERT(pos >= resampler->start);
+						MIX_CUBIC(+=, 1, x, x, 0, 1, 2, 3);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+				}
+				diff = diff - pos;
+				overshot = resampler->start - pos - 1;
+				if (diff >= 3) {
+					COPYSRC2(resampler->X, 0, overshot < 3, src, pos+3);
+					COPYSRC2(resampler->X, 1, overshot < 2, src, pos+2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos+1);
+				} else if (diff >= 2) {
+					COPYSRC(resampler->X, 0, resampler->X, 2);
+					COPYSRC2(resampler->X, 1, overshot < 2, src, pos+2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos+1);
+				} else if (diff >= 1) {
+					COPYSRC(resampler->X, 0, resampler->X, 1);
+					COPYSRC(resampler->X, 1, resampler->X, 2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos+1);
+				}
+			} else {
+				if (!dst) {
+					/* Silence or simulation */
+					LONG_LONG new_subpos = subpos + (LONG_LONG)dt * todo;
+					pos += (long)(new_subpos >> 16);
+					subpos = (long)new_subpos & 65535;
+				} else if (quality <= DUMB_RQ_ALIASING) {
+					/* Aliasing, forwards */
+					SRCTYPE xbuf[2*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[0];
+					SRCTYPE *xstart;
+					COPYSRC(xbuf, 0, resampler->X, 1);
+					COPYSRC(xbuf, 1, resampler->X, 2);
+					while (todo && x < &xbuf[2*SRC_CHANNELS]) {
+						HEAVYASSERT(pos < resampler->end);
+						MIX_ALIAS(+=, 1, 0);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					x = xstart = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						MIX_ALIAS(+=, 1, -2);
+						subpos += dt;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+					pos += DIVIDE_BY_SRC_CHANNELS(x - xstart);
+				} else if (quality <= DUMB_RQ_LINEAR) {
+					/* Linear interpolation, forwards */
+					SRCTYPE xbuf[3*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[1*SRC_CHANNELS];
+					COPYSRC(xbuf, 0, resampler->X, 1);
+					COPYSRC(xbuf, 1, resampler->X, 2);
+					COPYSRC(xbuf, 2, src, pos);
+					while (todo && x < &xbuf[3*SRC_CHANNELS]) {
+						HEAVYASSERT(pos < resampler->end);
+						MIX_LINEAR(+=, 1, -1, 0);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					x = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						HEAVYASSERT(pos < resampler->end);
+						MIX_LINEAR(+=, 1, -2, -1);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+				} else {
+					/* Cubic interpolation, forwards */
+					SRCTYPE xbuf[6*SRC_CHANNELS];
+					SRCTYPE *x = &xbuf[3*SRC_CHANNELS];
+					COPYSRC(xbuf, 0, resampler->X, 0);
+					COPYSRC(xbuf, 1, resampler->X, 1);
+					COPYSRC(xbuf, 2, resampler->X, 2);
+					COPYSRC(xbuf, 3, src, pos);
+					if (pos+1 < resampler->end) COPYSRC(xbuf, 4, src, pos+1);
+					if (pos+2 < resampler->end) COPYSRC(xbuf, 5, src, pos+2);
+					while (todo && x < &xbuf[6*SRC_CHANNELS]) {
+						HEAVYASSERT(pos < resampler->end);
+						MIX_CUBIC(+=, 1, x, x, -3, -2, -1, 0);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+						todo--;
+					}
+					x = &src[pos*SRC_CHANNELS];
+					LOOP4(todo,
+						HEAVYASSERT(pos < resampler->end);
+						MIX_CUBIC(+=, 1, x, x, -3, -2, -1, 0);
+						subpos += dt;
+						pos += subpos >> 16;
+						x += (subpos >> 16) * SRC_CHANNELS;
+						subpos &= 65535;
+					);
+				}
+				diff = pos - diff;
+				overshot = pos - resampler->end;
+				if (diff >= 3) {
+					COPYSRC2(resampler->X, 0, overshot < 3, src, pos-3);
+					COPYSRC2(resampler->X, 1, overshot < 2, src, pos-2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos-1);
+				} else if (diff >= 2) {
+					COPYSRC(resampler->X, 0, resampler->X, 2);
+					COPYSRC2(resampler->X, 1, overshot < 2, src, pos-2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos-1);
+				} else if (diff >= 1) {
+					COPYSRC(resampler->X, 0, resampler->X, 1);
+					COPYSRC(resampler->X, 1, resampler->X, 2);
+					COPYSRC2(resampler->X, 2, overshot < 1, src, pos-1);
+				}
+			}
+			resampler->pos = pos;
+			resampler->subpos = subpos;
+		}
+	}
+
+	RETURN_VOLUME_VARIABLES;
+	return done;
+}
+
+
+
+void dumb_resample_get_current_sample(DUMB_RESAMPLER *resampler, VOLUME_PARAMETERS, sample_t *dst)
+{
+	int VOLUME_VARIABLES;
+	SRCTYPE *src;
+	long pos;
+	int subpos;
+	int quality;
+	SRCTYPE *x;
+
+	if (!resampler || resampler->dir == 0) { MIX_ZEROS(=); return; }
+	ASSERT(resampler->dir == -1 || resampler->dir == 1);
+
+	if (process_pickup(resampler)) { MIX_ZEROS(=); return; }
+
+	SET_VOLUME_VARIABLES;
+
+	if (VOLUMES_ARE_ZERO) { MIX_ZEROS(=); return; }
+
+	init_cubic();
+
+	quality = resampler->quality;
+
+	src = resampler->src;
+	pos = resampler->pos;
+	subpos = resampler->subpos;
+	x = resampler->X;
+
+	if (resampler->dir < 0) {
+		HEAVYASSERT(pos >= resampler->start);
+		if (dumb_resampling_quality <= DUMB_RQ_ALIASING) {
+			/* Aliasing, backwards */
+			MIX_ALIAS(=, 0, 1);
+		} else if (quality <= DUMB_RQ_LINEAR) {
+			/* Linear interpolation, backwards */
+			MIX_LINEAR(=, 0, 2, 1);
+		} else {
+			/* Cubic interpolation, backwards */
+			MIX_CUBIC(=, 0, src, x, pos, 2, 1, 0);
+		}
+	} else {
+		HEAVYASSERT(pos < resampler->end);
+		if (dumb_resampling_quality <= DUMB_RQ_ALIASING) {
+			/* Aliasing */
+			MIX_ALIAS(=, 0, 1);
+		} else if (dumb_resampling_quality <= DUMB_RQ_LINEAR) {
+			/* Linear interpolation, forwards */
+			MIX_LINEAR(=, 0, 1, 2);
+		} else {
+			/* Cubic interpolation, forwards */
+			MIX_CUBIC(=, 0, x, src, 0, 1, 2, pos);
+		}
+	}
+}
+
+
+
+#undef MIX_ZEROS
+#undef MIX_CUBIC
+#undef MIX_LINEAR
+#undef MIX_ALIAS
+#undef VOLUMES_ARE_ZERO
+#undef SET_VOLUME_VARIABLES
+#undef RETURN_VOLUME_VARIABLES
+#undef VOLUME_VARIABLES
+#undef VOLUME_PARAMETERS
+#undef SUFFIX3

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.c Added

@@ -0,0 +1,393 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * resample.c - Resampling helpers. / / \ \
+ * | < / \_
+ * By Bob and entheh. | \/ /\ /
+ * \_ / > /
+ * In order to find a good trade-off between | \ / /
+ * speed and accuracy in this code, some tests | ' /
+ * were carried out regarding the behaviour of \__/
+ * long long ints with gcc. The following code
+ * was tested:
+ *
+ * int a, b, c;
+ * c = ((long long)a * b) >> 16;
+ *
+ * DJGPP GCC Version 3.0.3 generated the following assembly language code for
+ * the multiplication and scaling, leaving the 32-bit result in EAX.
+ *
+ * movl -8(%ebp), %eax ; read one int into EAX
+ * imull -4(%ebp) ; multiply by the other; result goes in EDX:EAX
+ * shrdl $16, %edx, %eax ; shift EAX right 16, shifting bits in from EDX
+ *
+ * Note that a 32*32->64 multiplication is performed, allowing for high
+ * accuracy. On the Pentium 2 and above, shrdl takes two cycles (generally),
+ * so it is a minor concern when four multiplications are being performed
+ * (the cubic resampler). On the Pentium MMX and earlier, it takes four or
+ * more cycles, so this method is unsuitable for use in the low-quality
+ * resamplers.
+ *
+ * Since "long long" is a gcc-specific extension, we use LONG_LONG instead,
+ * defined in dumb.h. We may investigate later what code MSVC generates, but
+ * if it seems too slow then we suggest you use a good compiler.
+ *
+ * FIXME: these comments are somewhat out of date now.
+ */
+
+#include <math.h>
+#include "dumb.h"
+
+
+
+/* Compile with -DHEAVYDEBUG if you want to make sure the pick-up function is
+ * called when it should be. There will be a considerable performance hit,
+ * since at least one condition has to be tested for every sample generated.
+ */
+#ifdef HEAVYDEBUG
+#define HEAVYASSERT(cond) ASSERT(cond)
+#else
+#define HEAVYASSERT(cond)
+#endif
+
+
+
+/* Make MSVC shut the hell up about if ( upd ) UPDATE_VOLUME() conditions being constant */
+#ifdef _MSC_VER
+#pragma warning(disable:4127 4701)
+#endif
+
+
+
+/* A global variable for controlling resampling quality wherever a local
+ * specification doesn't override it. The following values are valid:
+ *
+ * 0 - DUMB_RQ_ALIASING - fastest
+ * 1 - DUMB_RQ_LINEAR
+ * 2 - DUMB_RQ_CUBIC - nicest
+ *
+ * Values outside the range 0-2 will behave the same as the nearest
+ * value within the range.
+ */
+int dumb_resampling_quality = DUMB_RQ_CUBIC;
+
+
+
+//#define MULSC(a, b) ((int)((LONG_LONG)(a) * (b) >> 16))
+//#define MULSC(a, b) ((a) * ((b) >> 2) >> 14)
+#define MULSCV(a, b) ((int)((LONG_LONG)(a) * (b) >> 32))
+#define MULSC(a, b) ((int)((LONG_LONG)((a) << 4) * ((b) << 12) >> 32))
+#define MULSC16(a, b) ((int)((LONG_LONG)((a) << 12) * ((b) << 12) >> 32))
+
+
+
+/* Executes the content 'iterator' times.
+ * Clobbers the 'iterator' variable.
+ * The loop is unrolled by four.
+ */
+#define LOOP4(iterator, CONTENT) \
+{ \
+	if ((iterator) & 2) { \
+		CONTENT; \
+		CONTENT; \
+	} \
+	if ((iterator) & 1) { \
+		CONTENT; \
+	} \
+	(iterator) >>= 2; \
+	while (iterator) { \
+		CONTENT; \
+		CONTENT; \
+		CONTENT; \
+		CONTENT; \
+		(iterator)--; \
+	} \
+}
+
+
+
+#define PASTERAW(a, b) a ## b /* This does not expand macros in b ... */
+#define PASTE(a, b) PASTERAW(a, b) /* ... but b is expanded during this substitution. */
+
+#define X PASTE(x.x, SRCBITS)
+
+
+
+/* Cubic resampler: look-up tables
+ *
+ * a = 1.5*x1 - 1.5*x2 + 0.5*x3 - 0.5*x0
+ * b = 2*x2 + x0 - 2.5*x1 - 0.5*x3
+ * c = 0.5*x2 - 0.5*x0
+ * d = x1
+ *
+ * x = a*t*t*t + b*t*t + c*t + d
+ * = (-0.5*x0 + 1.5*x1 - 1.5*x2 + 0.5*x3) * t*t*t +
+ * ( 1*x0 - 2.5*x1 + 2 *x2 - 0.5*x3) * t*t +
+ * (-0.5*x0 + 0.5*x2 ) * t +
+ * ( 1*x1 )
+ * = (-0.5*t*t*t + 1 *t*t - 0.5*t ) * x0 +
+ * ( 1.5*t*t*t - 2.5*t*t + 1) * x1 +
+ * (-1.5*t*t*t + 2 *t*t + 0.5*t ) * x2 +
+ * ( 0.5*t*t*t - 0.5*t*t ) * x3
+ * = A0(t) * x0 + A1(t) * x1 + A2(t) * x2 + A3(t) * x3
+ *
+ * A0, A1, A2 and A3 stay within the range [-1,1].
+ * In the tables, they are scaled with 14 fractional bits.
+ *
+ * Turns out we don't need to store A2 and A3; they are symmetrical to A1 and A0.
+ *
+ * TODO: A0 and A3 stay very small indeed. Consider different scale/resolution?
+ */
+
+static short cubicA0[1025], cubicA1[1025];
+
+/*static*/ void init_cubic(void)
+{
+	unsigned int t; /* 3*1024*1024*1024 is within range if it's unsigned */
+	static int done = 0;
+	if (done) return;
+	done = 1;
+	for (t = 0; t < 1025; t++) {
+		/* int casts to pacify warnings about negating unsigned values */
+		cubicA0[t] = -(int)( t*t*t >> 17) + (int)( t*t >> 6) - (int)(t << 3);
+		cubicA1[t] = (int)(3*t*t*t >> 17) - (int)(5*t*t >> 7) + (int)(1 << 14);
+	}
+}
+
+
+
+/* Create resamplers for 24-in-32-bit source samples. */
+
+/* #define SUFFIX
+ * MSVC warns if we try to paste a null SUFFIX, so instead we define
+ * special macros for the function names that don't bother doing the
+ * corresponding paste. The more generic definitions are further down.
+ */
+#define process_pickup PASTE(process_pickup, SUFFIX2)
+#define dumb_resample PASTE(PASTE(dumb_resample, SUFFIX2), SUFFIX3)
+#define dumb_resample_get_current_sample PASTE(PASTE(dumb_resample_get_current_sample, SUFFIX2), SUFFIX3)
+
+#define SRCTYPE sample_t
+#define SRCBITS 24
+#define ALIAS(x, vol) MULSC(x, vol)
+#define LINEAR(x0, x1) (x0 + MULSC(x1 - x0, subpos))
+/*
+#define SET_CUBIC_COEFFICIENTS(x0, x1, x2, x3) { \
+	a = (3 * (x1 - x2) + (x3 - x0)) >> 1; \
+	b = ((x2 << 2) + (x0 << 1) - (5 * x1 + x3)) >> 1; \
+	c = (x2 - x0) >> 1; \
+}
+#define CUBIC(d) MULSC(MULSC(MULSC(MULSC(a, subpos) + b, subpos) + c, subpos) + d, vol)
+*/
+#define CUBIC(x0, x1, x2, x3) ( \
+	MULSC(x0, cubicA0[subpos >> 6] << 2) + \
+	MULSC(x1, cubicA1[subpos >> 6] << 2) + \
+	MULSC(x2, cubicA1[1 + (subpos >> 6 ^ 1023)] << 2) + \
+	MULSC(x3, cubicA0[1 + (subpos >> 6 ^ 1023)] << 2))
+#define CUBICVOL(x, vol) MULSC(x, vol)
+#include "resample.inc"
+
+/* Undefine the simplified macros. */
+#undef dumb_resample_get_current_sample
+#undef dumb_resample
+#undef process_pickup
+
+
+/* Now define the proper ones that use SUFFIX. */
+#define dumb_reset_resampler PASTE(dumb_reset_resampler, SUFFIX)
+#define dumb_start_resampler PASTE(dumb_start_resampler, SUFFIX)
+#define process_pickup PASTE(PASTE(process_pickup, SUFFIX), SUFFIX2)
+#define dumb_resample PASTE(PASTE(PASTE(dumb_resample, SUFFIX), SUFFIX2), SUFFIX3)
+#define dumb_resample_get_current_sample PASTE(PASTE(PASTE(dumb_resample_get_current_sample, SUFFIX), SUFFIX2), SUFFIX3)
+#define dumb_end_resampler PASTE(dumb_end_resampler, SUFFIX)
+
+/* Create resamplers for 16-bit source samples. */
+#define SUFFIX _16
+#define SRCTYPE short
+#define SRCBITS 16
+#define ALIAS(x, vol) (x * vol >> 8)
+#define LINEAR(x0, x1) ((x0 << 8) + MULSC16(x1 - x0, subpos))
+/*
+#define SET_CUBIC_COEFFICIENTS(x0, x1, x2, x3) { \
+	a = (3 * (x1 - x2) + (x3 - x0)) << 7; \
+	b = ((x2 << 2) + (x0 << 1) - (5 * x1 + x3)) << 7; \
+	c = (x2 - x0) << 7; \
+}
+#define CUBIC(d) MULSC(MULSC(MULSC(MULSC(a, subpos) + b, subpos) + c, subpos) + (d << 8), vol)
+*/
+#define CUBIC(x0, x1, x2, x3) ( \
+	x0 * cubicA0[subpos >> 6] + \
+	x1 * cubicA1[subpos >> 6] + \
+	x2 * cubicA1[1 + (subpos >> 6 ^ 1023)] + \
+	x3 * cubicA0[1 + (subpos >> 6 ^ 1023)])
+#define CUBICVOL(x, vol) (int)((LONG_LONG)(x) * (vol << 10) >> 32)
+#include "resample.inc"
+
+/* Create resamplers for 8-bit source samples. */
+#define SUFFIX _8
+#define SRCTYPE signed char
+#define SRCBITS 8
+#define ALIAS(x, vol) (x * vol)
+#define LINEAR(x0, x1) ((x0 << 16) + (x1 - x0) * subpos)
+/*
+#define SET_CUBIC_COEFFICIENTS(x0, x1, x2, x3) { \
+	a = 3 * (x1 - x2) + (x3 - x0); \
+	b = ((x2 << 2) + (x0 << 1) - (5 * x1 + x3)) << 15; \
+	c = (x2 - x0) << 15; \
+}
+#define CUBIC(d) MULSC(MULSC(MULSC((a * subpos >> 1) + b, subpos) + c, subpos) + (d << 16), vol)
+*/
+#define CUBIC(x0, x1, x2, x3) (( \
+	x0 * cubicA0[subpos >> 6] + \
+	x1 * cubicA1[subpos >> 6] + \
+	x2 * cubicA1[1 + (subpos >> 6 ^ 1023)] + \
+	x3 * cubicA0[1 + (subpos >> 6 ^ 1023)]) << 6)
+#define CUBICVOL(x, vol) (int)((LONG_LONG)(x) * (vol << 12) >> 32)
+#include "resample.inc"
+
+
+#undef dumb_reset_resampler
+#undef dumb_start_resampler
+#undef process_pickup
+#undef dumb_resample
+#undef dumb_resample_get_current_sample
+#undef dumb_end_resampler
+
+
+
+void dumb_reset_resampler_n(int n, DUMB_RESAMPLER *resampler, void *src, int src_channels, long pos, long start, long end, int quality)
+{
+	if (n == 8)
+		dumb_reset_resampler_8(resampler, src, src_channels, pos, start, end, quality);
+	else if (n == 16)
+		dumb_reset_resampler_16(resampler, src, src_channels, pos, start, end, quality);
+	else
+		dumb_reset_resampler(resampler, src, src_channels, pos, start, end, quality);
+}
+
+
+
+DUMB_RESAMPLER *dumb_start_resampler_n(int n, void *src, int src_channels, long pos, long start, long end, int quality)
+{
+	if (n == 8)
+		return dumb_start_resampler_8(src, src_channels, pos, start, end, quality);
+	else if (n == 16)
+		return dumb_start_resampler_16(src, src_channels, pos, start, end, quality);
+	else
+		return dumb_start_resampler(src, src_channels, pos, start, end, quality);
+}
+
+
+
+long dumb_resample_n_1_1(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume, float delta)
+{
+	if (n == 8)
+		return dumb_resample_8_1_1(resampler, dst, dst_size, volume, delta);
+	else if (n == 16)
+		return dumb_resample_16_1_1(resampler, dst, dst_size, volume, delta);
+	else
+		return dumb_resample_1_1(resampler, dst, dst_size, volume, delta);
+}
+
+
+
+long dumb_resample_n_1_2(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta)
+{
+	if (n == 8)
+		return dumb_resample_8_1_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else if (n == 16)
+		return dumb_resample_16_1_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else
+		return dumb_resample_1_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+}
+
+
+
+long dumb_resample_n_2_1(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta)
+{
+	if (n == 8)
+		return dumb_resample_8_2_1(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else if (n == 16)
+		return dumb_resample_16_2_1(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else
+		return dumb_resample_2_1(resampler, dst, dst_size, volume_left, volume_right, delta);
+}
+
+
+
+long dumb_resample_n_2_2(int n, DUMB_RESAMPLER *resampler, sample_t *dst, long dst_size, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, float delta)
+{
+	if (n == 8)
+		return dumb_resample_8_2_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else if (n == 16)
+		return dumb_resample_16_2_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+	else
+		return dumb_resample_2_2(resampler, dst, dst_size, volume_left, volume_right, delta);
+}
+
+
+
+void dumb_resample_get_current_sample_n_1_1(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume, sample_t *dst)
+{
+	if (n == 8)
+		dumb_resample_get_current_sample_8_1_1(resampler, volume, dst);
+	else if (n == 16)
+		dumb_resample_get_current_sample_16_1_1(resampler, volume, dst);
+	else
+		dumb_resample_get_current_sample_1_1(resampler, volume, dst);
+}
+
+
+
+void dumb_resample_get_current_sample_n_1_2(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst)
+{
+	if (n == 8)
+		dumb_resample_get_current_sample_8_1_2(resampler, volume_left, volume_right, dst);
+	else if (n == 16)
+		dumb_resample_get_current_sample_16_1_2(resampler, volume_left, volume_right, dst);
+	else
+		dumb_resample_get_current_sample_1_2(resampler, volume_left, volume_right, dst);
+}
+
+
+
+void dumb_resample_get_current_sample_n_2_1(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst)
+{
+	if (n == 8)
+		dumb_resample_get_current_sample_8_2_1(resampler, volume_left, volume_right, dst);
+	else if (n == 16)
+		dumb_resample_get_current_sample_16_2_1(resampler, volume_left, volume_right, dst);
+	else
+		dumb_resample_get_current_sample_2_1(resampler, volume_left, volume_right, dst);
+}
+
+
+
+void dumb_resample_get_current_sample_n_2_2(int n, DUMB_RESAMPLER *resampler, DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right, sample_t *dst)
+{
+	if (n == 8)
+		dumb_resample_get_current_sample_8_2_2(resampler, volume_left, volume_right, dst);
+	else if (n == 16)
+		dumb_resample_get_current_sample_16_2_2(resampler, volume_left, volume_right, dst);
+	else
+		dumb_resample_get_current_sample_2_2(resampler, volume_left, volume_right, dst);
+}
+
+
+
+void dumb_end_resampler_n(int n, DUMB_RESAMPLER *resampler)
+{
+	if (n == 8)
+		dumb_end_resampler_8(resampler);
+	else if (n == 16)
+		dumb_end_resampler_16(resampler);
+	else
+		dumb_end_resampler(resampler);
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.inc Added

@@ -0,0 +1,264 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * resample.inc - Resampling helper template. / / \ \
+ * | < / \_
+ * By Bob and entheh. | \/ /\ /
+ * \_ / > /
+ * In order to find a good trade-off between | \ / /
+ * speed and accuracy in this code, some tests | ' /
+ * were carried out regarding the behaviour of \__/
+ * long long ints with gcc. The following code
+ * was tested:
+ *
+ * int a, b, c;
+ * c = ((long long)a * b) >> 16;
+ *
+ * DJGPP GCC Version 3.0.3 generated the following assembly language code for
+ * the multiplication and scaling, leaving the 32-bit result in EAX.
+ *
+ * movl -8(%ebp), %eax ; read one int into EAX
+ * imull -4(%ebp) ; multiply by the other; result goes in EDX:EAX
+ * shrdl $16, %edx, %eax ; shift EAX right 16, shifting bits in from EDX
+ *
+ * Note that a 32*32->64 multiplication is performed, allowing for high
+ * accuracy. On the Pentium 2 and above, shrdl takes two cycles (generally),
+ * so it is a minor concern when four multiplications are being performed
+ * (the cubic resampler). On the Pentium MMX and earlier, it takes four or
+ * more cycles, so this method is unsuitable for use in the low-quality
+ * resamplers.
+ *
+ * Since "long long" is a gcc-specific extension, we use LONG_LONG instead,
+ * defined in dumb.h. We may investigate later what code MSVC generates, but
+ * if it seems too slow then we suggest you use a good compiler.
+ *
+ * FIXME: these comments are somewhat out of date now.
+ */
+
+
+
+void dumb_reset_resampler(DUMB_RESAMPLER *resampler, SRCTYPE *src, int src_channels, long pos, long start, long end, int quality)
+{
+	int i;
+	resampler->src = src;
+	resampler->pos = pos;
+	resampler->subpos = 0;
+	resampler->start = start;
+	resampler->end = end;
+	resampler->dir = 1;
+	resampler->pickup = NULL;
+	resampler->pickup_data = NULL;
+	if (quality < 0)
+	{
+		resampler->quality = 0;
+	}
+	else if (quality > DUMB_RQ_N_LEVELS - 1)
+	{
+		resampler->quality = DUMB_RQ_N_LEVELS - 1;
+	}
+	else
+	{
+		resampler->quality = quality;
+	}
+	for (i = 0; i < src_channels*3; i++) resampler->X[i] = 0;
+	resampler->overshot = -1;
+}
+
+
+
+DUMB_RESAMPLER *dumb_start_resampler(SRCTYPE *src, int src_channels, long pos, long start, long end, int quality)
+{
+	DUMB_RESAMPLER *resampler = malloc(sizeof(*resampler));
+	if (!resampler) return NULL;
+	dumb_reset_resampler(resampler, src, src_channels, pos, start, end, quality);
+	return resampler;
+}
+
+
+
+#define UPDATE_VOLUME( pvol, vol ) { \
+	if (pvol) { \
+		vol##r += vol##d; \
+		if ((vol##d < 0 && vol##r <= vol##t) || \
+			(vol##d > 0 && vol##r >= vol##t)) { \
+			pvol->volume = pvol->target; \
+			pvol = NULL; \
+			vol = MULSCV( vol##t, vol##m ); \
+		} else { \
+			vol = MULSCV( vol##r, vol##m ); \
+		} \
+	} \
+}
+
+
+
+/* Create mono source resampler. */
+#define SUFFIX2 _1
+#define SRC_CHANNELS 1
+#define DIVIDE_BY_SRC_CHANNELS(x) (x)
+#define COPYSRC(dstarray, dstindex, srcarray, srcindex) (dstarray)[dstindex] = (srcarray)[srcindex]
+#define COPYSRC2(dstarray, dstindex, condition, srcarray, srcindex) (dstarray)[dstindex] = condition ? (srcarray)[srcindex] : 0
+#define MONO_DEST_VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume
+#define MONO_DEST_VOLUME_VARIABLES vol=0, volr=0, vold=0, volt=0, volm=0
+#define MONO_DEST_VOLUME_ZEROS 0
+#define SET_MONO_DEST_VOLUME_VARIABLES { \
+	if ( volume ) { \
+		volr = (int)(volume->volume * 16777216.0); \
+		vold = (int)(volume->delta * 16777216.0); \
+		volt = (int)(volume->target * 16777216.0); \
+		volm = (int)(volume->mix * 16777216.0); \
+		vol = MULSCV( volr, volm ); \
+		if ( volr == volt ) volume = NULL; \
+	} else { \
+		vol = 0; \
+		volt = 0; \
+	} \
+}
+#define RETURN_MONO_DEST_VOLUME_VARIABLES if ( volume ) volume->volume = (float)volr / 16777216.0f
+#define MONO_DEST_VOLUMES_ARE_ZERO (vol == 0 && volt == 0)
+#define MONO_DEST_MIX_ALIAS(op, upd, offset) { \
+	*dst++ op ALIAS(x[offset], vol); \
+	if ( upd ) UPDATE_VOLUME( volume, vol ); \
+}
+#define STEREO_DEST_MIX_ALIAS(op, upd, offset) { \
+	int xm = x[offset]; \
+	*dst++ op ALIAS(xm, lvol); \
+	*dst++ op ALIAS(xm, rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define MONO_DEST_MIX_LINEAR(op, upd, o0, o1) { \
+	*dst++ op MULSC(LINEAR(x[o0], x[o1]), vol); \
+	if ( upd ) UPDATE_VOLUME( volume, vol ); \
+}
+#define STEREO_DEST_MIX_LINEAR(op, upd, o0, o1) { \
+	int xm = LINEAR(x[o0], x[o1]); \
+	*dst++ op MULSC(xm, lvol); \
+	*dst++ op MULSC(xm, rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define MONO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) { \
+	*dst++ op CUBICVOL(CUBIC(x0[o0], x[o1], x[o2], x3[o3]), vol); \
+	if ( upd ) UPDATE_VOLUME( volume, vol ); \
+}
+#define STEREO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) { \
+	int xm = CUBIC(x0[o0], x[o1], x[o2], x3[o3]); \
+	*dst++ op CUBICVOL(xm, lvol); \
+	*dst++ op CUBICVOL(xm, rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#include "resamp2.inc"
+
+/* Create stereo source resampler. */
+#define SUFFIX2 _2
+#define SRC_CHANNELS 2
+#define DIVIDE_BY_SRC_CHANNELS(x) ((x) >> 1)
+#define COPYSRC(dstarray, dstindex, srcarray, srcindex) { \
+	(dstarray)[(dstindex)*2] = (srcarray)[(srcindex)*2]; \
+	(dstarray)[(dstindex)*2+1] = (srcarray)[(srcindex)*2+1]; \
+}
+#define COPYSRC2(dstarray, dstindex, condition, srcarray, srcindex) { \
+	if (condition) { \
+		(dstarray)[(dstindex)*2] = (srcarray)[(srcindex)*2]; \
+		(dstarray)[(dstindex)*2+1] = (srcarray)[(srcindex)*2+1]; \
+	} else { \
+		(dstarray)[(dstindex)*2] = 0; \
+		(dstarray)[(dstindex)*2+1] = 0; \
+	} \
+}
+
+#define MONO_DEST_VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right
+#define MONO_DEST_VOLUME_VARIABLES lvol=0, lvolr=0, lvold=0, lvolt=0, lvolm=0, rvol=0, rvolr=0, rvold=0, rvolt=0, rvolm=0
+#define MONO_DEST_VOLUME_ZEROS 0, 0
+#define SET_MONO_DEST_VOLUME_VARIABLES { \
+	if ( volume_left ) { \
+		lvolr = (int)(volume_left->volume * 16777216.0); \
+		lvold = (int)(volume_left->delta * 16777216.0); \
+		lvolt = (int)(volume_left->target * 16777216.0); \
+		lvolm = (int)(volume_left->mix * 16777216.0); \
+		lvol = MULSCV( lvolr, lvolm ); \
+		if ( lvolr == lvolt ) volume_left = NULL; \
+	} else { \
+		lvol = 0; \
+		lvolt = 0; \
+	} \
+	if ( volume_right ) { \
+		rvolr = (int)(volume_right->volume * 16777216.0); \
+		rvold = (int)(volume_right->delta * 16777216.0); \
+		rvolt = (int)(volume_right->target * 16777216.0); \
+		rvolm = (int)(volume_right->mix * 16777216.0); \
+		rvol = MULSCV( rvolr, rvolm ); \
+		if ( rvolr == rvolt ) volume_right = NULL; \
+	} else { \
+		rvol = 0; \
+		rvolt = 0; \
+	} \
+}
+#define RETURN_MONO_DEST_VOLUME_VARIABLES { \
+	if ( volume_left ) volume_left->volume = (float)lvolr / 16777216.0f; \
+	if ( volume_right ) volume_right->volume = (float)rvolr / 16777216.0f; \
+}
+#define MONO_DEST_VOLUMES_ARE_ZERO (lvol == 0 && lvolt == 0 && rvol == 0 && rvolt == 0)
+#define MONO_DEST_MIX_ALIAS(op, upd, offset) { \
+	*dst++ op ALIAS(x[(offset)*2], lvol) + ALIAS(x[(offset)*2+1], rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define STEREO_DEST_MIX_ALIAS(op, upd, offset) { \
+	*dst++ op ALIAS(x[(offset)*2], lvol); \
+	*dst++ op ALIAS(x[(offset)*2+1], rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define MONO_DEST_MIX_LINEAR(op, upd, o0, o1) { \
+	*dst++ op MULSC(LINEAR(x[(o0)*2], x[(o1)*2]), lvol) + MULSC(LINEAR(x[(o0)*2+1], x[(o1)*2+1]), rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define STEREO_DEST_MIX_LINEAR(op, upd, o0, o1) { \
+	*dst++ op MULSC(LINEAR(x[(o0)*2], x[(o1)*2]), lvol); \
+	*dst++ op MULSC(LINEAR(x[(o0)*2+1], x[(o1)*2+1]), rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define MONO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) { \
+	*dst++ op \
+		CUBICVOL(CUBIC(x0[(o0)*2], x[(o1)*2], x[(o2)*2], x3[(o3)*2]), lvol) + \
+		CUBICVOL(CUBIC(x0[(o0)*2+1], x[(o1)*2+1], x[(o2)*2+1], x3[(o3)*2+1]), rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define STEREO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) { \
+	*dst++ op CUBICVOL(CUBIC(x0[(o0)*2], x[(o1)*2], x[(o2)*2], x3[(o3)*2]), lvol); \
+	*dst++ op CUBICVOL(CUBIC(x0[(o0)*2+1], x[(o1)*2+1], x[(o2)*2+1], x3[(o3)*2+1]), rvol); \
+	if ( upd ) UPDATE_VOLUME( volume_left, lvol ); \
+	if ( upd ) UPDATE_VOLUME( volume_right, rvol ); \
+}
+#include "resamp2.inc"
+
+
+
+void dumb_end_resampler(DUMB_RESAMPLER *resampler)
+{
+	if (resampler)
+		free(resampler);
+}
+
+
+
+#undef CUBICVOL
+#undef CUBIC
+#undef LINEAR
+#undef ALIAS
+#undef SRCBITS
+#undef SRCTYPE
+#undef SUFFIX

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/riff.c Added

@@ -0,0 +1,88 @@
+#include "internal/riff.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+struct riff * riff_parse( unsigned char * ptr, unsigned size, unsigned proper )
+{
+	unsigned stream_size;
+	struct riff * stream;
+
+	if ( size < 8 ) return 0;
+
+	if ( ptr[0] != 'R' || ptr[1] != 'I' || ptr[2] != 'F' || ptr[3] != 'F' ) return 0;
+
+	stream_size = ptr[4] | ( ptr[5] << 8 ) | ( ptr[6] << 16 ) | ( ptr[7] << 24 );
+	if ( stream_size + 8 > size ) return 0;
+	if ( stream_size < 4 ) return 0;
+
+	stream = malloc( sizeof( struct riff ) );
+	if ( ! stream ) return 0;
+
+	stream->type = ( ptr[8] << 24 ) | ( ptr[9] << 16 ) | ( ptr[10] << 8 ) | ptr[11];
+	stream->chunk_count = 0;
+	stream->chunks = 0;
+
+	ptr += 12;
+	stream_size -= 4;
+
+	while ( stream_size )
+	{
+		struct riff_chunk * chunk;
+		if ( stream_size < 8 ) break;
+		stream->chunks = realloc( stream->chunks, ( stream->chunk_count + 1 ) * sizeof( struct riff_chunk ) );
+		if ( ! stream->chunks ) break;
+		chunk = stream->chunks + stream->chunk_count;
+		chunk->type = ( ptr[0] << 24 ) | ( ptr[1] << 16 ) | ( ptr[2] << 8 ) | ptr[3];
+		chunk->size = ptr[4] | ( ptr[5] << 8 ) | ( ptr[6] << 16 ) | ( ptr[7] << 24 );
+		ptr += 8;
+		stream_size -= 8;
+		if ( stream_size < chunk->size ) break;
+		if ( chunk->type == 'RIFF' )
+		{
+			chunk->data = riff_parse( ptr - 8, chunk->size + 8, proper );
+			if ( ! chunk->data ) break;
+		}
+		else
+		{
+			chunk->data = malloc( chunk->size );
+			if ( ! chunk->data ) break;
+			memcpy( chunk->data, ptr, chunk->size );
+		}
+		ptr += chunk->size;
+		stream_size -= chunk->size;
+		if ( proper && ( chunk->size & 1 ) )
+		{
+			++ ptr;
+			-- stream_size;
+		}
+		++stream->chunk_count;
+	}
+	
+	if ( stream_size )
+	{
+		riff_free( stream );
+		stream = 0;
+	}
+
+	return stream;
+}
+
+void riff_free( struct riff * stream )
+{
+	if ( stream )
+	{
+		if ( stream->chunks )
+		{
+			unsigned i;
+			for ( i = 0; i < stream->chunk_count; ++i )
+			{
+				struct riff_chunk * chunk = stream->chunks + i;
+				if ( chunk->type == 'RIFF' ) riff_free( ( struct riff * ) chunk->data );
+				else free( chunk->data );
+			}
+			free( stream->chunks );
+		}
+		free( stream );
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/sampbuf.c Added

@@ -0,0 +1,64 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * sampbuf.c - Helper for allocating sample / / \ \
+ * buffers. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include "dumb.h"
+
+
+
+/* DEPRECATED */
+sample_t **create_sample_buffer(int n_channels, long length)
+{
+	int i;
+	sample_t **samples = malloc(n_channels * sizeof(*samples));
+	if (!samples) return NULL;
+	samples[0] = malloc(n_channels * length * sizeof(*samples[0]));
+	if (!samples[0]) {
+		free(samples);
+		return NULL;
+	}
+	for (i = 1; i < n_channels; i++) samples[i] = samples[i-1] + length;
+	return samples;
+}
+
+
+
+sample_t **allocate_sample_buffer(int n_channels, long length)
+{
+	int i;
+	sample_t **samples = malloc(((n_channels + 1) >> 1) * sizeof(*samples));
+	if (!samples) return NULL;
+	samples[0] = malloc(n_channels * length * sizeof(*samples[0]));
+	if (!samples[0]) {
+		free(samples);
+		return NULL;
+	}
+	for (i = 1; i < (n_channels + 1) >> 1; i++) samples[i] = samples[i-1] + length*2;
+	return samples;
+}
+
+
+
+void destroy_sample_buffer(sample_t **samples)
+{
+	if (samples) {
+		free(samples[0]);
+		free(samples);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/silence.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * silence.c - Silencing helper. / / \ \
+ * | < / \_
+ * By entheh. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <string.h>
+#include "dumb.h"
+
+
+
+void dumb_silence(sample_t *samples, long length)
+{
+	memset(samples, 0, length * sizeof(*samples));
+}
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/stdfile.c Added

@@ -0,0 +1,93 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * stdfile.c - stdio file input module. / / \ \
+ * | < / \_
+ * By entheh. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdio.h>
+
+#include "dumb.h"
+
+
+
+static void *dumb_stdfile_open(const char *filename)
+{
+	return fopen(filename, "rb");
+}
+
+
+
+static int dumb_stdfile_skip(void *f, long n)
+{
+	return fseek(f, n, SEEK_CUR);
+}
+
+
+
+static int dumb_stdfile_getc(void *f)
+{
+	return fgetc(f);
+}
+
+
+
+static long dumb_stdfile_getnc(char *ptr, long n, void *f)
+{
+	return fread(ptr, 1, n, f);
+}
+
+
+
+static void dumb_stdfile_close(void *f)
+{
+	fclose(f);
+}
+
+
+
+static DUMBFILE_SYSTEM stdfile_dfs = {
+	&dumb_stdfile_open,
+	&dumb_stdfile_skip,
+	&dumb_stdfile_getc,
+	&dumb_stdfile_getnc,
+	&dumb_stdfile_close
+};
+
+
+
+void dumb_register_stdfiles(void)
+{
+	register_dumbfile_system(&stdfile_dfs);
+}
+
+
+
+static DUMBFILE_SYSTEM stdfile_dfs_leave_open = {
+	NULL,
+	&dumb_stdfile_skip,
+	&dumb_stdfile_getc,
+	&dumb_stdfile_getnc,
+	NULL
+};
+
+
+
+DUMBFILE *dumbfile_open_stdfile(FILE *p)
+{
+	DUMBFILE *d = dumbfile_open_ex(p, &stdfile_dfs_leave_open);
+
+	return d;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itload.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itload.c - Code to read an Impulse Tracker / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By entheh. Don't worry Bob, you're credited | \ / /
+ * in itread.c! | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_it_quick(): loads an IT file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must pass
+ * the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_it_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_it_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itload2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itload2.c - Function to read an Impulse Tracker / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from itload.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_it(const char *filename)
+{
+	DUH *duh = dumb_load_it_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itmisc.c Added

@@ -0,0 +1,249 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itmisc.c - Miscellaneous functions relating / / \ \
+ * to module files. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+DUMB_IT_SIGDATA *duh_get_it_sigdata(DUH *duh)
+{
+	return duh_get_raw_sigdata(duh, 0, SIGTYPE_IT);
+}
+
+
+
+const unsigned char *dumb_it_sd_get_song_message(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->song_message : NULL;
+}
+
+
+
+int dumb_it_sd_get_n_orders(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->n_orders : 0;
+}
+
+
+
+int dumb_it_sd_get_n_samples(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->n_samples : 0;
+}
+
+
+
+int dumb_it_sd_get_n_instruments(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->n_instruments : 0;
+}
+
+
+
+const unsigned char *dumb_it_sd_get_sample_name(DUMB_IT_SIGDATA *sd, int i)
+{
+	ASSERT(sd && sd->sample && i >= 0 && i < sd->n_samples);
+	return sd->sample[i].name;
+}
+
+
+
+const unsigned char *dumb_it_sd_get_sample_filename(DUMB_IT_SIGDATA *sd, int i)
+{
+	ASSERT(sd && sd->sample && i >= 0 && i < sd->n_samples);
+	return sd->sample[i].filename;
+}
+
+
+
+const unsigned char *dumb_it_sd_get_instrument_name(DUMB_IT_SIGDATA *sd, int i)
+{
+	ASSERT(sd && sd->instrument && i >= 0 && i < sd->n_instruments);
+	return sd->instrument[i].name;
+}
+
+
+
+const unsigned char *dumb_it_sd_get_instrument_filename(DUMB_IT_SIGDATA *sd, int i)
+{
+	ASSERT(sd && sd->instrument && i >= 0 && i < sd->n_instruments);
+	return sd->instrument[i].filename;
+}
+
+
+
+int dumb_it_sd_get_initial_global_volume(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->global_volume : 0;
+}
+
+
+
+void dumb_it_sd_set_initial_global_volume(DUMB_IT_SIGDATA *sd, int gv)
+{
+	if (sd) sd->global_volume = gv;
+}
+
+
+
+int dumb_it_sd_get_mixing_volume(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->mixing_volume : 0;
+}
+
+
+
+void dumb_it_sd_set_mixing_volume(DUMB_IT_SIGDATA *sd, int mv)
+{
+	if (sd) sd->mixing_volume = mv;
+}
+
+
+
+int dumb_it_sd_get_initial_speed(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->speed : 0;
+}
+
+
+
+void dumb_it_sd_set_initial_speed(DUMB_IT_SIGDATA *sd, int speed)
+{
+	if (sd) sd->speed = speed;
+}
+
+
+
+int dumb_it_sd_get_initial_tempo(DUMB_IT_SIGDATA *sd)
+{
+	return sd ? sd->tempo : 0;
+}
+
+
+
+void dumb_it_sd_set_initial_tempo(DUMB_IT_SIGDATA *sd, int tempo)
+{
+	if (sd) sd->tempo = tempo;
+}
+
+
+
+int dumb_it_sd_get_initial_channel_volume(DUMB_IT_SIGDATA *sd, int channel)
+{
+	ASSERT(channel >= 0 && channel < DUMB_IT_N_CHANNELS);
+	return sd ? sd->channel_volume[channel] : 0;
+}
+
+void dumb_it_sd_set_initial_channel_volume(DUMB_IT_SIGDATA *sd, int channel, int volume)
+{
+	ASSERT(channel >= 0 && channel < DUMB_IT_N_CHANNELS);
+	if (sd) sd->channel_volume[channel] = volume;
+}
+
+
+
+int dumb_it_sr_get_current_order(DUMB_IT_SIGRENDERER *sr)
+{
+	return sr ? sr->order : -1;
+}
+
+
+
+int dumb_it_sr_get_current_row(DUMB_IT_SIGRENDERER *sr)
+{
+	return sr ? sr->row : -1;
+}
+
+
+
+int dumb_it_sr_get_global_volume(DUMB_IT_SIGRENDERER *sr)
+{
+	return sr ? sr->globalvolume : 0;
+}
+
+
+
+void dumb_it_sr_set_global_volume(DUMB_IT_SIGRENDERER *sr, int gv)
+{
+	if (sr) sr->globalvolume = gv;
+}
+
+
+
+int dumb_it_sr_get_tempo(DUMB_IT_SIGRENDERER *sr)
+{
+	return sr ? sr->tempo : 0;
+}
+
+
+
+void dumb_it_sr_set_tempo(DUMB_IT_SIGRENDERER *sr, int tempo)
+{
+	if (sr) sr->tempo = tempo;
+}
+
+
+
+int dumb_it_sr_get_speed(DUMB_IT_SIGRENDERER *sr)
+{
+	return sr ? sr->speed : 0;
+}
+
+
+
+void dumb_it_sr_set_speed(DUMB_IT_SIGRENDERER *sr, int speed)
+{
+	if (sr) sr->speed = speed;
+}
+
+
+
+int dumb_it_sr_get_channel_volume(DUMB_IT_SIGRENDERER *sr, int channel)
+{
+	return sr ? sr->channel[channel].channelvolume : 0;
+}
+
+
+
+void dumb_it_sr_set_channel_volume(DUMB_IT_SIGRENDERER *sr, int channel, int volume)
+{
+	if (sr) sr->channel[channel].channelvolume = volume;
+}
+
+
+
+void dumb_it_sr_set_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel, int muted)
+{
+	if (sr) {
+		if (muted)
+			sr->channel[channel].flags |= IT_CHANNEL_MUTED;
+		else
+			sr->channel[channel].flags &= ~IT_CHANNEL_MUTED;
+	}
+}
+
+
+
+int dumb_it_sr_get_channel_muted(DUMB_IT_SIGRENDERER *sr, int channel)
+{
+	return sr ? (sr->channel[channel].flags & IT_CHANNEL_MUTED) != 0 : 0;
+}
+
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itorder.c Added

@@ -0,0 +1,63 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itorder.c - Code to fix invalid patterns in / / \ \
+ * the pattern table. | < / \_
+ * | \/ /\ /
+ * By Julien Cugniere. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* This function ensures that any pattern mentioned in the order table but
+ * not present in the pattern table is treated as an empty 64 rows pattern.
+ * This is done by adding such a dummy pattern at the end of the pattern
+ * table, and redirect invalid orders to it.
+ * Patterns 254 and 255 are left untouched, unless the signal is an XM.
+ */
+int _dumb_it_fix_invalid_orders(DUMB_IT_SIGDATA *sigdata)
+{
+	int i;
+	int found_some = 0;
+
+	int first_invalid = sigdata->n_patterns;
+	int last_invalid = (sigdata->flags & IT_WAS_AN_XM) ? 255 : 253;
+
+	for (i = 0; i < sigdata->n_orders; i++) {
+		if (sigdata->order[i] >= first_invalid && sigdata->order[i] <= last_invalid) {
+			sigdata->order[i] = sigdata->n_patterns;
+			found_some = 1;
+		}
+	}
+
+	if (found_some) {
+		IT_PATTERN *new_pattern = realloc(sigdata->pattern, sizeof(*sigdata->pattern) * (sigdata->n_patterns + 1));
+		if (!new_pattern)
+			return -1;
+		
+		new_pattern[sigdata->n_patterns].n_rows = 64;
+		new_pattern[sigdata->n_patterns].n_entries = 0;
+		new_pattern[sigdata->n_patterns].entry = NULL;
+		sigdata->pattern = new_pattern;
+		sigdata->n_patterns++;
+	}
+
+	return 0;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itread.c Added

@@ -0,0 +1,1343 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itread.c - Code to read an Impulse Tracker / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * Based on the loader from an IT player by Bob. \_ / > /
+ * Adapted for DUMB by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>//might not be necessary later; required for memset
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+#define INVESTIGATE_OLD_INSTRUMENTS
+
+
+
+static int it_seek(DUMBFILE *f, long offset)
+{
+	long pos = dumbfile_pos(f);
+
+	if (pos > offset)
+		return -1;
+
+	if (pos < offset)
+		if (dumbfile_skip(f, offset - pos))
+			return -1;
+
+	return 0;
+}
+
+
+
+typedef unsigned char byte;
+typedef unsigned short word;
+typedef unsigned long dword;
+
+typedef struct readblock_crap readblock_crap;
+
+struct readblock_crap {
+	unsigned char *sourcebuf;
+	unsigned char *sourcepos;
+	unsigned char *sourceend;
+	int rembits;
+};
+
+
+static int readblock(DUMBFILE *f, readblock_crap * crap)
+{
+	long size;
+	int c;
+
+	size = dumbfile_igetw(f);
+	if (size < 0)
+		return size;
+
+	crap->sourcebuf = malloc(size);
+	if (!crap->sourcebuf)
+		return -1;
+
+	c = dumbfile_getnc((char *)crap->sourcebuf, size, f);
+	if (c < size) {
+		free(crap->sourcebuf);
+		crap->sourcebuf = NULL;
+		return -1;
+	}
+
+	crap->sourcepos = crap->sourcebuf;
+	crap->sourceend = crap->sourcebuf + size;
+	crap->rembits = 8;
+	return 0;
+}
+
+
+
+static void freeblock(readblock_crap * crap)
+{
+	free(crap->sourcebuf);
+	crap->sourcebuf = NULL;
+}
+
+
+
+static int readbits(int bitwidth, readblock_crap * crap)
+{
+	int val = 0;
+	int b = 0;
+
+	if (crap->sourcepos >= crap->sourceend) return val;
+
+	while (bitwidth > crap->rembits) {
+		val |= *crap->sourcepos++ << b;
+		if (crap->sourcepos >= crap->sourceend) return val;
+		b += crap->rembits;
+		bitwidth -= crap->rembits;
+		crap->rembits = 8;
+	}
+
+	val |= (*crap->sourcepos & ((1 << bitwidth) - 1)) << b;
+	*crap->sourcepos >>= bitwidth;
+	crap->rembits -= bitwidth;
+
+	return val;
+}
+
+
+
+/** WARNING - do we even need to pass `right`? */
+/** WARNING - why bother memsetting at all? The whole array is written... */
+// if we do memset, dumb_silence() would be neater...
+static int decompress8(DUMBFILE *f, signed char *data, int len, int cmwt)
+{
+	int blocklen, blockpos;
+	byte bitwidth;
+	word val;
+	char d1, d2;
+	readblock_crap crap;
+
+	memset(&crap, 0, sizeof(crap));
+
+	memset(data, 0, len * sizeof(*data));
+
+	while (len > 0) {
+		//Read a block of compressed data:
+		if (readblock(f, &crap))
+			return -1;
+		//Set up a few variables
+		blocklen = (len < 0x8000) ? len : 0x8000; //Max block length is 0x8000 bytes
+		blockpos = 0;
+		bitwidth = 9;
+		d1 = d2 = 0;
+		//Start the decompression:
+		while (blockpos < blocklen) {
+			//Read a value:
+			val = (word)readbits(bitwidth, &crap);
+			//Check for bit width change:
+
+			if (bitwidth < 7) { //Method 1:
+				if (val == (1 << (bitwidth - 1))) {
+					val = (word)readbits(3, &crap) + 1;
+					bitwidth = (val < bitwidth) ? val : val + 1;
+					continue;
+				}
+			}
+			else if (bitwidth < 9) { //Method 2
+				byte border = (0xFF >> (9 - bitwidth)) - 4;
+
+				if (val > border && val <= (border + 8)) {
+					val -= border;
+					bitwidth = (val < bitwidth) ? val : val + 1;
+					continue;
+				}
+			}
+			else if (bitwidth == 9) { //Method 3
+				if (val & 0x100) {
+					bitwidth = (val + 1) & 0xFF;
+					continue;
+				}
+			}
+			else { //Illegal width, abort ?
+				freeblock(&crap);
+				return -1;
+			}
+
+			//Expand the value to signed byte:
+			{
+				char v; //The sample value:
+				if (bitwidth < 8) {
+					byte shift = 8 - bitwidth;
+					v = (val << shift);
+					v >>= shift;
+				}
+				else
+					v = (char)val;
+
+				//And integrate the sample value
+				//(It always has to end with integration doesn't it ? ;-)
+				d1 += v;
+				d2 += d1;
+			}
+
+			//Store !
+			/* Version 2.15 was an unofficial version with hacked compression
+			 * code. Yay, better compression :D
+			 */
+			*data++ = cmwt == 0x215 ? d2 : d1;
+			len--;
+			blockpos++;
+		}
+		freeblock(&crap);
+	}
+	return 0;
+}
+
+
+
+static int decompress16(DUMBFILE *f, short *data, int len, int cmwt)
+{
+	int blocklen, blockpos;
+	byte bitwidth;
+	long val;
+	short d1, d2;
+	readblock_crap crap;
+
+	memset(&crap, 0, sizeof(crap));
+
+	memset(data, 0, len * sizeof(*data));
+
+	while (len > 0) {
+		//Read a block of compressed data:
+		if (readblock(f, &crap))
+			return -1;
+		//Set up a few variables
+		blocklen = (len < 0x4000) ? len : 0x4000; // Max block length is 0x4000 bytes
+		blockpos = 0;
+		bitwidth = 17;
+		d1 = d2 = 0;
+		//Start the decompression:
+		while (blockpos < blocklen) {
+			val = readbits(bitwidth, &crap);
+			//Check for bit width change:
+
+			if (bitwidth < 7) { //Method 1:
+				if (val == (1 << (bitwidth - 1))) {
+					val = readbits(4, &crap) + 1;
+					bitwidth = (val < bitwidth) ? val : val + 1;
+					continue;
+				}
+			}
+			else if (bitwidth < 17) { //Method 2
+				word border = (0xFFFF >> (17 - bitwidth)) - 8;
+
+				if (val > border && val <= (border + 16)) {
+					val -= border;
+					bitwidth = val < bitwidth ? val : val + 1;
+					continue;
+				}
+			}
+			else if (bitwidth == 17) { //Method 3
+				if (val & 0x10000) {
+					bitwidth = (val + 1) & 0xFF;
+					continue;
+				}
+			}
+			else { //Illegal width, abort ?
+				freeblock(&crap);
+				return -1;
+			}
+
+			//Expand the value to signed byte:
+			{
+				short v; //The sample value:
+				if (bitwidth < 16) {
+					byte shift = 16 - bitwidth;
+					v = (short)(val << shift);
+					v >>= shift;
+				}
+				else
+					v = (short)val;
+
+				//And integrate the sample value
+				//(It always has to end with integration doesn't it ? ;-)
+				d1 += v;
+				d2 += d1;
+			}
+
+			//Store !
+			/* Version 2.15 was an unofficial version with hacked compression
+			 * code. Yay, better compression :D
+			 */
+			*data++ = cmwt == 0x215 ? d2 : d1;
+			len--;
+			blockpos++;
+		}
+		freeblock(&crap);
+	}
+	return 0;
+}
+
+
+
+static int it_read_envelope(IT_ENVELOPE *envelope, DUMBFILE *f)
+{
+	int n;
+
+	envelope->flags = dumbfile_getc(f);
+	envelope->n_nodes = dumbfile_getc(f);
+	envelope->loop_start = dumbfile_getc(f);
+	envelope->loop_end = dumbfile_getc(f);
+	envelope->sus_loop_start = dumbfile_getc(f);
+	envelope->sus_loop_end = dumbfile_getc(f);
+	for (n = 0; n < envelope->n_nodes; n++) {
+		envelope->node_y[n] = dumbfile_getc(f);
+		envelope->node_t[n] = dumbfile_igetw(f);
+	}
+	dumbfile_skip(f, 75 - envelope->n_nodes * 3 + 1);
+
+	if (envelope->n_nodes <= 0)
+		envelope->flags &= ~IT_ENVELOPE_ON;
+	else {
+		if (envelope->loop_end >= envelope->n_nodes || envelope->loop_start > envelope->loop_end) envelope->flags &= ~IT_ENVELOPE_LOOP_ON;
+		if (envelope->sus_loop_end >= envelope->n_nodes || envelope->sus_loop_start > envelope->sus_loop_end) envelope->flags &= ~IT_ENVELOPE_SUSTAIN_LOOP;
+	}
+
+	if (envelope->n_nodes <= 0)
+		envelope->flags &= ~IT_ENVELOPE_ON;
+	else {
+		if (envelope->loop_end >= envelope->n_nodes || envelope->loop_start > envelope->loop_end) envelope->flags &= ~IT_ENVELOPE_LOOP_ON;
+		if (envelope->sus_loop_end >= envelope->n_nodes || envelope->sus_loop_start > envelope->sus_loop_end) envelope->flags &= ~IT_ENVELOPE_SUSTAIN_LOOP;
+	}
+
+	return dumbfile_error(f);
+}
+
+
+
+static int it_read_old_instrument(IT_INSTRUMENT *instrument, DUMBFILE *f)
+{
+	int n;
+
+	/*if (dumbfile_mgetl(f) != IT_INSTRUMENT_SIGNATURE)
+		return -1;*/
+	// XXX
+	dumbfile_skip(f, 4);
+
+	dumbfile_getnc(instrument->filename, 13, f);
+	instrument->filename[13] = 0;
+
+	instrument->volume_envelope.flags = dumbfile_getc(f);
+	instrument->volume_envelope.loop_start = dumbfile_getc(f);
+	instrument->volume_envelope.loop_end = dumbfile_getc(f);
+	instrument->volume_envelope.sus_loop_start = dumbfile_getc(f);
+	instrument->volume_envelope.sus_loop_end = dumbfile_getc(f);
+
+	/* Skip two unused bytes. */
+	dumbfile_skip(f, 2);
+
+	/* In the old instrument format, fadeout ranges from 0 to 64, and is
+	 * subtracted at intervals from a value starting at 512. In the new
+	 * format, all these values are doubled. Therefore we double when loading
+	 * from the old instrument format - that way we don't have to think about
+	 * it later.
+	 */
+	instrument->fadeout = dumbfile_igetw(f) << 1;
+	instrument->new_note_action = dumbfile_getc(f);
+	instrument->dup_check_type = dumbfile_getc(f);
+	instrument->dup_check_action = DCA_NOTE_CUT; // This might be wrong!
+	/** WARNING - what is the duplicate check action for old-style instruments? */
+
+	/* Skip Tracker Version and Number of Samples. These are only used in
+	 * separate instrument files. Also skip unused byte.
+	 */
+	dumbfile_skip(f, 4);
+
+	dumbfile_getnc(instrument->name, 26, f);
+	instrument->name[26] = 0;
+
+	/* Skip unused bytes following the Instrument Name. */
+	dumbfile_skip(f, 6);
+
+	instrument->pp_separation = 0;
+	instrument->pp_centre = 60;
+	instrument->global_volume = 128;
+	/** WARNING - should global_volume be 64 or something? */
+	instrument->default_pan = 32;
+	/** WARNING - should default_pan be 128, meaning don`t use? */
+	instrument->random_volume = 0;
+	instrument->random_pan = 0;
+
+	for (n = 0; n < 120; n++) {
+		instrument->map_note[n] = dumbfile_getc(f);
+		instrument->map_sample[n] = dumbfile_getc(f);
+	}
+
+	/* Skip "Volume envelope (200 bytes)". */
+	// - need to know better what this is for though.
+	dumbfile_skip(f, 200);
+
+#ifdef INVESTIGATE_OLD_INSTRUMENTS
+	fprintf(stderr, "Inst %02d Env:", n);
+#endif
+
+	for (n = 0; n < 25; n++)
+	{
+		instrument->volume_envelope.node_t[n] = dumbfile_getc(f);
+		instrument->volume_envelope.node_y[n] = dumbfile_getc(f);
+
+#ifdef INVESTIGATE_OLD_INSTRUMENTS
+		fprintf(stderr, " %d,%d",
+				instrument->volume_envelope.node_t[n],
+				instrument->volume_envelope.node_y[n]);
+#endif
+
+		// This loop is unfinished, as we can probably escape from it before
+		// the end if we want to. Hence the otherwise useless dumbfile_skip()
+		// call below.
+	}
+	dumbfile_skip(f, 50 - (n << 1));
+	instrument->volume_envelope.n_nodes = n;
+
+#ifdef INVESTIGATE_OLD_INSTRUMENTS
+	fprintf(stderr, "\n");
+#endif
+
+	if (dumbfile_error(f))
+		return -1;
+
+	{
+		IT_ENVELOPE *envelope = &instrument->volume_envelope;
+		if (envelope->n_nodes <= 0)
+			envelope->flags &= ~IT_ENVELOPE_ON;
+		else {
+			if (envelope->loop_end >= envelope->n_nodes || envelope->loop_start > envelope->loop_end) envelope->flags &= ~IT_ENVELOPE_LOOP_ON;
+			if (envelope->sus_loop_end >= envelope->n_nodes || envelope->sus_loop_start > envelope->sus_loop_end) envelope->flags &= ~IT_ENVELOPE_SUSTAIN_LOOP;
+		}
+	}
+
+	{
+		IT_ENVELOPE *envelope = &instrument->volume_envelope;
+		if (envelope->n_nodes <= 0)
+			envelope->flags &= ~IT_ENVELOPE_ON;
+		else {
+			if (envelope->loop_end >= envelope->n_nodes || envelope->loop_start > envelope->loop_end) envelope->flags &= ~IT_ENVELOPE_LOOP_ON;
+			if (envelope->sus_loop_end >= envelope->n_nodes || envelope->sus_loop_start > envelope->sus_loop_end) envelope->flags &= ~IT_ENVELOPE_SUSTAIN_LOOP;
+		}
+	}
+
+	instrument->filter_cutoff = 127;
+	instrument->filter_resonance = 0;
+
+	instrument->pan_envelope.flags = 0;
+	instrument->pitch_envelope.flags = 0;
+
+	return 0;
+}
+
+
+
+static int it_read_instrument(IT_INSTRUMENT *instrument, DUMBFILE *f, int maxlen)
+{
+	int n, len;
+
+	/*if (dumbfile_mgetl(f) != IT_INSTRUMENT_SIGNATURE)
+		return -1;*/
+	// XXX
+
+	if (maxlen) len = dumbfile_pos(f);
+
+	dumbfile_skip(f, 4);
+
+	dumbfile_getnc(instrument->filename, 13, f);
+	instrument->filename[13] = 0;
+
+	instrument->new_note_action = dumbfile_getc(f);
+	instrument->dup_check_type = dumbfile_getc(f);
+	instrument->dup_check_action = dumbfile_getc(f);
+	instrument->fadeout = dumbfile_igetw(f);
+	instrument->pp_separation = dumbfile_getc(f);
+	instrument->pp_centre = dumbfile_getc(f);
+	instrument->global_volume = dumbfile_getc(f);
+	instrument->default_pan = dumbfile_getc(f);
+	instrument->random_volume = dumbfile_getc(f);
+	instrument->random_pan = dumbfile_getc(f);
+
+	/* Skip Tracker Version and Number of Samples. These are only used in
+	 * separate instrument files. Also skip unused byte.
+	 */
+	dumbfile_skip(f, 4);
+
+	dumbfile_getnc(instrument->name, 26, f);
+	instrument->name[26] = 0;
+
+	instrument->filter_cutoff = dumbfile_getc(f);
+	instrument->filter_resonance = dumbfile_getc(f);
+
+	/* Skip MIDI Channel, Program and Bank. */
+	//dumbfile_skip(f, 4);
+	/*instrument->output = dumbfile_getc(f);
+	if ( instrument->output > 16 ) {
+		instrument->output -= 128;
+	} else {
+		instrument->output = 0;
+	}
+	dumbfile_skip(f, 3);*/
+	dumbfile_skip(f, 4);
+
+	for (n = 0; n < 120; n++) {
+		instrument->map_note[n] = dumbfile_getc(f);
+		instrument->map_sample[n] = dumbfile_getc(f);
+	}
+
+	if (dumbfile_error(f))
+		return -1;
+
+	if (it_read_envelope(&instrument->volume_envelope, f)) return -1;
+	if (it_read_envelope(&instrument->pan_envelope, f)) return -1;
+	if (it_read_envelope(&instrument->pitch_envelope, f)) return -1;
+
+	if (maxlen) {
+		len = dumbfile_pos(f) - len;
+		if ( maxlen - len < 124 ) return 0;
+	}
+
+	if ( dumbfile_mgetl(f) == IT_MPTX_SIGNATURE ) {
+		for ( n = 0; n < 120; n++ ) {
+			instrument->map_sample[ n ] += dumbfile_getc( f ) << 8;
+		}
+
+		if (dumbfile_error(f))
+			return -1;
+	}
+
+	/*if ( dumbfile_mgetl(f) == IT_INSM_SIGNATURE ) {
+		long end = dumbfile_igetl(f);
+		end += dumbfile_pos(f);
+		while ( dumbfile_pos(f) < end ) {
+			int chunkid = dumbfile_igetl(f);
+			switch ( chunkid ) {
+				case DUMB_ID('P','L','U','G'):
+					instrument->output = dumbfile_getc(f);
+					break;
+				default:
+					chunkid = chunkid / 0x100 + dumbfile_getc(f) * 0x1000000;
+					break;
+			}
+		}
+
+		if (dumbfile_error(f))
+			return -1;
+	}*/
+
+	return 0;
+}
+
+
+
+static int it_read_sample_header(IT_SAMPLE *sample, unsigned char *convert, long *offset, DUMBFILE *f)
+{
+	/* XXX
+	if (dumbfile_mgetl(f) != IT_SAMPLE_SIGNATURE)
+		return -1;*/
+	int hax = 0;
+	long s = dumbfile_mgetl(f);
+	if (s != IT_SAMPLE_SIGNATURE) {
+		if ( s == ( IT_SAMPLE_SIGNATURE >> 16 ) ) {
+			s <<= 16;
+			s |= dumbfile_mgetw(f);
+			if ( s != IT_SAMPLE_SIGNATURE )
+				return -1;
+			hax = 1;
+		}
+	}
+
+	dumbfile_getnc(sample->filename, 13, f);
+	sample->filename[13] = 0;
+
+	sample->global_volume = dumbfile_getc(f);
+	sample->flags = dumbfile_getc(f);
+	sample->default_volume = dumbfile_getc(f);
+
+	dumbfile_getnc(sample->name, 26, f);
+	sample->name[26] = 0;
+
+	*convert = dumbfile_getc(f);
+	sample->default_pan = dumbfile_getc(f);
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = dumbfile_igetl(f);
+	sample->C5_speed = dumbfile_igetl(f);
+	sample->sus_loop_start = dumbfile_igetl(f);
+	sample->sus_loop_end = dumbfile_igetl(f);
+
+#ifdef STEREO_SAMPLES_COUNT_AS_TWO
+	if (sample->flags & IT_SAMPLE_STEREO) {
+		sample->length >>= 1;
+		sample->loop_start >>= 1;
+		sample->loop_end >>= 1;
+		sample->C5_speed >>= 1;
+		sample->sus_loop_start >>= 1;
+		sample->sus_loop_end >>= 1;
+	}
+#endif
+
+	if (sample->flags & IT_SAMPLE_EXISTS) {
+		if (sample->length <= 0)
+			sample->flags &= ~IT_SAMPLE_EXISTS;
+		else {
+			if ((unsigned int)sample->loop_end > (unsigned int)sample->length)
+				sample->flags &= ~IT_SAMPLE_LOOP;
+			else if ((unsigned int)sample->loop_start >= (unsigned int)sample->loop_end)
+				sample->flags &= ~IT_SAMPLE_LOOP;
+
+			if ((unsigned int)sample->sus_loop_end > (unsigned int)sample->length)
+				sample->flags &= ~IT_SAMPLE_SUS_LOOP;
+			else if ((unsigned int)sample->sus_loop_start >= (unsigned int)sample->sus_loop_end)
+				sample->flags &= ~IT_SAMPLE_SUS_LOOP;
+
+			/* We may be able to truncate the sample to save memory. */
+			if (sample->flags & IT_SAMPLE_LOOP &&
+				*convert != 0xFF) { /* not truncating compressed samples, for now... */
+				if ((sample->flags & IT_SAMPLE_SUS_LOOP) && sample->sus_loop_end >= sample->loop_end)
+					sample->length = sample->sus_loop_end;
+				else
+					sample->length = sample->loop_end;
+			}
+		}
+	}
+
+	*offset = dumbfile_igetl(f);
+
+	sample->vibrato_speed = dumbfile_getc(f);
+	sample->vibrato_depth = dumbfile_getc(f);
+	if ( ! hax ) {
+		sample->vibrato_rate = dumbfile_getc(f);
+		sample->vibrato_waveform = dumbfile_getc(f);
+	} else {
+		sample->vibrato_rate = 0;
+		sample->vibrato_waveform = 0;
+	}
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+long _dumb_it_read_sample_data_adpcm4(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	long n, len, delta;
+	signed char * ptr, * end;
+	signed char compression_table[16];
+	if (dumbfile_getnc(compression_table, 16, f) != 16)
+		return -1;
+	ptr = (signed char *) sample->data;
+	delta = 0;
+
+	end = ptr + sample->length;
+	len = (sample->length + 1) / 2;
+	for (n = 0; n < len; n++) {
+		int b = dumbfile_getc(f);
+		if (b < 0) return -1;
+		delta += compression_table[b & 0x0F];
+		*ptr++ = delta;
+		if (ptr >= end) break;
+		delta += compression_table[b >> 4];
+		*ptr++ = delta;
+	}
+
+	return 0;
+}
+
+
+static long it_read_sample_data(int cmwt, IT_SAMPLE *sample, unsigned char convert, DUMBFILE *f)
+{
+	long n;
+
+	long datasize = sample->length;
+	if (sample->flags & IT_SAMPLE_STEREO) datasize <<= 1;
+
+	sample->data = malloc(datasize * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1));
+	if (!sample->data)
+		return -1;
+
+	if (!(sample->flags & IT_SAMPLE_16BIT) && (convert == 0xFF)) {
+		if (_dumb_it_read_sample_data_adpcm4(sample, f) < 0)
+			return -1;
+	} else if (sample->flags & 8) {
+		/* If the sample is packed, then we must unpack it. */
+
+		/** WARNING - unresolved business here... test with ModPlug? */
+
+		if (sample->flags & IT_SAMPLE_STEREO)
+			return -1;
+
+/*
+//#ifndef STEREO_SAMPLES_COUNT_AS_TWO
+		ASSERT(!(sample->flags & IT_SAMPLE_STEREO));
+//#endif
+*/
+		if (sample->flags & IT_SAMPLE_16BIT)
+			decompress16(f, sample->data, datasize, ((cmwt >= 0x215) && (convert & 4)));
+		else
+			decompress8(f, sample->data, datasize, ((cmwt >= 0x215) && (convert & 4)));
+ 	} else if (sample->flags & IT_SAMPLE_16BIT) {
+ 		if (convert & 2)
+			for (n = 0; n < datasize; n++)
+				((short *)sample->data)[n] = dumbfile_mgetw(f);
+ 		else
+			for (n = 0; n < datasize; n++)
+				((short *)sample->data)[n] = dumbfile_igetw(f);
+ 	} else
+		for (n = 0; n < datasize; n++)
+			((signed char *)sample->data)[n] = dumbfile_getc(f);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	if (!(convert & 1)) {
+		/* Convert to signed. */
+		if (sample->flags & IT_SAMPLE_16BIT)
+			for (n = 0; n < datasize; n++)
+				((short *)sample->data)[n] ^= 0x8000;
+		else
+			for (n = 0; n < datasize; n++)
+				((signed char *)sample->data)[n] ^= 0x80;
+	}
+
+	/* NOT SUPPORTED:
+	 *
+	 * convert & 4 - Samples stored as delta values
+	 * convert & 16 - Samples stored as TX-Wave 12-bit values
+	 * convert & 32 - Left/Right/All Stereo prompt
+	 */
+
+	return 0;
+}
+
+
+
+//#define DETECT_DUPLICATE_CHANNELS
+#ifdef DETECT_DUPLICATE_CHANNELS
+#include <stdio.h>
+#endif
+static int it_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer)
+{
+	unsigned char cmask[DUMB_IT_N_CHANNELS];
+	unsigned char cnote[DUMB_IT_N_CHANNELS];
+	unsigned char cinstrument[DUMB_IT_N_CHANNELS];
+	unsigned char cvolpan[DUMB_IT_N_CHANNELS];
+	unsigned char ceffect[DUMB_IT_N_CHANNELS];
+	unsigned char ceffectvalue[DUMB_IT_N_CHANNELS];
+#ifdef DETECT_DUPLICATE_CHANNELS
+	IT_ENTRY *dupentry[DUMB_IT_N_CHANNELS];
+#endif
+
+	int n_entries = 0;
+	int buflen;
+	int bufpos = 0;
+
+	IT_ENTRY *entry;
+
+	unsigned char channel;
+	unsigned char mask;
+
+	memset(cmask, 0, sizeof(cmask));
+	memset(cnote, 0, sizeof(cnote));
+	memset(cinstrument, 0, sizeof(cinstrument));
+	memset(cvolpan, 0, sizeof(cvolpan));
+	memset(ceffect, 0, sizeof(ceffect));
+	memset(ceffectvalue, 0, sizeof(ceffectvalue));
+#ifdef DETECT_DUPLICATE_CHANNELS
+	{
+		int i;
+		for (i = 0; i < DUMB_IT_N_CHANNELS; i++) dupentry[i] = NULL;
+	}
+#endif
+
+	buflen = dumbfile_igetw(f);
+	pattern->n_rows = dumbfile_igetw(f);
+
+	/* Skip four unused bytes. */
+	dumbfile_skip(f, 4);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	/* Read in the pattern data. */
+	dumbfile_getnc(buffer, buflen, f);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	/* Scan the pattern data, and work out how many entries we need room for. */
+	while (bufpos < buflen) {
+		unsigned char b = buffer[bufpos++];
+
+		if (b == 0) {
+			/* End of row */
+			n_entries++;
+			continue;
+		}
+
+		channel = (b - 1) & 63;
+
+		if (b & 128)
+			cmask[channel] = mask = buffer[bufpos++];
+		else
+			mask = cmask[channel];
+
+		{
+			static const unsigned char used[16] = {0, 1, 1, 2, 1, 2, 2, 3, 2, 3, 3, 4, 3, 4, 4, 5};
+			n_entries += (mask != 0);
+			bufpos += used[mask & 15];
+		}
+	}
+
+	pattern->n_entries = n_entries;
+
+	pattern->entry = malloc(n_entries * sizeof(*pattern->entry));
+
+	if (!pattern->entry)
+		return -1;
+
+	bufpos = 0;
+	memset(cmask, 0, sizeof(cmask));
+
+	entry = pattern->entry;
+
+	while (bufpos < buflen) {
+		unsigned char b = buffer[bufpos++];
+
+		if (b == 0) {
+			/* End of row */
+			IT_SET_END_ROW(entry);
+			entry++;
+#ifdef DETECT_DUPLICATE_CHANNELS
+			{
+				int i;
+				for (i = 0; i < DUMB_IT_N_CHANNELS; i++) dupentry[i] = NULL;
+			}
+#endif
+			continue;
+		}
+
+		channel = (b - 1) & 63;
+
+		if (b & 128)
+			cmask[channel] = mask = buffer[bufpos++];
+		else
+			mask = cmask[channel];
+
+		if (mask) {
+			entry->mask = (mask & 15) | (mask >> 4);
+			entry->channel = channel;
+
+			if (mask & IT_ENTRY_NOTE)
+				cnote[channel] = entry->note = buffer[bufpos++];
+			else if (mask & (IT_ENTRY_NOTE << 4))
+				entry->note = cnote[channel];
+
+			if (mask & IT_ENTRY_INSTRUMENT)
+				cinstrument[channel] = entry->instrument = buffer[bufpos++];
+			else if (mask & (IT_ENTRY_INSTRUMENT << 4))
+				entry->instrument = cinstrument[channel];
+
+			if (mask & IT_ENTRY_VOLPAN)
+				cvolpan[channel] = entry->volpan = buffer[bufpos++];
+			else if (mask & (IT_ENTRY_VOLPAN << 4))
+				entry->volpan = cvolpan[channel];
+
+			if (mask & IT_ENTRY_EFFECT) {
+				ceffect[channel] = entry->effect = buffer[bufpos++];
+				ceffectvalue[channel] = entry->effectvalue = buffer[bufpos++];
+			} else {
+				entry->effect = ceffect[channel];
+				entry->effectvalue = ceffectvalue[channel];
+			}
+
+#ifdef DETECT_DUPLICATE_CHANNELS
+			if (dupentry[channel]) {
+				FILE *f = fopen("dupentry.txt", "a");
+				if (!f) abort();
+				fprintf(f, "Two events on channel %d:", channel);
+				fprintf(f, " Event #1:");
+				if (dupentry[channel]->mask & IT_ENTRY_NOTE ) fprintf(f, " %03d", dupentry[channel]->note ); else fprintf(f, " ...");
+				if (dupentry[channel]->mask & IT_ENTRY_INSTRUMENT) fprintf(f, " %03d", dupentry[channel]->instrument); else fprintf(f, " ...");
+				if (dupentry[channel]->mask & IT_ENTRY_VOLPAN ) fprintf(f, " %03d", dupentry[channel]->volpan ); else fprintf(f, " ...");
+				if (dupentry[channel]->mask & IT_ENTRY_EFFECT) fprintf(f, " %c%02X\n", 'A' - 1 + dupentry[channel]->effect, dupentry[channel]->effectvalue); else fprintf(f, " ...\n");
+				fprintf(f, " Event #2:");
+				if (entry->mask & IT_ENTRY_NOTE ) fprintf(f, " %03d", entry->note ); else fprintf(f, " ...");
+				if (entry->mask & IT_ENTRY_INSTRUMENT) fprintf(f, " %03d", entry->instrument); else fprintf(f, " ...");
+				if (entry->mask & IT_ENTRY_VOLPAN ) fprintf(f, " %03d", entry->volpan ); else fprintf(f, " ...");
+				if (entry->mask & IT_ENTRY_EFFECT) fprintf(f, " %c%02X\n", 'A' - 1 + entry->effect, entry->effectvalue); else fprintf(f, " ...\n");
+				fclose(f);
+			}
+			dupentry[channel] = entry;
+#endif
+
+			entry++;
+		}
+	}
+
+	ASSERT(entry == pattern->entry + n_entries);
+
+	return 0;
+}
+
+
+
+/* Currently we assume the sample data are stored after the sample headers in
+ * module files. This assumption may be unjustified; let me know if you have
+ * trouble.
+ */
+
+#define IT_COMPONENT_SONG_MESSAGE 1
+#define IT_COMPONENT_INSTRUMENT 2
+#define IT_COMPONENT_PATTERN 3
+#define IT_COMPONENT_SAMPLE 4
+
+typedef struct IT_COMPONENT
+{
+	unsigned char type;
+	unsigned short n;
+	long offset;
+	short sampfirst; /* component[sampfirst] = first sample data after this */
+	short sampnext; /* sampnext is used to create linked lists of sample data */
+}
+IT_COMPONENT;
+
+
+
+static int it_component_compare(const void *e1, const void *e2)
+{
+	return ((const IT_COMPONENT *)e1)->offset -
+	 ((const IT_COMPONENT *)e2)->offset;
+}
+
+
+
+static sigdata_t *it_load_sigdata(DUMBFILE *f)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int cwt, cmwt;
+	int special;
+	int message_length, message_offset;
+
+	IT_COMPONENT *component;
+	int n_components = 0;
+
+	unsigned char sample_convert[4096];
+
+	int n;
+
+	unsigned char *buffer;
+
+	if (dumbfile_mgetl(f) != IT_SIGNATURE)
+		return NULL;
+
+	sigdata = malloc(sizeof(*sigdata));
+
+	if (!sigdata)
+		return NULL;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	dumbfile_getnc(sigdata->name, 26, f);
+	sigdata->name[26] = 0;
+
+	/* Skip pattern row highlight info. */
+	dumbfile_skip(f, 2);
+
+	sigdata->n_orders = dumbfile_igetw(f);
+	sigdata->n_instruments = dumbfile_igetw(f);
+	sigdata->n_samples = dumbfile_igetw(f);
+	sigdata->n_patterns = dumbfile_igetw(f);
+
+	cwt = dumbfile_igetw(f);
+	cmwt = dumbfile_igetw(f);
+
+	sigdata->flags = dumbfile_igetw(f);
+	special = dumbfile_igetw(f);
+
+	sigdata->global_volume = dumbfile_getc(f);
+	sigdata->mixing_volume = dumbfile_getc(f);
+	sigdata->speed = dumbfile_getc(f);
+	if (sigdata->speed == 0) sigdata->speed = 6; // Should we? What about tempo?
+	sigdata->tempo = dumbfile_getc(f);
+	sigdata->pan_separation = dumbfile_getc(f); /** WARNING: use this */
+
+	/* Skip Pitch Wheel Depth */
+	dumbfile_skip(f, 1);
+
+	message_length = dumbfile_igetw(f);
+	message_offset = dumbfile_igetl(f);
+
+	/* Skip Reserved. */
+	dumbfile_skip(f, 4);
+
+	dumbfile_getnc(sigdata->channel_pan, DUMB_IT_N_CHANNELS, f);
+	dumbfile_getnc(sigdata->channel_volume, DUMB_IT_N_CHANNELS, f);
+
+	// XXX sample count
+	if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_instruments > 256 || sigdata->n_samples > 4000 || sigdata->n_patterns > 256) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->order = malloc(sigdata->n_orders);
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (sigdata->n_instruments) {
+		sigdata->instrument = malloc(sigdata->n_instruments * sizeof(*sigdata->instrument));
+		if (!sigdata->instrument) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+	}
+
+	if (sigdata->n_samples) {
+		sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+		if (!sigdata->sample) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_samples; n++)
+			sigdata->sample[n].data = NULL;
+	}
+
+	if (sigdata->n_patterns) {
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_patterns; n++)
+			sigdata->pattern[n].entry = NULL;
+	}
+
+	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+	sigdata->restart_position = 0;
+
+	component = malloc(769 * sizeof(*component));
+	if (!component) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (special & 1) {
+		component[n_components].type = IT_COMPONENT_SONG_MESSAGE;
+		component[n_components].offset = message_offset;
+		component[n_components].sampfirst = -1;
+		n_components++;
+	}
+
+	for (n = 0; n < sigdata->n_instruments; n++) {
+		component[n_components].type = IT_COMPONENT_INSTRUMENT;
+		component[n_components].n = n;
+		component[n_components].offset = dumbfile_igetl(f);
+		component[n_components].sampfirst = -1;
+		n_components++;
+	}
+
+	for (n = 0; n < sigdata->n_samples; n++) {
+		component[n_components].type = IT_COMPONENT_SAMPLE;
+		component[n_components].n = n;
+		component[n_components].offset = dumbfile_igetl(f);
+		component[n_components].sampfirst = -1;
+		n_components++;
+	}
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		long offset = dumbfile_igetl(f);
+		if (offset) {
+			component[n_components].type = IT_COMPONENT_PATTERN;
+			component[n_components].n = n;
+			component[n_components].offset = offset;
+			component[n_components].sampfirst = -1;
+			n_components++;
+		} else {
+			/* Empty 64-row pattern */
+			sigdata->pattern[n].n_rows = 64;
+			sigdata->pattern[n].n_entries = 0;
+		}
+	}
+
+	if (dumbfile_error(f)) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	/*
+	if (!(sigdata->flags & 128) != !(special & 8)) {
+		fprintf(stderr, "Flags Bit 7 (\"Request embedded MIDI configuration\"): %s\n", sigdata->flags & 128 ? "=SET=" : "clear");
+		fprintf(stderr, "Special Bit 3 (\"MIDI configuration embedded\") : %s\n", special & 8 ? "=SET=" : "clear");
+		fprintf(stderr, "entheh would like to investigate this IT file.\n");
+		fprintf(stderr, "Please contact him! entheh@users.sf.net\n");
+	}
+	*/
+
+	if (special & 8) {
+		/* MIDI configuration is embedded. */
+		unsigned char mididata[32];
+		int i;
+		sigdata->midi = malloc(sizeof(*sigdata->midi));
+		if (!sigdata->midi) {
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+			// Should we be happy with this outcome in some situations?
+		}
+		// What are we skipping?
+		i = dumbfile_igetw(f);
+		if (dumbfile_error(f) || dumbfile_skip(f, 8*i)) {
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		/* Read embedded MIDI configuration */
+		// What are the first 9 commands for?
+		if (dumbfile_skip(f, 32*9)) {
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (i = 0; i < 16; i++) {
+			unsigned char len = 0;
+			int j, leftdigit = -1;
+			if (dumbfile_getnc(mididata, 32, f) < 32) {
+				free(component);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+			sigdata->midi->SFmacroz[i] = 0;
+			for (j = 0; j < 32; j++) {
+				if (leftdigit >= 0) {
+					if (mididata[j] == 0) {
+						sigdata->midi->SFmacro[i][len++] = leftdigit;
+						break;
+					} else if (mididata[j] == ' ')
+						sigdata->midi->SFmacro[i][len++] = leftdigit;
+					else if (mididata[j] >= '0' && mididata[j] <= '9')
+						sigdata->midi->SFmacro[i][len++] = (leftdigit << 4) | (mididata[j] - '0');
+					else if (mididata[j] >= 'A' && mididata[j] <= 'F')
+						sigdata->midi->SFmacro[i][len++] = (leftdigit << 4) | (mididata[j] - 'A' + 0xA);
+					leftdigit = -1;
+				} else if (mididata[j] == 0)
+					break;
+				else if (mididata[j] == 'z')
+					sigdata->midi->SFmacroz[i] |= 1 << len++;
+				else if (mididata[j] >= '0' && mididata[j] <= '9')
+					leftdigit = mididata[j] - '0';
+				else if (mididata[j] >= 'A' && mididata[j] <= 'F')
+					leftdigit = mididata[j] - 'A' + 0xA;
+			}
+			sigdata->midi->SFmacrolen[i] = len;
+		}
+		for (i = 0; i < 128; i++) {
+			unsigned char len = 0;
+			int j, leftdigit = -1;
+			dumbfile_getnc(mididata, 32, f);
+			for (j = 0; j < 32; j++) {
+				if (leftdigit >= 0) {
+					if (mididata[j] == 0) {
+						sigdata->midi->Zmacro[i][len++] = leftdigit;
+						break;
+					} else if (mididata[j] == ' ')
+						sigdata->midi->Zmacro[i][len++] = leftdigit;
+					else if (mididata[j] >= '0' && mididata[j] <= '9')
+						sigdata->midi->Zmacro[i][len++] = (leftdigit << 4) | (mididata[j] - '0');
+					else if (mididata[j] >= 'A' && mididata[j] <= 'F')
+						sigdata->midi->Zmacro[i][len++] = (leftdigit << 4) | (mididata[j] - 'A' + 0xA);
+					leftdigit = -1;
+				} else if (mididata[j] == 0)
+					break;
+				else if (mididata[j] >= '0' && mididata[j] <= '9')
+					leftdigit = mididata[j] - '0';
+				else if (mididata[j] >= 'A' && mididata[j] <= 'F')
+					leftdigit = mididata[j] - 'A' + 0xA;
+			}
+			sigdata->midi->Zmacrolen[i] = len;
+		}
+	}
+
+	sigdata->flags &= IT_REAL_FLAGS;
+
+	qsort(component, n_components, sizeof(IT_COMPONENT), &it_component_compare);
+
+	buffer = malloc(65536);
+	if (!buffer) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (n = 0; n < n_components; n++) {
+		long offset;
+		int m;
+
+		/* XXX */
+		if ( component[n].offset == 0 ) {
+			switch (component[n].type) {
+				case IT_COMPONENT_INSTRUMENT:
+					memset( &sigdata->instrument[component[n].n], 0, sizeof(IT_INSTRUMENT) );
+					break;
+				case IT_COMPONENT_SAMPLE:
+					memset( &sigdata->sample[component[n].n], 0, sizeof(IT_SAMPLE) );
+					break;
+				case IT_COMPONENT_PATTERN:
+					{
+						IT_PATTERN * p = &sigdata->pattern[component[n].n];
+						p->entry = 0;
+						p->n_rows = 64;
+						p->n_entries = 0;
+					}
+					break;
+			}
+			continue;
+		}
+
+		if (it_seek(f, component[n].offset)) {
+			free(buffer);
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		switch (component[n].type) {
+
+			case IT_COMPONENT_SONG_MESSAGE:
+				sigdata->song_message = malloc(message_length + 1);
+				if (sigdata->song_message) {
+					if (dumbfile_getnc(sigdata->song_message, message_length, f) < message_length) {
+						free(buffer);
+						free(component);
+						_dumb_it_unload_sigdata(sigdata);
+						return NULL;
+					}
+					sigdata->song_message[message_length] = 0;
+				}
+				break;
+
+			case IT_COMPONENT_INSTRUMENT:
+				if (cmwt < 0x200)
+					m = it_read_old_instrument(&sigdata->instrument[component[n].n], f);
+				else
+					m = it_read_instrument(&sigdata->instrument[component[n].n], f, (n + 1 < n_components) ? (component[n+1].offset - component[n].offset) : 0);
+
+				if (m) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				break;
+
+			case IT_COMPONENT_PATTERN:
+				if (it_read_pattern(&sigdata->pattern[component[n].n], f, buffer)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				break;
+
+			case IT_COMPONENT_SAMPLE:
+				if (it_read_sample_header(&sigdata->sample[component[n].n], &sample_convert[component[n].n], &offset, f)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+
+				if (sigdata->sample[component[n].n].flags & IT_SAMPLE_EXISTS) {
+					short *sample;
+
+					for (m = n + 1; m < n_components; m++)
+						if (component[m].offset > offset)
+							break;
+					m--;
+
+					sample = &component[m].sampfirst;
+
+					while (*sample >= 0 && component[*sample].offset <= offset)
+						sample = &component[*sample].sampnext;
+
+					component[n].sampnext = *sample;
+					*sample = n;
+
+					component[n].offset = offset;
+				}
+		}
+
+		m = component[n].sampfirst;
+
+		while (m >= 0) {
+			if (it_seek(f, component[m].offset)) {
+				free(buffer);
+				free(component);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+
+			if (it_read_sample_data(cmwt, &sigdata->sample[component[m].n], sample_convert[component[m].n], f)) {
+				free(buffer);
+				free(component);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+
+			m = component[m].sampnext;
+		}
+	}
+
+	free(buffer);
+	free(component);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+DUH *dumb_read_it_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_load_sigdata(f);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[1][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		return make_duh(-1, 1, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itread2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itread2.c - Function to read an Impulse Tracker / / \ \
+ * module from an open file and do an | < / \_
+ * initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from itread.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_it(DUMBFILE *f)
+{
+	DUH *duh = dumb_read_it_quick(f);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itrender.c Added

@@ -0,0 +1,5564 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itrender.c - Code to render an Impulse Tracker / / \ \
+ * module. | < / \_
+ * | \/ /\ /
+ * Written - painstakingly - by entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <math.h>
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+#include "internal/it.h"
+
+// #define BIT_ARRAY_BULLSHIT
+
+#define END_RAMPING
+#define RAMP_DOWN
+
+static IT_PLAYING *dup_playing(IT_PLAYING *src, IT_CHANNEL *dstchannel, IT_CHANNEL *srcchannel)
+{
+	IT_PLAYING *dst;
+
+	if (!src) return NULL;
+
+	dst = malloc(sizeof(*dst));
+	if (!dst) return NULL;
+
+	dst->flags = src->flags;
+	dst->resampling_quality = src->resampling_quality;
+
+	ASSERT(src->channel);
+	dst->channel = &dstchannel[src->channel - srcchannel];
+	dst->sample = src->sample;
+	dst->instrument = src->instrument;
+	dst->env_instrument = src->env_instrument;
+
+	dst->sampnum = src->sampnum;
+	dst->instnum = src->instnum;
+
+#ifdef END_RAMPING
+	dst->declick_stage = src->declick_stage;
+	dst->declick_volume = src->declick_volume;
+#endif
+
+	dst->float_volume[0] = src->float_volume[0];
+	dst->float_volume[1] = src->float_volume[1];
+
+	dst->ramp_volume[0] = src->ramp_volume[0];
+	dst->ramp_volume[1] = src->ramp_volume[1];
+
+	dst->ramp_delta[0] = src->ramp_delta[0];
+	dst->ramp_delta[1] = src->ramp_delta[1];
+
+	dst->channel_volume = src->channel_volume;
+
+	dst->volume = src->volume;
+	dst->pan = src->pan;
+
+	dst->volume_offset = src->volume_offset;
+	dst->panning_offset = src->panning_offset;
+
+	dst->note = src->note;
+
+	dst->enabled_envelopes = src->enabled_envelopes;
+
+	dst->filter_cutoff = src->filter_cutoff;
+	dst->filter_resonance = src->filter_resonance;
+
+	dst->true_filter_cutoff = src->true_filter_cutoff;
+	dst->true_filter_resonance = src->true_filter_resonance;
+
+	dst->vibrato_speed = src->vibrato_speed;
+	dst->vibrato_depth = src->vibrato_depth;
+	dst->vibrato_n = src->vibrato_n;
+	dst->vibrato_time = src->vibrato_time;
+	dst->vibrato_waveform = src->vibrato_waveform;
+
+	dst->tremolo_speed = src->tremolo_speed;
+	dst->tremolo_depth = src->tremolo_depth;
+	dst->tremolo_time = src->tremolo_time;
+	dst->tremolo_waveform = src->tremolo_waveform;
+
+	dst->panbrello_speed = src->panbrello_speed;
+	dst->panbrello_depth = src->panbrello_depth;
+	dst->panbrello_time = src->panbrello_time;
+	dst->panbrello_waveform = src->panbrello_waveform;
+	dst->panbrello_random = src->panbrello_random;
+
+	dst->sample_vibrato_time = src->sample_vibrato_time;
+	dst->sample_vibrato_waveform = src->sample_vibrato_waveform;
+	dst->sample_vibrato_depth = src->sample_vibrato_depth;
+
+	dst->slide = src->slide;
+	dst->delta = src->delta;
+	dst->finetune = src->finetune;
+
+	dst->volume_envelope = src->volume_envelope;
+	dst->pan_envelope = src->pan_envelope;
+	dst->pitch_envelope = src->pitch_envelope;
+
+	dst->fadeoutcount = src->fadeoutcount;
+
+	dst->filter_state[0] = src->filter_state[0];
+	dst->filter_state[1] = src->filter_state[1];
+
+	dst->resampler = src->resampler;
+	dst->resampler.pickup_data = dst;
+	dst->time_lost = src->time_lost;
+
+	//dst->output = src->output;
+
+	return dst;
+}
+
+
+
+static void dup_channel(IT_CHANNEL *dst, IT_CHANNEL *src)
+{
+	dst->flags = src->flags;
+
+	dst->volume = src->volume;
+	dst->volslide = src->volslide;
+	dst->xm_volslide = src->xm_volslide;
+	dst->panslide = src->panslide;
+
+	dst->pan = src->pan;
+	dst->truepan = src->truepan;
+
+	dst->channelvolume = src->channelvolume;
+	dst->channelvolslide = src->channelvolslide;
+
+	dst->instrument = src->instrument;
+	dst->note = src->note;
+
+	dst->SFmacro = src->SFmacro;
+
+	dst->filter_cutoff = src->filter_cutoff;
+	dst->filter_resonance = src->filter_resonance;
+
+	dst->key_off_count = src->key_off_count;
+	dst->note_cut_count = src->note_cut_count;
+	dst->note_delay_count = src->note_delay_count;
+	dst->note_delay_entry = src->note_delay_entry;
+
+	dst->new_note_action = src->new_note_action;
+
+	dst->arpeggio = src->arpeggio;
+	dst->retrig = src->retrig;
+	dst->xm_retrig = src->xm_retrig;
+	dst->retrig_tick = src->retrig_tick;
+
+	dst->tremor_time = src->tremor_time;
+
+	dst->vibrato_waveform = src->vibrato_waveform;
+	dst->tremolo_waveform = src->tremolo_waveform;
+	dst->panbrello_waveform = src->panbrello_waveform;
+
+	dst->portamento = src->portamento;
+	dst->toneporta = src->toneporta;
+	dst->toneslide = src->toneslide;
+	dst->toneslide_tick = src->toneslide_tick;
+	dst->last_toneslide_tick = src->last_toneslide_tick;
+	dst->ptm_toneslide = src->ptm_toneslide;
+	dst->ptm_last_toneslide = src->ptm_last_toneslide;
+	dst->destnote = src->destnote;
+
+	dst->glissando = src->glissando;
+
+	dst->sample = src->sample;
+	dst->truenote = src->truenote;
+
+	dst->midi_state = src->midi_state;
+
+	dst->lastvolslide = src->lastvolslide;
+	dst->lastDKL = src->lastDKL;
+	dst->lastEF = src->lastEF;
+	dst->lastG = src->lastG;
+	dst->lastHspeed = src->lastHspeed;
+	dst->lastHdepth = src->lastHdepth;
+	dst->lastRspeed = src->lastRspeed;
+	dst->lastRdepth = src->lastRdepth;
+	dst->lastYspeed = src->lastYspeed;
+	dst->lastYdepth = src->lastYdepth;
+	dst->lastI = src->lastI;
+	dst->lastJ = src->lastJ;
+	dst->lastN = src->lastN;
+	dst->lastO = src->lastO;
+	dst->high_offset = src->high_offset;
+	dst->lastP = src->lastP;
+	dst->lastQ = src->lastQ;
+	dst->lastS = src->lastS;
+	dst->pat_loop_row = src->pat_loop_row;
+	dst->pat_loop_count = src->pat_loop_count;
+	dst->pat_loop_end_row = src->pat_loop_end_row;
+	dst->lastW = src->lastW;
+
+	dst->xm_lastE1 = src->xm_lastE1;
+	dst->xm_lastE2 = src->xm_lastE2;
+	dst->xm_lastEA = src->xm_lastEA;
+	dst->xm_lastEB = src->xm_lastEB;
+	dst->xm_lastX1 = src->xm_lastX1;
+	dst->xm_lastX2 = src->xm_lastX2;
+
+	dst->playing = dup_playing(src->playing, dst, src);
+
+
+#ifdef BIT_ARRAY_BULLSHIT
+	dst->played_patjump = bit_array_dup(src->played_patjump);
+	dst->played_patjump_order = src->played_patjump_order;
+#endif
+
+	//dst->output = src->output;
+}
+
+
+
+/* Allocate the new callbacks first, then pass them to this function!
+ * It will free them on failure.
+ */
+static DUMB_IT_SIGRENDERER *dup_sigrenderer(DUMB_IT_SIGRENDERER *src, int n_channels, IT_CALLBACKS *callbacks)
+{
+	DUMB_IT_SIGRENDERER *dst;
+	int i;
+
+	if (!src) {
+		if (callbacks) free(callbacks);
+		return NULL;
+	}
+
+	dst = malloc(sizeof(*dst));
+	if (!dst) {
+		if (callbacks) free(callbacks);
+		return NULL;
+	}
+
+	dst->sigdata = src->sigdata;
+
+	dst->n_channels = n_channels;
+
+	dst->resampling_quality = src->resampling_quality;
+
+	dst->globalvolume = src->globalvolume;
+	dst->globalvolslide = src->globalvolslide;
+
+	dst->tempo = src->tempo;
+	dst->temposlide = src->temposlide;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++)
+		dup_channel(&dst->channel[i], &src->channel[i]);
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+		dst->playing[i] = dup_playing(src->playing[i], dst->channel, src->channel);
+
+	dst->tick = src->tick;
+	dst->speed = src->speed;
+	dst->rowcount = src->rowcount;
+
+	dst->order = src->order;
+	dst->row = src->row;
+	dst->processorder = src->processorder;
+	dst->processrow = src->processrow;
+	dst->breakrow = src->breakrow;
+
+	dst->restart_position = src->restart_position;
+
+	dst->n_rows = src->n_rows;
+
+	dst->entry_start = src->entry_start;
+	dst->entry = src->entry;
+	dst->entry_end = src->entry_end;
+
+	dst->time_left = src->time_left;
+	dst->sub_time_left = src->sub_time_left;
+
+	dst->click_remover = NULL;
+
+	dst->callbacks = callbacks;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	dst->played = bit_array_dup(src->played);
+#endif
+
+	dst->gvz_time = src->gvz_time;
+	dst->gvz_sub_time = src->gvz_sub_time;
+
+	//dst->max_output = src->max_output;
+
+	return dst;
+}
+
+
+
+static const IT_MIDI default_midi = {
+	/* unsigned char SFmacro[16][16]; */
+	{
+		{0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+	},
+	/* unsigned char SFmacrolen[16]; */
+	{4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	/* unsigned short SFmacroz[16]; */
+	/* Bitfield; bit 0 set = z in first position */
+	{
+		0x0008, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+		0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	},
+	/* unsigned char Zmacro[128][16]; */
+	{
+		{0xF0, 0xF0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0xF0, 0xF0, 0x01, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+		{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+	},
+	/* unsigned char Zmacrolen[128]; */
+	{
+		4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	}
+};
+
+
+
+static void it_reset_filter_state(IT_FILTER_STATE *state)
+{
+	state->currsample = 0;
+	state->prevsample = 0;
+}
+
+
+
+#if 1
+#define LOG10 2.30258509299
+
+/* IMPORTANT: This function expects one extra sample in 'src' so it can apply
+ * click removal. It reads size samples, starting from src[0], and writes its
+ * output starting at dst[pos]. The pos parameter is required for getting
+ * click removal right.
+ */
+static void it_filter(DUMB_CLICK_REMOVER *cr, IT_FILTER_STATE *state, sample_t *dst, long pos, sample_t *src, long size, int step, int sampfreq, int cutoff, int resonance)
+{
+	sample_t currsample = state->currsample;
+	sample_t prevsample = state->prevsample;
+
+	float a, b, c;
+
+	long datasize;
+
+	{
+		float inv_angle = (float)(sampfreq * pow(0.5, 0.25 + cutoff*(1.0/(24<<IT_ENVELOPE_SHIFT))) * (1.0/(2*3.14159265358979323846*110.0)));
+		float loss = (float)exp(resonance*(-LOG10*1.2/128.0));
+		float d, e;
+#if 0
+		loss *= 2; // This is the mistake most players seem to make!
+#endif
+
+#if 1
+		d = (1.0f - loss) / inv_angle;
+		if (d > 2.0f) d = 2.0f;
+		d = (loss - d) * inv_angle;
+		e = inv_angle * inv_angle;
+		a = 1.0f / (1.0f + d + e);
+		c = -e * a;
+		b = 1.0f - a - c;
+#else
+		a = 1.0f / (inv_angle*inv_angle + inv_angle*loss + loss);
+		c = -(inv_angle*inv_angle) * a;
+		b = 1.0f - a - c;
+#endif
+	}
+
+	dst += pos * step;
+	datasize = size * step;
+
+#define INT_FILTERS
+#ifdef INT_FILTERS
+#define MULSCA(a, b) ((int)((LONG_LONG)((a) << 4) * (b) >> 32))
+#define SCALEB 12
+	{
+		int ai = (int)(a * (1 << (16+SCALEB)));
+		int bi = (int)(b * (1 << (16+SCALEB)));
+		int ci = (int)(c * (1 << (16+SCALEB)));
+		int i;
+
+		if (cr) {
+			sample_t startstep = MULSCA(src[0], ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+			dumb_record_click(cr, pos, startstep);
+		}
+
+		for (i = 0; i < datasize; i += step) {
+			{
+				sample_t newsample = MULSCA(src[i], ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+				prevsample = currsample;
+				currsample = newsample;
+			}
+			dst[i] += currsample;
+		}
+
+		if (cr) {
+			sample_t endstep = MULSCA(src[datasize], ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+			dumb_record_click(cr, pos + size, -endstep);
+		}
+	}
+#else
+#error This version is broken - it does not use step, and state should contain floats for it
+	if (cr) {
+		float startstep = src[0]*a + currsample*b + prevsample*c;
+		dumb_record_click(cr, pos, (sample_t)startstep);
+	}
+
+	{
+		int i = size % 3;
+		while (i > 0) {
+			{
+				float newsample = *src++*a + currsample*b + prevsample*c;
+				prevsample = currsample;
+				currsample = newsample;
+			}
+			*dst++ += (sample_t)currsample;
+			i--;
+		}
+		i = size / 3;
+		while (i > 0) {
+			float newsample;
+			/* Gotta love unrolled loops! */
+			*dst++ += (sample_t)(newsample = *src++*a + currsample*b + prevsample*c);
+			*dst++ += (sample_t)(prevsample = *src++*a + newsample*b + currsample*c);
+			*dst++ += (sample_t)(currsample = *src++*a + prevsample*b + newsample*c);
+			i--;
+		}
+	}
+
+	if (cr) {
+		float endstep = src[datasize]*a + currsample*b + prevsample*c;
+		dumb_record_click(cr, pos + size, -(sample_t)endstep);
+	}
+#endif
+
+	state->currsample = currsample;
+	state->prevsample = prevsample;
+}
+#undef LOG10
+#endif
+
+
+
+static const signed char it_sine[256] = {
+	 0, 2, 3, 5, 6, 8, 9, 11, 12, 14, 16, 17, 19, 20, 22, 23,
+	 24, 26, 27, 29, 30, 32, 33, 34, 36, 37, 38, 39, 41, 42, 43, 44,
+	 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 56, 57, 58, 59,
+	 59, 60, 60, 61, 61, 62, 62, 62, 63, 63, 63, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 63, 63, 63, 62, 62, 62, 61, 61, 60, 60,
+	 59, 59, 58, 57, 56, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46,
+	 45, 44, 43, 42, 41, 39, 38, 37, 36, 34, 33, 32, 30, 29, 27, 26,
+	 24, 23, 22, 20, 19, 17, 16, 14, 12, 11, 9, 8, 6, 5, 3, 2,
+	 0, -2, -3, -5, -6, -8, -9,-11,-12,-14,-16,-17,-19,-20,-22,-23,
+	-24,-26,-27,-29,-30,-32,-33,-34,-36,-37,-38,-39,-41,-42,-43,-44,
+	-45,-46,-47,-48,-49,-50,-51,-52,-53,-54,-55,-56,-56,-57,-58,-59,
+	-59,-60,-60,-61,-61,-62,-62,-62,-63,-63,-63,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-63,-63,-63,-62,-62,-62,-61,-61,-60,-60,
+	-59,-59,-58,-57,-56,-56,-55,-54,-53,-52,-51,-50,-49,-48,-47,-46,
+	-45,-44,-43,-42,-41,-39,-38,-37,-36,-34,-33,-32,-30,-29,-27,-26,
+	-24,-23,-22,-20,-19,-17,-16,-14,-12,-11, -9, -8, -6, -5, -3, -2
+};
+
+
+
+#if 1
+/** WARNING: use these! */
+/** JULIEN: Plus for XM compatibility it could be interesting to rename
+ * it_sawtooth[] to it_rampdown[], and add an it_rampup[].
+ * Also, still for XM compat', twood be good if it was possible to tell the
+ * the player not to retrig' the waveform on a new instrument.
+ * Both of these are only for completness though, as I don't think it would
+ * be very noticeable ;)
+ */
+/** ENTHEH: IT also has the 'don't retrig' thingy :) */
+static const signed char it_sawtooth[256] = {
+	 64, 63, 63, 62, 62, 61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 56,
+	 56, 55, 55, 54, 54, 53, 53, 52, 52, 51, 51, 50, 50, 49, 49, 48,
+	 48, 47, 47, 46, 46, 45, 45, 44, 44, 43, 43, 42, 42, 41, 41, 40,
+	 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 34, 34, 33, 33, 32,
+	 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26, 25, 25, 24,
+	 24, 23, 23, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16,
+	 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8,
+	 8, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0,
+	 0, -1, -1, -2, -2, -3, -3, -4, -4, -5, -5, -6, -6, -7, -7, -8,
+	 -8, -9, -9,-10,-10,-11,-11,-12,-12,-13,-13,-14,-14,-15,-15,-16,
+	-16,-17,-17,-18,-18,-19,-19,-20,-20,-21,-21,-22,-22,-23,-23,-24,
+	-24,-25,-25,-26,-26,-27,-27,-28,-28,-29,-29,-30,-30,-31,-31,-32,
+	-32,-33,-33,-34,-34,-35,-35,-36,-36,-37,-37,-38,-38,-39,-39,-40,
+	-40,-41,-41,-42,-42,-43,-43,-44,-44,-45,-45,-46,-46,-47,-47,-48,
+	-48,-49,-49,-50,-50,-51,-51,-52,-52,-53,-53,-54,-54,-55,-55,-56,
+	-56,-57,-57,-58,-58,-59,-59,-60,-60,-61,-61,-62,-62,-63,-63,-64
+};
+
+static const signed char it_squarewave[256] = {
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static const signed char it_xm_ramp[256] = {
+	 0, -1, -1, -2, -2, -3, -3, -4, -4, -5, -5, -6, -6, -7, -7, -8,
+	 -8, -9, -9,-10,-10,-11,-11,-12,-12,-13,-13,-14,-14,-15,-15,-16,
+	-16,-17,-17,-18,-18,-19,-19,-20,-20,-21,-21,-22,-22,-23,-23,-24,
+	-24,-25,-25,-26,-26,-27,-27,-28,-28,-29,-29,-30,-30,-31,-31,-32,
+	-32,-33,-33,-34,-34,-35,-35,-36,-36,-37,-37,-38,-38,-39,-39,-40,
+	-40,-41,-41,-42,-42,-43,-43,-44,-44,-45,-45,-46,-46,-47,-47,-48,
+	-48,-49,-49,-50,-50,-51,-51,-52,-52,-53,-53,-54,-54,-55,-55,-56,
+	-56,-57,-57,-58,-58,-59,-59,-60,-60,-61,-61,-62,-62,-63,-63,-64,
+	 64, 63, 63, 62, 62, 61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 56,
+	 56, 55, 55, 54, 54, 53, 53, 52, 52, 51, 51, 50, 50, 49, 49, 48,
+	 48, 47, 47, 46, 46, 45, 45, 44, 44, 43, 43, 42, 42, 41, 41, 40,
+	 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 34, 34, 33, 33, 32,
+	 32, 31, 31, 30, 30, 29, 29, 28, 28, 27, 27, 26, 26, 25, 25, 24,
+	 24, 23, 23, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, 17, 17, 16,
+	 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8,
+	 8, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0
+};
+
+static const signed char it_xm_squarewave[256] = {
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64
+};
+
+#endif
+
+
+
+static void reset_tick_counts(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	int i;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+		channel->key_off_count = 0;
+		channel->note_cut_count = 0;
+		channel->note_delay_count = 0;
+	}
+}
+
+
+static void reset_channel_effects(IT_CHANNEL *channel)
+{
+	channel->volslide = 0;
+	channel->xm_volslide = 0;
+	channel->panslide = 0;
+	channel->channelvolslide = 0;
+	channel->arpeggio = 0;
+	channel->retrig = 0;
+	if (channel->xm_retrig) {
+		channel->xm_retrig = 0;
+		channel->retrig_tick = 0;
+	}
+	channel->tremor_time &= 127;
+	channel->portamento = 0;
+	channel->toneporta = 0;
+	if (channel->ptm_toneslide) {
+		channel->ptm_last_toneslide = channel->ptm_toneslide;
+		channel->last_toneslide_tick = channel->toneslide_tick;
+	} else
+		channel->ptm_last_toneslide = 0;
+	channel->ptm_toneslide = 0;
+	channel->toneslide_tick = 0;
+	if (channel->playing) {
+		channel->playing->vibrato_n = 0;
+		channel->playing->tremolo_speed = 0;
+		channel->playing->tremolo_depth = 0;
+		channel->playing->panbrello_speed = 0;
+	}
+}
+
+static void reset_effects(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	int i;
+
+	sigrenderer->globalvolslide = 0;
+	sigrenderer->temposlide = 0;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		reset_channel_effects(&sigrenderer->channel[i]);
+	}
+}
+
+
+
+static void update_tremor(IT_CHANNEL *channel)
+{
+	if ((channel->tremor_time & 128) && channel->playing) {
+		if (channel->tremor_time == 128)
+			channel->tremor_time = (channel->lastI >> 4) | 192;
+		else if (channel->tremor_time == 192)
+			channel->tremor_time = (channel->lastI & 15) | 128;
+		else
+			channel->tremor_time--;
+	}
+}
+
+
+
+static void it_pickup_loop(DUMB_RESAMPLER *resampler, void *data)
+{
+	resampler->pos -= resampler->end - resampler->start;
+	((IT_PLAYING *)data)->time_lost += resampler->end - resampler->start;
+}
+
+
+
+static void it_pickup_pingpong_loop(DUMB_RESAMPLER *resampler, void *data)
+{
+	if (resampler->dir < 0) {
+		resampler->pos = (resampler->start << 1) - 1 - resampler->pos;
+		resampler->subpos ^= 65535;
+		resampler->dir = 1;
+		((IT_PLAYING *)data)->time_lost += (resampler->end - resampler->start) << 1;
+	} else {
+		resampler->pos = (resampler->end << 1) - 1 - resampler->pos;
+		resampler->subpos ^= 65535;
+		resampler->dir = -1;
+	}
+}
+
+
+
+static void it_pickup_stop_at_end(DUMB_RESAMPLER *resampler, void *data)
+{
+	(void)data;
+
+	if (resampler->dir < 0) {
+		resampler->pos = (resampler->start << 1) - 1 - resampler->pos;
+		resampler->subpos ^= 65535;
+		/* By rights, time_lost would be updated here. However, there is no
+		 * need at this point; it will not be used.
+		 *
+		 * ((IT_PLAYING *)data)->time_lost += (resampler->src_end - resampler->src_start) << 1;
+		 */
+		resampler->dir = 1;
+	} else
+		resampler->dir = 0;
+}
+
+
+
+static void it_playing_update_resamplers(IT_PLAYING *playing)
+{
+	if ((playing->sample->flags & IT_SAMPLE_SUS_LOOP) && !(playing->flags & IT_PLAYING_SUSTAINOFF)) {
+		playing->resampler.start = playing->sample->sus_loop_start;
+		playing->resampler.end = playing->sample->sus_loop_end;
+		if (playing->resampler.start == playing->resampler.end)
+			playing->resampler.pickup = &it_pickup_stop_at_end;
+		else if (playing->sample->flags & IT_SAMPLE_PINGPONG_SUS_LOOP)
+			playing->resampler.pickup = &it_pickup_pingpong_loop;
+		else
+			playing->resampler.pickup = &it_pickup_loop;
+	} else if (playing->sample->flags & IT_SAMPLE_LOOP) {
+		playing->resampler.start = playing->sample->loop_start;
+		playing->resampler.end = playing->sample->loop_end;
+		if (playing->resampler.start == playing->resampler.end)
+			playing->resampler.pickup = &it_pickup_stop_at_end;
+		else if (playing->sample->flags & IT_SAMPLE_PINGPONG_LOOP)
+			playing->resampler.pickup = &it_pickup_pingpong_loop;
+		else
+			playing->resampler.pickup = &it_pickup_loop;
+	} else {
+		if (playing->sample->flags & IT_SAMPLE_SUS_LOOP)
+			playing->resampler.start = playing->sample->sus_loop_start;
+		else
+			playing->resampler.start = 0;
+		playing->resampler.end = playing->sample->length;
+		playing->resampler.pickup = &it_pickup_stop_at_end;
+	}
+	ASSERT(playing->resampler.pickup_data == playing);
+}
+
+
+
+/* This should be called whenever the sample or sample position changes. */
+static void it_playing_reset_resamplers(IT_PLAYING *playing, long pos)
+{
+	int bits = playing->sample->flags & IT_SAMPLE_16BIT ? 16 : 8;
+	int quality = playing->resampling_quality;
+	int channels = playing->sample->flags & IT_SAMPLE_STEREO ? 2 : 1;
+	if (playing->sample->max_resampling_quality >= 0 && quality > playing->sample->max_resampling_quality)
+		quality = playing->sample->max_resampling_quality;
+	dumb_reset_resampler_n(bits, &playing->resampler, playing->sample->data, channels, pos, 0, 0, quality);
+	playing->resampler.pickup_data = playing;
+	playing->time_lost = 0;
+	playing->flags &= ~IT_PLAYING_DEAD;
+	it_playing_update_resamplers(playing);
+}
+
+static void it_retrigger_note(DUMB_IT_SIGRENDERER *sigrenderer, IT_CHANNEL *channel);
+
+/* Should we only be retriggering short samples on XM? */
+
+static void update_retrig(DUMB_IT_SIGRENDERER *sigrenderer, IT_CHANNEL *channel)
+{
+	if (channel->xm_retrig) {
+		channel->retrig_tick--;
+		if (channel->retrig_tick <= 0) {
+			if (channel->playing) {
+				it_playing_reset_resamplers(channel->playing, 0);
+#ifdef END_RAMPING
+				channel->playing->declick_stage = 0;
+				channel->playing->declick_volume = 1.f / 256.f;
+#endif
+			} else if (sigrenderer->sigdata->flags & IT_WAS_AN_XM) it_retrigger_note(sigrenderer, channel);
+			channel->retrig_tick = channel->xm_retrig;
+		}
+	} else if (channel->retrig & 0x0F) {
+		channel->retrig_tick--;
+		if (channel->retrig_tick <= 0) {
+			if (channel->retrig < 0x10) {
+			} else if (channel->retrig < 0x20) {
+				channel->volume--;
+				if (channel->volume > 64) channel->volume = 0;
+			} else if (channel->retrig < 0x30) {
+				channel->volume -= 2;
+				if (channel->volume > 64) channel->volume = 0;
+			} else if (channel->retrig < 0x40) {
+				channel->volume -= 4;
+				if (channel->volume > 64) channel->volume = 0;
+			} else if (channel->retrig < 0x50) {
+				channel->volume -= 8;
+				if (channel->volume > 64) channel->volume = 0;
+			} else if (channel->retrig < 0x60) {
+				channel->volume -= 16;
+				if (channel->volume > 64) channel->volume = 0;
+			} else if (channel->retrig < 0x70) {
+				channel->volume <<= 1;
+				channel->volume /= 3;
+			} else if (channel->retrig < 0x80) {
+				channel->volume >>= 1;
+			} else if (channel->retrig < 0x90) {
+			} else if (channel->retrig < 0xA0) {
+				channel->volume++;
+				if (channel->volume > 64) channel->volume = 64;
+			} else if (channel->retrig < 0xB0) {
+				channel->volume += 2;
+				if (channel->volume > 64) channel->volume = 64;
+			} else if (channel->retrig < 0xC0) {
+				channel->volume += 4;
+				if (channel->volume > 64) channel->volume = 64;
+			} else if (channel->retrig < 0xD0) {
+				channel->volume += 8;
+				if (channel->volume > 64) channel->volume = 64;
+			} else if (channel->retrig < 0xE0) {
+				channel->volume += 16;
+				if (channel->volume > 64) channel->volume = 64;
+			} else if (channel->retrig < 0xF0) {
+				channel->volume *= 3;
+				channel->volume >>= 1;
+				if (channel->volume > 64) channel->volume = 64;
+			} else {
+				channel->volume <<= 1;
+				if (channel->volume > 64) channel->volume = 64;
+			}
+			if (channel->playing) {
+				it_playing_reset_resamplers(channel->playing, 0);
+#ifdef END_RAMPING
+				channel->playing->declick_stage = 0;
+				channel->playing->declick_volume = 1.f / 256.f;
+#endif
+			} else if (sigrenderer->sigdata->flags & IT_WAS_AN_XM) it_retrigger_note(sigrenderer, channel);
+			channel->retrig_tick = channel->retrig & 0x0F;
+		}
+	}
+}
+
+
+
+static void update_smooth_effects(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	int i;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+		IT_PLAYING *playing = channel->playing;
+
+		if (playing) {
+			playing->vibrato_time += playing->vibrato_n *
+			 (playing->vibrato_speed << 2);
+			playing->tremolo_time += playing->tremolo_speed << 2;
+			playing->panbrello_time += playing->panbrello_speed;
+			if (playing->panbrello_waveform == 3)
+				playing->panbrello_random = (rand() % 129) - 64;
+		}
+	}
+}
+
+
+
+static void update_effects(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	int i;
+
+	if (sigrenderer->globalvolslide) {
+		sigrenderer->globalvolume += sigrenderer->globalvolslide;
+		if (sigrenderer->globalvolume > 128) {
+			if (sigrenderer->globalvolslide >= 0)
+				sigrenderer->globalvolume = 128;
+			else
+				sigrenderer->globalvolume = 0;
+		}
+	}
+
+	if (sigrenderer->temposlide) {
+		sigrenderer->tempo += sigrenderer->temposlide;
+		if (sigrenderer->tempo < 32) {
+			if (sigrenderer->temposlide >= 0)
+				sigrenderer->tempo = 255;
+			else
+				sigrenderer->tempo = 32;
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+		IT_PLAYING *playing = channel->playing;
+
+		if (channel->xm_volslide) {
+			channel->volume += channel->xm_volslide;
+			if (channel->volume > 64) {
+				if (channel->xm_volslide >= 0)
+					channel->volume = 64;
+				else
+					channel->volume = 0;
+			}
+		}
+
+		if (channel->volslide) {
+			channel->volume += channel->volslide;
+			if (channel->volume > 64) {
+				if (channel->volslide >= 0)
+					channel->volume = 64;
+				else
+					channel->volume = 0;
+			}
+		}
+
+		if (channel->panslide) {
+			if (sigrenderer->sigdata->flags & IT_WAS_AN_XM) {
+				if (IT_IS_SURROUND(channel->pan))
+				{
+					channel->pan = 32;
+					channel->truepan = 32 + 128 * 64;
+				}
+				if (channel->panslide == -128)
+					channel->truepan = 32;
+				else
+					channel->truepan = MID(32, channel->truepan + channel->panslide*64, 32+255*64);
+			} else {
+				if (IT_IS_SURROUND(channel->pan))
+				{
+					channel->pan = 32;
+				}
+				channel->pan += channel->panslide;
+				if (channel->pan > 64) {
+					if (channel->panslide >= 0)
+						channel->pan = 64;
+					else
+						channel->pan = 0;
+				}
+				channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+			}
+		}
+
+		if (channel->panslide && !IT_IS_SURROUND(channel->pan)) {
+			if (sigrenderer->sigdata->flags & IT_WAS_AN_XM) {
+				if (channel->panslide == -128)
+					channel->truepan = 32;
+				else
+					channel->truepan = MID(32, channel->truepan + channel->panslide*64, 32+255*64);
+			} else {
+				channel->pan += channel->panslide;
+				if (channel->pan > 64) {
+					if (channel->panslide >= 0)
+						channel->pan = 64;
+					else
+						channel->pan = 0;
+				}
+				channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+			}
+		}
+
+		if (channel->channelvolslide) {
+			channel->channelvolume += channel->channelvolslide;
+			if (channel->channelvolume > 64) {
+				if (channel->channelvolslide >= 0)
+					channel->channelvolume = 64;
+				else
+					channel->channelvolume = 0;
+			}
+			if (channel->playing)
+				channel->playing->channel_volume = channel->channelvolume;
+		}
+
+		update_tremor(channel);
+
+		channel->arpeggio = (channel->arpeggio << 4) | (channel->arpeggio >> 8);
+		channel->arpeggio &= 0xFFF;
+
+		update_retrig(sigrenderer, channel);
+
+		if (playing) {
+			playing->slide += channel->portamento;
+
+			if (channel->ptm_toneslide) {
+				if (--channel->toneslide_tick == 0) {
+					channel->toneslide_tick = channel->ptm_toneslide;
+					playing->note += channel->toneslide;
+					if (playing->note >= 120) {
+						if (channel->toneslide < 0) playing->note = 0;
+						else playing->note = 119;
+					}
+					channel->note = channel->truenote = playing->note;
+					if (channel->toneslide_retrig) {
+						it_playing_reset_resamplers(playing, 0);
+#ifdef END_RAMPING
+						playing->declick_stage = 0;
+						playing->declick_volume = 1.f / 256.f;
+#endif
+					}
+				}
+			}
+
+			if (sigrenderer->sigdata->flags & IT_LINEAR_SLIDES) {
+				if (channel->toneporta && channel->destnote < 120) {
+					int currpitch = ((playing->note - 60) << 8) + playing->slide;
+					int destpitch = (channel->destnote - 60) << 8;
+					if (currpitch > destpitch) {
+						currpitch -= channel->toneporta;
+						if (currpitch < destpitch) {
+							currpitch = destpitch;
+							channel->destnote = IT_NOTE_OFF;
+						}
+					} else if (currpitch < destpitch) {
+						currpitch += channel->toneporta;
+						if (currpitch > destpitch) {
+							currpitch = destpitch;
+							channel->destnote = IT_NOTE_OFF;
+						}
+					}
+					playing->slide = currpitch - ((playing->note - 60) << 8);
+				}
+			} else {
+				if (channel->toneporta && channel->destnote < 120) {
+					float amiga_multiplier = playing->sample->C5_speed * (1.0f / AMIGA_DIVISOR);
+
+					float deltanote = (float)pow(DUMB_SEMITONE_BASE, 60 - playing->note);
+					/* deltanote is 1.0 for C-5, 0.5 for C-6, etc. */
+
+					float deltaslid = deltanote - playing->slide * amiga_multiplier;
+
+					float destdelta = (float)pow(DUMB_SEMITONE_BASE, 60 - channel->destnote);
+					if (deltaslid < destdelta) {
+						playing->slide -= channel->toneporta;
+						deltaslid = deltanote - playing->slide * amiga_multiplier;
+						if (deltaslid > destdelta) {
+							playing->note = channel->destnote;
+							playing->slide = 0;
+							channel->destnote = IT_NOTE_OFF;
+						}
+					} else {
+						playing->slide += channel->toneporta;
+						deltaslid = deltanote - playing->slide * amiga_multiplier;
+						if (deltaslid < destdelta) {
+							playing->note = channel->destnote;
+							playing->slide = 0;
+							channel->destnote = IT_NOTE_OFF;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	update_smooth_effects(sigrenderer);
+}
+
+
+static void it_note_off(IT_PLAYING *playing);
+
+// This function should be renamed; it doesn't do the 'Update Pattern Variables' operation ittech.txt describes
+/* Returns 1 if a pattern loop is happening. */
+static int update_pattern_variables(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry)
+{
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+
+	if (entry->mask & IT_ENTRY_EFFECT) {
+		switch (entry->effect) {
+			case IT_JUMP_TO_ORDER:
+				/* XXX jump and break in same row */
+				if ( ( ( sigrenderer->processrow | 0xC00 ) == 0xFFFE ) &&
+					! ( sigrenderer->processrow & 0x800 ) ) {
+					sigrenderer->processrow = 0xFFFE & ~0xC00;
+				} else {
+					sigrenderer->breakrow = 0;
+					sigrenderer->processrow = 0xFFFE & ~0x400;
+				}
+				sigrenderer->processorder = entry->effectvalue - 1;
+				break;
+
+			case IT_S:
+				{
+					unsigned char effectvalue = entry->effectvalue;
+					if (effectvalue == 0)
+						effectvalue = channel->lastS;
+					channel->lastS = effectvalue;
+					switch (effectvalue >> 4) {
+						case IT_S_PATTERN_LOOP:
+							{
+								unsigned char v = effectvalue & 15;
+								if (v == 0) {
+#ifdef BIT_ARRAY_BULLSHIT
+									if (!channel->played_patjump)
+										channel->played_patjump = bit_array_create(256);
+									else {
+										//if (channel->played_patjump_order != sigrenderer->order)
+											bit_array_reset(channel->played_patjump);
+									}
+									channel->played_patjump_order = sigrenderer->order;
+#endif
+									channel->pat_loop_row = sigrenderer->processrow;
+								} else {
+									if (channel->pat_loop_count == 0) {
+#ifdef BIT_ARRAY_BULLSHIT
+										/* wft, uninitialized and no start marker yet... */
+										if (channel->played_patjump_order == 0xFFFE) {
+											int n;
+											bit_array_destroy(channel->played_patjump);
+											channel->played_patjump = bit_array_create(256);
+											for (n = 0; n < 256; n++)
+												bit_array_clear(sigrenderer->played, sigrenderer->order * 256 + n);
+											channel->played_patjump_order = sigrenderer->order;
+										} else if (channel->played_patjump_order == sigrenderer->order) {
+											bit_array_set(channel->played_patjump, sigrenderer->row);
+											bit_array_mask(sigrenderer->played, channel->played_patjump, channel->played_patjump_order * 256);
+											bit_array_reset(channel->played_patjump);
+										}
+#endif
+										channel->pat_loop_count = v;
+										sigrenderer->breakrow = channel->pat_loop_row;
+										if ((sigrenderer->sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD)) == IT_WAS_AN_XM) {
+											/* For XM files, if a loop occurs by itself, keep breakrow set for when the pattern ends - fun bug in FT2! */
+											if ((sigrenderer->processrow|0xC00) < 0xFFFE) {
+												/* Infinite pattern loops are possible, so we check whether the pattern loop we're hitting now is earlier than the last one we hit. */
+												if (sigrenderer->processrow < channel->pat_loop_end_row)
+													sigrenderer->processorder = 0xFFFE; /* suspect infinite loop, so trigger loop callback */
+												else
+													sigrenderer->processorder = 0xFFFF; /* don't trigger loop callback */
+												channel->pat_loop_end_row = sigrenderer->processrow;
+												sigrenderer->processrow = 0xFFFF; /* special case: don't reset breakrow or pat_loop_end_row */
+											}
+										} else {
+											/* IT files do this regardless of other flow control effects seen here. */
+											sigrenderer->processorder = 0xFFFF; /* special case: don't trigger loop callback */
+											sigrenderer->processrow = 0xFFFE;
+										}
+										return 1;
+									} else if (--channel->pat_loop_count) {
+#ifdef BIT_ARRAY_BULLSHIT
+										if (channel->played_patjump_order == sigrenderer->order) {
+											bit_array_set(channel->played_patjump, sigrenderer->row);
+											bit_array_mask(sigrenderer->played, channel->played_patjump, channel->played_patjump_order * 256);
+											bit_array_reset(channel->played_patjump);
+										}
+#endif
+										sigrenderer->breakrow = channel->pat_loop_row;
+										if ((sigrenderer->sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD)) == IT_WAS_AN_XM) {
+											/* For XM files, if a loop occurs by itself, keep breakrow set for when the pattern ends - fun bug in FT2! */
+											if ((sigrenderer->processrow|0xC00) < 0xFFFE) {
+												/* Infinite pattern loops are possible, so we check whether the pattern loop we're hitting now is earlier than the last one we hit. */
+												if (sigrenderer->processrow < channel->pat_loop_end_row)
+													sigrenderer->processorder = 0xFFFE; /* suspect infinite loop, so trigger loop callback */
+												else
+													sigrenderer->processorder = 0xFFFF; /* don't trigger loop callback */
+												channel->pat_loop_end_row = sigrenderer->processrow;
+												sigrenderer->processrow = 0xFFFF; /* special case: don't reset breakrow or pat_loop_end_row */
+											}
+										} else {
+											/* IT files do this regardless of other flow control effects seen here. */
+											sigrenderer->processorder = 0xFFFF; /* special case: don't trigger loop callback */
+											sigrenderer->processrow = 0xFFFE;
+										}
+										return 1;
+									} else if ((sigrenderer->sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD)) == IT_WAS_AN_XM) {
+										channel->pat_loop_end_row = 0;
+										// TODO
+										/* Findings:
+										- If a pattern loop completes successfully, and then the pattern terminates, then the next pattern will start on the row corresponding to the E60.
+										- If a pattern loop doesn't do any loops, and then the pattern terminates, then the next pattern will start on the first row.
+										- If a break appears to the left of the pattern loop, it jumps into the relevant position in the next pattern, and that's it.
+										- If a break appears to the right of the pattern loop, it jumps to the start of the next pattern, and that's it.
+										- If we jump, then effect a loop using an old E60, and then the pattern ends, the next pattern starts on the row corresponding to the E60.
+										- Theory: breakrow is not cleared when it's a pattern loop effect!
+										*/
+										//if (sigrenderer->processrow < 0xFFFE) // I have no idea if this is correct or not - FT2 is so weird :(
+										//	sigrenderer->breakrow = channel->pat_loop_row; /* emulate bug in FT2 */
+									} else
+										channel->pat_loop_row = sigrenderer->processrow + 1;
+#ifdef BIT_ARRAY_BULLSHIT
+									/*channel->played_patjump_order |= 0x8000;*/
+									if (channel->played_patjump_order == sigrenderer->order) {
+										bit_array_destroy(channel->played_patjump);
+										channel->played_patjump = 0;
+										channel->played_patjump_order = 0xFFFE;
+									}
+									bit_array_clear(sigrenderer->played, sigrenderer->order * 256 + sigrenderer->row);
+#endif
+								}
+							}
+							break;
+						case IT_S_PATTERN_DELAY:
+							sigrenderer->rowcount = 1 + (effectvalue & 15);
+							break;
+					}
+				}
+		}
+	}
+
+	return 0;
+}
+
+
+
+/* This function guarantees that channel->sample will always be valid if it
+ * is nonzero. In other words, to check if it is valid, simply check if it is
+ * nonzero.
+ */
+static void instrument_to_sample(DUMB_IT_SIGDATA *sigdata, IT_CHANNEL *channel)
+{
+	if (sigdata->flags & IT_USE_INSTRUMENTS) {
+		if (channel->instrument >= 1 && channel->instrument <= sigdata->n_instruments) {
+			if (channel->note < 120) {
+				channel->sample = sigdata->instrument[channel->instrument-1].map_sample[channel->note];
+				channel->truenote = sigdata->instrument[channel->instrument-1].map_note[channel->note];
+			} else
+				channel->sample = 0;
+		} else
+			channel->sample = 0;
+	} else {
+		channel->sample = channel->instrument;
+		channel->truenote = channel->note;
+	}
+	if (!(channel->sample >= 1 && channel->sample <= sigdata->n_samples && (sigdata->sample[channel->sample-1].flags & IT_SAMPLE_EXISTS) && sigdata->sample[channel->sample-1].C5_speed))
+		channel->sample = 0;
+}
+
+
+
+static void fix_sample_looping(IT_PLAYING *playing)
+{
+	if ((playing->sample->flags & (IT_SAMPLE_LOOP | IT_SAMPLE_SUS_LOOP)) ==
+	 (IT_SAMPLE_LOOP | IT_SAMPLE_SUS_LOOP)) {
+		if (playing->resampler.dir < 0) {
+			playing->resampler.pos = (playing->sample->sus_loop_end << 1) - 1 - playing->resampler.pos;
+			playing->resampler.subpos ^= 65535;
+			playing->resampler.dir = 1;
+		}
+
+		playing->resampler.pos += playing->time_lost;
+		// XXX what
+		playing->time_lost = 0;
+	}
+}
+
+
+
+static void it_compatible_gxx_retrigger(DUMB_IT_SIGDATA *sigdata, IT_CHANNEL *channel)
+{
+	int flags = 0;
+	if (channel->sample) {
+		if (sigdata->flags & IT_USE_INSTRUMENTS) {
+			if (channel->playing->env_instrument == &sigdata->instrument[channel->instrument-1]) {
+				if (channel->playing->env_instrument->volume_envelope.flags & IT_ENVELOPE_CARRY)
+					flags |= 1;
+				if (channel->playing->env_instrument->pan_envelope.flags & IT_ENVELOPE_CARRY)
+					flags |= 2;
+				if (channel->playing->env_instrument->pitch_envelope.flags & IT_ENVELOPE_CARRY)
+					flags |= 4;
+			}
+		}
+	}
+	if (!(flags & 1)) {
+		channel->playing->volume_envelope.next_node = 0;
+		channel->playing->volume_envelope.tick = 0;
+	}
+	if (!(flags & 2)) {
+		channel->playing->pan_envelope.next_node = 0;
+		channel->playing->pan_envelope.tick = 0;
+	}
+	if (!(flags & 4)) {
+		channel->playing->pitch_envelope.next_node = 0;
+		channel->playing->pitch_envelope.tick = 0;
+	}
+	channel->playing->fadeoutcount = 1024;
+	// Should we remove IT_PLAYING_BACKGROUND? Test with sample with sustain loop...
+	channel->playing->flags &= ~(IT_PLAYING_BACKGROUND | IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING | IT_PLAYING_DEAD);
+	it_playing_update_resamplers(channel->playing);
+
+	if (!flags && channel->sample)
+		if (sigdata->flags & IT_USE_INSTRUMENTS)
+			channel->playing->env_instrument = &sigdata->instrument[channel->instrument-1];
+}
+
+
+
+static void it_note_off(IT_PLAYING *playing)
+{
+	if (playing) {
+		playing->enabled_envelopes |= IT_ENV_VOLUME;
+		playing->flags |= IT_PLAYING_BACKGROUND | IT_PLAYING_SUSTAINOFF;
+		fix_sample_looping(playing);
+		it_playing_update_resamplers(playing);
+		if (playing->instrument)
+			if ((playing->instrument->volume_envelope.flags & (IT_ENVELOPE_ON | IT_ENVELOPE_LOOP_ON)) != IT_ENVELOPE_ON)
+				playing->flags |= IT_PLAYING_FADING;
+	}
+}
+
+
+
+static void xm_note_off(DUMB_IT_SIGDATA *sigdata, IT_CHANNEL *channel)
+{
+	if (channel->playing) {
+		if (channel->instrument > sigdata->n_instruments ||
+			!(sigdata->instrument[channel->instrument-1].volume_envelope.flags & IT_ENVELOPE_ON))
+			//if (!(entry->mask & IT_ENTRY_INSTRUMENT))
+			// dunno what that was there for ...
+				channel->volume = 0;
+		channel->playing->flags |= IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING;
+		it_playing_update_resamplers(channel->playing);
+	}
+}
+
+
+
+static void it_retrigger_note(DUMB_IT_SIGRENDERER *sigrenderer, IT_CHANNEL *channel)
+{
+	IT_PLAYING_ENVELOPE volume_envelope;
+	IT_PLAYING_ENVELOPE pan_envelope;
+	IT_PLAYING_ENVELOPE pitch_envelope;
+
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+	unsigned char nna;
+	int i, flags = 0;
+
+	if (channel->playing) {
+#ifdef INVALID_NOTES_CAUSE_NOTE_CUT
+		if (channel->note == IT_NOTE_OFF)
+			nna = NNA_NOTE_OFF;
+		else if (channel->note >= 120 || !channel->playing->instrument || (channel->playing->flags & IT_PLAYING_DEAD))
+			nna = NNA_NOTE_CUT;
+		else if (channel->new_note_action != 0xFF)
+		{
+			nna = channel->new_note_action;
+		}
+		else
+			nna = channel->playing->instrument->new_note_action;
+#else
+		if (channel->note == IT_NOTE_CUT)
+			nna = NNA_NOTE_CUT;
+		if (channel->note >= 120)
+			nna = NNA_NOTE_OFF;
+		else if (!channel->playing->instrument || (channel->playing->flags & IT_PLAYING_DEAD))
+			nna = NNA_NOTE_CUT;
+		else if (channel->new_note_action != 0xFF)
+		{
+			nna = channel->new_note_action;
+		}
+		else
+			nna = channel->playing->instrument->new_note_action;
+#endif
+
+		if ((sigdata->flags & IT_USE_INSTRUMENTS) && (channel->playing->enabled_envelopes) && channel->playing->instnum == channel->instrument) {
+			IT_PLAYING * playing = channel->playing;
+			IT_INSTRUMENT * inst = &sigdata->instrument[channel->instrument-1];
+			if ((playing->enabled_envelopes & IT_ENV_VOLUME) && (inst->volume_envelope.flags & IT_ENVELOPE_CARRY)) {
+				flags |= 1;
+				volume_envelope = playing->volume_envelope;
+			}
+			if ((playing->enabled_envelopes & IT_ENV_PANNING) && (inst->pan_envelope.flags & IT_ENVELOPE_CARRY)) {
+				flags |= 2;
+				pan_envelope = playing->pan_envelope;
+			}
+			if ((playing->enabled_envelopes & IT_ENV_PITCH) && (inst->pitch_envelope.flags & IT_ENVELOPE_CARRY)) {
+				flags |= 4;
+				pitch_envelope = playing->pitch_envelope;
+			}
+		}
+
+		switch (nna) {
+			case NNA_NOTE_CUT:
+#ifdef RAMP_DOWN
+				channel->playing->declick_stage = 2;
+#else
+				free(channel->playing);
+				channel->playing = NULL;
+#endif
+				break;
+			case NNA_NOTE_OFF:
+				it_note_off(channel->playing);
+				break;
+			case NNA_NOTE_FADE:
+				channel->playing->flags |= IT_PLAYING_BACKGROUND | IT_PLAYING_FADING;
+				break;
+		}
+	}
+
+	channel->new_note_action = 0xFF;
+
+	if (channel->sample == 0 || channel->note >= 120)
+		return;
+
+	channel->destnote = IT_NOTE_OFF;
+
+	if (channel->playing) {
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+			if (!sigrenderer->playing[i]) {
+				sigrenderer->playing[i] = channel->playing;
+				channel->playing = NULL;
+				break;
+			}
+		}
+
+		if (sigrenderer->sigdata->flags & IT_USE_INSTRUMENTS)
+		{
+			for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+				IT_PLAYING * playing = sigrenderer->playing[i];
+				if (playing && playing->channel == channel && playing->instrument->dup_check_type) {
+					int match = 0;
+					switch (playing->instrument->dup_check_type)
+					{
+					case DCT_NOTE:
+						match = (channel->truenote == playing->note);
+					case DCT_SAMPLE:
+						match = match && (channel->sample == playing->sampnum);
+					case DCT_INSTRUMENT:
+						match = match && (channel->instrument == playing->instnum);
+						break;
+					}
+
+					if (match)
+					{
+						switch (playing->instrument->dup_check_action)
+						{
+						case DCA_NOTE_CUT:
+#ifdef RAMP_DOWN
+							playing->declick_stage = 2;
+#else
+							free(playing);
+							sigrenderer->playing[i] = NULL;
+#endif
+							if (channel->playing == playing) channel->playing = NULL;
+							break;
+						case DCA_NOTE_OFF:
+							if (!(playing->flags & IT_PLAYING_SUSTAINOFF))
+								it_note_off(playing);
+							break;
+						case DCA_NOTE_FADE:
+							playing->flags |= IT_PLAYING_BACKGROUND | IT_PLAYING_FADING;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+/** WARNING - come up with some more heuristics for replacing old notes */
+#if 0
+		if (channel->playing) {
+			for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+				if (sigrenderer->playing[i]->flags & IT_PLAYING_BACKGROUND) {
+					write_seqtime();
+					sequence_c(SEQUENCE_STOP_SIGNAL);
+					sequence_c(i);
+					channel->VChannel = &module->VChannel[i];
+					break;
+				}
+			}
+		}
+#endif
+	}
+
+	if (channel->playing)
+		free(channel->playing);
+
+	channel->playing = malloc(sizeof(*channel->playing));
+
+	if (!channel->playing)
+		return;
+
+	if (!flags && sigdata->flags & IT_USE_INSTRUMENTS) {
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+			IT_PLAYING * playing = sigrenderer->playing[i];
+			if (playing && (playing->enabled_envelopes) && playing->instnum == channel->instrument) {
+				IT_INSTRUMENT * inst = &sigdata->instrument[channel->instrument-1];
+				if ((playing->enabled_envelopes & IT_ENV_VOLUME) && (inst->volume_envelope.flags & IT_ENVELOPE_CARRY)) {
+					flags |= 1;
+					volume_envelope = playing->volume_envelope;
+				}
+				if ((playing->enabled_envelopes & IT_ENV_PANNING) && (inst->pan_envelope.flags & IT_ENVELOPE_CARRY)) {
+					flags |= 2;
+					pan_envelope = playing->pan_envelope;
+				}
+				if ((playing->enabled_envelopes & IT_ENV_PITCH) && (inst->pitch_envelope.flags & IT_ENVELOPE_CARRY)) {
+					flags |= 4;
+					pitch_envelope = playing->pitch_envelope;
+				}
+				break;
+			}
+		}
+	}				
+
+	channel->playing->flags = 0;
+	channel->playing->resampling_quality = sigrenderer->resampling_quality;
+	channel->playing->channel = channel;
+	channel->playing->sample = &sigdata->sample[channel->sample-1];
+	if (sigdata->flags & IT_USE_INSTRUMENTS)
+		channel->playing->instrument = &sigdata->instrument[channel->instrument-1];
+	else
+		channel->playing->instrument = NULL;
+	channel->playing->env_instrument = channel->playing->instrument;
+	channel->playing->sampnum = channel->sample;
+	channel->playing->instnum = channel->instrument;
+#ifdef END_RAMPING
+	channel->playing->declick_stage = 0;
+	channel->playing->declick_volume = 1.f / 256.f;
+#endif
+	channel->playing->channel_volume = channel->channelvolume;
+	channel->playing->ramp_volume[0] = 31337.0; /* special */
+	channel->playing->note = channel->truenote;
+	channel->playing->enabled_envelopes = 0;
+	channel->playing->volume_offset = 0;
+	channel->playing->panning_offset = 0;
+	//channel->playing->output = channel->output;
+	if (sigdata->flags & IT_USE_INSTRUMENTS) {
+		IT_PLAYING * playing = channel->playing;
+		IT_INSTRUMENT * instrument = playing->instrument;
+		if (instrument->volume_envelope.flags & IT_ENVELOPE_ON) playing->enabled_envelopes |= IT_ENV_VOLUME;
+		if (instrument->pan_envelope.flags & IT_ENVELOPE_ON) playing->enabled_envelopes |= IT_ENV_PANNING;
+		if (instrument->pitch_envelope.flags & IT_ENVELOPE_ON) playing->enabled_envelopes |= IT_ENV_PITCH;
+		if (instrument->random_volume) playing->volume_offset = (rand() % (instrument->random_volume * 2 + 1)) - instrument->random_volume;
+		if (instrument->random_pan) playing->panning_offset = (rand() % (instrument->random_pan * 2 + 1)) - instrument->random_pan;
+		//if (instrument->output) playing->output = instrument->output;
+	}
+	channel->playing->filter_cutoff = 127;
+	channel->playing->filter_resonance = 0;
+	channel->playing->true_filter_cutoff = 127 << 8;
+	channel->playing->true_filter_resonance = 0;
+	channel->playing->vibrato_speed = 0;
+	channel->playing->vibrato_depth = 0;
+	channel->playing->vibrato_n = 0;
+	channel->playing->vibrato_time = 0;
+	channel->playing->vibrato_waveform = channel->vibrato_waveform;
+	channel->playing->tremolo_speed = 0;
+	channel->playing->tremolo_depth = 0;
+	channel->playing->tremolo_time = 0;
+	channel->playing->tremolo_waveform = channel->tremolo_waveform;
+	channel->playing->panbrello_speed = 0;
+	channel->playing->panbrello_depth = 0;
+	channel->playing->panbrello_time = 0;
+	channel->playing->panbrello_waveform = channel->panbrello_waveform;
+	channel->playing->panbrello_random = 0;
+	channel->playing->sample_vibrato_time = 0;
+	channel->playing->sample_vibrato_waveform = channel->playing->sample->vibrato_waveform;
+	channel->playing->sample_vibrato_depth = 0;
+	channel->playing->slide = 0;
+	channel->playing->finetune = channel->playing->sample->finetune;
+
+	if (flags & 1) {
+		channel->playing->volume_envelope = volume_envelope;
+	} else {
+		channel->playing->volume_envelope.next_node = 0;
+		channel->playing->volume_envelope.tick = 0;
+	}
+	if (flags & 2) {
+		channel->playing->pan_envelope = pan_envelope;
+	} else {
+		channel->playing->pan_envelope.next_node = 0;
+		channel->playing->pan_envelope.tick = 0;
+	}
+	if (flags & 4) {
+		channel->playing->pitch_envelope = pitch_envelope;
+	} else {
+		channel->playing->pitch_envelope.next_node = 0;
+		channel->playing->pitch_envelope.tick = 0;
+	}
+	channel->playing->fadeoutcount = 1024;
+	it_reset_filter_state(&channel->playing->filter_state[0]);
+	it_reset_filter_state(&channel->playing->filter_state[1]);
+	it_playing_reset_resamplers(channel->playing, 0);
+
+	/** WARNING - is everything initialised? */
+}
+
+
+
+static void get_default_volpan(DUMB_IT_SIGDATA *sigdata, IT_CHANNEL *channel)
+{
+	if (channel->sample == 0)
+		return;
+
+	channel->volume = sigdata->sample[channel->sample-1].default_volume;
+
+	if (sigdata->flags & IT_WAS_AN_XM) {
+		if (!(sigdata->flags & IT_WAS_A_MOD))
+			channel->truepan = 32 + sigdata->sample[channel->sample-1].default_pan*64;
+		return;
+	}
+
+	if (sigdata->flags & IT_WAS_AN_XM) {
+		if (!(sigdata->flags & IT_WAS_A_MOD))
+			channel->truepan = 32 + sigdata->sample[channel->sample-1].default_pan*64;
+		return;
+	}
+
+	{
+		int pan = sigdata->sample[channel->sample-1].default_pan;
+		if (pan >= 128 && pan <= 192) {
+			channel->pan = pan - 128;
+			return;
+		}
+	}
+
+	if (sigdata->flags & IT_USE_INSTRUMENTS) {
+		IT_INSTRUMENT *instrument = &sigdata->instrument[channel->instrument-1];
+		if (instrument->default_pan <= 64)
+			channel->pan = instrument->default_pan;
+		if (instrument->filter_cutoff >= 128)
+			channel->filter_cutoff = instrument->filter_cutoff - 128;
+		if (instrument->filter_resonance >= 128)
+			channel->filter_resonance = instrument->filter_resonance - 128;
+	}
+}
+
+
+
+static void get_true_pan(DUMB_IT_SIGDATA *sigdata, IT_CHANNEL *channel)
+{
+	channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+
+	if (channel->sample && !IT_IS_SURROUND_SHIFTED(channel->truepan) && (sigdata->flags & IT_USE_INSTRUMENTS)) {
+		IT_INSTRUMENT *instrument = &sigdata->instrument[channel->instrument-1];
+		int truepan = channel->truepan;
+		truepan += (channel->note - instrument->pp_centre) * instrument->pp_separation << (IT_ENVELOPE_SHIFT - 3);
+		channel->truepan = (unsigned short)MID(0, truepan, 64 << IT_ENVELOPE_SHIFT);
+	}
+}
+
+
+
+static void post_process_it_volpan(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry)
+{
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+
+	if (entry->mask & IT_ENTRY_VOLPAN) {
+		if (entry->volpan <= 84) {
+			/* Volume */
+			/* Fine volume slide up */
+			/* Fine volume slide down */
+		} else if (entry->volpan <= 94) {
+			/* Volume slide up */
+			unsigned char v = entry->volpan - 85;
+			if (v == 0)
+				v = channel->lastvolslide;
+			channel->lastvolslide = v;
+			/* = effect Dx0 where x == entry->volpan - 85 */
+			channel->volslide = v;
+		} else if (entry->volpan <= 104) {
+			/* Volume slide down */
+			unsigned char v = entry->volpan - 95;
+			if (v == 0)
+				v = channel->lastvolslide;
+			channel->lastvolslide = v;
+			/* = effect D0x where x == entry->volpan - 95 */
+			channel->volslide = -v;
+		} else if (entry->volpan <= 114) {
+			/* Portamento down */
+			unsigned char v = (entry->volpan - 105) << 2;
+			if (v == 0)
+				v = channel->lastEF;
+			channel->lastEF = v;
+			channel->portamento -= v << 4;
+		} else if (entry->volpan <= 124) {
+			/* Portamento up */
+			unsigned char v = (entry->volpan - 115) << 2;
+			if (v == 0)
+				v = channel->lastEF;
+			channel->lastEF = v;
+			channel->portamento += v << 4;
+		} else if (entry->volpan <= 202) {
+			/* Pan */
+			/* Tone Portamento */
+		} else if (entry->volpan <= 212) {
+			/* Vibrato */
+			/* This is unaffected by IT_OLD_EFFECTS. However, if v == 0, then any doubling of depth that happened before (with Hxy in the effect column) will be preserved. */
+			unsigned char v = entry->volpan - 203;
+			if (v == 0)
+				v = channel->lastHdepth;
+			else {
+				v <<= 2;
+				channel->lastHdepth = v;
+			}
+			if (channel->playing) {
+				channel->playing->vibrato_speed = channel->lastHspeed;
+				channel->playing->vibrato_depth = v;
+				channel->playing->vibrato_n++;
+			}
+		}
+	}
+}
+
+
+
+static void it_send_midi(DUMB_IT_SIGRENDERER *sigrenderer, IT_CHANNEL *channel, unsigned char midi_byte)
+{
+	if (sigrenderer->callbacks->midi)
+		if ((*sigrenderer->callbacks->midi)(sigrenderer->callbacks->midi_data, channel - sigrenderer->channel, midi_byte))
+			return;
+
+	switch (channel->midi_state) {
+		case 4: /* Ready to receive resonance parameter */
+			if (midi_byte < 0x80) channel->filter_resonance = midi_byte;
+			channel->midi_state = 0;
+			break;
+		case 3: /* Ready to receive cutoff parameter */
+			if (midi_byte < 0x80) channel->filter_cutoff = midi_byte;
+			channel->midi_state = 0;
+			break;
+		case 2: /* Ready for byte specifying which parameter will follow */
+			if (midi_byte == 0) /* Cutoff */
+				channel->midi_state = 3;
+			else if (midi_byte == 1) /* Resonance */
+				channel->midi_state = 4;
+			else
+				channel->midi_state = 0;
+			break;
+		default: /* Counting initial F0 bytes */
+			switch (midi_byte) {
+				case 0xF0:
+					channel->midi_state++;
+					break;
+				case 0xFA:
+				case 0xFC:
+				case 0xFF:
+					/* Reset filter parameters for all channels */
+					{
+						int i;
+						for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+							sigrenderer->channel[i].filter_cutoff = 127;
+							sigrenderer->channel[i].filter_resonance = 0;
+							//// should we be resetting channel[i].playing->filter_* here?
+						}
+					}
+					/* Fall through */
+				default:
+					channel->midi_state = 0;
+					break;
+			}
+	}
+}
+
+
+
+static void xm_envelope_calculate_value(IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe)
+{
+	if (pe->next_node <= 0)
+		pe->value = envelope->node_y[0] << IT_ENVELOPE_SHIFT;
+	else if (pe->next_node >= envelope->n_nodes)
+		pe->value = envelope->node_y[envelope->n_nodes-1] << IT_ENVELOPE_SHIFT;
+	else {
+		int ys = envelope->node_y[pe->next_node-1] << IT_ENVELOPE_SHIFT;
+		int ts = envelope->node_t[pe->next_node-1];
+		int te = envelope->node_t[pe->next_node];
+
+		if (ts == te)
+			pe->value = ys;
+		else {
+			int ye = envelope->node_y[pe->next_node] << IT_ENVELOPE_SHIFT;
+			int t = pe->tick;
+
+			pe->value = ys + (ye - ys) * (t - ts) / (te - ts);
+		}
+	}
+}
+
+
+
+extern const char xm_convert_vibrato[];
+
+/* Returns 1 if a callback caused termination of playback. */
+static int process_effects(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry, int ignore_cxx)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+
+	if (entry->mask & IT_ENTRY_EFFECT) {
+		switch (entry->effect) {
+/*
+Notes about effects (as compared to other module formats)
+
+C This is now in *HEX*. (Used to be in decimal in ST3)
+E/F/G/H/U You need to check whether the song uses Amiga/Linear slides.
+H/U Vibrato in Impulse Tracker is two times finer than in
+ any other tracker and is updated EVERY tick.
+ If "Old Effects" is *ON*, then the vibrato is played in the
+ normal manner (every non-row tick and normal depth)
+E/F/G These commands ALL share the same memory.
+Oxx Offsets to samples are to the 'xx00th' SAMPLE. (ie. for
+ 16 bit samples, the offset is xx00h*2)
+ Oxx past the sample end will be ignored, unless "Old Effects"
+ is ON, in which case the Oxx will play from the end of the
+ sample.
+Yxy This uses a table 4 times larger (hence 4 times slower) than
+ vibrato or tremelo. If the waveform is set to random, then
+ the 'speed' part of the command is interpreted as a delay.
+*/
+			case IT_SET_SPEED:
+				if (entry->effectvalue)
+				{
+					/*if (entry->effectvalue == 255)
+						if (sigrenderer->callbacks->xm_speed_zero && (*sigrenderer->callbacks->xm_speed_zero)(sigrenderer->callbacks->xm_speed_zero_data))
+							return 1;*/
+					sigrenderer->tick = sigrenderer->speed = entry->effectvalue;
+				}
+				else if ((sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD)) == IT_WAS_AN_XM) {
+#ifdef BIT_ARRAY_BULLSHIT
+					bit_array_set(sigrenderer->played, sigrenderer->order * 256 + sigrenderer->row);
+#endif
+					sigrenderer->speed = 0;
+					if (sigrenderer->callbacks->xm_speed_zero && (*sigrenderer->callbacks->xm_speed_zero)(sigrenderer->callbacks->xm_speed_zero_data))
+						return 1;
+				}
+				break;
+
+			case IT_BREAK_TO_ROW:
+				if (ignore_cxx) break;
+				sigrenderer->breakrow = entry->effectvalue;
+				/* XXX jump and break on the same row */
+				if ( ( ( sigrenderer->processrow | 0xC00 ) == 0xFFFE ) &&
+					! ( sigrenderer->processrow & 0x400 ) ) {
+					sigrenderer->processrow = 0xFFFE & ~0xC00;
+				} else {
+					sigrenderer->processorder = sigrenderer->order;
+					sigrenderer->processrow = 0xFFFE & ~0x800;
+				}
+				break;
+
+			case IT_VOLSLIDE_VIBRATO:
+				if (channel->playing) {
+					channel->playing->vibrato_speed = channel->lastHspeed;
+					channel->playing->vibrato_depth = channel->lastHdepth;
+					channel->playing->vibrato_n++;
+				}
+				/* Fall through and process volume slide. */
+			case IT_VOLUME_SLIDE:
+			case IT_VOLSLIDE_TONEPORTA:
+				/* The tone portamento component is handled elsewhere. */
+				{
+					unsigned char v = entry->effectvalue;
+					if (!(sigdata->flags & IT_WAS_A_MOD)) {
+						if (v == 0)
+							v = channel->lastDKL;
+						channel->lastDKL = v;
+					}
+					if ((v & 0x0F) == 0) { /* Dx0 */
+						channel->volslide = v >> 4;
+						if (channel->volslide == 15 && !(sigdata->flags & IT_WAS_AN_XM)) {
+							channel->volume += 15;
+							if (channel->volume > 64) channel->volume = 64;
+						}
+					} else if ((v & 0xF0) == 0) { /* D0x */
+						channel->volslide = -v;
+						if (channel->volslide == -15 && !(sigdata->flags & IT_WAS_AN_XM)) {
+							channel->volume -= 15;
+							if (channel->volume > 64) channel->volume = 0;
+						}
+					} else if ((v & 0x0F) == 0x0F) { /* DxF */
+						channel->volume += v >> 4;
+						if (channel->volume > 64) channel->volume = 64;
+					} else if ((v & 0xF0) == 0xF0) { /* DFx */
+						channel->volume -= v & 15;
+						if (channel->volume > 64) channel->volume = 0;
+					}
+				}
+				break;
+			case IT_XM_FINE_VOLSLIDE_DOWN:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->xm_lastEB;
+					channel->xm_lastEB = v;
+					channel->volume -= v;
+					if (channel->volume > 64) channel->volume = 0;
+				}
+				break;
+			case IT_XM_FINE_VOLSLIDE_UP:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->xm_lastEA;
+					channel->xm_lastEA = v;
+					channel->volume += v;
+					if (channel->volume > 64) channel->volume = 64;
+				}
+				break;
+			case IT_PORTAMENTO_DOWN:
+				{
+					unsigned char v = entry->effectvalue;
+					if (sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_669)) {
+						if (!(sigdata->flags & IT_WAS_A_MOD)) {
+							if (v == 0xF0)
+								v |= channel->xm_lastE2;
+							else if (v >= 0xF0)
+								channel->xm_lastE2 = v & 15;
+							else if (v == 0xE0)
+								v |= channel->xm_lastX2;
+							else
+								channel->xm_lastX2 = v & 15;
+						}
+					} else {
+						if (v == 0)
+							v = channel->lastEF;
+						channel->lastEF = v;
+					}
+					if (channel->playing) {
+						if ((v & 0xF0) == 0xF0)
+							channel->playing->slide -= (v & 15) << 4;
+						else if ((v & 0xF0) == 0xE0)
+							channel->playing->slide -= (v & 15) << 2;
+						else if (sigdata->flags & IT_WAS_A_669)
+							channel->portamento -= v << 3;
+						else
+							channel->portamento -= v << 4;
+					}
+				}
+				break;
+			case IT_PORTAMENTO_UP:
+				{
+					unsigned char v = entry->effectvalue;
+					if (sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_669)) {
+						if (!(sigdata->flags & IT_WAS_A_MOD)) {
+							if (v == 0xF0)
+								v |= channel->xm_lastE1;
+							else if (v >= 0xF0)
+								channel->xm_lastE1 = v & 15;
+							else if (v == 0xE0)
+								v |= channel->xm_lastX1;
+							else
+								channel->xm_lastX1 = v & 15;
+						}
+					} else {
+						if (v == 0)
+							v = channel->lastEF;
+						channel->lastEF = v;
+					}
+					if (channel->playing) {
+						if ((v & 0xF0) == 0xF0)
+							channel->playing->slide += (v & 15) << 4;
+						else if ((v & 0xF0) == 0xE0)
+							channel->playing->slide += (v & 15) << 2;
+						else if (sigdata->flags & IT_WAS_A_669)
+							channel->portamento += v << 3;
+						else
+							channel->portamento += v << 4;
+					}
+				}
+				break;
+			case IT_XM_PORTAMENTO_DOWN:
+				{
+					unsigned char v = entry->effectvalue;
+					if (!(sigdata->flags & IT_WAS_A_MOD)) {
+						if (v == 0)
+							v = channel->lastJ;
+						channel->lastJ = v;
+					}
+					if (channel->playing)
+						channel->portamento -= v << 4;
+				}
+				break;
+			case IT_XM_PORTAMENTO_UP:
+				{
+					unsigned char v = entry->effectvalue;
+					if (!(sigdata->flags & IT_WAS_A_MOD)) {
+						if (v == 0)
+							v = channel->lastEF;
+						channel->lastEF = v;
+					}
+					if (channel->playing)
+						channel->portamento += v << 4;
+				}
+				break;
+			case IT_XM_KEY_OFF:
+				channel->key_off_count = entry->effectvalue;
+				if (!channel->key_off_count) xm_note_off(sigdata, channel);
+				break;
+			case IT_VIBRATO:
+				{
+					if (entry->effectvalue || !(sigdata->flags & IT_WAS_A_669)) {
+						unsigned char speed = entry->effectvalue >> 4;
+						unsigned char depth = entry->effectvalue & 15;
+						if (speed == 0)
+							speed = channel->lastHspeed;
+						channel->lastHspeed = speed;
+						if (depth == 0)
+							depth = channel->lastHdepth;
+						else {
+							if (sigdata->flags & IT_OLD_EFFECTS)
+								depth <<= 3;
+							else
+								depth <<= 2;
+							channel->lastHdepth = depth;
+						}
+						if (channel->playing) {
+							channel->playing->vibrato_speed = speed;
+							channel->playing->vibrato_depth = depth;
+							channel->playing->vibrato_n++;
+						}
+					}
+				}
+				break;
+			case IT_TREMOR:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->lastI;
+					else if (!(sigdata->flags & IT_OLD_EFFECTS)) {
+						if (v & 0xF0) v -= 0x10;
+						if (v & 0x0F) v -= 0x01;
+					}
+					channel->lastI = v;
+					channel->tremor_time |= 128;
+				}
+				update_tremor(channel);
+				break;
+			case IT_ARPEGGIO:
+				{
+					unsigned char v = entry->effectvalue;
+					/* XM files have no memory for arpeggio (000 = no effect)
+					 * and we use lastJ for portamento down instead.
+					 */
+					if (!(sigdata->flags & IT_WAS_AN_XM)) {
+						if (v == 0)
+							v = channel->lastJ;
+						channel->lastJ = v;
+					}
+					channel->arpeggio = v;
+				}
+				break;
+			case IT_SET_CHANNEL_VOLUME:
+				if (sigdata->flags & IT_WAS_AN_XM)
+					channel->volume = MIN(entry->effectvalue, 64);
+				else if (entry->effectvalue <= 64)
+					channel->channelvolume = entry->effectvalue;
+#ifdef VOLUME_OUT_OF_RANGE_SETS_MAXIMUM
+				else
+					channel->channelvolume = 64;
+#endif
+				if (channel->playing)
+					channel->playing->channel_volume = channel->channelvolume;
+				break;
+			case IT_CHANNEL_VOLUME_SLIDE:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->lastN;
+					channel->lastN = v;
+					if ((v & 0x0F) == 0) { /* Nx0 */
+						channel->channelvolslide = v >> 4;
+					} else if ((v & 0xF0) == 0) { /* N0x */
+						channel->channelvolslide = -v;
+					} else {
+						if ((v & 0x0F) == 0x0F) { /* NxF */
+							channel->channelvolume += v >> 4;
+							if (channel->channelvolume > 64) channel->channelvolume = 64;
+						} else if ((v & 0xF0) == 0xF0) { /* NFx */
+							channel->channelvolume -= v & 15;
+							if (channel->channelvolume > 64) channel->channelvolume = 0;
+						} else
+							break;
+						if (channel->playing)
+							channel->playing->channel_volume = channel->channelvolume;
+					}
+				}
+				break;
+			case IT_SET_SAMPLE_OFFSET:
+				{
+					unsigned char v = entry->effectvalue;
+					/*if (sigdata->flags & IT_WAS_A_MOD) {
+						if (v == 0) break;
+					} else*/ {
+						if (v == 0)
+							v = channel->lastO;
+						channel->lastO = v;
+					}
+					/* Note: we set the offset even if tone portamento is
+					 * specified. Impulse Tracker does the same.
+					 */
+					if (entry->mask & IT_ENTRY_NOTE) {
+						if (channel->playing) {
+							int offset = ((int)channel->high_offset << 16) | ((int)v << 8);
+							IT_PLAYING *playing = channel->playing;
+							IT_SAMPLE *sample = playing->sample;
+							int end;
+							if ((sample->flags & IT_SAMPLE_SUS_LOOP) && !(playing->flags & IT_PLAYING_SUSTAINOFF))
+								end = sample->sus_loop_end;
+							else if (sample->flags & IT_SAMPLE_LOOP)
+								end = sample->loop_end;
+							else
+								end = sample->length;
+							if ((sigdata->flags & IT_WAS_A_PTM) && (sample->flags & IT_SAMPLE_16BIT))
+								offset >>= 1;
+							if (offset < end) {
+								it_playing_reset_resamplers(playing, offset);
+#ifdef END_RAMPING
+								playing->declick_stage = 0;
+								playing->declick_volume = 1.f / 256.f;
+#endif
+							} else if (sigdata->flags & IT_OLD_EFFECTS) {
+								it_playing_reset_resamplers(playing, end);
+#ifdef END_RAMPING
+								playing->declick_stage = 0;
+								playing->declick_volume = 1.f / 256.f;
+#endif
+							}
+						}
+					}
+				}
+				break;
+			case IT_PANNING_SLIDE:
+				/** JULIEN: guess what? the docs are wrong! (how unusual ;)
+				 * Pxy seems to memorize its previous value... and there
+				 * might be other mistakes like that... (sigh!)
+				 */
+				/** ENTHEH: umm... but... the docs say that Pxy memorises its
+				 * value... don't they? :o
+				 */
+				{
+					unsigned char v = entry->effectvalue;
+					int p = channel->truepan;
+					if (sigdata->flags & IT_WAS_AN_XM)
+					{
+						if (IT_IS_SURROUND(channel->pan))
+						{
+							channel->pan = 32;
+							p = 32 + 128 * 64;
+						}
+						p >>= 6;
+					}
+					else {
+						if (IT_IS_SURROUND(channel->pan)) p = 32 << 8;
+						p = (p + 128) >> 8;
+						channel->pan = p;
+					}
+					if (v == 0)
+						v = channel->lastP;
+					channel->lastP = v;
+					if ((v & 0x0F) == 0) { /* Px0 */
+						channel->panslide = -(v >> 4);
+					} else if ((v & 0xF0) == 0) { /* P0x */
+						channel->panslide = v;
+					} else if ((v & 0x0F) == 0x0F) { /* PxF */
+						p -= v >> 4;
+					} else if ((v & 0xF0) == 0xF0) { /* PFx */
+						p += v & 15;
+					}
+					if (sigdata->flags & IT_WAS_AN_XM)
+						channel->truepan = 32 + MID(0, p, 255) * 64;
+					else {
+						if (p < 0) p = 0;
+						else if (p > 64) p = 64;
+						channel->pan = p;
+						channel->truepan = p << 8;
+					}
+				}
+				break;
+			case IT_RETRIGGER_NOTE:
+				{
+					unsigned char v = entry->effectvalue;
+					if (sigdata->flags & IT_WAS_AN_XM) {
+						if ((v & 0x0F) == 0) v |= channel->lastQ & 0x0F;
+						if ((v & 0xF0) == 0) v |= channel->lastQ & 0xF0;
+					} else {
+						if (v == 0)
+							v = channel->lastQ;
+					}
+					channel->lastQ = v;
+					if ((v & 0x0F) == 0) v |= 0x01;
+					channel->retrig = v;
+					if (entry->mask & IT_ENTRY_NOTE) {
+						channel->retrig_tick = v & 0x0F;
+						/* Emulate a bug */
+						if (sigdata->flags & IT_WAS_AN_XM)
+							update_retrig(sigrenderer, channel);
+					} else
+						update_retrig(sigrenderer, channel);
+				}
+				break;
+			case IT_XM_RETRIGGER_NOTE:
+				channel->retrig_tick = channel->xm_retrig = entry->effectvalue;
+				if (entry->effectvalue == 0)
+					if (channel->playing) {
+						it_playing_reset_resamplers(channel->playing, 0);
+#ifdef END_RAMPING
+						channel->playing->declick_stage = 0;
+						channel->playing->declick_volume = 1.f / 256.f;
+#endif
+					}
+				break;
+			case IT_TREMOLO:
+				{
+					unsigned char speed = entry->effectvalue >> 4;
+					unsigned char depth = entry->effectvalue & 15;
+					if (speed == 0)
+						speed = channel->lastRspeed;
+					channel->lastRspeed = speed;
+					if (depth == 0)
+						depth = channel->lastRdepth;
+					channel->lastRdepth = depth;
+					if (channel->playing) {
+						channel->playing->tremolo_speed = speed;
+						channel->playing->tremolo_depth = depth;
+					}
+				}
+				break;
+			case IT_S:
+				{
+					/* channel->lastS was set in update_pattern_variables(). */
+					unsigned char effectvalue = channel->lastS;
+					switch (effectvalue >> 4) {
+						//case IT_S_SET_FILTER:
+							/* Waveforms for commands S3x, S4x and S5x:
+							 * 0: Sine wave
+							 * 1: Ramp down
+							 * 2: Square wave
+							 * 3: Random wave
+							 */
+						case IT_S_SET_GLISSANDO_CONTROL:
+							channel->glissando = effectvalue & 15;
+							break;
+
+						case IT_S_FINETUNE:
+							if (channel->playing) {
+								channel->playing->finetune = ((int)(effectvalue & 15) - 8) << 5;
+							}
+							break;
+
+						case IT_S_SET_VIBRATO_WAVEFORM:
+							{
+								int waveform = effectvalue & 3;
+								if (sigdata->flags & IT_WAS_AN_XM) waveform = xm_convert_vibrato[waveform];
+								channel->vibrato_waveform = waveform;
+								if (channel->playing) {
+									channel->playing->vibrato_waveform = waveform;
+									if (!(effectvalue & 4))
+										channel->playing->vibrato_time = 0;
+								}
+							}
+							break;
+						case IT_S_SET_TREMOLO_WAVEFORM:
+							{
+								int waveform = effectvalue & 3;
+								if (sigdata->flags & IT_WAS_AN_XM) waveform = xm_convert_vibrato[waveform];
+								channel->tremolo_waveform = waveform;
+								if (channel->playing) {
+									channel->playing->tremolo_waveform = waveform;
+									if (!(effectvalue & 4))
+										channel->playing->tremolo_time = 0;
+								}
+							}
+							break;
+						case IT_S_SET_PANBRELLO_WAVEFORM:
+							channel->panbrello_waveform = effectvalue & 3;
+							if (channel->playing) {
+								channel->playing->panbrello_waveform = effectvalue & 3;
+								if (!(effectvalue & 4))
+									channel->playing->panbrello_time = 0;
+							}
+							break;
+
+						case IT_S_FINE_PATTERN_DELAY:
+							sigrenderer->tick += effectvalue & 15;
+							break;
+#if 1
+						case IT_S7:
+							{
+								if (sigrenderer->sigdata->flags & IT_USE_INSTRUMENTS)
+								{
+									int i;
+									switch (effectvalue & 15)
+									{
+									case 0: /* cut background notes */
+										for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+										{
+											IT_PLAYING * playing = sigrenderer->playing[i];
+											if (playing && channel == playing->channel)
+											{
+#ifdef RAMP_DOWN
+												playing->declick_stage = 2;
+#else
+												free(playing);
+												sigrenderer->playing[i] = NULL;
+#endif
+												if (channel->playing == playing) channel->playing = NULL;
+											}
+										}
+										break;
+									case 1: /* release background notes */
+										for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+										{
+											IT_PLAYING * playing = sigrenderer->playing[i];
+											if (playing && channel == playing->channel && !(playing->flags & IT_PLAYING_SUSTAINOFF))
+											{
+												it_note_off(playing);
+											}
+										}
+										break;
+									case 2: /* fade background notes */
+										for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+										{
+											IT_PLAYING * playing = sigrenderer->playing[i];
+											if (playing && channel == playing->channel)
+											{
+												//playing->flags &= IT_PLAYING_SUSTAINOFF;
+												playing->flags |= IT_PLAYING_FADING;
+											}
+										}
+										break;
+									case 3:
+										channel->new_note_action = NNA_NOTE_CUT;
+										break;
+									case 4:
+										channel->new_note_action = NNA_NOTE_CONTINUE;
+										break;
+									case 5:
+										channel->new_note_action = NNA_NOTE_OFF;
+										break;
+									case 6:
+										channel->new_note_action = NNA_NOTE_FADE;
+										break;
+
+									case 7:
+										if (channel->playing)
+											channel->playing->enabled_envelopes &= ~IT_ENV_VOLUME;
+										break;
+									case 8:
+										if (channel->playing)
+											channel->playing->enabled_envelopes |= IT_ENV_VOLUME;
+										break;
+
+									case 9:
+										if (channel->playing)
+											channel->playing->enabled_envelopes &= ~IT_ENV_PANNING;
+										break;
+									case 10:
+										if (channel->playing)
+											channel->playing->enabled_envelopes |= IT_ENV_PANNING;
+										break;
+
+									case 11:
+										if (channel->playing)
+											channel->playing->enabled_envelopes &= ~IT_ENV_PITCH;
+										break;
+									case 12:
+										if (channel->playing)
+											channel->playing->enabled_envelopes |= IT_ENV_PITCH;
+										break;
+									}
+								}
+							}
+							break;
+#endif
+						case IT_S_SET_PAN:
+							//ASSERT(!(sigdata->flags & IT_WAS_AN_XM));
+							channel->pan =
+								((effectvalue & 15) << 2) |
+								((effectvalue & 15) >> 2);
+							channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+
+							if (channel->playing)
+								channel->playing->panbrello_depth = 0;
+							break;
+						case IT_S_SET_SURROUND_SOUND:
+							if ((effectvalue & 15) == 1) {
+								channel->pan = IT_SURROUND;
+								channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+							}
+							if (channel->playing)
+								channel->playing->panbrello_depth = 0;
+							break;
+						case IT_S_SET_HIGH_OFFSET:
+							channel->high_offset = effectvalue & 15;
+							break;
+						//case IT_S_PATTERN_LOOP:
+						case IT_S_DELAYED_NOTE_CUT:
+							channel->note_cut_count = effectvalue & 15;
+							if (!channel->note_cut_count) {
+								if (sigdata->flags & (IT_WAS_AN_XM | IT_WAS_A_PTM))
+									channel->volume = 0;
+								else
+									channel->note_cut_count = 1;
+							}
+							break;
+						case IT_S_SET_MIDI_MACRO:
+							channel->SFmacro = effectvalue & 15;
+							break;
+					}
+				}
+				break;
+			case IT_SET_SONG_TEMPO:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->lastW;
+					channel->lastW = v;
+					if (v < 0x10)
+						sigrenderer->temposlide = -v;
+					else if (v < 0x20)
+						sigrenderer->temposlide = v & 15;
+					else
+						sigrenderer->tempo = v;
+				}
+				break;
+			case IT_FINE_VIBRATO:
+				{
+					unsigned char speed = entry->effectvalue >> 4;
+					unsigned char depth = entry->effectvalue & 15;
+					if (speed == 0)
+						speed = channel->lastHspeed;
+					channel->lastHspeed = speed;
+					if (depth == 0)
+						depth = channel->lastHdepth;
+					else {
+						if (sigdata->flags & IT_OLD_EFFECTS)
+							depth <<= 1;
+						channel->lastHdepth = depth;
+					}
+					if (channel->playing) {
+						channel->playing->vibrato_speed = speed;
+						channel->playing->vibrato_depth = depth;
+						channel->playing->vibrato_n++;
+					}
+				}
+				break;
+			case IT_SET_GLOBAL_VOLUME:
+				if (entry->effectvalue <= 128)
+					sigrenderer->globalvolume = entry->effectvalue;
+#ifdef VOLUME_OUT_OF_RANGE_SETS_MAXIMUM
+				else
+					sigrenderer->globalvolume = 128;
+#endif
+				break;
+			case IT_GLOBAL_VOLUME_SLIDE:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0)
+						v = channel->lastW;
+					channel->lastW = v;
+					if ((v & 0x0F) == 0) { /* Wx0 */
+						sigrenderer->globalvolslide =
+							(sigdata->flags & IT_WAS_AN_XM) ? (v >> 4)*2 : (v >> 4);
+					} else if ((v & 0xF0) == 0) { /* W0x */
+						sigrenderer->globalvolslide =
+							(sigdata->flags & IT_WAS_AN_XM) ? (-v)*2 : (-v);
+					} else if ((v & 0x0F) == 0x0F) { /* WxF */
+						sigrenderer->globalvolume += v >> 4;
+						if (sigrenderer->globalvolume > 128) sigrenderer->globalvolume = 128;
+					} else if ((v & 0xF0) == 0xF0) { /* WFx */
+						sigrenderer->globalvolume -= v & 15;
+						if (sigrenderer->globalvolume > 128) sigrenderer->globalvolume = 0;
+					}
+				}
+				break;
+			case IT_SET_PANNING:
+				if (sigdata->flags & IT_WAS_AN_XM) {
+					if (sigdata->flags & IT_WAS_A_MOD)
+						channel->truepan = entry->effectvalue*128;
+					else
+						channel->truepan = 32 + entry->effectvalue*64;
+				} else {
+					if (sigdata->flags & IT_WAS_AN_S3M)
+						channel->pan = (entry->effectvalue + 1) >> 1;
+					else
+						channel->pan = (entry->effectvalue + 2) >> 2;
+					channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+				}
+				if (channel->playing)
+					channel->playing->panbrello_depth = 0;
+				break;
+			case IT_PANBRELLO:
+				{
+					unsigned char speed = entry->effectvalue >> 4;
+					unsigned char depth = entry->effectvalue & 15;
+					if (speed == 0)
+						speed = channel->lastYspeed;
+					channel->lastYspeed = speed;
+					if (depth == 0)
+						depth = channel->lastYdepth;
+					channel->lastYdepth = depth;
+					if (channel->playing) {
+						channel->playing->panbrello_speed = speed;
+						channel->playing->panbrello_depth = depth;
+					}
+				}
+				break;
+			case IT_MIDI_MACRO:
+				{
+					const IT_MIDI *midi = sigdata->midi ? sigdata->midi : &default_midi;
+					if (entry->effectvalue >= 0x80) {
+						int n = midi->Zmacrolen[entry->effectvalue-0x80];
+						int i;
+						for (i = 0; i < n; i++)
+							it_send_midi(sigrenderer, channel, midi->Zmacro[entry->effectvalue-0x80][i]);
+					} else {
+						int n = midi->SFmacrolen[channel->SFmacro];
+						int i, j;
+						for (i = 0, j = 1; i < n; i++, j <<= 1)
+							it_send_midi(sigrenderer, channel,
+								(unsigned char)(midi->SFmacroz[channel->SFmacro] & j ?
+									entry->effectvalue : midi->SFmacro[channel->SFmacro][i]));
+					}
+				}
+				break;
+			case IT_XM_SET_ENVELOPE_POSITION:
+				if (channel->playing && channel->playing->env_instrument) {
+					IT_ENVELOPE *envelope = &channel->playing->env_instrument->volume_envelope;
+					if (envelope->flags & IT_ENVELOPE_ON) {
+						IT_PLAYING_ENVELOPE *pe = &channel->playing->volume_envelope;
+						pe->tick = entry->effectvalue;
+						if (pe->tick >= envelope->node_t[envelope->n_nodes-1])
+							pe->tick = envelope->node_t[envelope->n_nodes-1];
+						pe->next_node = 0;
+						while (pe->tick > envelope->node_t[pe->next_node]) pe->next_node++;
+						xm_envelope_calculate_value(envelope, pe);
+					}
+				}
+				break;
+
+			/* uggly plain portamento for now */
+			case IT_PTM_NOTE_SLIDE_DOWN:
+			case IT_PTM_NOTE_SLIDE_DOWN_RETRIG:
+				{
+					channel->toneslide_retrig = (entry->effect == IT_PTM_NOTE_SLIDE_DOWN_RETRIG);
+
+					if (channel->ptm_last_toneslide) {
+						channel->toneslide_tick = channel->last_toneslide_tick;
+
+						if (--channel->toneslide_tick == 0) {
+							channel->truenote += channel->toneslide;
+							if (channel->truenote >= 120) {
+								if (channel->toneslide < 0) channel->truenote = 0;
+								else channel->truenote = 119;
+							}
+							channel->note += channel->toneslide;
+							if (channel->note >= 120) {
+								if (channel->toneslide < 0) channel->note = 0;
+								else channel->note = 119;
+							}
+
+							if (channel->playing) {
+								if (channel->sample) channel->playing->note = channel->truenote;
+								else channel->playing->note = channel->note;
+								it_playing_reset_resamplers(channel->playing, 0);
+#ifdef END_RAMPING
+								channel->playing->declick_stage = 0;
+								channel->playing->declick_volume = 1.f / 256.f;
+#endif
+							}
+						}
+					}
+
+					channel->ptm_last_toneslide = 0;
+
+					channel->toneslide = -(entry->effectvalue & 15);
+					channel->ptm_toneslide = (entry->effectvalue & 0xF0) >> 4;
+					channel->toneslide_tick += channel->ptm_toneslide;
+				}
+				break;
+			case IT_PTM_NOTE_SLIDE_UP:
+			case IT_PTM_NOTE_SLIDE_UP_RETRIG:
+				{
+					channel->toneslide_retrig = (entry->effect == IT_PTM_NOTE_SLIDE_UP_RETRIG);
+
+					if (channel->ptm_last_toneslide) {
+						channel->toneslide_tick = channel->last_toneslide_tick;
+
+						if (--channel->toneslide_tick == 0) {
+							channel->truenote += channel->toneslide;
+							if (channel->truenote >= 120) {
+								if (channel->toneslide < 0) channel->truenote = 0;
+								else channel->truenote = 119;
+							}
+							channel->note += channel->toneslide;
+							if (channel->note >= 120) {
+								if (channel->toneslide < 0) channel->note = 0;
+								else channel->note = 119;
+							}
+
+							if (channel->playing) {
+								if (channel->sample) channel->playing->note = channel->truenote;
+								else channel->playing->note = channel->note;
+								it_playing_reset_resamplers(channel->playing, 0);
+#ifdef END_RAMPING
+								channel->playing->declick_stage = 0;
+								channel->playing->declick_volume = 1.f / 256.f;
+#endif
+							}
+						}
+					}
+
+					channel->ptm_last_toneslide = 0;
+
+					channel->toneslide = -(entry->effectvalue & 15);
+					channel->ptm_toneslide = (entry->effectvalue & 0xF0) >> 4;
+					channel->toneslide_tick += channel->ptm_toneslide;
+				}
+				break;
+		}
+	}
+
+	if (!(sigdata->flags & IT_WAS_AN_XM))
+		post_process_it_volpan(sigrenderer, entry);
+
+	return 0;
+}
+
+
+
+static int process_it_note_data(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+
+	// When tone portamento and instrument are specified:
+	// If Gxx is off:
+	// - same sample, do nothing but portamento
+	// - diff sample, retrigger all but keep current note+slide + do porta
+	// - if instrument is invalid, nothing; if sample is invalid, cut
+	// If Gxx is on:
+	// - same sample or new sample invalid, retrigger envelopes and initialise note value for portamento to 'seek' to
+	// - diff sample/inst, start using new envelopes
+	// When tone portamento is specified alone, sample won't change.
+	// TODO: consider what happens with instrument alone after all this...
+
+	if (entry->mask & (IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT)) {
+		if (entry->mask & IT_ENTRY_INSTRUMENT)
+			channel->instrument = entry->instrument;
+		instrument_to_sample(sigdata, channel);
+		if (channel->note < 120) {
+			if ((sigdata->flags & IT_USE_INSTRUMENTS) && channel->sample == 0)
+				it_retrigger_note(sigrenderer, channel); /* Stop the note */ /*return 1;*/
+			if (entry->mask & IT_ENTRY_INSTRUMENT)
+				get_default_volpan(sigdata, channel);
+		} else
+			it_retrigger_note(sigrenderer, channel); /* Stop the note */
+	}
+
+	/** WARNING: This is not ideal, since channel->playing might not get allocated owing to lack of memory... */
+	if (((entry->mask & IT_ENTRY_VOLPAN) && entry->volpan >= 193 && entry->volpan <= 202) ||
+	 ((entry->mask & IT_ENTRY_EFFECT) && (entry->effect == IT_TONE_PORTAMENTO || entry->effect == IT_VOLSLIDE_TONEPORTA)))
+	{
+		if (channel->playing && (entry->mask & IT_ENTRY_INSTRUMENT)) {
+			if (sigdata->flags & IT_COMPATIBLE_GXX)
+				it_compatible_gxx_retrigger(sigdata, channel);
+			else if ((!(sigdata->flags & IT_USE_INSTRUMENTS) ||
+				(channel->instrument >= 1 && channel->instrument <= sigdata->n_instruments)) &&
+				channel->sample != channel->playing->sampnum)
+			{
+				unsigned char note = channel->playing->note;
+				int slide = channel->playing->slide;
+				it_retrigger_note(sigrenderer, channel);
+				if (channel->playing) {
+					channel->playing->note = note;
+					channel->playing->slide = slide;
+					// Should we be preserving sample_vibrato_time? depth?
+				}
+			}
+		}
+
+		if ((entry->mask & IT_ENTRY_VOLPAN) && entry->volpan >= 193 && entry->volpan <= 202) {
+			/* Tone Portamento in the volume column */
+			static const unsigned char slidetable[] = {0, 1, 4, 8, 16, 32, 64, 96, 128, 255};
+			unsigned char v = slidetable[entry->volpan - 193];
+			if (sigdata->flags & IT_COMPATIBLE_GXX) {
+				if (v == 0)
+					v = channel->lastG;
+				channel->lastG = v;
+			} else {
+				if (v == 0)
+					v = channel->lastEF;
+				channel->lastEF = v;
+			}
+			if ((entry->mask & IT_ENTRY_NOTE) || ((sigdata->flags & IT_COMPATIBLE_GXX) && (entry->mask & IT_ENTRY_INSTRUMENT))) {
+				if (channel->note < 120) {
+					if (channel->sample)
+						channel->destnote = channel->truenote;
+					else
+						channel->destnote = channel->note;
+				}
+			}
+			channel->toneporta = v << 4;
+		} else {
+			/* Tone Portamento in the effect column */
+			unsigned char v;
+			if (entry->effect == IT_TONE_PORTAMENTO)
+				v = entry->effectvalue;
+			else
+				v = 0;
+			if (sigdata->flags & IT_COMPATIBLE_GXX) {
+				if (v == 0)
+					v = channel->lastG;
+				channel->lastG = v;
+			} else {
+				if (v == 0 && !(sigdata->flags & IT_WAS_A_669))
+					v = channel->lastEF;
+				channel->lastEF = v;
+			}
+			if ((entry->mask & IT_ENTRY_NOTE) || ((sigdata->flags & IT_COMPATIBLE_GXX) && (entry->mask & IT_ENTRY_INSTRUMENT))) {
+				if (channel->note < 120) {
+					if (channel->sample)
+						channel->destnote = channel->truenote;
+					else
+						channel->destnote = channel->note;
+				}
+			}
+			channel->toneporta = v << 4;
+		}
+		if (channel->playing) goto skip_start_note;
+	}
+
+	if ((entry->mask & IT_ENTRY_NOTE) ||
+		((entry->mask & IT_ENTRY_INSTRUMENT) && (!channel->playing || entry->instrument != channel->playing->instnum)))
+	{
+		if (channel->note < 120) {
+			get_true_pan(sigdata, channel);
+			if ((entry->mask & IT_ENTRY_NOTE) || !(sigdata->flags & (IT_WAS_AN_S3M|IT_WAS_A_PTM)))
+				it_retrigger_note(sigrenderer, channel);
+		}
+	}
+
+	skip_start_note:
+
+	if (entry->mask & IT_ENTRY_VOLPAN) {
+		if (entry->volpan <= 64) {
+			/* Volume */
+			channel->volume = entry->volpan;
+		} else if (entry->volpan <= 74) {
+			/* Fine volume slide up */
+			unsigned char v = entry->volpan - 65;
+			if (v == 0)
+				v = channel->lastvolslide;
+			channel->lastvolslide = v;
+			/* = effect DxF where x == entry->volpan - 65 */
+			channel->volume += v;
+			if (channel->volume > 64) channel->volume = 64;
+		} else if (entry->volpan <= 84) {
+			/* Fine volume slide down */
+			unsigned char v = entry->volpan - 75;
+			if (v == 0)
+				v = channel->lastvolslide;
+			channel->lastvolslide = v;
+			/* = effect DFx where x == entry->volpan - 75 */
+			channel->volume -= v;
+			if (channel->volume > 64) channel->volume = 0;
+		} else if (entry->volpan < 128) {
+			/* Volume slide up */
+			/* Volume slide down */
+			/* Portamento down */
+			/* Portamento up */
+		} else if (entry->volpan <= 192) {
+			/* Pan */
+			channel->pan = entry->volpan - 128;
+			channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+		}
+		/* else */
+		/* Tone Portamento */
+		/* Vibrato */
+	}
+	return 0;
+}
+
+
+
+static void retrigger_xm_envelopes(IT_PLAYING *playing)
+{
+	playing->volume_envelope.next_node = 0;
+	playing->volume_envelope.tick = -1;
+	playing->pan_envelope.next_node = 0;
+	playing->pan_envelope.tick = -1;
+	playing->fadeoutcount = 1024;
+}
+
+
+
+static void process_xm_note_data(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+	IT_PLAYING playing;
+
+	playing.sample = 0;
+
+	if (entry->mask & IT_ENTRY_INSTRUMENT) {
+		int oldsample = channel->sample;
+		int oldvolume = channel->volume;
+		channel->instrument = entry->instrument;
+		instrument_to_sample(sigdata, channel);
+		if (channel->playing &&
+			!((entry->mask & IT_ENTRY_NOTE) && entry->note >= 120) &&
+			!((entry->mask & IT_ENTRY_EFFECT) && entry->effect == IT_XM_KEY_OFF && entry->effectvalue == 0)) {
+			playing = *channel->playing;
+			if (!(sigdata->flags & IT_WAS_A_MOD)) {
+				/* Retrigger vol/pan envelopes if enabled, and cancel fadeout.
+				 * Also reset vol/pan to that of _original_ instrument.
+				 */
+				channel->playing->flags &= ~(IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING);
+				it_playing_update_resamplers(channel->playing);
+
+				channel->volume = channel->playing->sample->default_volume;
+				channel->truepan = 32 + channel->playing->sample->default_pan*64;
+
+				retrigger_xm_envelopes(channel->playing);
+			} else {
+				/* Switch if sample changed */
+				if (oldsample != channel->sample) {
+#ifdef RAMP_DOWN
+					int i;
+					for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (!sigrenderer->playing[i]) {
+							channel->playing->declick_stage = 2;
+							sigrenderer->playing[i] = channel->playing;
+							channel->playing = NULL;
+							break;
+						}
+					}
+
+					if (!channel->sample) {
+						if (channel->playing)
+						{
+							free(channel->playing);
+							channel->playing = NULL;
+						}
+					} else {
+						if (!channel->playing) {
+							channel->playing = malloc(sizeof(*channel->playing));
+							if (!channel->playing) return;
+						}
+						*channel->playing = playing;
+						playing.sample = (IT_SAMPLE *)-1;
+						channel->playing->declick_stage = 0;
+						channel->playing->declick_volume = 1.f / 256.f;
+#else
+					if (!channel->sample) {
+						free(channel->playing);
+						channel->playing = NULL;
+					} else {
+#endif
+						channel->playing->sampnum = channel->sample;
+						channel->playing->sample = &sigdata->sample[channel->sample-1];
+						it_playing_reset_resamplers(channel->playing, 0);
+					}
+				}
+				get_default_volpan(sigdata, channel);
+			}
+#ifdef END_RAMPING
+			if (channel->volume && !oldvolume) {
+				channel->playing->declick_stage = 0;
+				channel->playing->declick_volume = 1.f / 256.f;
+			}
+#endif
+		}
+	}
+
+	if (!((entry->mask & IT_ENTRY_EFFECT) && entry->effect == IT_XM_KEY_OFF && entry->effectvalue == 0) &&
+		(entry->mask & IT_ENTRY_NOTE))
+	{
+		if (!(entry->mask & IT_ENTRY_INSTRUMENT))
+			instrument_to_sample(sigdata, channel);
+
+		if (channel->note >= 120)
+			xm_note_off(sigdata, channel);
+		else if (channel->sample == 0) {
+			/** If we get here, one of the following is the case:
+			 ** 1. The instrument has never been specified on this channel.
+			 ** 2. The specified instrument is invalid.
+			 ** 3. The instrument has no sample mapped to the selected note.
+			 ** What should happen?
+			 **
+			 ** Experimentation shows that any existing note stops and cannot
+			 ** be brought back. A subsequent instrument change fixes that.
+			 **/
+			if (channel->playing) {
+#ifdef RAMP_DOWN
+				int i;
+				if (playing.sample) *channel->playing = playing;
+				for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+					if (!sigrenderer->playing[i]) {
+						channel->playing->declick_stage = 2;
+						sigrenderer->playing[i] = channel->playing;
+						channel->playing = NULL;
+						break;
+					}
+				}
+				if (channel->playing) {
+					free(channel->playing);
+					channel->playing = NULL;
+				}
+#else
+				free(channel->playing);
+				channel->playing = NULL;
+#endif
+			}
+			return;
+		} else if (channel->playing && (entry->mask & IT_ENTRY_VOLPAN) && ((entry->volpan>>4) == 0xF)) {
+			/* Don't retrigger note; portamento in the volume column. */
+		} else if (channel->playing &&
+		 (entry->mask & IT_ENTRY_EFFECT) &&
+		 (entry->effect == IT_TONE_PORTAMENTO ||
+		 entry->effect == IT_VOLSLIDE_TONEPORTA)) {
+			/* Don't retrigger note; portamento in the effects column. */
+		} else {
+			channel->destnote = IT_NOTE_OFF;
+
+			if (!channel->playing) {
+				channel->playing = malloc(sizeof(*channel->playing));
+				if (!channel->playing)
+					return;
+				// Adding the following seems to do the trick for the case where a piece starts with an instrument alone and then some notes alone.
+				retrigger_xm_envelopes(channel->playing);
+			}
+#ifdef RAMP_DOWN
+			else if (playing.sample != (IT_SAMPLE *)-1) {
+				/* volume rampy stuff! move note to NNA */
+				int i;
+				IT_PLAYING * ptemp = malloc(sizeof(*channel->playing));
+				if (!ptemp) return;
+				if (playing.sample) *ptemp = playing;
+				else *ptemp = *channel->playing;
+				for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+					if (!sigrenderer->playing[i]) {
+						ptemp->declick_stage = 2;
+						ptemp->flags |= IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING;
+						sigrenderer->playing[i] = ptemp;
+						ptemp = NULL;
+						break;
+					}
+				}
+				if (ptemp) free(ptemp);
+			}
+#endif
+
+			channel->playing->flags = 0;
+			channel->playing->resampling_quality = sigrenderer->resampling_quality;
+			channel->playing->channel = channel;
+			channel->playing->sample = &sigdata->sample[channel->sample-1];
+			if (sigdata->flags & IT_USE_INSTRUMENTS)
+				channel->playing->instrument = &sigdata->instrument[channel->instrument-1];
+			else
+				channel->playing->instrument = NULL;
+			channel->playing->env_instrument = channel->playing->instrument;
+			channel->playing->sampnum = channel->sample;
+			channel->playing->instnum = channel->instrument;
+#ifdef END_RAMPING
+			channel->playing->declick_stage = 0;
+			channel->playing->declick_volume = 1.f / 256.f;
+#endif
+			channel->playing->channel_volume = channel->channelvolume;
+			channel->playing->ramp_volume[0] = 31337.0; /* special */
+			channel->playing->note = channel->truenote;
+			channel->playing->enabled_envelopes = 0;
+			channel->playing->volume_offset = 0;
+			channel->playing->panning_offset = 0;
+			//channel->playing->output = channel->output;
+			if (sigdata->flags & IT_USE_INSTRUMENTS) {
+				IT_PLAYING * playing = channel->playing;
+				IT_INSTRUMENT * instrument = playing->instrument;
+				if (instrument->volume_envelope.flags & IT_ENVELOPE_ON) playing->enabled_envelopes |= IT_ENV_VOLUME;
+				if (instrument->pan_envelope.flags & IT_ENVELOPE_ON) playing->enabled_envelopes |= IT_ENV_PANNING;
+				//if (instrument->output) playing->output = instrument->output;
+			}
+			channel->playing->filter_cutoff = 127;
+			channel->playing->filter_resonance = 0;
+			channel->playing->true_filter_cutoff = 127 << 8;
+			channel->playing->true_filter_resonance = 0;
+			channel->playing->vibrato_speed = 0;
+			channel->playing->vibrato_depth = 0;
+			channel->playing->vibrato_n = 0;
+			channel->playing->vibrato_time = 0;
+			channel->playing->vibrato_waveform = 0;
+			channel->playing->tremolo_speed = 0;
+			channel->playing->tremolo_depth = 0;
+			channel->playing->tremolo_time = 0;
+			channel->playing->tremolo_waveform = 0;
+			channel->playing->panbrello_speed = 0;
+			channel->playing->panbrello_depth = 0;
+			channel->playing->panbrello_time = 0;
+			channel->playing->panbrello_waveform = 0;
+			channel->playing->panbrello_random = 0;
+			channel->playing->sample_vibrato_time = 0;
+			channel->playing->sample_vibrato_waveform = channel->playing->sample->vibrato_waveform;
+			channel->playing->sample_vibrato_depth = 0;
+			channel->playing->slide = 0;
+			channel->playing->finetune = channel->playing->sample->finetune;
+			it_reset_filter_state(&channel->playing->filter_state[0]); // Are these
+			it_reset_filter_state(&channel->playing->filter_state[1]); // necessary?
+			it_playing_reset_resamplers(channel->playing, 0);
+
+			/** WARNING - is everything initialised? */
+		}
+	}
+
+	if (!((entry->mask & IT_ENTRY_EFFECT) && entry->effect == IT_XM_KEY_OFF && entry->effectvalue == 0) &&
+		!((entry->mask & IT_ENTRY_NOTE) && entry->note >= 120) &&
+		(entry->mask & (IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT)) == (IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT))
+	{
+		if (channel->playing) retrigger_xm_envelopes(channel->playing);
+		get_default_volpan(sigdata, channel);
+	}
+
+	if ((entry->mask & IT_ENTRY_VOLPAN) && ((entry->volpan>>4) == 0xF)) {
+		/* Tone Portamento */
+		unsigned char v = (entry->volpan & 15) << 4;
+		if (v == 0)
+			v = channel->lastG;
+		channel->lastG = v;
+		if (entry->mask & IT_ENTRY_NOTE)
+			if (channel->sample && channel->note < 120)
+				channel->destnote = channel->truenote;
+		channel->toneporta = v << 4;
+	} else if ((entry->mask & IT_ENTRY_EFFECT) &&
+	 (entry->effect == IT_TONE_PORTAMENTO ||
+	 entry->effect == IT_VOLSLIDE_TONEPORTA)) {
+		unsigned char v;
+		if (entry->effect == IT_TONE_PORTAMENTO)
+			v = entry->effectvalue;
+		else
+			v = 0;
+		if (v == 0)
+			v = channel->lastG;
+		channel->lastG = v;
+		if (entry->mask & IT_ENTRY_NOTE)
+			if (channel->sample && channel->note < 120)
+				channel->destnote = channel->truenote;
+		channel->toneporta = v << 4;
+	}
+
+	if (entry->mask & IT_ENTRY_VOLPAN) {
+		int effect = entry->volpan >> 4;
+		int value = entry->volpan & 15;
+		switch (effect) {
+			case 0x6: /* Volume slide down */
+				channel->xm_volslide = -value;
+				break;
+			case 0x7: /* Volume slide up */
+				channel->xm_volslide = value;
+				break;
+			case 0x8: /* Fine volume slide down */
+				channel->volume -= value;
+				if (channel->volume > 64) channel->volume = 0;
+				break;
+			case 0x9: /* Fine volume slide up */
+				channel->volume += value;
+				if (channel->volume > 64) channel->volume = 64;
+				break;
+			case 0xA: /* Set vibrato speed */
+				if (value)
+					channel->lastHspeed = value;
+				if (channel->playing)
+					channel->playing->vibrato_speed = channel->lastHspeed;
+				break;
+			case 0xB: /* Vibrato */
+				if (value)
+					channel->lastHdepth = value << 2; /** WARNING: correct ? */
+				if (channel->playing) {
+					channel->playing->vibrato_depth = channel->lastHdepth;
+					channel->playing->vibrato_speed = channel->lastHspeed;
+					channel->playing->vibrato_n++;
+				}
+				break;
+			case 0xC: /* Set panning */
+				channel->truepan = 32 + value*(17*64);
+				break;
+			case 0xD: /* Pan slide left */
+				/* -128 is a special case for emulating a 'feature' in FT2.
+				 * As soon as effects are processed, it goes hard left.
+				 */
+				channel->panslide = value ? -value : -128;
+				break;
+			case 0xE: /* Pan slide Right */
+				channel->panslide = value;
+				break;
+			case 0xF: /* Tone porta */
+				break;
+			default: /* Volume */
+				channel->volume = entry->volpan - 0x10;
+				break;
+		}
+	}
+}
+
+
+
+/* This function assumes !IT_IS_END_ROW(entry). */
+static int process_note_data(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry, int ignore_cxx)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+
+	if (sigdata->flags & IT_WAS_AN_XM)
+		process_xm_note_data(sigrenderer, entry);
+	else
+		if (process_it_note_data(sigrenderer, entry)) return 0;
+
+	return process_effects(sigrenderer, entry, ignore_cxx);
+}
+
+
+
+static int process_entry(DUMB_IT_SIGRENDERER *sigrenderer, IT_ENTRY *entry, int ignore_cxx)
+{
+	IT_CHANNEL *channel = &sigrenderer->channel[(int)entry->channel];
+
+	if (entry->mask & IT_ENTRY_NOTE)
+		channel->note = entry->note;
+
+	if ((entry->mask & (IT_ENTRY_NOTE|IT_ENTRY_EFFECT)) && (sigrenderer->sigdata->flags & IT_WAS_A_669)) {
+		reset_channel_effects(channel);
+		// XXX unknown
+		if (channel->playing) channel->playing->finetune = 0;
+	}
+
+	if ((entry->mask & IT_ENTRY_EFFECT) && entry->effect == IT_S) {
+		/* channel->lastS was set in update_pattern_variables(). */
+		unsigned char effectvalue = channel->lastS;
+		if (effectvalue >> 4 == IT_S_NOTE_DELAY) {
+			channel->note_delay_count = effectvalue & 15;
+			if (channel->note_delay_count == 0)
+				channel->note_delay_count = 1;
+			channel->note_delay_entry = entry;
+			return 0;
+		}
+	}
+
+	return process_note_data(sigrenderer, entry, ignore_cxx);
+}
+
+
+
+static void update_tick_counts(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	int i;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+
+		if (channel->key_off_count) {
+			channel->key_off_count--;
+			if (channel->key_off_count == 0)
+				xm_note_off(sigrenderer->sigdata, channel);
+		} else if (channel->note_cut_count) {
+			channel->note_cut_count--;
+			if (channel->note_cut_count == 0) {
+				if (sigrenderer->sigdata->flags & (IT_WAS_AN_XM | IT_WAS_A_PTM))
+					channel->volume = 0;
+				else if (channel->playing) {
+#ifdef RAMP_DOWN
+					int i;
+					for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (!sigrenderer->playing[i]) {
+							channel->playing->declick_stage = 2;
+							sigrenderer->playing[i] = channel->playing;
+							channel->playing = NULL;
+							break;
+						}
+					}
+					if (channel->playing) {
+						free(channel->playing);
+						channel->playing = NULL;
+					}
+#else
+					free(channel->playing);
+					channel->playing = NULL;
+#endif
+				}
+			}
+		} else if (channel->note_delay_count) {
+			channel->note_delay_count--;
+			if (channel->note_delay_count == 0)
+				process_note_data(sigrenderer, channel->note_delay_entry, 0);
+					/* Don't bother checking the return value; if the note
+					 * was delayed, there can't have been a speed=0.
+					 */
+		}
+	}
+}
+
+
+
+static int envelope_get_y(IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe)
+{
+#if 1
+	(void)envelope; //TODO: remove the parameter
+	return pe->value;
+#else
+	int ys, ye;
+	int ts, te;
+	int t;
+
+	if (pe->next_node <= 0)
+		return envelope->node_y[0] << IT_ENVELOPE_SHIFT;
+
+	if (pe->next_node >= envelope->n_nodes)
+		return envelope->node_y[envelope->n_nodes-1] << IT_ENVELOPE_SHIFT;
+
+	ys = envelope->node_y[pe->next_node-1] << IT_ENVELOPE_SHIFT;
+	ts = envelope->node_t[pe->next_node-1];
+	te = envelope->node_t[pe->next_node];
+
+	if (ts == te)
+		return ys;
+
+	ye = envelope->node_y[pe->next_node] << IT_ENVELOPE_SHIFT;
+
+	t = pe->tick;
+
+	return ys + (ye - ys) * (t - ts) / (te - ts);
+#endif
+}
+
+
+
+#if 0
+static int it_envelope_end(IT_PLAYING *playing, IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe)
+{
+	if (pe->next_node >= envelope->n_nodes)
+		return 1;
+
+	if (pe->tick < envelope->node_t[pe->next_node]) return 0;
+
+	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) &&
+	 envelope->loop_end >= pe->next_node &&
+	 envelope->node_t[envelope->loop_end] <= pe->tick) return 0;
+
+	if ((envelope->flags & IT_ENVELOPE_SUSTAIN_LOOP) &&
+	 !(playing->flags & IT_PLAYING_SUSTAINOFF) &&
+	 envelope->sus_loop_end >= pe->next_node &&
+	 envelope->node_t[envelope->sus_loop_end] <= pe->tick) return 0;
+
+	if (envelope->node_t[envelope->n_nodes-1] <= pe->tick) return 1;
+
+	return 0;
+}
+#endif
+
+
+
+/* Returns 1 when fading should be initiated for a volume envelope. */
+static int update_it_envelope(IT_PLAYING *playing, IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe, int flags)
+{
+	if (!(playing->enabled_envelopes & flags))
+		return 0;
+
+	ASSERT(envelope->n_nodes > 0);
+
+	if (pe->next_node <= 0)
+		pe->value = envelope->node_y[0] << IT_ENVELOPE_SHIFT;
+	else if (pe->next_node >= envelope->n_nodes) {
+		pe->value = envelope->node_y[envelope->n_nodes-1] << IT_ENVELOPE_SHIFT;
+		return 1;
+	} else {
+		int ys = envelope->node_y[pe->next_node-1] << IT_ENVELOPE_SHIFT;
+		int ts = envelope->node_t[pe->next_node-1];
+		int te = envelope->node_t[pe->next_node];
+
+		if (ts == te)
+			pe->value = ys;
+		else {
+			int ye = envelope->node_y[pe->next_node] << IT_ENVELOPE_SHIFT;
+			int t = pe->tick;
+
+			pe->value = ys + (ye - ys) * (t - ts) / (te - ts);
+		}
+	}
+
+	pe->tick++;
+	while (pe->tick >= envelope->node_t[pe->next_node]) {
+		pe->next_node++;
+		if ((envelope->flags & IT_ENVELOPE_SUSTAIN_LOOP) && !(playing->flags & IT_PLAYING_SUSTAINOFF)) {
+			if (pe->next_node > envelope->sus_loop_end) {
+				pe->next_node = envelope->sus_loop_start;
+				ASSERT(pe->next_node < envelope->n_nodes);
+				pe->tick = envelope->node_t[envelope->sus_loop_start];
+				return 0;
+			}
+		} else if (envelope->flags & IT_ENVELOPE_LOOP_ON) {
+			if (pe->next_node > envelope->loop_end) {
+				pe->next_node = envelope->loop_start;
+				ASSERT(pe->next_node < envelope->n_nodes);
+				pe->tick = envelope->node_t[envelope->loop_start];
+				return 0;
+			}
+		}
+		if (pe->next_node >= envelope->n_nodes)
+			return 0;
+	}
+	return 0;
+}
+
+
+
+static void update_it_envelopes(IT_PLAYING *playing)
+{
+	IT_ENVELOPE *envelope = &playing->env_instrument->volume_envelope;
+	IT_PLAYING_ENVELOPE *pe = &playing->volume_envelope;
+
+	if (update_it_envelope(playing, envelope, pe, IT_ENV_VOLUME)) {
+		playing->flags |= IT_PLAYING_FADING;
+		if (pe->value == 0)
+			playing->flags |= IT_PLAYING_DEAD;
+	}
+
+	update_it_envelope(playing, &playing->env_instrument->pan_envelope, &playing->pan_envelope, IT_ENV_PANNING);
+	update_it_envelope(playing, &playing->env_instrument->pitch_envelope, &playing->pitch_envelope, IT_ENV_PITCH);
+}
+
+
+
+static int xm_envelope_is_sustaining(IT_PLAYING *playing, IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe)
+{
+	if ((envelope->flags & IT_ENVELOPE_SUSTAIN_LOOP) && !(playing->flags & IT_PLAYING_SUSTAINOFF))
+		if (envelope->sus_loop_start < envelope->n_nodes)
+			if (pe->tick == envelope->node_t[envelope->sus_loop_start])
+				return 1;
+	return 0;
+}
+
+
+
+static void update_xm_envelope(IT_PLAYING *playing, IT_ENVELOPE *envelope, IT_PLAYING_ENVELOPE *pe)
+{
+	if (!(envelope->flags & IT_ENVELOPE_ON))
+		return;
+
+	if (xm_envelope_is_sustaining(playing, envelope, pe))
+		return;
+
+	if (pe->tick >= envelope->node_t[envelope->n_nodes-1])
+		return;
+
+	pe->tick++;
+
+	/* pe->next_node must be kept up to date for envelope_get_y(). */
+	while (pe->tick > envelope->node_t[pe->next_node])
+		pe->next_node++;
+
+	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) && envelope->loop_end < envelope->n_nodes) {
+		if (pe->tick == envelope->node_t[envelope->loop_end]) {
+			pe->next_node = MID(0, envelope->loop_start, envelope->n_nodes - 1);
+			pe->tick = envelope->node_t[pe->next_node];
+		}
+	}
+
+	xm_envelope_calculate_value(envelope, pe);
+}
+
+
+
+static void update_xm_envelopes(IT_PLAYING *playing)
+{
+	update_xm_envelope(playing, &playing->env_instrument->volume_envelope, &playing->volume_envelope);
+	update_xm_envelope(playing, &playing->env_instrument->pan_envelope, &playing->pan_envelope);
+}
+
+
+
+static void update_fadeout(DUMB_IT_SIGDATA *sigdata, IT_PLAYING *playing)
+{
+	if (playing->flags & IT_PLAYING_FADING) {
+		playing->fadeoutcount -= playing->env_instrument->fadeout;
+		if (playing->fadeoutcount <= 0) {
+			playing->fadeoutcount = 0;
+			if (!(sigdata->flags & IT_WAS_AN_XM))
+				playing->flags |= IT_PLAYING_DEAD;
+		}
+	}
+}
+
+static int apply_pan_envelope(IT_PLAYING *playing);
+static float calculate_volume(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float volume);
+
+static void playing_volume_setup(DUMB_IT_SIGRENDERER * sigrenderer, IT_PLAYING * playing, float invt2g)
+{
+	DUMB_IT_SIGDATA * sigdata = sigrenderer->sigdata;
+	int pan;
+	float volume, vol, span;
+
+	if ((sigrenderer->n_channels == 2) && (sigdata->flags & IT_STEREO)) {
+		pan = apply_pan_envelope(playing);
+		if ((sigdata->flags & IT_WAS_AN_S3M) && IT_IS_SURROUND_SHIFTED(pan)) {
+			volume = -1.0f * (float)(pan) * (1.0f / (64.0f * 256.0f));
+		} else {
+			volume = 1.0f;
+		}
+		span = (pan - (32<<8)) * sigdata->pan_separation * (1.0f / ((32<<8) * 128));
+		vol = volume;
+		if (!IT_IS_SURROUND_SHIFTED(pan)) vol *= 1.0f - span;
+		playing->float_volume[0] = vol;
+		vol = -vol;
+		if (!IT_IS_SURROUND_SHIFTED(pan)) vol += 2.0f * volume;
+		playing->float_volume[1] = vol;
+	} else {
+		if ((sigdata->flags & IT_STEREO) && (playing->sample->flags & IT_SAMPLE_STEREO)) {
+			pan = apply_pan_envelope(playing);
+			span = (pan - (32<<8)) * sigdata->pan_separation * (1.0f / ((32<<8) * 128));
+			vol = 0.5f;
+			if (!IT_IS_SURROUND_SHIFTED(pan)) vol *= 1.0f - span;
+			playing->float_volume[0] = vol;
+			if (!IT_IS_SURROUND_SHIFTED(pan)) vol = 2.0f - vol;
+			playing->float_volume[1] = vol;
+		} else {
+			playing->float_volume[0] = 1.0f;
+			playing->float_volume[1] = 1.0f;
+		}
+	}
+
+	vol = calculate_volume(sigrenderer, playing, 1.0f);
+	playing->float_volume[0] *= vol;
+	playing->float_volume[1] *= vol;
+
+	if (!sigrenderer->ramp_style || playing->ramp_volume[0] == 31337.0) {
+		playing->ramp_volume[0] = playing->float_volume[0];
+		playing->ramp_volume[1] = playing->float_volume[1];
+		playing->ramp_delta[0] = 0;
+		playing->ramp_delta[1] = 0;
+	} else {
+		playing->ramp_delta[0] = invt2g * (playing->float_volume[0] - playing->ramp_volume[0]);
+		playing->ramp_delta[1] = invt2g * (playing->float_volume[1] - playing->ramp_volume[1]);
+	}
+}
+
+static void process_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float invt2g)
+{
+	DUMB_IT_SIGDATA * sigdata = sigrenderer->sigdata;
+
+	if (playing->instrument) {
+		if (sigdata->flags & IT_WAS_AN_XM)
+			update_xm_envelopes(playing);
+		else
+			update_it_envelopes(playing);
+		update_fadeout(sigdata, playing);
+	}
+
+	playing_volume_setup(sigrenderer, playing, invt2g);
+
+	if (sigdata->flags & IT_WAS_AN_XM) {
+		/* 'depth' is used to store the tick number for XM files. */
+		if (playing->sample_vibrato_depth < playing->sample->vibrato_rate)
+			playing->sample_vibrato_depth++;
+	} else {
+		playing->sample_vibrato_depth += playing->sample->vibrato_rate;
+		if (playing->sample_vibrato_depth > playing->sample->vibrato_depth << 8)
+			playing->sample_vibrato_depth = playing->sample->vibrato_depth << 8;
+	}
+
+	playing->sample_vibrato_time += playing->sample->vibrato_speed;
+}
+
+#ifndef __linux__
+static inline float log2(float x) {return (float)log(x)/(float)log(2.0f);}
+#endif
+
+static int delta_to_note(float delta, int base)
+{
+	float note;
+	note = log2(delta * 65536.f / (float)base)*12.0f+60.5f;
+	if (note > 119) note = 119;
+	else if (note < 0) note = 0;
+	return (int)note;
+}
+
+// Period table for Protracker octaves 0-5:
+static const unsigned short ProTrackerPeriodTable[6*12] =
+{
+	1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,907,
+	856,808,762,720,678,640,604,570,538,508,480,453,
+	428,404,381,360,339,320,302,285,269,254,240,226,
+	214,202,190,180,170,160,151,143,135,127,120,113,
+	107,101,95,90,85,80,75,71,67,63,60,56,
+	53,50,47,45,42,40,37,35,33,31,30,28
+};
+
+
+static const unsigned short ProTrackerTunedPeriods[16*12] = 
+{
+	1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,907,
+	1700,1604,1514,1430,1348,1274,1202,1134,1070,1010,954,900,
+	1688,1592,1504,1418,1340,1264,1194,1126,1064,1004,948,894,
+	1676,1582,1492,1408,1330,1256,1184,1118,1056,996,940,888,
+	1664,1570,1482,1398,1320,1246,1176,1110,1048,990,934,882,
+	1652,1558,1472,1388,1310,1238,1168,1102,1040,982,926,874,
+	1640,1548,1460,1378,1302,1228,1160,1094,1032,974,920,868,
+	1628,1536,1450,1368,1292,1220,1150,1086,1026,968,914,862,
+	1814,1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,
+	1800,1700,1604,1514,1430,1350,1272,1202,1134,1070,1010,954,
+	1788,1688,1592,1504,1418,1340,1264,1194,1126,1064,1004,948,
+	1774,1676,1582,1492,1408,1330,1256,1184,1118,1056,996,940,
+	1762,1664,1570,1482,1398,1320,1246,1176,1110,1048,988,934,
+	1750,1652,1558,1472,1388,1310,1238,1168,1102,1040,982,926,
+	1736,1640,1548,1460,1378,1302,1228,1160,1094,1032,974,920,
+	1724,1628,1536,1450,1368,1292,1220,1150,1086,1026,968,914 
+};
+
+static void process_all_playing(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+	int i;
+
+	float invt2g = 1.0f / ((float)TICK_TIME_DIVIDEND / (float)sigrenderer->tempo);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+		IT_PLAYING *playing = channel->playing;
+
+		if (playing) {
+			int vibrato_shift;
+			switch (playing->vibrato_waveform)
+			{
+			default:
+				vibrato_shift = it_sine[playing->vibrato_time];
+				break;
+			case 1:
+				vibrato_shift = it_sawtooth[playing->vibrato_time];
+				break;
+			case 2:
+				vibrato_shift = it_squarewave[playing->vibrato_time];
+				break;
+			case 3:
+				vibrato_shift = (rand() % 129) - 64;
+				break;
+			case 4:
+				vibrato_shift = it_xm_squarewave[playing->vibrato_time];
+				break;
+			case 5:
+				vibrato_shift = it_xm_ramp[playing->vibrato_time];
+				break;
+			case 6:
+				vibrato_shift = it_xm_ramp[255-playing->vibrato_time];
+				break;
+			}
+			vibrato_shift *= playing->vibrato_n;
+			vibrato_shift *= playing->vibrato_depth;
+			vibrato_shift >>= 4;
+
+			if (sigdata->flags & IT_OLD_EFFECTS)
+				vibrato_shift = -vibrato_shift;
+
+			playing->volume = channel->volume;
+			playing->pan = channel->truepan;
+
+			if (playing->volume_offset) {
+				playing->volume += (playing->volume_offset * playing->volume) >> 7;
+				if (playing->volume > 64) {
+					if (playing->volume_offset < 0) playing->volume = 0;
+					else playing->volume = 64;
+				}
+			}
+
+			if (playing->panning_offset && !IT_IS_SURROUND_SHIFTED(playing->pan)) {
+				playing->pan += playing->panning_offset << IT_ENVELOPE_SHIFT;
+				if (playing->pan > 64 << IT_ENVELOPE_SHIFT) {
+					if (playing->panning_offset < 0) playing->pan = 0;
+					else playing->pan = 64 << IT_ENVELOPE_SHIFT;
+				}
+			}
+
+			if (sigdata->flags & IT_LINEAR_SLIDES) {
+				int currpitch = ((playing->note - 60) << 8) + playing->slide
+				 + vibrato_shift
+															+ playing->finetune;
+
+				/* We add a feature here, which is that of keeping the pitch
+				 * within range. Otherwise it crashes. Trust me. It happened.
+				 * The limit 32768 gives almost 11 octaves either way.
+				 */
+				if (currpitch < -32768)
+					currpitch = -32768;
+				else if (currpitch > 32767)
+					currpitch = 32767;
+
+				playing->delta = (float)pow(DUMB_PITCH_BASE, currpitch);
+				playing->delta *= playing->sample->C5_speed * (1.f / 65536.0f);
+			} else {
+				int slide = playing->slide + vibrato_shift;
+
+				playing->delta = (float)pow(DUMB_PITCH_BASE, ((60 - playing->note) << 8) - playing->finetune );
+				/* playing->delta is 1.0 for C-5, 0.5 for C-6, etc. */
+
+				playing->delta *= 1.0f / playing->sample->C5_speed;
+
+				playing->delta -= slide / AMIGA_DIVISOR;
+
+				if (playing->delta < (1.0f / 65536.0f) / 32768.0f) {
+					// Should XM notes die if Amiga slides go out of range?
+					playing->flags |= IT_PLAYING_DEAD;
+					playing->delta = 1. / 32768.;
+					continue;
+				}
+
+				playing->delta = (1.0f / 65536.0f) / playing->delta;
+			}
+
+			if (playing->channel->glissando && playing->channel->toneporta && playing->channel->destnote < 120) {
+				playing->delta = (float)pow(DUMB_SEMITONE_BASE, delta_to_note(playing->delta, playing->sample->C5_speed) - 60)
+					* playing->sample->C5_speed * (1.f / 65536.f);
+			}
+
+			/*
+			if ( channel->arpeggio ) { // another FT2 bug...
+				if ((sigdata->flags & (IT_LINEAR_SLIDES|IT_WAS_AN_XM|IT_WAS_A_MOD)) == (IT_WAS_AN_XM|IT_LINEAR_SLIDES) &&
+					playing->flags & IT_PLAYING_SUSTAINOFF)
+				{
+					if ( channel->arpeggio > 0xFF )
+						playing->delta = playing->sample->C5_speed * (1.f / 65536.f);
+				}
+				else*/ playing->delta *= (float)pow(DUMB_SEMITONE_BASE, channel->arpeggio >> 8);/*
+			}*/
+
+			playing->filter_cutoff = channel->filter_cutoff;
+			playing->filter_resonance = channel->filter_resonance;
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channel[i].playing) {
+			process_playing(sigrenderer, sigrenderer->channel[i].playing, invt2g);
+			if (!(sigdata->flags & IT_WAS_AN_XM)) {
+				//if ((sigrenderer->channel[i].playing->flags & (IT_PLAYING_BACKGROUND | IT_PLAYING_DEAD)) == (IT_PLAYING_BACKGROUND | IT_PLAYING_DEAD)) {
+				// This change was made so Gxx would work correctly when a note faded out or whatever. Let's hope nothing else was broken by it.
+				if (sigrenderer->channel[i].playing->flags & IT_PLAYING_DEAD) {
+					free(sigrenderer->channel[i].playing);
+					sigrenderer->channel[i].playing = NULL;
+				}
+			}
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playing[i]) {
+			process_playing(sigrenderer, sigrenderer->playing[i], invt2g);
+			if (sigrenderer->playing[i]->flags & IT_PLAYING_DEAD) {
+				free(sigrenderer->playing[i]);
+				sigrenderer->playing[i] = NULL;
+			}
+		}
+	}
+}
+
+
+
+static int process_tick(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+
+	// Set note vol/freq to vol/freq set for each channel
+
+	if (sigrenderer->speed && --sigrenderer->tick == 0) {
+		reset_tick_counts(sigrenderer);
+		sigrenderer->tick = sigrenderer->speed;
+		sigrenderer->rowcount--;
+		if (sigrenderer->rowcount == 0) {
+			sigrenderer->rowcount = 1;
+
+#ifdef BIT_ARRAY_BULLSHIT
+			if (sigrenderer->n_rows)
+			{
+#if 1
+				/*
+				if (bit_array_test(sigrenderer->played, sigrenderer->order * 256 + sigrenderer->row))
+				{
+					if (sigrenderer->callbacks->loop) {
+						if ((*sigrenderer->callbacks->loop)(sigrenderer->callbacks->loop_data))
+							return 1;
+						bit_array_reset(sigrenderer->played);
+						if (sigrenderer->speed == 0)
+							goto speed0; /* I love goto *
+					}
+				}
+				*/
+#endif
+				bit_array_set(sigrenderer->played, sigrenderer->order * 256 + sigrenderer->row);
+				{
+					int n;
+					for (n = 0; n < DUMB_IT_N_CHANNELS; n++)
+					{
+						IT_CHANNEL * channel = &sigrenderer->channel[n];
+						if (channel->played_patjump)
+						{
+							if (channel->played_patjump_order == sigrenderer->order)
+							{
+								bit_array_set(channel->played_patjump, sigrenderer->row);
+							}
+							/*
+							else if ((channel->played_patjump_order & 0x7FFF) == sigrenderer->order)
+							{
+								channel->played_patjump_order |= 0x4000;
+							}
+							else if ((channel->played_patjump_order & 0x3FFF) == sigrenderer->order)
+							{
+								if ((sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD)) == IT_WAS_AN_XM)
+								{
+									/* joy, was XM, pattern loop bug triggered break to row in same order 
+									bit_array_mask(sigrenderer->played, channel->played_patjump, sigrenderer->order * 256);
+								}
+								bit_array_destroy(channel->played_patjump);
+								channel->played_patjump = 0;
+								channel->played_patjump_order = 0xFFFE;
+							}
+							*/
+							else
+							{
+								bit_array_destroy(channel->played_patjump);
+								channel->played_patjump = 0;
+								channel->played_patjump_order = 0xFFFE;
+							}
+						}
+					}
+				}
+			}
+#endif
+
+			sigrenderer->processrow++;
+
+			if (sigrenderer->processrow >= sigrenderer->n_rows) {
+				IT_PATTERN *pattern;
+				int n;
+				int processorder = sigrenderer->processorder;
+
+				if ((sigrenderer->processrow|0xC00) == 0xFFFE + 1) { /* It was incremented above! */
+					sigrenderer->processrow = sigrenderer->breakrow;
+					sigrenderer->breakrow = 0;
+					for (n = 0; n < DUMB_IT_N_CHANNELS; n++) sigrenderer->channel[n].pat_loop_end_row = 0;
+				} else
+					sigrenderer->processrow = sigrenderer->breakrow;
+
+				if (sigrenderer->processorder == 0xFFFF)
+					sigrenderer->processorder = sigrenderer->order - 1;
+
+				for (;;) {
+					sigrenderer->processorder++;
+
+					if (sigrenderer->processorder >= sigdata->n_orders) {
+						sigrenderer->processorder = sigrenderer->restart_position;
+						if (sigrenderer->processorder >= sigdata->n_orders) {
+							/* Restarting beyond end. We'll loop for now. */
+							sigrenderer->processorder = -1;
+							continue;
+						}
+					}
+
+					n = sigdata->order[sigrenderer->processorder];
+
+					if (n < sigdata->n_patterns)
+						break;
+
+#ifdef INVALID_ORDERS_END_SONG
+					if (n != IT_ORDER_SKIP)
+#else
+					if (n == IT_ORDER_END)
+#endif
+					{
+						sigrenderer->processorder = sigrenderer->restart_position - 1;
+					}
+				}
+
+				pattern = &sigdata->pattern[n];
+
+				n = sigrenderer->n_rows;
+				sigrenderer->n_rows = pattern->n_rows;
+
+				if (sigrenderer->processrow >= sigrenderer->n_rows)
+					sigrenderer->processrow = 0;
+
+/** WARNING - everything pertaining to a new pattern initialised? */
+
+				sigrenderer->entry = sigrenderer->entry_start = pattern->entry;
+				sigrenderer->entry_end = sigrenderer->entry + pattern->n_entries;
+
+				/* If n_rows was 0, we're only just starting. Don't do anything weird here. */
+				/* added: process row check, for break to row spooniness */
+				if (n && (processorder == 0xFFFF ? sigrenderer->order > sigrenderer->processorder : sigrenderer->order >= sigrenderer->processorder)
+#ifdef BIT_ARRAY_BULLSHIT
+					&& bit_array_test(sigrenderer->played, sigrenderer->processorder * 256 + sigrenderer->processrow)
+#endif
+					) {
+					if (sigrenderer->callbacks->loop) {
+						if ((*sigrenderer->callbacks->loop)(sigrenderer->callbacks->loop_data))
+							return 1;
+#ifdef BIT_ARRAY_BULLSHIT
+						bit_array_reset(sigrenderer->played);
+#endif
+						if (sigrenderer->speed == 0)
+							goto speed0; /* I love goto */
+					}
+				}
+				sigrenderer->order = sigrenderer->processorder;
+
+				n = sigrenderer->processrow;
+				while (n) {
+					while (sigrenderer->entry < sigrenderer->entry_end) {
+						if (IT_IS_END_ROW(sigrenderer->entry)) {
+							sigrenderer->entry++;
+							break;
+						}
+						sigrenderer->entry++;
+					}
+					n--;
+				}
+				sigrenderer->row = sigrenderer->processrow;
+			} else {
+				if (sigrenderer->entry) {
+					while (sigrenderer->entry < sigrenderer->entry_end) {
+						if (IT_IS_END_ROW(sigrenderer->entry)) {
+							sigrenderer->entry++;
+							break;
+						}
+						sigrenderer->entry++;
+					}
+					sigrenderer->row++;
+				} else {
+#ifdef BIT_ARRAY_BULLSHIT
+					bit_array_clear(sigrenderer->played, sigrenderer->order * 256);
+#endif
+					sigrenderer->entry = sigrenderer->entry_start;
+					sigrenderer->row = 0;
+				}
+			}
+
+			if (!(sigdata->flags & IT_WAS_A_669))
+				reset_effects(sigrenderer);
+
+			{
+				IT_ENTRY *entry = sigrenderer->entry;
+				int ignore_cxx = 0;
+
+				while (entry < sigrenderer->entry_end && !IT_IS_END_ROW(entry))
+					ignore_cxx |= update_pattern_variables(sigrenderer, entry++);
+
+				entry = sigrenderer->entry;
+
+				while (entry < sigrenderer->entry_end && !IT_IS_END_ROW(entry))
+					if (process_entry(sigrenderer, entry++, sigdata->flags & IT_WAS_AN_XM ? 0 : ignore_cxx))
+						return 1;
+			}
+
+			if (!(sigdata->flags & IT_OLD_EFFECTS))
+				update_smooth_effects(sigrenderer);
+		} else {
+			{
+				IT_ENTRY *entry = sigrenderer->entry;
+
+				while (entry < sigrenderer->entry_end && !IT_IS_END_ROW(entry)) {
+					if (entry->mask & IT_ENTRY_EFFECT && entry->effect != IT_SET_SAMPLE_OFFSET)
+						process_effects(sigrenderer, entry, 0);
+							/* Don't bother checking the return value; if there
+							 * was a pattern delay, there can't be a speed=0.
+							 */
+					entry++;
+				}
+			}
+
+			update_effects(sigrenderer);
+		}
+	} else {
+		speed0:
+		update_effects(sigrenderer);
+		update_tick_counts(sigrenderer);
+	}
+
+	if (sigrenderer->globalvolume == 0) {
+		if (sigrenderer->callbacks->global_volume_zero) {
+			LONG_LONG t = sigrenderer->gvz_sub_time + ((LONG_LONG)TICK_TIME_DIVIDEND << 16) / sigrenderer->tempo;
+			sigrenderer->gvz_time += (int)(t >> 16);
+			sigrenderer->gvz_sub_time = (int)t & 65535;
+			if (sigrenderer->gvz_time >= 65536 * 12) {
+				if ((*sigrenderer->callbacks->global_volume_zero)(sigrenderer->callbacks->global_volume_zero_data))
+					return 1;
+			}
+		}
+	} else {
+		if (sigrenderer->callbacks->global_volume_zero) {
+			sigrenderer->gvz_time = 0;
+			sigrenderer->gvz_sub_time = 0;
+		}
+	}
+
+	process_all_playing(sigrenderer);
+
+	{
+		LONG_LONG t = sigrenderer->sub_time_left + ((LONG_LONG)TICK_TIME_DIVIDEND << 16) / sigrenderer->tempo;
+		sigrenderer->time_left += (int)(t >> 16);
+		sigrenderer->sub_time_left = (int)t & 65535;
+	}
+
+	return 0;
+}
+
+
+
+int dumb_it_max_to_mix = 64;
+
+static const int aiMODVol[] =
+{
+	0,
+		16, 24, 32, 48, 64, 80, 96, 112,
+		128, 144, 160, 176, 192, 208, 224, 240,
+		256, 272, 288, 304, 320, 336, 352, 368,
+		384, 400, 416, 432, 448, 464, 480, 496,
+		529, 545, 561, 577, 593, 609, 625, 641,
+		657, 673, 689, 705, 721, 737, 753, 769,
+		785, 801, 817, 833, 849, 865, 881, 897,
+		913, 929, 945, 961, 977, 993, 1009, 1024
+};
+
+static const int aiPTMVolScaled[] =
+{
+	0,
+		31, 54, 73, 96, 111, 130, 153, 172,
+		191, 206, 222, 237, 252, 275, 298, 317,
+		336, 351, 370, 386, 401, 416, 428, 443,
+		454, 466, 477, 489, 512, 531, 553, 573,
+		592, 611, 626, 645, 660, 679, 695, 710,
+		725, 740, 756, 767, 782, 798, 809, 820,
+		836, 847, 859, 870, 881, 897, 908, 916,
+		927, 939, 950, 962, 969, 983, 1005, 1024
+};
+
+static float calculate_volume(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float volume)
+{
+	if (volume != 0) {
+		int vol;
+
+		if (playing->channel->flags & IT_CHANNEL_MUTED)
+			return 0;
+
+		if ((playing->channel->tremor_time & 192) == 128)
+			return 0;
+
+		switch (playing->tremolo_waveform)
+		{
+		default:
+			vol = it_sine[playing->tremolo_time];
+			break;
+		case 1:
+			vol = it_sawtooth[playing->tremolo_time];
+			break;
+		case 2:
+			vol = it_squarewave[playing->tremolo_time];
+			break;
+		case 3:
+			vol = (rand() % 129) - 64;
+			break;
+		case 4:
+			vol = it_xm_squarewave[playing->vibrato_time];
+			break;
+		case 5:
+			vol = it_xm_ramp[playing->vibrato_time];
+			break;
+		case 6:
+			vol = it_xm_ramp[255-playing->vibrato_time];
+			break;
+		}
+		vol *= playing->tremolo_depth;
+
+		vol = (playing->volume << 5) + vol;
+
+		if (vol <= 0)
+			return 0;
+
+		if (vol > 64 << 5)
+			vol = 64 << 5;
+
+		if ( sigrenderer->sigdata->flags & IT_WAS_A_PTM )
+		{
+			int v = aiPTMVolScaled[ vol >> 5 ];
+			if ( vol < 64 << 5 )
+			{
+				int f = vol & ( ( 1 << 5 ) - 1 );
+				int f2 = ( 1 << 5 ) - f;
+				int v2 = aiPTMVolScaled[ ( vol >> 5 ) + 1 ];
+				v = ( v * f2 + v2 * f ) >> 5;
+			}
+			vol = v << 1;
+		}
+
+		volume *= vol; /* 64 << 5 */
+		volume *= playing->sample->global_volume; /* 64 */
+		volume *= playing->channel_volume; /* 64 */
+		volume *= sigrenderer->globalvolume; /* 128 */
+		volume *= sigrenderer->sigdata->mixing_volume; /* 128 */
+		volume *= 1.0f / ((64 << 5) * 64.0f * 64.0f * 128.0f * 128.0f);
+
+		if (volume && playing->instrument) {
+			if (playing->enabled_envelopes & IT_ENV_VOLUME) {
+				volume *= envelope_get_y(&playing->env_instrument->volume_envelope, &playing->volume_envelope);
+				volume *= 1.0f / (64 << IT_ENVELOPE_SHIFT);
+			}
+			volume *= playing->instrument->global_volume; /* 128 */
+			volume *= playing->fadeoutcount; /* 1024 */
+			volume *= 1.0f / (128.0f * 1024.0f);
+		}
+	}
+
+	return volume;
+}
+
+
+
+static int apply_pan_envelope(IT_PLAYING *playing)
+{
+	if (playing->pan <= 64 << IT_ENVELOPE_SHIFT) {
+		int pan;
+		if (playing->panbrello_depth) {
+			switch (playing->panbrello_waveform) {
+			default:
+				pan = it_sine[playing->panbrello_time];
+				break;
+			case 1:
+				pan = it_sawtooth[playing->panbrello_time];
+				break;
+			case 2:
+				pan = it_squarewave[playing->panbrello_time];
+				break;
+			case 3:
+				pan = playing->panbrello_random;
+				break;
+			}
+			pan *= playing->panbrello_depth << 3;
+
+			pan += playing->pan;
+			if (pan < 0) pan = 0;
+			else if (pan > 64 << IT_ENVELOPE_SHIFT) pan = 64 << IT_ENVELOPE_SHIFT;
+		} else {
+			pan = playing->pan;
+		}
+
+		if (playing->env_instrument && (playing->enabled_envelopes & IT_ENV_PANNING)) {
+			int p = envelope_get_y(&playing->env_instrument->pan_envelope, &playing->pan_envelope);
+			if (pan > 32 << IT_ENVELOPE_SHIFT)
+				p *= (64 << IT_ENVELOPE_SHIFT) - pan;
+			else
+				p *= pan;
+			pan += p >> (5 + IT_ENVELOPE_SHIFT);
+		}
+		return pan;
+	}
+	return playing->pan;
+}
+
+
+
+/* Note: if a click remover is provided, and store_end_sample is set, then
+ * the end point will be computed twice. This situation should not arise.
+ */
+static long render_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float volume, float main_delta, float delta, long pos, long size, sample_t **samples, int store_end_sample, int *left_to_mix, int cr_record_which)
+{
+	int bits;
+
+	long size_rendered;
+
+	DUMB_VOLUME_RAMP_INFO lvol, rvol;
+
+	if (playing->flags & IT_PLAYING_DEAD)
+		return 0;
+
+	if (*left_to_mix <= 0)
+		volume = 0;
+
+#ifndef END_RAMPING
+	{
+		int quality = sigrenderer->resampling_quality;
+		if (playing->sample->max_resampling_quality >= 0 && quality > playing->sample->max_resampling_quality)
+			quality = playing->sample->max_resampling_quality;
+		playing->resampler.quality = quality;
+	}
+#endif
+
+	bits = playing->sample->flags & IT_SAMPLE_16BIT ? 16 : 8;
+
+	if (volume == 0) {
+		if (playing->sample->flags & IT_SAMPLE_STEREO)
+			size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, NULL, size, 0, 0, delta);
+		else
+			size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, NULL, size, 0, delta);
+	} else {
+		lvol.volume = playing->ramp_volume [0];
+		rvol.volume = playing->ramp_volume [1];
+		lvol.delta = playing->ramp_delta [0] * main_delta;
+		rvol.delta = playing->ramp_delta [1] * main_delta;
+		lvol.target = playing->float_volume [0];
+		rvol.target = playing->float_volume [1];
+		rvol.mix = lvol.mix = volume;
+		if (sigrenderer->n_channels == 2) {
+			if (playing->sample->flags & IT_SAMPLE_STEREO) {
+				if ((cr_record_which & 1) && sigrenderer->click_remover) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover[0], pos, click[0]);
+					dumb_record_click(sigrenderer->click_remover[1], pos, click[1]);
+				}
+				size_rendered = dumb_resample_n_2_2(bits, &playing->resampler, samples[0] + pos*2, size, &lvol, &rvol, delta);
+				if (store_end_sample) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					samples[0][(pos + size_rendered) * 2] = click[0];
+					samples[0][(pos + size_rendered) * 2 + 1] = click[1];
+				}
+				if ((cr_record_which & 2) && sigrenderer->click_remover) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click[0]);
+					dumb_record_click(sigrenderer->click_remover[1], pos + size_rendered, -click[1]);
+				}
+			} else {
+				if ((cr_record_which & 1) && sigrenderer->click_remover) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover[0], pos, click[0]);
+					dumb_record_click(sigrenderer->click_remover[1], pos, click[1]);
+				}
+				size_rendered = dumb_resample_n_1_2(bits, &playing->resampler, samples[0] + pos*2, size, &lvol, &rvol, delta);
+				if (store_end_sample) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					samples[0][(pos + size_rendered) * 2] = click[0];
+					samples[0][(pos + size_rendered) * 2 + 1] = click[1];
+				}
+				if ((cr_record_which & 2) && sigrenderer->click_remover) {
+					sample_t click[2];
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click[0]);
+					dumb_record_click(sigrenderer->click_remover[1], pos + size_rendered, -click[1]);
+				}
+			}
+		} else {
+			if (playing->sample->flags & IT_SAMPLE_STEREO) {
+				if ((cr_record_which & 1) && sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, &lvol, &rvol, &click);
+					dumb_record_click(sigrenderer->click_remover[0], pos, click);
+				}
+				size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, samples[0] + pos, size, &lvol, &rvol, delta);
+				if (store_end_sample)
+					dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, &lvol, &rvol, &samples[0][pos + size_rendered]);
+				if ((cr_record_which & 2) && sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, &lvol, &rvol, &click);
+					dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click);
+				}
+			} else {
+				if ((cr_record_which & 1) && sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &click);
+					dumb_record_click(sigrenderer->click_remover[0], pos, click);
+				}
+				size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, samples[0] + pos, size, &lvol, delta);
+				if (store_end_sample)
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &samples[0][pos + size_rendered]);
+				if ((cr_record_which & 2) && sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &click);
+					dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click);
+				}
+			}
+		}
+		playing->ramp_volume [0] = lvol.volume;
+		playing->ramp_volume [1] = rvol.volume;
+		(*left_to_mix)--;
+	}
+
+	if (playing->resampler.dir == 0)
+		playing->flags |= IT_PLAYING_DEAD;
+
+	return size_rendered;
+}
+
+#ifdef END_RAMPING
+#if 1
+static long render_playing_part(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, DUMB_VOLUME_RAMP_INFO * lvol, DUMB_VOLUME_RAMP_INFO * rvol, int bits, float delta, long pos, long size, sample_t **samples, int store_end_sample, int cr_record_which)
+{
+	long size_rendered = 0;
+
+	if (sigrenderer->n_channels == 2) {
+		if (playing->sample->flags & IT_SAMPLE_STEREO) {
+			if ((cr_record_which & 1) && sigrenderer->click_remover) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
+				dumb_record_click(sigrenderer->click_remover[0], pos, click[0]);
+				dumb_record_click(sigrenderer->click_remover[1], pos, click[1]);
+			}
+			size_rendered = dumb_resample_n_2_2(bits, &playing->resampler, samples[0] + pos*2, size, lvol, rvol, delta);
+			if (store_end_sample) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
+				samples[0][(pos + size_rendered) * 2] = click[0];
+				samples[0][(pos + size_rendered) * 2 + 1] = click[1];
+			}
+			if ((cr_record_which & 2) && sigrenderer->click_remover) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
+				dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click[0]);
+				dumb_record_click(sigrenderer->click_remover[1], pos + size_rendered, -click[1]);
+			}
+		} else {
+			if ((cr_record_which & 1) && sigrenderer->click_remover) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
+				dumb_record_click(sigrenderer->click_remover[0], pos, click[0]);
+				dumb_record_click(sigrenderer->click_remover[1], pos, click[1]);
+			}
+			size_rendered = dumb_resample_n_1_2(bits, &playing->resampler, samples[0] + pos*2, size, lvol, rvol, delta);
+			if (store_end_sample) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
+				samples[0][(pos + size_rendered) * 2] = click[0];
+				samples[0][(pos + size_rendered) * 2 + 1] = click[1];
+			}
+			if ((cr_record_which & 2) && sigrenderer->click_remover) {
+				sample_t click[2];
+				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
+				dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click[0]);
+				dumb_record_click(sigrenderer->click_remover[1], pos + size_rendered, -click[1]);
+			}
+		}
+	} else {
+		if (playing->sample->flags & IT_SAMPLE_STEREO) {
+			if ((cr_record_which & 1) && sigrenderer->click_remover) {
+				sample_t click;
+				dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, lvol, rvol, &click);
+				dumb_record_click(sigrenderer->click_remover[0], pos, click);
+			}
+			size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, samples[0] + pos, size, lvol, rvol, delta);
+			if (store_end_sample)
+				dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, lvol, rvol, &samples[0][pos + size_rendered]);
+			if ((cr_record_which & 2) && sigrenderer->click_remover) {
+				sample_t click;
+				dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, lvol, rvol, &click);
+				dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click);
+			}
+		} else {
+			if ((cr_record_which & 1) && sigrenderer->click_remover) {
+				sample_t click;
+				dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, lvol, &click);
+				dumb_record_click(sigrenderer->click_remover[0], pos, click);
+			}
+			size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, samples[0] + pos, size, lvol, delta);
+			if (store_end_sample)
+				dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, lvol, &samples[0][pos + size_rendered]);
+			if ((cr_record_which & 2) && sigrenderer->click_remover) {
+				sample_t click;
+				dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, lvol, &click);
+				dumb_record_click(sigrenderer->click_remover[0], pos + size_rendered, -click);
+			}
+		}
+	}
+	return size_rendered;
+}
+
+static long render_playing_ramp(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float volume, float main_delta, float delta, long pos, long size, sample_t **samples, int store_end_sample, int *left_to_mix, int ramp_style)
+{
+	int bits;
+
+	long size_rendered;
+
+	DUMB_VOLUME_RAMP_INFO lvol, rvol;
+
+	if (!size) return 0;
+
+	if (playing->flags & IT_PLAYING_DEAD)
+		return 0;
+
+	if (*left_to_mix <= 0)
+		volume = 0;
+
+	{
+		int quality = sigrenderer->resampling_quality;
+		if (playing->sample->max_resampling_quality >= 0 && quality > playing->sample->max_resampling_quality)
+			quality = playing->sample->max_resampling_quality;
+		playing->resampler.quality = quality;
+	}
+
+	bits = playing->sample->flags & IT_SAMPLE_16BIT ? 16 : 8;
+	size_rendered = size;
+
+	if (volume == 0) {
+		if (playing->declick_stage < 2) {
+			if (playing->sample->flags & IT_SAMPLE_STEREO)
+				size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, NULL, size, 0, 0, delta);
+			else
+				size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, NULL, size, 0, delta);
+		} else {
+			playing->declick_stage = 3;
+		}
+	} else {
+		lvol.volume = playing->ramp_volume [0];
+		rvol.volume = playing->ramp_volume [1];
+		lvol.delta = playing->ramp_delta [0] * main_delta;
+		rvol.delta = playing->ramp_delta [1] * main_delta;
+		lvol.target = playing->float_volume [0];
+		rvol.target = playing->float_volume [1];
+		rvol.mix = lvol.mix = volume;
+		if (ramp_style) {
+			if (playing->declick_stage == 1) {
+				size_rendered = render_playing_part(sigrenderer, playing, &lvol, &rvol, bits, delta, pos, size, samples, store_end_sample, 3);
+			} else if (playing->declick_stage == 0 || playing->declick_stage == 2) {
+				float declick_count = ((ramp_style == 2) ? 327.68 : 49.152) / main_delta; /* 5ms / 0.75ms */
+				float declick_remain = playing->declick_volume * declick_count;
+				float declick_dir = -1;
+				float declick_target;
+				int remain;
+				DUMB_VOLUME_RAMP_INFO declick_lvol, declick_rvol;
+				if (playing->declick_stage == 0) {
+					declick_remain = declick_count - declick_remain;
+					declick_dir = 1;
+				}
+				if (size < declick_remain) declick_remain = size;
+				remain = declick_remain;
+				declick_target = playing->declick_volume + declick_dir / declick_count * declick_remain;
+				declick_lvol.volume = lvol.volume * playing->declick_volume;
+				declick_rvol.volume = rvol.volume * playing->declick_volume;
+				lvol.volume += lvol.delta * declick_remain;
+				rvol.volume += rvol.delta * declick_remain;
+				declick_lvol.target = lvol.volume * declick_target;
+				declick_rvol.target = rvol.volume * declick_target;
+				declick_lvol.delta = (declick_lvol.target - declick_lvol.volume) / declick_remain;
+				declick_rvol.delta = (declick_rvol.target - declick_rvol.volume) / declick_remain;
+				declick_lvol.mix = declick_rvol.mix = volume;
+				if (remain < size) {
+					size_rendered = render_playing_part(sigrenderer, playing, &declick_lvol, &declick_rvol, bits, delta, pos, remain, samples, 0, 1);
+					if (size_rendered == remain) {
+						if (playing->declick_stage == 0) {
+							size_rendered += render_playing_part(sigrenderer, playing, &lvol, &rvol, bits, delta, pos + remain, size - remain, samples, store_end_sample, 2);
+						} else {
+							size_rendered = size;
+						}
+					}
+					playing->declick_stage++;
+					playing->declick_volume = 1;
+				} else {
+					size_rendered = render_playing_part(sigrenderer, playing, &declick_lvol, &declick_rvol, bits, delta, pos, remain, samples, store_end_sample, 3);
+					playing->declick_volume = declick_target;
+				}
+			} else /*if (playing->declick_stage == 3)*/ {
+				(*left_to_mix)++;
+			}
+		} else if (playing->declick_stage < 2) {
+			size_rendered = render_playing_part(sigrenderer, playing, &lvol, &rvol, bits, delta, pos, size, samples, store_end_sample, 3);
+		} else {
+			playing->declick_stage = 3;
+			(*left_to_mix)++;
+		}
+		playing->ramp_volume [0] = lvol.volume;
+		playing->ramp_volume [1] = rvol.volume;
+		(*left_to_mix)--;
+	}
+
+	if (playing->resampler.dir == 0)
+		playing->flags |= IT_PLAYING_DEAD;
+
+	return size_rendered;
+}
+#else
+static long render_playing_ramp(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float volume, float main_delta, float delta, long pos, long size, sample_t **samples, int store_end_sample, int *left_to_mix, int ramp_style)
+{
+	long rv, trv;
+	int l_t_m_temp, cr_which;
+	if (!size) return 0;
+
+	rv = 0;
+	cr_which = 3;
+
+	{
+		int quality = sigrenderer->resampling_quality;
+		if (playing->sample->max_resampling_quality >= 0 && quality > playing->sample->max_resampling_quality)
+			quality = playing->sample->max_resampling_quality;
+		playing->resampler.quality = quality;
+	}
+
+	if (ramp_style)
+	{
+		if (playing->declick_stage == 0) {
+			/* ramp up! */
+			cr_which = 1;
+			while (playing->declick_stage == 0 && size) {
+				l_t_m_temp = *left_to_mix;
+				if (size == 1) cr_which |= 2;
+				trv = render_playing(sigrenderer, playing, volume * playing->declick_volume, main_delta, delta, pos, 1, samples, store_end_sample, &l_t_m_temp, cr_which);
+				cr_which &= 2;
+				if (ramp_style == 2) playing->declick_volume += (1.f / 256.f) * main_delta;
+				else playing->declick_volume *= (float)pow(2.0f, main_delta);
+				if (playing->declick_volume >= 1.0f) {
+					playing->declick_volume = 1.0f;
+					playing->declick_stage = 1;
+				}
+				if (!trv) {
+					*left_to_mix = l_t_m_temp;
+					return rv;
+				}
+				rv += trv;
+				pos += trv;
+				size -= trv;
+			}
+
+			if (!size) {
+				*left_to_mix = l_t_m_temp;
+				return rv;
+			}
+
+			cr_which = 2;
+
+		}
+#ifdef RAMP_DOWN
+		else if (playing->declick_stage == 2) {
+			float halflife = pow(0.5, 1.0 / 64.0 * main_delta);
+			cr_which = 1;
+			while (playing->declick_stage == 2 && size) {
+				l_t_m_temp = *left_to_mix;
+				if (size == 1) cr_which |= 2;
+				trv = render_playing(sigrenderer, playing, volume * playing->declick_volume, main_delta, delta, pos, 1, samples, store_end_sample, &l_t_m_temp, cr_which);
+				cr_which &= 2;
+				/*if (ramp_style == 2) playing->declick_volume -= (1.f / 256.f) * main_delta;
+				else playing->declick_volume *= (float)pow(0.5f, main_delta);*/
+				playing->declick_volume *= halflife;
+				if (playing->declick_volume < (1.f / 256.f)) {
+					playing->declick_stage = 3;
+				}
+				if (!trv) {
+					*left_to_mix = l_t_m_temp;
+					return rv;
+				}
+				rv += trv;
+				pos += trv;
+				size -= trv;
+			}
+
+			if (size) rv += render_playing(sigrenderer, playing, volume * playing->declick_volume, main_delta, delta, pos, 1, samples, store_end_sample, left_to_mix, 2);
+			else *left_to_mix = l_t_m_temp;
+
+			return rv;
+
+		} else if (playing->declick_stage == 3) {
+			return size;
+		}
+#endif
+	} else if (playing->declick_stage >= 2) {
+		playing->declick_stage = 3;
+		return size;
+	}
+
+	return rv + render_playing(sigrenderer, playing, volume, main_delta, delta, pos, size, samples, store_end_sample, left_to_mix, cr_which);
+}
+#endif
+#else
+#define render_playing_ramp(sigrenderer, playing, volume, main_delta, delta, pos, size, samples, store_end_sample, left_to_mix, ramp_style) render_playing(sigrenderer, playing, volume, main_delta, delta, pos, size, samples, store_end_sample, left_to_mix, 3)
+#endif
+
+typedef struct IT_TO_MIX
+{
+	IT_PLAYING *playing;
+	float volume;
+}
+IT_TO_MIX;
+
+
+
+static int it_to_mix_compare(const void *e1, const void *e2)
+{
+	if (((const IT_TO_MIX *)e1)->volume > ((const IT_TO_MIX *)e2)->volume)
+		return -1;
+
+	if (((const IT_TO_MIX *)e1)->volume < ((const IT_TO_MIX *)e2)->volume)
+		return 1;
+
+	return 0;
+}
+
+
+
+static void apply_pitch_modifications(DUMB_IT_SIGDATA *sigdata, IT_PLAYING *playing, float *delta, int *cutoff)
+{
+	{
+		int sample_vibrato_shift;
+		switch (playing->sample_vibrato_waveform)
+		{
+		default:
+			sample_vibrato_shift = it_sine[playing->sample_vibrato_time];
+			break;
+		case 1:
+			sample_vibrato_shift = it_sawtooth[playing->sample_vibrato_time];
+			break;
+		case 2:
+			sample_vibrato_shift = it_squarewave[playing->sample_vibrato_time];
+			break;
+		case 3:
+			sample_vibrato_shift = (rand() % 129) - 64;
+			break;
+		case 4:
+			sample_vibrato_shift = it_xm_squarewave[playing->sample_vibrato_time];
+			break;
+		case 5:
+			sample_vibrato_shift = it_xm_ramp[playing->sample_vibrato_time];
+			break;
+		case 6:
+			sample_vibrato_shift = it_xm_ramp[255-playing->sample_vibrato_time];
+			break;
+		}
+
+		if (sigdata->flags & IT_WAS_AN_XM) {
+			int depth = playing->sample->vibrato_depth; /* True depth */
+			if (playing->sample->vibrato_rate) {
+				depth *= playing->sample_vibrato_depth; /* Tick number */
+				depth /= playing->sample->vibrato_rate; /* XM sweep */
+			}
+			sample_vibrato_shift *= depth;
+		} else
+			sample_vibrato_shift *= playing->sample_vibrato_depth >> 8;
+
+		sample_vibrato_shift >>= 4;
+
+		if (sample_vibrato_shift) {
+			if ((sigdata->flags & IT_LINEAR_SLIDES) || !(sigdata->flags & IT_WAS_AN_XM))
+				*delta *= (float)pow(DUMB_PITCH_BASE, sample_vibrato_shift);
+			else {
+				/* complicated! */
+				float scale = *delta / playing->delta;
+
+				*delta = (1.0f / 65536.0f) / playing->delta;
+
+				*delta -= sample_vibrato_shift / AMIGA_DIVISOR;
+
+				if (*delta < (1.0f / 65536.0f) / 32767.0f) {
+					*delta = (1.0f / 65536.0f) / 32767.0f;
+				}
+
+				*delta = (1.0f / 65536.0f) / *delta * scale;
+			}
+		}
+	}
+
+	if (playing->env_instrument &&
+		(playing->enabled_envelopes & IT_ENV_PITCH))
+	{
+		int p = envelope_get_y(&playing->env_instrument->pitch_envelope, &playing->pitch_envelope);
+		if (playing->env_instrument->pitch_envelope.flags & IT_ENVELOPE_PITCH_IS_FILTER)
+			*cutoff = (*cutoff * (p+(32<<IT_ENVELOPE_SHIFT))) >> (6 + IT_ENVELOPE_SHIFT);
+		else
+			*delta *= (float)pow(DUMB_PITCH_BASE, p >> (IT_ENVELOPE_SHIFT - 7));
+	}
+}
+
+
+
+static void render(DUMB_IT_SIGRENDERER *sigrenderer, float volume, float delta, long pos, long size, sample_t **samples)
+{
+	int i;
+
+	int n_to_mix = 0;
+	IT_TO_MIX to_mix[DUMB_IT_TOTAL_CHANNELS];
+	int left_to_mix = dumb_it_max_to_mix;
+
+	sample_t **samples_to_filter = NULL;
+
+	int ramp_style = sigrenderer->ramp_style;
+
+	//int max_output = sigrenderer->max_output;
+
+	if (ramp_style > 2) {
+		if ((sigrenderer->sigdata->flags & (IT_WAS_AN_XM | IT_WAS_A_MOD)) == IT_WAS_AN_XM) ramp_style = 2;
+		else ramp_style -= 3;
+	}
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channel[i].playing && !(sigrenderer->channel[i].playing->flags & IT_PLAYING_DEAD)) {
+			to_mix[n_to_mix].playing = sigrenderer->channel[i].playing;
+			to_mix[n_to_mix].volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->channel[i].playing, volume);
+			n_to_mix++;
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playing[i]) { /* Won't be dead; it would have been freed. */
+			to_mix[n_to_mix].playing = sigrenderer->playing[i];
+			to_mix[n_to_mix].volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->playing[i], volume);
+			n_to_mix++;
+		}
+	}
+
+	if (volume != 0)
+		qsort(to_mix, n_to_mix, sizeof(IT_TO_MIX), &it_to_mix_compare);
+
+	for (i = 0; i < n_to_mix; i++) {
+		IT_PLAYING *playing = to_mix[i].playing;
+		float note_delta = delta * playing->delta;
+		int cutoff = playing->filter_cutoff << IT_ENVELOPE_SHIFT;
+		//int output = min( playing->output, max_output );
+
+		apply_pitch_modifications(sigrenderer->sigdata, playing, &note_delta, &cutoff);
+
+		if (cutoff != 127 << IT_ENVELOPE_SHIFT || playing->filter_resonance != 0) {
+			playing->true_filter_cutoff = cutoff;
+			playing->true_filter_resonance = playing->filter_resonance;
+		}
+
+		if (volume && (playing->true_filter_cutoff != 127 << IT_ENVELOPE_SHIFT || playing->true_filter_resonance != 0)) {
+			if (!samples_to_filter) {
+				samples_to_filter = allocate_sample_buffer(sigrenderer->n_channels, size + 1);
+				if (!samples_to_filter) {
+					render_playing_ramp(sigrenderer, playing, 0, delta, note_delta, pos, size, NULL, 0, &left_to_mix, ramp_style);
+					continue;
+				}
+			}
+			{
+				long size_rendered;
+				DUMB_CLICK_REMOVER **cr = sigrenderer->click_remover;
+				dumb_silence(samples_to_filter[0], sigrenderer->n_channels * (size + 1));
+				sigrenderer->click_remover = NULL;
+				size_rendered = render_playing_ramp(sigrenderer, playing, volume, delta, note_delta, 0, size, samples_to_filter, 1, &left_to_mix, ramp_style);
+				sigrenderer->click_remover = cr;
+				if (sigrenderer->n_channels == 2) {
+					it_filter(cr ? cr[0] : NULL, &playing->filter_state[0], samples[0 /*output*/], pos, samples_to_filter[0], size_rendered,
+						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+					it_filter(cr ? cr[1] : NULL, &playing->filter_state[1], samples[0 /*output*/]+1, pos, samples_to_filter[0]+1, size_rendered,
+						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+				} else {
+					it_filter(cr ? cr[0] : NULL, &playing->filter_state[0], samples[0 /*output*/], pos, samples_to_filter[0], size_rendered,
+						1, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+				}
+				// FIXME: filtering is not prevented by low left_to_mix!
+				// FIXME: change 'warning' to 'FIXME' everywhere
+			}
+		} else {
+			it_reset_filter_state(&playing->filter_state[0]);
+			it_reset_filter_state(&playing->filter_state[1]);
+			render_playing_ramp(sigrenderer, playing, volume, delta, note_delta, pos, size, samples /*&samples[output]*/, 0, &left_to_mix, ramp_style);
+		}
+	}
+
+	destroy_sample_buffer(samples_to_filter);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channel[i].playing) {
+			//if ((sigrenderer->channel[i].playing->flags & (IT_PLAYING_BACKGROUND | IT_PLAYING_DEAD)) == (IT_PLAYING_BACKGROUND | IT_PLAYING_DEAD)) {
+			// This change was made so Gxx would work correctly when a note faded out or whatever. Let's hope nothing else was broken by it.
+			if (
+#ifdef RAMP_DOWN
+			(sigrenderer->channel[i].playing->declick_stage == 3) || 
+#endif
+			(sigrenderer->channel[i].playing->flags & IT_PLAYING_DEAD)) {
+				free(sigrenderer->channel[i].playing);
+				sigrenderer->channel[i].playing = NULL;
+			}
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playing[i]) {
+			if (
+#ifdef RAMP_DOWN
+				(sigrenderer->playing[i]->declick_stage == 3) ||
+#endif
+				(sigrenderer->playing[i]->flags & IT_PLAYING_DEAD)) {
+				free(sigrenderer->playing[i]);
+				sigrenderer->playing[i] = NULL;
+			}
+		}
+	}
+}
+
+
+
+static DUMB_IT_SIGRENDERER *init_sigrenderer(DUMB_IT_SIGDATA *sigdata, int n_channels, int startorder, IT_CALLBACKS *callbacks, DUMB_CLICK_REMOVER **cr)
+{
+	DUMB_IT_SIGRENDERER *sigrenderer;
+	int i;
+
+	if (startorder > sigdata->n_orders) {
+		free(callbacks);
+		dumb_destroy_click_remover_array(n_channels, cr);
+		return NULL;
+	}
+
+	sigrenderer = malloc(sizeof(*sigrenderer));
+	if (!sigrenderer) {
+		free(callbacks);
+		dumb_destroy_click_remover_array(n_channels, cr);
+		return NULL;
+	}
+
+	sigrenderer->callbacks = callbacks;
+	sigrenderer->click_remover = cr;
+
+	sigrenderer->sigdata = sigdata;
+	sigrenderer->n_channels = n_channels;
+	sigrenderer->resampling_quality = dumb_resampling_quality;
+	sigrenderer->ramp_style = 0;
+	sigrenderer->globalvolume = sigdata->global_volume;
+	sigrenderer->tempo = sigdata->tempo;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channel[i];
+#if IT_CHANNEL_MUTED != 1
+#error this is wrong
+#endif
+		channel->flags = sigdata->channel_pan[i] >> 7;
+		channel->volume = (sigdata->flags & IT_WAS_AN_XM) ? 0 : 64;
+		channel->pan = sigdata->channel_pan[i] & 0x7F;
+		channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+		channel->channelvolume = sigdata->channel_volume[i];
+		channel->instrument = 0;
+		channel->sample = 0;
+		channel->note = 0;
+		channel->SFmacro = 0;
+		channel->filter_cutoff = 127;
+		channel->filter_resonance = 0;
+		channel->new_note_action = 0xFF;
+		channel->xm_retrig = 0;
+		channel->retrig_tick = 0;
+		channel->tremor_time = 0;
+		channel->vibrato_waveform = 0;
+		channel->tremolo_waveform = 0;
+		channel->panbrello_waveform = 0;
+		channel->glissando = 0;
+		channel->toneslide = 0;
+		channel->ptm_toneslide = 0;
+		channel->ptm_last_toneslide = 0;
+		channel->midi_state = 0;
+		channel->lastvolslide = 0;
+		channel->lastDKL = 0;
+		channel->lastEF = 0;
+		channel->lastG = 0;
+		channel->lastHspeed = 0;
+		channel->lastHdepth = 0;
+		channel->lastRspeed = 0;
+		channel->lastRdepth = 0;
+		channel->lastYspeed = 0;
+		channel->lastYdepth = 0;
+		channel->lastI = 0;
+		channel->lastJ = 0;
+		channel->lastN = 0;
+		channel->lastO = 0;
+		channel->high_offset = 0;
+		channel->lastP = 0;
+		channel->lastQ = 0;
+		channel->lastS = 0;
+		channel->pat_loop_row = 0;
+		channel->pat_loop_count = 0;
+		channel->pat_loop_end_row = 0;
+		channel->lastW = 0;
+		channel->xm_lastE1 = 0;
+		channel->xm_lastE2 = 0;
+		channel->xm_lastEA = 0;
+		channel->xm_lastEB = 0;
+		channel->xm_lastX1 = 0;
+		channel->xm_lastX2 = 0;
+		channel->playing = NULL;
+#ifdef BIT_ARRAY_BULLSHIT
+		channel->played_patjump = NULL;
+		channel->played_patjump_order = 0xFFFE;
+#endif
+		//channel->output = 0;
+	}
+
+	if (sigdata->flags & IT_WAS_A_669)
+		reset_effects(sigrenderer);
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+		sigrenderer->playing[i] = NULL;
+
+	sigrenderer->speed = sigdata->speed;
+
+	sigrenderer->processrow = 0xFFFE;
+	sigrenderer->n_rows = 0;
+	sigrenderer->breakrow = 0;
+	sigrenderer->rowcount = 1;
+	sigrenderer->order = startorder;
+	/* meh!
+	if (startorder > 0) {
+		int n;
+		for (n = startorder - 1; n >= 0; n--) {
+			if (sigdata->order[n] > sigdata->n_patterns) {
+				sigrenderer->restart_position = n + 1;
+				break;
+			}
+		}
+	}
+	*/
+	if (startorder > 0) {
+		sigrenderer->restart_position = startorder;
+	} else {
+		sigrenderer->restart_position = sigdata->restart_position;
+	}
+
+	sigrenderer->row = 0;
+	sigrenderer->processorder = startorder - 1;
+	sigrenderer->tick = 1;
+
+	{
+		int order;
+		for (order = 0; order < sigdata->n_orders; order++) {
+			int n = sigdata->order[order];
+			if (n < sigdata->n_patterns) goto found_valid_order;
+#ifdef INVALID_ORDERS_END_SONG
+			if (n != IT_ORDER_SKIP)
+#else
+			if (n == IT_ORDER_END)
+#endif
+				break;
+		}
+		/* If we get here, there were no valid orders in the song. */
+		_dumb_it_end_sigrenderer(sigrenderer);
+		return NULL;
+	}
+	found_valid_order:
+
+	sigrenderer->time_left = 0;
+	sigrenderer->sub_time_left = 0;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	sigrenderer->played = bit_array_create(sigdata->n_orders * 256);
+#endif
+
+	sigrenderer->gvz_time = 0;
+	sigrenderer->gvz_sub_time = 0;
+
+	//sigrenderer->max_output = 0;
+
+	return sigrenderer;
+}
+
+
+void dumb_it_set_resampling_quality(DUMB_IT_SIGRENDERER * sigrenderer, int quality)
+{
+	if (sigrenderer && quality >= 0 && quality < DUMB_RQ_N_LEVELS)
+	{
+		int i;
+		sigrenderer->resampling_quality = quality;
+		for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+			if (sigrenderer->channel[i].playing)
+			{
+				IT_PLAYING * playing = sigrenderer->channel[i].playing;
+				playing->resampling_quality = quality;
+				playing->resampler.quality = quality;
+			}
+		}
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+			if (sigrenderer->playing[i]) {
+				IT_PLAYING * playing = sigrenderer->playing[i];
+				playing->resampling_quality = quality;
+				playing->resampler.quality = quality;
+			}
+		}
+	}
+}
+
+
+void dumb_it_set_ramp_style(DUMB_IT_SIGRENDERER * sigrenderer, int ramp_style) {
+	if (sigrenderer && ramp_style >= 0 && ramp_style <= 4) {
+		sigrenderer->ramp_style = ramp_style;
+	}
+}
+
+
+void dumb_it_set_loop_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data)
+{
+	if (sigrenderer) {
+		sigrenderer->callbacks->loop = callback;
+		sigrenderer->callbacks->loop_data = data;
+	}
+}
+
+
+
+void dumb_it_set_xm_speed_zero_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data)
+{
+	if (sigrenderer) {
+		sigrenderer->callbacks->xm_speed_zero = callback;
+		sigrenderer->callbacks->xm_speed_zero_data = data;
+	}
+}
+
+
+
+void dumb_it_set_midi_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data, int channel, unsigned char midi_byte), void *data)
+{
+	if (sigrenderer) {
+		sigrenderer->callbacks->midi = callback;
+		sigrenderer->callbacks->midi_data = data;
+	}
+}
+
+
+
+void dumb_it_set_global_volume_zero_callback(DUMB_IT_SIGRENDERER *sigrenderer, int (*callback)(void *data), void *data)
+{
+	if (sigrenderer) {
+		sigrenderer->callbacks->global_volume_zero = callback;
+		sigrenderer->callbacks->global_volume_zero_data = data;
+	}
+}
+
+
+
+static IT_CALLBACKS *create_callbacks(void)
+{
+	IT_CALLBACKS *callbacks = malloc(sizeof(*callbacks));
+	if (!callbacks) return NULL;
+	callbacks->loop = NULL;
+	callbacks->xm_speed_zero = NULL;
+	callbacks->midi = NULL;
+	callbacks->global_volume_zero = NULL;
+	return callbacks;
+}
+
+
+
+static DUMB_IT_SIGRENDERER *dumb_it_init_sigrenderer(DUMB_IT_SIGDATA *sigdata, int n_channels, int startorder)
+{
+	IT_CALLBACKS *callbacks;
+
+	if (!sigdata) return NULL;
+
+	callbacks = create_callbacks();
+	if (!callbacks) return NULL;
+
+	return init_sigrenderer(sigdata, n_channels, startorder, callbacks,
+		dumb_create_click_remover_array(n_channels));
+}
+
+
+
+DUH_SIGRENDERER *dumb_it_start_at_order(DUH *duh, int n_channels, int startorder)
+{
+	DUMB_IT_SIGDATA *itsd = duh_get_it_sigdata(duh);
+	DUMB_IT_SIGRENDERER *itsr = dumb_it_init_sigrenderer(itsd, n_channels, startorder);
+	/*duh->length = dumb_it_build_checkpoints(itsd, startorder);*/
+	return duh_encapsulate_it_sigrenderer(itsr, n_channels, 0);
+}
+
+
+
+static sigrenderer_t *it_start_sigrenderer(DUH *duh, sigdata_t *vsigdata, int n_channels, long pos)
+{
+	DUMB_IT_SIGDATA *sigdata = vsigdata;
+	DUMB_IT_SIGRENDERER *sigrenderer;
+
+	(void)duh;
+
+	{
+		IT_CALLBACKS *callbacks = create_callbacks();
+		if (!callbacks) return NULL;
+
+		if (sigdata->checkpoint) {
+			IT_CHECKPOINT *checkpoint = sigdata->checkpoint;
+			while (checkpoint->next && checkpoint->next->time < pos)
+				checkpoint = checkpoint->next;
+			sigrenderer = dup_sigrenderer(checkpoint->sigrenderer, n_channels, callbacks);
+			if (!sigrenderer) return NULL;
+			sigrenderer->click_remover = dumb_create_click_remover_array(n_channels);
+			pos -= checkpoint->time;
+		} else {
+			sigrenderer = init_sigrenderer(sigdata, n_channels, 0, callbacks,
+				dumb_create_click_remover_array(n_channels));
+			if (!sigrenderer) return NULL;
+		}
+	}
+
+	while (pos >= sigrenderer->time_left) {
+		render(sigrenderer, 0, 1.0f, 0, sigrenderer->time_left, NULL);
+
+		pos -= sigrenderer->time_left;
+		sigrenderer->time_left = 0;
+
+		if (process_tick(sigrenderer)) {
+			_dumb_it_end_sigrenderer(sigrenderer);
+			return NULL;
+		}
+	}
+
+	render(sigrenderer, 0, 1.0f, 0, pos, NULL);
+	sigrenderer->time_left -= pos;
+
+	return sigrenderer;
+}
+
+
+
+static long it_sigrenderer_get_samples(
+	sigrenderer_t *vsigrenderer,
+	float volume, float delta,
+	long size, sample_t **samples
+)
+{
+	DUMB_IT_SIGRENDERER *sigrenderer = vsigrenderer;
+	long pos;
+	int dt;
+	long todo;
+	LONG_LONG t;
+
+	if (sigrenderer->order < 0) return 0; // problematic
+
+	pos = 0;
+	dt = (int)(delta * 65536.0f + 0.5f);
+
+	/* When samples is finally used in render_playing(), it won't be used if
+	 * volume is 0.
+	 */
+	if (!samples) volume = 0;
+
+	for (;;) {
+		todo = (long)((((LONG_LONG)sigrenderer->time_left << 16) | sigrenderer->sub_time_left) / dt);
+
+		if (todo >= size)
+			break;
+
+		render(sigrenderer, volume, delta, pos, todo, samples);
+
+		pos += todo;
+		size -= todo;
+
+		t = sigrenderer->sub_time_left - (LONG_LONG)todo * dt;
+		sigrenderer->sub_time_left = (long)t & 65535;
+		sigrenderer->time_left += (long)(t >> 16);
+
+		if (process_tick(sigrenderer)) {
+			sigrenderer->order = -1;
+			sigrenderer->row = -1;
+			return pos;
+		}
+	}
+
+	render(sigrenderer, volume, delta, pos, size, samples);
+
+	pos += size;
+
+	t = sigrenderer->sub_time_left - (LONG_LONG)size * dt;
+	sigrenderer->sub_time_left = (long)t & 65535;
+	sigrenderer->time_left += (long)(t >> 16);
+
+	if (samples)
+		dumb_remove_clicks_array(sigrenderer->n_channels, sigrenderer->click_remover, samples, pos, 512.0f / delta);
+
+	return pos;
+}
+
+
+
+static void it_sigrenderer_get_current_sample(sigrenderer_t *vsigrenderer, float volume, sample_t *samples)
+{
+	DUMB_IT_SIGRENDERER *sigrenderer = vsigrenderer;
+	(void)volume; // for consideration: in any of these such functions, is 'volume' going to be required?
+	dumb_click_remover_get_offset_array(sigrenderer->n_channels, sigrenderer->click_remover, samples);
+}
+
+
+
+void _dumb_it_end_sigrenderer(sigrenderer_t *vsigrenderer)
+{
+	DUMB_IT_SIGRENDERER *sigrenderer = vsigrenderer;
+
+	int i;
+
+	if (sigrenderer) {
+		for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+			if (sigrenderer->channel[i].playing)
+				free(sigrenderer->channel[i].playing);
+#ifdef BIT_ARRAY_BULLSHIT
+			bit_array_destroy(sigrenderer->channel[i].played_patjump);
+#endif
+		}
+
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+			if (sigrenderer->playing[i])
+				free(sigrenderer->playing[i]);
+
+		dumb_destroy_click_remover_array(sigrenderer->n_channels, sigrenderer->click_remover);
+
+		if (sigrenderer->callbacks)
+			free(sigrenderer->callbacks);
+
+#ifdef BIT_ARRAY_BULLSHIT
+		bit_array_destroy(sigrenderer->played);
+#endif
+
+		free(vsigrenderer);
+	}
+}
+
+
+
+DUH_SIGTYPE_DESC _dumb_sigtype_it = {
+	SIGTYPE_IT,
+	NULL,
+	&it_start_sigrenderer,
+	NULL,
+	&it_sigrenderer_get_samples,
+	&it_sigrenderer_get_current_sample,
+	&_dumb_it_end_sigrenderer,
+	&_dumb_it_unload_sigdata
+};
+
+
+
+DUH_SIGRENDERER *duh_encapsulate_it_sigrenderer(DUMB_IT_SIGRENDERER *it_sigrenderer, int n_channels, long pos)
+{
+	return duh_encapsulate_raw_sigrenderer(it_sigrenderer, &_dumb_sigtype_it, n_channels, pos);
+}
+
+
+
+DUMB_IT_SIGRENDERER *duh_get_it_sigrenderer(DUH_SIGRENDERER *sigrenderer)
+{
+	return duh_get_raw_sigrenderer(sigrenderer, SIGTYPE_IT);
+}
+
+
+
+/* Values of 64 or more will access NNA channels here. */
+void dumb_it_sr_get_channel_state(DUMB_IT_SIGRENDERER *sr, int channel, DUMB_IT_CHANNEL_STATE *state)
+{
+	IT_PLAYING *playing;
+	int t; /* temporary var for holding accurate pan and filter cutoff */
+	float delta;
+	ASSERT(channel < DUMB_IT_TOTAL_CHANNELS);
+	if (!sr) { state->sample = 0; return; }
+	if (channel >= DUMB_IT_N_CHANNELS) {
+		playing = sr->playing[channel - DUMB_IT_N_CHANNELS];
+		if (!playing) { state->sample = 0; return; }
+	} else {
+		playing = sr->channel[channel].playing;
+		if (!playing) { state->sample = 0; return; }
+	}
+
+	if (playing->flags & IT_PLAYING_DEAD) { state->sample = 0; return; }
+
+	state->channel = playing->channel - sr->channel;
+	state->sample = playing->sampnum;
+	state->volume = calculate_volume(sr, playing, 1.0f);
+
+	t = apply_pan_envelope(playing);
+	state->pan = (unsigned char)((t + 128) >> IT_ENVELOPE_SHIFT);
+	state->subpan = (signed char)t;
+
+	delta = playing->delta * 65536.0f;
+	t = playing->filter_cutoff << IT_ENVELOPE_SHIFT;
+	apply_pitch_modifications(sr->sigdata, playing, &delta, &t);
+	state->freq = (int)delta;
+	if (t == 127 << IT_ENVELOPE_SHIFT && playing->filter_resonance == 0) {
+		state->filter_resonance = playing->true_filter_resonance;
+		t = playing->true_filter_cutoff;
+	} else
+		state->filter_resonance = playing->filter_resonance;
+	state->filter_cutoff = (unsigned char)(t >> 8);
+	state->filter_subcutoff = (unsigned char)t;
+}
+
+
+
+int dumb_it_callback_terminate(void *data)
+{
+	(void)data;
+	return 1;
+}
+
+
+
+int dumb_it_callback_midi_block(void *data, int channel, unsigned char midi_byte)
+{
+	(void)data;
+	(void)channel;
+	(void)midi_byte;
+	return 1;
+}
+
+
+
+#define IT_CHECKPOINT_INTERVAL (30 * 65536) /* Half a minute */
+
+#define FUCKIT_THRESHOLD (120 * 60 * 65536) /* two hours? probably a pattern loop mess... */
+
+/* Returns the length of the module, up until it first loops. */
+long dumb_it_build_checkpoints(DUMB_IT_SIGDATA *sigdata, int startorder)
+{
+	IT_CHECKPOINT *checkpoint;
+	if (!sigdata) return 0;
+	checkpoint = sigdata->checkpoint;
+	while (checkpoint) {
+		IT_CHECKPOINT *next = checkpoint->next;
+		_dumb_it_end_sigrenderer(checkpoint->sigrenderer);
+		free(checkpoint);
+		checkpoint = next;
+	}
+	sigdata->checkpoint = NULL;
+	checkpoint = malloc(sizeof(*checkpoint));
+	if (!checkpoint) return 0;
+	checkpoint->time = 0;
+	checkpoint->sigrenderer = dumb_it_init_sigrenderer(sigdata, 0, startorder);
+	if (!checkpoint->sigrenderer) {
+		free(checkpoint);
+		return 0;
+	}
+	checkpoint->sigrenderer->callbacks->loop = &dumb_it_callback_terminate;
+	checkpoint->sigrenderer->callbacks->xm_speed_zero = &dumb_it_callback_terminate;
+	checkpoint->sigrenderer->callbacks->global_volume_zero = &dumb_it_callback_terminate;
+
+	if (sigdata->checkpoint)
+	{
+		IT_CHECKPOINT *checkpoint = sigdata->checkpoint;
+		while (checkpoint) {
+			IT_CHECKPOINT *next = checkpoint->next;
+			_dumb_it_end_sigrenderer(checkpoint->sigrenderer);
+			free(checkpoint);
+			checkpoint = next;
+		}
+	}
+
+	sigdata->checkpoint = checkpoint;
+
+	for (;;) {
+		long l;
+		DUMB_IT_SIGRENDERER *sigrenderer = dup_sigrenderer(checkpoint->sigrenderer, 0, checkpoint->sigrenderer->callbacks);
+		checkpoint->sigrenderer->callbacks = NULL;
+		if (!sigrenderer) {
+			checkpoint->next = NULL;
+			return checkpoint->time;
+		}
+
+		l = it_sigrenderer_get_samples(sigrenderer, 0, 1.0f, IT_CHECKPOINT_INTERVAL, NULL);
+		if (l < IT_CHECKPOINT_INTERVAL) {
+			_dumb_it_end_sigrenderer(sigrenderer);
+			checkpoint->next = NULL;
+			return checkpoint->time + l;
+		}
+
+		checkpoint->next = malloc(sizeof(*checkpoint->next));
+		if (!checkpoint->next) {
+			_dumb_it_end_sigrenderer(sigrenderer);
+			return checkpoint->time + IT_CHECKPOINT_INTERVAL;
+		}
+
+		checkpoint->next->time = checkpoint->time + IT_CHECKPOINT_INTERVAL;
+		checkpoint = checkpoint->next;
+		checkpoint->sigrenderer = sigrenderer;
+
+		if (checkpoint->time >= FUCKIT_THRESHOLD) {
+			checkpoint->next = NULL;
+			return 0;
+		}
+	}
+}
+
+
+
+void dumb_it_do_initial_runthrough(DUH *duh)
+{
+	if (duh) {
+		DUMB_IT_SIGDATA *sigdata = duh_get_it_sigdata(duh);
+
+		if (sigdata)
+			duh_set_length(duh, dumb_it_build_checkpoints(sigdata, 0));
+	}
+}
+
+static int is_pattern_silent(IT_PATTERN * pattern, int order) {
+	int ret = 1;
+	IT_ENTRY * entry, * end;
+	if (!pattern || !pattern->n_rows || !pattern->n_entries || !pattern->entry) return 2;
+
+	if ( pattern->n_entries == pattern->n_rows ) {
+		int n;
+		entry = pattern->entry;
+		for ( n = 0; n < pattern->n_entries; ++n, ++entry ) {
+			if ( !IT_IS_END_ROW(entry) ) break;
+		}
+		if ( n == pattern->n_entries ) return 2;
+		// broken?
+	}
+
+	entry = pattern->entry;
+	end = entry + pattern->n_entries;
+
+	while (entry < end) {
+		if (!IT_IS_END_ROW(entry)) {
+			if (entry->mask & (IT_ENTRY_INSTRUMENT | IT_ENTRY_VOLPAN))
+				return 0;
+			if (entry->mask & IT_ENTRY_NOTE && entry->note < 120)
+				return 0;
+			if (entry->mask & IT_ENTRY_EFFECT) {
+				switch (entry->effect) {
+					case IT_SET_GLOBAL_VOLUME:
+						if (entry->effectvalue) return 0;
+						break;
+
+					case IT_SET_SPEED:
+						if (entry->effectvalue > 64) ret++;
+						break;
+
+					case IT_SET_SONG_TEMPO:
+					case IT_XM_KEY_OFF:
+						break;
+
+					case IT_JUMP_TO_ORDER:
+						if (entry->effectvalue != order)
+							return 0;
+						break;
+
+					case IT_S:
+						switch (entry->effectvalue >> 4) {
+							case 0: // meh bastard
+								if ( entry->effectvalue != 0 ) return 0;
+								break;
+
+							case IT_S_FINE_PATTERN_DELAY:
+							case IT_S_PATTERN_LOOP:
+							case IT_S_PATTERN_DELAY:
+								ret++;
+								break;
+
+							case IT_S7:
+								if ((entry->effectvalue & 15) > 2)
+									return 0;
+								break;
+
+							default:
+								return 0;
+						}
+						break;
+
+					// clever idiot with his S L O W crap; do nothing
+					case IT_VOLSLIDE_TONEPORTA:
+					case IT_SET_SAMPLE_OFFSET:
+					case IT_GLOBAL_VOLUME_SLIDE:
+						if ( entry->effectvalue != 0 ) return 0;
+						break;
+
+					// genius also uses this instead of jump to order by mistake, meh, and it's bloody BCD
+					case IT_BREAK_TO_ROW:						
+						if ( ( ( entry->effectvalue >> 4 ) * 10 + ( entry->effectvalue & 15 ) ) != order ) return 0;
+						break;
+
+					default:
+						return 0;
+				}
+			}
+		}
+		entry++;
+	}
+
+	return ret;
+}
+
+int dumb_it_trim_silent_patterns(DUH * duh) {
+	int n;
+	DUMB_IT_SIGDATA *sigdata;
+
+	if (!duh) return -1;
+
+	sigdata = duh_get_it_sigdata(duh);
+
+	if (!sigdata || !sigdata->order || !sigdata->pattern) return -1;
+
+	for (n = 0; n < sigdata->n_orders; n++) {
+		int p = sigdata->order[n];
+		if (p < sigdata->n_patterns) {
+			IT_PATTERN * pattern = &sigdata->pattern[p];
+			if (is_pattern_silent(pattern, n) > 1) {
+				pattern->n_rows = 1;
+				pattern->n_entries = 0;
+				if (pattern->entry)
+				{
+					free(pattern->entry);
+					pattern->entry = NULL;
+				}
+			} else
+				break;
+		}
+	}
+
+	if (n == sigdata->n_orders) return -1;
+
+	for (n = sigdata->n_orders - 1; n >= 0; n--) {
+		int p = sigdata->order[n];
+		if (p < sigdata->n_patterns) {
+			IT_PATTERN * pattern = &sigdata->pattern[p];
+			if (is_pattern_silent(pattern, n) > 1) {
+				pattern->n_rows = 1;
+				pattern->n_entries = 0;
+				if (pattern->entry)
+				{
+					free(pattern->entry);
+					pattern->entry = NULL;
+				}
+			} else
+				break;
+		}
+	}
+
+	if (n < 0) return -1;
+
+	/*duh->length = dumb_it_build_checkpoints(sigdata, 0);*/
+
+	return 0;
+}
+
+int dumb_it_scan_for_playable_orders(DUMB_IT_SIGDATA *sigdata, dumb_scan_callback callback, void * callback_data)
+{
+	int n;
+	long length;
+	void * ba_played;
+	DUMB_IT_SIGRENDERER * sigrenderer;
+	
+	if (!sigdata->n_orders || !sigdata->order) return -1;
+
+	ba_played = bit_array_create(sigdata->n_orders * 256);
+	if (!ba_played) return -1;
+
+	for (n = 0; n < sigdata->n_orders; n++) {
+		if ((sigdata->order[n] >= sigdata->n_patterns) ||
+			(is_pattern_silent(&sigdata->pattern[sigdata->order[n]], n) > 1))
+			bit_array_set(ba_played, n * 256);
+	}
+
+	for (;;) {
+		for (n = 0; n < sigdata->n_orders; n++) {
+			if (!bit_array_test_range(ba_played, n * 256, 256)) break;
+		}
+
+		if (n == sigdata->n_orders) break;
+
+		sigrenderer = dumb_it_init_sigrenderer(sigdata, 0, n);
+		if (!sigrenderer) {
+			bit_array_destroy(ba_played);
+			return -1;
+		}
+		sigrenderer->callbacks->loop = &dumb_it_callback_terminate;
+		sigrenderer->callbacks->xm_speed_zero = &dumb_it_callback_terminate;
+		sigrenderer->callbacks->global_volume_zero = &dumb_it_callback_terminate;
+
+		length = 0;
+
+		for (;;) {
+			long l;
+
+			l = it_sigrenderer_get_samples(sigrenderer, 0, 1.0f, IT_CHECKPOINT_INTERVAL, NULL);
+			length += l;
+			if (l < IT_CHECKPOINT_INTERVAL || length >= FUCKIT_THRESHOLD) {
+				/* SONG OVA! */
+				break;
+			}
+		}
+
+		if ((*callback)(callback_data, n, length) < 0) return -1;
+
+		bit_array_merge(ba_played, sigrenderer->played, 0);
+
+		_dumb_it_end_sigrenderer(sigrenderer);
+	}
+
+	bit_array_destroy(ba_played);
+
+	return 0;
+}
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itunload.c Added

@@ -0,0 +1,72 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itunload.c - Code to free an Impulse Tracker / / \ \
+ * module from memory. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+void _dumb_it_unload_sigdata(sigdata_t *vsigdata)
+{
+	if (vsigdata) {
+		DUMB_IT_SIGDATA *sigdata = vsigdata;
+		int n;
+
+		if (sigdata->song_message)
+			free(sigdata->song_message);
+
+		if (sigdata->order)
+			free(sigdata->order);
+
+		if (sigdata->instrument)
+			free(sigdata->instrument);
+
+		if (sigdata->sample) {
+			for (n = 0; n < sigdata->n_samples; n++)
+				if (sigdata->sample[n].data)
+					free(sigdata->sample[n].data);
+
+			free(sigdata->sample);
+		}
+
+		if (sigdata->pattern) {
+			for (n = 0; n < sigdata->n_patterns; n++)
+				if (sigdata->pattern[n].entry)
+					free(sigdata->pattern[n].entry);
+			free(sigdata->pattern);
+		}
+
+		if (sigdata->midi)
+			free(sigdata->midi);
+
+		{
+			IT_CHECKPOINT *checkpoint = sigdata->checkpoint;
+			while (checkpoint) {
+				IT_CHECKPOINT *next = checkpoint->next;
+				_dumb_it_end_sigrenderer(checkpoint->sigrenderer);
+				free(checkpoint);
+				checkpoint = next;
+			}
+		}
+
+		free(vsigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/load669.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmod.c - Code to read a 669 Composer module / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_669_quick(): loads a 669 file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_669_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_669_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/load6692.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmod2.c - Code to read a 669 Composer module / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_669(): loads a 669 file into a DUH struct, returning a pointer
+ * to the DUH struct. When you have finished with it, you must pass the
+ * pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_669(const char *filename)
+{
+	DUH *duh = dumb_load_669_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadasy.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadasy.c - Code to read an ASYLUM Music Format / / \ \
+ * module file, opening and closing it | < / \_
+ * for you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_asy_quick(): loads a AMF file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_asy_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_asy_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadasy2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadasy2.c - Code to read an ASYLUM Music Format / / \ \
+ * module file, opening and closing it | < / \_
+ * for you, and do an initial run- | \/ /\ /
+ * through. \_ / > /
+ * | \ / /
+ * By Chris Moeller. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_asy(): loads a AMF file into a DUH struct, returning a pointer
+ * to the DUH struct. When you have finished with it, you must pass the
+ * pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_asy(const char *filename)
+{
+	DUH *duh = dumb_load_asy_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmod.c - Code to read a good old-fashioned / / \ \
+ * Amiga module file, opening and | < / \_
+ * closing it for you. | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_mod_quick(): loads a MOD file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_mod_quick(const char *filename, int restr)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_mod_quick(f, restr);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmod2.c - Function to read a good old- / / \ \
+ * fashioned Amiga module file, | < / \_
+ * opening and closing it for you, | \/ /\ /
+ * and do an initial run-through. \_ / > /
+ * | \ / /
+ * Split off from loadmod.c by entheh. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_mod(const char *filename, int restr)
+{
+	DUH *duh = dumb_load_mod_quick(filename, restr);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmtm.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmtm.c - Code to read a MultiTracker Module / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_mtm_quick(): loads a MTM file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_mtm_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_mtm_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmtm2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadmtm2.c - Code to read a MultiTracker Module / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_mtm(): loads a MTM file into a DUH struct, returning a pointer
+ * to the DUH struct. When you have finished with it, you must pass the
+ * pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_mtm(const char *filename)
+{
+	DUH *duh = dumb_load_mtm_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadoldpsm.c Added

@@ -0,0 +1,43 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadoldpsm.c - Code to read a ProTracker Studio / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_old_psm_quick(): loads an old PSM file into a DUH struct,
+ * returning a pointer to the DUH struct. When you have finished with it,
+ * you must pass the pointer to unload_duh() so that the memory can be
+ * freed.
+ */
+DUH *dumb_load_old_psm_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_old_psm_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadoldpsm2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadoldpsm2.c - Code to read a ProTracker Studio / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run- | \/ /\ /
+ * through. \_ / > /
+ * | \ / /
+ * By Chris Moeller. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_old_psm(): loads an old PSM file into a DUH struct, returning
+ * a pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_old_psm(const char *filename)
+{
+	DUH *duh = dumb_load_old_psm_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadpsm.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadpsm.c - Code to read a ProTracker Studio / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_psm_quick(): loads a PSM file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_psm_quick(const char *filename, int subsong)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_psm_quick(f, subsong);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadpsm2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadpsm2.c - Code to read a ProTracker Studio / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_psm(): loads a PSM file into a DUH struct, returning a pointer
+ * to the DUH struct. When you have finished with it, you must pass the
+ * pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_psm(const char *filename, int subsong)
+{
+	DUH *duh = dumb_load_psm_quick(filename, subsong);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadptm.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadptm.c - Code to read a Poly Tracker v2.03 / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_ptm_quick(): loads a PTM file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_ptm_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_ptm_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadptm2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadptm2.c - Code to read a Poly Tracker v2.03 / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_ptm(): loads a PTM file into a DUH struct, returning a pointer
+ * to the DUH struct. When you have finished with it, you must pass the
+ * pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_ptm(const char *filename)
+{
+	DUH *duh = dumb_load_ptm_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadriff.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadriff.c - Code to read a RIFF module file / / \ \
+ * opening and closing it for you. | < / \_
+ * | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_riff_quick(): loads a RIFF file into a DUH struct, returning
+ * a pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH * dumb_load_riff_quick( const char *filename )
+{
+	DUH * duh;
+	DUMBFILE * f = dumbfile_open( filename );
+
+	if ( ! f )
+		return NULL;
+
+	duh = dumb_read_riff_quick( f );
+
+	dumbfile_close( f );
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadriff2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadriff2.c - Code to read a RIFF module file / / \ \
+ * opening and closing it for you, | < / \_
+ * and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_riff(const char *filename)
+{
+	DUH *duh = dumb_load_riff_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loads3m.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loads3m.c - Code to read a ScreamTracker 3 / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_s3m_quick(): loads an S3M file into a DUH struct, returning
+ * a pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_s3m_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_s3m_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loads3m2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loads3m2.c - Function to read a ScreamTracker 3 / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from loads3m.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_s3m(const char *filename)
+{
+	DUH *duh = dumb_load_s3m_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadstm.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadstm.c - Code to read a ScreamTracker 2 / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_stm_quick(): loads an STM file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_stm_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_stm_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadstm2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadstm2.c - Function to read a ScreamTracker 2 / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_stm(const char *filename)
+{
+	DUH *duh = dumb_load_stm_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadxm.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadxm.c - Code to read a Fast Tracker II / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_xm_quick(): loads an XM file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must
+ * pass the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_load_xm_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_xm_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadxm2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadxm2.c - Function to read a Fast Tracker II / / \ \
+ * file, opening and closing it for | < / \_
+ * you, and do an initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from loadxm.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_xm(const char *filename)
+{
+	DUH *duh = dumb_load_xm_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/ptmeffect.c Added

@@ -0,0 +1,125 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * ptmeffect.c - Code for converting PTM / / \ \
+ * effects to IT effects. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. Based on xmeffect.c \_ / > /
+ * by Julien Cugniere. | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+void _dumb_it_ptm_convert_effect(int effect, int value, IT_ENTRY *entry)
+{
+	if (effect >= PTM_N_EFFECTS)
+		return;
+
+	/* Linearisation of the effect number... */
+	if (effect == PTM_E) {
+		effect = PTM_EBASE + HIGH(value);
+		value = LOW(value);
+	}
+
+	/* convert effect */
+	entry->mask |= IT_ENTRY_EFFECT;
+	switch (effect) {
+
+		case PTM_APPREGIO: effect = IT_ARPEGGIO; break;
+		case PTM_PORTAMENTO_UP: effect = IT_PORTAMENTO_UP; break;
+		case PTM_PORTAMENTO_DOWN: effect = IT_PORTAMENTO_DOWN; break;
+		case PTM_TONE_PORTAMENTO: effect = IT_TONE_PORTAMENTO; break;
+		case PTM_VIBRATO: effect = IT_VIBRATO; break;
+		case PTM_VOLSLIDE_TONEPORTA: effect = IT_VOLSLIDE_TONEPORTA; break;
+		case PTM_VOLSLIDE_VIBRATO: effect = IT_VOLSLIDE_VIBRATO; break;
+		case PTM_TREMOLO: effect = IT_TREMOLO; break;
+		case PTM_SAMPLE_OFFSET: effect = IT_SET_SAMPLE_OFFSET; break;
+		case PTM_VOLUME_SLIDE: effect = IT_VOLUME_SLIDE; break;
+		case PTM_POSITION_JUMP: effect = IT_JUMP_TO_ORDER; break;
+		case PTM_SET_CHANNEL_VOLUME: effect = IT_SET_CHANNEL_VOLUME; break;
+		case PTM_PATTERN_BREAK: effect = IT_BREAK_TO_ROW; break;
+		case PTM_SET_GLOBAL_VOLUME: effect = IT_SET_GLOBAL_VOLUME; break;
+		case PTM_RETRIGGER: effect = IT_RETRIGGER_NOTE; break;
+		case PTM_FINE_VIBRATO: effect = IT_FINE_VIBRATO; break;
+
+		/* TODO properly */
+		case PTM_NOTE_SLIDE_UP: effect = IT_PTM_NOTE_SLIDE_UP; break;
+		case PTM_NOTE_SLIDE_DOWN: effect = IT_PTM_NOTE_SLIDE_DOWN; break;
+		case PTM_NOTE_SLIDE_UP_RETRIG: effect = IT_PTM_NOTE_SLIDE_UP_RETRIG; break;
+		case PTM_NOTE_SLIDE_DOWN_RETRIG: effect = IT_PTM_NOTE_SLIDE_DOWN_RETRIG; break;
+
+		case PTM_SET_TEMPO_BPM:
+			effect = (value < 0x20) ? (IT_SET_SPEED) : (IT_SET_SONG_TEMPO);
+			break;
+
+		case PTM_EBASE+PTM_E_SET_FINETUNE: effect = SBASE+IT_S_FINETUNE; break; /** TODO */
+		case PTM_EBASE+PTM_E_SET_LOOP: effect = SBASE+IT_S_PATTERN_LOOP; break;
+		case PTM_EBASE+PTM_E_NOTE_CUT: effect = SBASE+IT_S_DELAYED_NOTE_CUT; break;
+		case PTM_EBASE+PTM_E_NOTE_DELAY: effect = SBASE+IT_S_NOTE_DELAY; break;
+		case PTM_EBASE+PTM_E_PATTERN_DELAY: effect = SBASE+IT_S_PATTERN_DELAY; break;
+		case PTM_EBASE+PTM_E_SET_PANNING: effect = SBASE+IT_S_SET_PAN; break;
+
+		case PTM_EBASE+PTM_E_FINE_VOLSLIDE_UP:
+			effect = IT_VOLUME_SLIDE;
+			value = EFFECT_VALUE(value, 0xF);
+			break;
+
+		case PTM_EBASE + PTM_E_FINE_VOLSLIDE_DOWN:
+			effect = IT_VOLUME_SLIDE;
+			value = EFFECT_VALUE(0xF, value);
+			break;
+
+		case PTM_EBASE + PTM_E_FINE_PORTA_UP:
+			effect = IT_PORTAMENTO_UP;
+			value = EFFECT_VALUE(0xF, value);
+			break;
+
+		case PTM_EBASE + PTM_E_FINE_PORTA_DOWN:
+			effect = IT_PORTAMENTO_DOWN;
+			value = EFFECT_VALUE(0xF, value);
+			break;
+
+		case PTM_EBASE + PTM_E_RETRIG_NOTE:
+			effect = IT_XM_RETRIGGER_NOTE;
+			value = EFFECT_VALUE(0, value);
+			break;
+
+		case PTM_EBASE + PTM_E_SET_VIBRATO_CONTROL:
+			effect = SBASE+IT_S_SET_VIBRATO_WAVEFORM;
+			value &= ~4; /** TODO: value&4 -> don't retrig wave */
+			break;
+
+		case PTM_EBASE + PTM_E_SET_TREMOLO_CONTROL:
+			effect = SBASE+IT_S_SET_TREMOLO_WAVEFORM;
+			value &= ~4; /** TODO: value&4 -> don't retrig wave */
+			break;
+
+		default:
+			/* user effect (often used in demos for synchronisation) */
+			entry->mask &= ~IT_ENTRY_EFFECT;
+	}
+
+	/* Inverse linearisation... */
+	if (effect >= SBASE && effect < SBASE+16) {
+		value = EFFECT_VALUE(effect-SBASE, value);
+		effect = IT_S;
+	}
+
+	entry->effect = effect;
+	entry->effectvalue = value;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/read669.c Added

@@ -0,0 +1,447 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * read669.c - Code to read a 669 Composer module / / \ \
+ * from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+static int it_669_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, int tempo, int breakpoint, unsigned char *buffer, int * used_channels)
+{
+	int pos;
+	int channel;
+	int row;
+	IT_ENTRY *entry;
+
+	pattern->n_rows = 64;
+
+	if (dumbfile_getnc(buffer, 64 * 3 * 8, f) < 64 * 3 * 8)
+		return -1;
+
+	/* compute number of entries */
+	pattern->n_entries = 64 + 1; /* Account for the row end markers, speed command */
+	if (breakpoint < 63) pattern->n_entries++; /* and break to row 0 */
+
+	pos = 0;
+	for (row = 0; row < 64; row++) {
+		for (channel = 0; channel < 8; channel++) {
+			if (buffer[pos+0] != 0xFF || buffer[pos+2] != 0xFF)
+				pattern->n_entries++;
+			pos += 3;
+		}
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+	if (!pattern->entry)
+		return -1;
+
+	if (breakpoint == 63) breakpoint++;
+
+	entry = pattern->entry;
+
+	entry->channel = 8;
+	entry->mask = IT_ENTRY_EFFECT;
+	entry->effect = IT_SET_SPEED;
+	entry->effectvalue = tempo;
+	entry++;
+
+	pos = 0;
+	for (row = 0; row < 64; row++) {
+
+		if (row == breakpoint) {
+			entry->channel = 8;
+			entry->mask = IT_ENTRY_EFFECT;
+			entry->effect = IT_BREAK_TO_ROW;
+			entry->effectvalue = 0;
+			entry++;
+		}
+
+		for (channel = 0; channel < 8; channel++) {
+			if (buffer[pos+0] != 0xFF || buffer[pos+2] != 0xFF) {
+				entry->channel = channel;
+				entry->mask = 0;
+
+				if (buffer[pos+0] < 0xFE) {
+					entry->mask |= IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT;
+					entry->note = (buffer[pos+0] >> 2) + 36;
+					entry->instrument = (((buffer[pos+0] << 4) | (buffer[pos+1] >> 4)) & 0x3F) + 1;
+				}
+				if (buffer[pos+0] <= 0xFE) {
+					entry->mask |= IT_ENTRY_VOLPAN;
+					entry->volpan = ((buffer[pos+1] & 15) << 6) / 15;
+					if (*used_channels < channel + 1) *used_channels = channel + 1;
+				}
+				if (buffer[pos+2] != 0xFF) {
+					entry->mask |= IT_ENTRY_EFFECT;
+					entry->effectvalue = buffer[pos+2] & 15;
+					switch (buffer[pos+2] >> 4) {
+						case 0:
+							entry->effect = IT_PORTAMENTO_UP;
+							break;
+						case 1:
+							entry->effect = IT_PORTAMENTO_DOWN;
+							break;
+						case 2:
+							entry->effect = IT_TONE_PORTAMENTO;
+							break;
+						case 3:
+							entry->effect = IT_S;
+							entry->effectvalue += IT_S_FINETUNE * 16 + 8;
+							break;
+						case 4:
+							entry->effect = IT_VIBRATO;
+							// XXX speed unknown
+							entry->effectvalue |= 0x10;
+							break;
+						case 5:
+							if (entry->effectvalue) {
+								entry->effect = IT_SET_SPEED;
+							} else {
+								entry->mask &= ~IT_ENTRY_EFFECT;
+							}
+							break;
+#if 0
+						/* dunno about this, really... */
+						case 6:
+							if (entry->effectvalue == 0) {
+								entry->effect = IT_PANNING_SLIDE;
+								entry->effectvalue = 0xFE;
+							} else if (entry->effectvalue == 1) {
+								entry->effect = IT_PANNING_SLIDE;
+								entry->effectvalue = 0xEF;
+							} else {
+								entry->mask &= ~IT_ENTRY_EFFECT;
+							}
+							break;
+#endif
+						default:
+							entry->mask &= ~IT_ENTRY_EFFECT;
+							break;
+					}
+					if (*used_channels < channel + 1) *used_channels = channel + 1;
+				}
+
+				entry++;
+			}
+			pos += 3;
+		}
+		IT_SET_END_ROW(entry);
+		entry++;
+	}
+
+	return 0;
+}
+
+
+
+static int it_669_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	dumbfile_getnc(sample->name, 13, f);
+	sample->name[13] = 0;
+
+	sample->filename[0] = 0;
+
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = dumbfile_igetl(f);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	if (sample->length <= 0) {
+		sample->flags = 0;
+		return 0;
+	}
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	sample->global_volume = 64;
+	sample->default_volume = 64;
+
+	sample->default_pan = 0;
+	sample->C5_speed = 8363;
+	// the above line might be wrong
+
+	if ((sample->loop_end > sample->length) && !(sample->loop_start))
+		sample->loop_end = 0;
+
+	if (sample->loop_end > sample->length)
+		sample->loop_end = sample->length;
+
+	if (sample->loop_end - sample->loop_start > 2)
+		sample->flags |= IT_SAMPLE_LOOP;
+
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = 0; // do we have to set _all_ these?
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	return 0;
+}
+
+
+
+static int it_669_read_sample_data(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	long i;
+	long truncated_size;
+
+	/* let's get rid of the sample data coming after the end of the loop */
+	if ((sample->flags & IT_SAMPLE_LOOP) && sample->loop_end < sample->length) {
+		truncated_size = sample->length - sample->loop_end;
+		sample->length = sample->loop_end;
+	} else {
+		truncated_size = 0;
+	}
+
+	sample->data = malloc(sample->length);
+
+	if (!sample->data)
+		return -1;
+
+	if (sample->length)
+	{
+		i = dumbfile_getnc(sample->data, sample->length, f);
+		
+		if (i < sample->length) {
+			//return -1;
+			// ficking truncated files
+			if (i <= 0) {
+				sample->flags = 0;
+				return 0;
+			}
+			sample->length = i;
+			if (sample->loop_end > i) sample->loop_end = i;
+		} else {
+			/* skip truncated data */
+			dumbfile_skip(f, truncated_size);
+			// Should we be truncating it?
+			if (dumbfile_error(f))
+				return -1;
+		}
+
+		for (i = 0; i < sample->length; i++)
+			((signed char *)sample->data)[i] ^= 0x80;
+	}
+
+	return 0;
+}
+
+
+static DUMB_IT_SIGDATA *it_669_load_sigdata(DUMBFILE *f, int * ext)
+{
+	DUMB_IT_SIGDATA *sigdata;
+	int n_channels;
+	int i;
+	unsigned char tempolist[128];
+	unsigned char breaklist[128];
+
+	i = dumbfile_igetw(f);
+	if (i != 0x6669 && i != 0x4E4A) return NULL;
+
+	*ext = (i == 0x4E4A);
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		return NULL;
+	}
+
+	if (dumbfile_getnc(sigdata->name, 36, f) < 36) {
+		free(sigdata);
+		return NULL;
+	}
+	sigdata->name[36] = 0;
+
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+	sigdata->sample = NULL;
+
+	sigdata->n_instruments = 0;
+
+	sigdata->song_message = malloc(72 + 2 + 1);
+	if (!sigdata->song_message) {
+		free(sigdata);
+		return NULL;
+	}
+	if (dumbfile_getnc(sigdata->song_message, 36, f) < 36) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	sigdata->song_message[36] = 13;
+	sigdata->song_message[36 + 1] = 10;
+	if (dumbfile_getnc(sigdata->song_message + 38, 36, f) < 36) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	sigdata->song_message[38 + 36] = 0;
+
+	sigdata->n_samples = dumbfile_getc(f);
+	sigdata->n_patterns = dumbfile_getc(f);
+	sigdata->restart_position = dumbfile_getc(f);
+
+	if ((sigdata->n_samples) > 64 || (sigdata->n_patterns > 128)) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->order = malloc(128); /* We may need to scan the extra ones! */
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	if (dumbfile_getnc(sigdata->order, 128, f) < 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (i = 0; i < 128; i++) {
+		if (sigdata->order[i] == 255) break;
+		if (sigdata->order[i] >= sigdata->n_patterns) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+	}
+	if (!i) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	sigdata->n_orders = i;
+
+	if (dumbfile_getnc(tempolist, 128, f) < 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (dumbfile_getnc(breaklist, 128, f) < 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (i = 0; i < sigdata->n_samples; i++)
+		sigdata->sample[i].data = NULL;
+
+	for (i = 0; i < sigdata->n_samples; i++) {
+		if (it_669_read_sample_header(&sigdata->sample[i], f)) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+	}
+
+	/* May as well try to save a tiny bit of memory. */
+	if (sigdata->n_orders < 128) {
+		unsigned char *order = realloc(sigdata->order, sigdata->n_orders);
+		if (order) sigdata->order = order;
+	}
+
+	sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+	if (!sigdata->pattern) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	for (i = 0; i < sigdata->n_patterns; i++)
+		sigdata->pattern[i].entry = NULL;
+
+	n_channels = 0;
+
+	/* Read in the patterns */
+	{
+		unsigned char *buffer = malloc(64 * 3 * 8); /* 64 rows * 3 bytes * 8 channels */
+		if (!buffer) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (i = 0; i < sigdata->n_patterns; i++) {
+			if (it_669_read_pattern(&sigdata->pattern[i], f, tempolist[i], breaklist[i], buffer, &n_channels) != 0) {
+				free(buffer);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+		}
+		free(buffer);
+	}
+
+	sigdata->n_pchannels = n_channels;
+
+	/* And finally, the sample data */
+	for (i = 0; i < sigdata->n_samples; i++) {
+		if (it_669_read_sample_data(&sigdata->sample[i], f)) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+	}
+
+	/* Now let's initialise the remaining variables, and we're done! */
+	sigdata->flags = IT_OLD_EFFECTS | IT_LINEAR_SLIDES | IT_STEREO | IT_WAS_A_669;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	sigdata->speed = 4;
+	sigdata->tempo = 78;
+	sigdata->pan_separation = 128;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 2) {
+		sigdata->channel_pan[i+0] = 48;
+		sigdata->channel_pan[i+1] = 16;
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+
+
+DUH *dumb_read_669_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+	int ext;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_669_load_sigdata(f, &ext);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = ext ? "669 Extended" : "669";
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/read6692.c Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readam.c Added

@@ -0,0 +1,752 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readam.c - Code to read a RIFF AM module / / \ \
+ * from a parsed RIFF structure. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+#include "internal/riff.h"
+
+static int it_riff_am_process_sample( IT_SAMPLE * sample, const unsigned char * data, int len, int ver )
+{
+	int header_length;
+	int default_pan;
+	int default_volume;
+	int flags;
+	int length;
+	int length_bytes;
+	int loop_start;
+	int loop_end;
+	int sample_rate;
+
+	if ( ver == 0 )
+	{
+		if ( len < 0x38 )
+			return -1;
+
+		header_length = 0x38;
+
+		memcpy( sample->name, data, 28 );
+		sample->name[ 28 ] = 0;
+
+		default_pan = data[ 0x1C ];
+		default_volume = data[ 0x1D ];
+		flags = data[ 0x1E ] | ( data[ 0x1F ] << 8 );
+		length = data[ 0x20 ] | ( data[ 0x21 ] << 8 ) | ( data[ 0x22 ] << 16 ) | ( data[ 0x23 ] << 24 );
+		loop_start = data[ 0x24 ] | ( data[ 0x25 ] << 8 ) | ( data[ 0x26 ] << 16 ) | ( data[ 0x27 ] << 24 );
+		loop_end = data[ 0x28 ] | ( data[ 0x29 ] << 8 ) | ( data[ 0x2A ] << 16 ) | ( data[ 0x2B ] << 24 );
+		sample_rate = data[ 0x2C ] | ( data[ 0x2D ] << 8 ) | ( data[ 0x2E ] << 16 ) | ( data[ 0x2F ] << 24 );
+	}
+	else
+	{
+		if (len < 4) return -1;
+
+		header_length = data[ 0 ] | ( data[ 1 ] << 8 ) | ( data[ 2 ] << 16 ) | ( data[ 3 ] << 24 );
+		if ( header_length < 0x40 )
+			return -1;
+		if ( header_length + 4 > len )
+			return -1;
+
+		data += 4;
+		len -= 4;
+
+		memcpy( sample->name, data, 32 );
+		sample->name[ 32 ] = 0;
+
+		default_pan = data[ 0x20 ] | ( data[ 0x21 ] << 8 );
+		default_volume = data[ 0x22 ] | ( data[ 0x23 ] << 8 );
+		flags = data[ 0x24 ] | ( data[ 0x25 ] << 8 ); /* | ( data[ 0x26 ] << 16 ) | ( data[ 0x27 ] << 24 );*/
+		length = data[ 0x28 ] | ( data[ 0x29 ] << 8 ) | ( data[ 0x2A ] << 16 ) | ( data[ 0x2B ] << 24 );
+		loop_start = data[ 0x2C ] | ( data[ 0x2D ] << 8 ) | ( data[ 0x2E ] << 16 ) | ( data[ 0x2F ] << 24 );
+		loop_end = data[ 0x30 ] | ( data[ 0x31 ] << 8 ) | ( data[ 0x32 ] << 16 ) | ( data[ 0x33 ] << 24 );
+		sample_rate = data[ 0x34 ] | ( data[ 0x35 ] << 8 ) | ( data[ 0x36 ] << 16 ) | ( data[ 0x37 ] << 24 );
+
+		if ( default_pan > 0x7FFF || default_volume > 0x7FFF )
+			return -1;
+
+		default_pan = default_pan * 64 / 32767;
+		default_volume = default_volume * 64 / 32767;
+	}
+
+	/*if ( data[ 0x38 ] || data[ 0x39 ] || data[ 0x3A ] || data[ 0x3B ] )
+		return -1;*/
+
+	if ( ! length ) {
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return 0;
+	}
+
+	if ( flags & ~( 0x8000 | 0x80 | 0x20 | 0x10 | 0x08 | 0x04 ) )
+		return -1;
+
+	length_bytes = length << ( ( flags & 0x04 ) >> 2 );
+
+	if ( length_bytes + header_length > len )
+		return -1;
+
+	sample->flags = 0;
+
+	if ( flags & 0x80 ) sample->flags |= IT_SAMPLE_EXISTS;
+	if ( flags & 0x04 ) sample->flags |= IT_SAMPLE_16BIT;
+
+	sample->length = length;
+	sample->loop_start = loop_start;
+	sample->loop_end = loop_end;
+	sample->C5_speed = sample_rate;
+	sample->default_volume = default_volume;
+	sample->default_pan = default_pan | ( ( flags & 0x20 ) << 2 );
+	sample->filename[0] = 0;
+	sample->global_volume = 64;
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	if ( flags & 0x08 )
+	{
+		if (((unsigned int)sample->loop_end <= (unsigned int)sample->length) &&
+			((unsigned int)sample->loop_start < (unsigned int)sample->loop_end))
+		{
+			sample->length = sample->loop_end;
+			sample->flags |= IT_SAMPLE_LOOP;
+			if ( flags & 0x10 ) sample->flags |= IT_SAMPLE_PINGPONG_LOOP;
+		}
+	}
+
+	length_bytes = sample->length << ( ( flags & 0x04 ) >> 2 );
+
+	sample->data = malloc( length_bytes );
+	if ( ! sample->data )
+		return -1;
+
+	memcpy( sample->data, data + header_length, length_bytes );
+
+	return 0;
+}
+
+static int it_riff_am_process_pattern( IT_PATTERN * pattern, const unsigned char * data, int len, int ver )
+{
+	int nrows, row, pos;
+	unsigned flags;
+	IT_ENTRY * entry;
+
+	nrows = data[0] + 1;
+
+	pattern->n_rows = nrows;
+
+	data += 1;
+	len -= 1;
+
+	pattern->n_entries = 0;
+
+	row = 0;
+	pos = 0;
+
+	while ( (row < nrows) && (pos < len) ) {
+		if ( ! data[ pos ] ) {
+			++ row;
+			++ pos;
+			continue;
+		}
+
+		flags = data[ pos++ ] & 0xE0;
+
+		if (flags) {
+			++ pattern->n_entries;
+			if (flags & 0x80) pos += 2;
+			if (flags & 0x40) pos += 2;
+			if (flags & 0x20) pos ++;
+		}
+	}
+
+	if ( ! pattern->n_entries ) return 0;
+
+	pattern->n_entries += nrows;
+
+	pattern->entry = malloc( pattern->n_entries * sizeof( * pattern->entry ) );
+	if ( ! pattern->entry ) return -1;
+
+	entry = pattern->entry;
+
+	row = 0;
+	pos = 0;
+
+	while ( ( row < nrows ) && ( pos < len ) )
+	{
+		if ( ! data[ pos ] )
+		{
+			IT_SET_END_ROW( entry );
+			++ entry;
+			++ row;
+			++ pos;
+			continue;
+		}
+
+		flags = data[ pos++ ];
+		entry->channel = flags & 0x1F;
+		entry->mask = 0;
+
+		if (flags & 0xE0)
+		{
+			if ( flags & 0x80 )
+			{
+				_dumb_it_xm_convert_effect( data[ pos + 1 ], data[ pos ], entry, 0 );
+				pos += 2;
+			}
+
+			if ( flags & 0x40 )
+			{
+				if ( data[ pos ] )
+				{
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+					entry->instrument = data[ pos ];
+				}
+				if ( data[ pos + 1 ] )
+				{
+					entry->mask |= IT_ENTRY_NOTE;
+					entry->note = data[ pos + 1 ] - 1;
+				}
+				pos += 2;
+			}
+
+			if ( flags & 0x20 )
+			{
+				entry->mask |= IT_ENTRY_VOLPAN;
+				if ( ver == 0 ) entry->volpan = data[ pos ];
+				else entry->volpan = data[ pos ] * 64 / 127;
+				++ pos;
+			}
+
+			if (entry->mask) entry++;
+		}
+	}
+
+	while ( row < nrows )
+	{
+		IT_SET_END_ROW( entry );
+		++ entry;
+		++ row;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+	if ( ! pattern->n_entries ) return -1;
+
+	return 0;
+}
+
+static DUMB_IT_SIGDATA *it_riff_amff_load_sigdata( struct riff * stream )
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int n, o, found;
+
+	unsigned char * ptr;
+
+	if ( ! stream ) goto error;
+
+	if ( stream->type != DUMB_ID( 'A', 'M', 'F', 'F' ) ) goto error;
+
+	sigdata = malloc( sizeof( *sigdata ) );
+	if ( ! sigdata ) goto error;
+
+	sigdata->n_patterns = 0;
+	sigdata->n_samples = 0;
+	sigdata->name[0] = 0;
+
+	found = 0;
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch( c->type )
+		{
+		case DUMB_ID( 'M', 'A', 'I', 'N' ):
+			/* initialization data */
+			if ( ( found & 1 ) || ( c->size < 0x48 ) ) goto error_sd;
+			found |= 1;
+			break;
+
+		case DUMB_ID( 'O', 'R', 'D', 'R' ):
+			if ( ( found & 2 ) || ( c->size < 1 ) ) goto error_sd;
+			found |= 2;
+			break;
+
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			ptr = ( unsigned char * ) c->data;
+			if ( ptr[ 0 ] >= sigdata->n_patterns ) sigdata->n_patterns = ptr[ 0 ] + 1;
+			o = ptr[ 1 ] | ( ptr[ 2 ] << 8 ) | ( ptr[ 3 ] << 16 ) | ( ptr[ 4 ] << 24 );
+			if ( o + 5 > c->size ) goto error_sd;
+			break;
+
+		case DUMB_ID( 'I', 'N', 'S', 'T' ):
+			{
+				if ( c->size < 0xE1 ) goto error;
+				ptr = ( unsigned char * ) c->data;
+				if ( ptr[ 1 ] >= sigdata->n_samples ) sigdata->n_samples = ptr[ 1 ] + 1;
+				if ( c->size >= 0x121 && ( ptr[ 0xE1 ] == 'S' && ptr[ 0xE2 ] == 'A' &&
+					ptr[ 0xE3 ] == 'M' && ptr[ 0xE4 ] == 'P' ) )
+				{
+					unsigned size = ptr[ 0xE5 ] | ( ptr[ 0xE6 ] << 8 ) | ( ptr[ 0xE7 ] << 16 ) | ( ptr[ 0xE8 ] << 24 );
+					if ( size + 0xE1 + 8 > c->size ) goto error;
+				}
+			}
+			break;
+		}
+	}
+
+	if ( found != 3 || !sigdata->n_samples || !sigdata->n_patterns ) goto error_sd;
+
+	if ( sigdata->n_samples > 255 || sigdata->n_patterns > 255 ) goto error_sd;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	sigdata->n_instruments = 0;
+	sigdata->n_orders = 0;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'M', 'A', 'I', 'N' ):
+			ptr = ( unsigned char * ) c->data;
+			memcpy( sigdata->name, c->data, 64 );
+			sigdata->name[ 64 ] = 0;
+			sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_AN_S3M;
+			if ( ! ( ptr[ 0x40 ] & 1 ) ) sigdata->flags |= IT_LINEAR_SLIDES;
+			if ( ( ptr[ 0x40 ] & ~3 ) || ! ( ptr[ 0x40 ] & 2 ) ) goto error_usd; // unknown flags
+			sigdata->n_pchannels = ptr[ 0x41 ];
+			sigdata->speed = ptr[ 0x42 ];
+			sigdata->tempo = ptr[ 0x43 ];
+
+			sigdata->global_volume = ptr[ 0x48 ];
+
+			if ( c->size < 0x48 + sigdata->n_pchannels ) goto error_usd;
+
+			for ( o = 0; o < sigdata->n_pchannels; ++o )
+			{
+				sigdata->channel_pan[ o ] = ptr[ 0x49 + o ];
+				if ( ptr[ 0x49 + o ] >= 128 )
+				{
+					sigdata->channel_volume[ o ] = 0;
+				}
+			}
+			break;
+		}
+	}
+
+	sigdata->pattern = malloc( sigdata->n_patterns * sizeof( *sigdata->pattern ) );
+	if ( ! sigdata->pattern ) goto error_usd;
+	for ( n = 0; n < sigdata->n_patterns; ++n )
+		sigdata->pattern[ n ].entry = NULL;
+
+	sigdata->sample = malloc( sigdata->n_samples * sizeof( *sigdata->sample ) );
+	if ( ! sigdata->sample ) goto error_usd;
+	for ( n = 0; n < sigdata->n_samples; ++n )
+	{
+		IT_SAMPLE * sample = sigdata->sample + n;
+		sample->data = NULL;
+		sample->flags = 0;
+		sample->name[ 0 ] = 0;
+	}
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'O', 'R', 'D', 'R' ):
+			ptr = ( unsigned char * ) c->data;
+			sigdata->n_orders = ptr[ 0 ] + 1;
+			if ( sigdata->n_orders + 1 > c->size ) goto error_usd;
+			sigdata->order = malloc( sigdata->n_orders );
+			if ( ! sigdata->order ) goto error_usd;
+			memcpy( sigdata->order, ptr + 1, sigdata->n_orders );
+			break;
+
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			ptr = ( unsigned char * ) c->data;
+			o = ptr[ 1 ] | ( ptr[ 2 ] << 8 ) | ( ptr[ 3 ] << 16 ) | ( ptr[ 4 ] << 24 );
+			if ( it_riff_am_process_pattern( sigdata->pattern + ptr[ 0 ], ptr + 5, o, 0 ) ) goto error_usd;
+			break;
+
+		case DUMB_ID( 'I', 'N', 'S', 'T' ):
+			{
+				IT_SAMPLE * sample;
+				ptr = ( unsigned char * ) c->data;
+				sample = sigdata->sample + ptr[ 1 ];
+				if ( c->size >= 0x121 && ( ptr[ 0xE1 ] == 'S' && ptr[ 0xE2 ] == 'A' &&
+					ptr[ 0xE3 ] == 'M' && ptr[ 0xE4 ] == 'P' ) )
+				{
+					unsigned size = ptr[ 0xE5 ] | ( ptr[ 0xE6 ] << 8 ) | ( ptr[ 0xE7 ] << 16 ) | ( ptr[ 0xE8 ] << 24 );
+					if ( it_riff_am_process_sample( sample, ptr + 0xE1 + 8, size, 0 ) ) goto error_usd;
+				}
+				else
+				{
+					memcpy( sample->name, ptr + 2, 28 );
+					sample->name[ 28 ] = 0;
+				}
+			}
+			break;
+		}
+	}
+
+	_dumb_it_fix_invalid_orders( sigdata );
+
+	return sigdata;
+
+error_usd:
+	_dumb_it_unload_sigdata( sigdata );
+	goto error;
+error_sd:
+	free( sigdata );
+error:
+	return NULL;
+}
+
+static DUMB_IT_SIGDATA *it_riff_am_load_sigdata( struct riff * stream )
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int n, o, p, found;
+
+	unsigned char * ptr;
+
+	if ( ! stream ) goto error;
+
+	if ( stream->type != DUMB_ID( 'A', 'M', ' ', ' ' ) ) goto error;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if ( ! sigdata ) goto error;
+
+	sigdata->n_patterns = 0;
+	sigdata->n_samples = 0;
+	sigdata->name[0] = 0;
+
+	found = 0;
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch( c->type )
+		{
+		case DUMB_ID( 'I' ,'N' ,'I' ,'T' ):
+			/* initialization data */
+			if ( ( found & 1 ) || ( c->size < 0x48 ) ) goto error_sd;
+			found |= 1;
+			break;
+
+		case DUMB_ID( 'O', 'R', 'D', 'R' ):
+			if ( ( found & 2 ) || ( c->size < 1 ) ) goto error_sd;
+			found |= 2;
+			break;
+
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			ptr = ( unsigned char * ) c->data;
+			if ( ptr[ 0 ] >= sigdata->n_patterns ) sigdata->n_patterns = ptr[ 0 ] + 1;
+			o = ptr[ 1 ] | ( ptr[ 2 ] << 8 ) | ( ptr[ 3 ] << 16 ) | ( ptr[ 4 ] << 24 );
+			if ( o + 5 > c->size ) goto error_sd;
+			break;
+
+		case DUMB_ID( 'R', 'I', 'F', 'F' ):
+			{
+				struct riff * str = ( struct riff * ) c->data;
+				switch ( str->type )
+				{
+				case DUMB_ID( 'A', 'I', ' ', ' ' ):
+					for ( o = 0; o < str->chunk_count; ++o )
+					{
+						struct riff_chunk * chk = str->chunks + o;
+						switch( chk->type )
+						{
+						case DUMB_ID( 'I', 'N', 'S', 'T' ):
+							{
+								struct riff * temp;
+								unsigned size;
+								unsigned sample_found;
+								ptr = ( unsigned char * ) chk->data;
+								size = ptr[ 0 ] | ( ptr[ 1 ] << 8 ) | ( ptr[ 2 ] << 16 ) | ( ptr[ 3 ] << 24 );
+								if ( size < 0x142 ) goto error;
+								sample_found = 0;
+								if ( ptr[ 5 ] >= sigdata->n_samples ) sigdata->n_samples = ptr[ 5 ] + 1;
+								temp = riff_parse( ptr + 4 + size, chk->size - size - 4, 1 );
+								if ( temp )
+								{
+									if ( temp->type == DUMB_ID( 'A', 'S', ' ', ' ' ) )
+									{
+										for ( p = 0; p < temp->chunk_count; ++p )
+										{
+											if ( temp->chunks[ p ].type == DUMB_ID( 'S', 'A', 'M', 'P' ) )
+											{
+												if ( sample_found )
+												{
+													riff_free( temp );
+													goto error;
+												}
+												sample_found = 1;
+											}
+										}
+									}
+									riff_free( temp );
+								}
+							}
+						}
+					}
+				}
+			}
+			break;
+		}
+	}
+
+	if ( found != 3 || !sigdata->n_samples || !sigdata->n_patterns ) goto error_sd;
+
+	if ( sigdata->n_samples > 255 || sigdata->n_patterns > 255 ) goto error_sd;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	sigdata->n_instruments = 0;
+	sigdata->n_orders = 0;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'I', 'N', 'I', 'T' ):
+			ptr = ( unsigned char * ) c->data;
+			memcpy( sigdata->name, c->data, 64 );
+			sigdata->name[ 64 ] = 0;
+			sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_AN_S3M;
+			if ( ! ( ptr[ 0x40 ] & 1 ) ) sigdata->flags |= IT_LINEAR_SLIDES;
+			if ( ( ptr[ 0x40 ] & ~3 ) || ! ( ptr[ 0x40 ] & 2 ) ) goto error_usd; // unknown flags
+			sigdata->n_pchannels = ptr[ 0x41 ];
+			sigdata->speed = ptr[ 0x42 ];
+			sigdata->tempo = ptr[ 0x43 ];
+
+			sigdata->global_volume = ptr[ 0x48 ];
+
+			if ( c->size < 0x48 + sigdata->n_pchannels ) goto error_usd;
+
+			for ( o = 0; o < sigdata->n_pchannels; ++o )
+			{
+				if ( ptr[ 0x49 + o ] <= 128 )
+				{
+					sigdata->channel_pan[ o ] = ptr[ 0x49 + o ] / 2;
+				}
+				else
+				{
+					sigdata->channel_volume[ o ] = 0;
+				}
+			}
+			break;
+		}
+	}
+
+	sigdata->pattern = malloc( sigdata->n_patterns * sizeof( *sigdata->pattern ) );
+	if ( ! sigdata->pattern ) goto error_usd;
+	for ( n = 0; n < sigdata->n_patterns; ++n )
+		sigdata->pattern[ n ].entry = NULL;
+
+	sigdata->sample = malloc( sigdata->n_samples * sizeof( *sigdata->sample ) );
+	if ( ! sigdata->sample ) goto error_usd;
+	for ( n = 0; n < sigdata->n_samples; ++n )
+	{
+		IT_SAMPLE * sample = sigdata->sample + n;
+		sample->data = NULL;
+		sample->flags = 0;
+		sample->name[ 0 ] = 0;
+	}
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'O', 'R', 'D', 'R' ):
+			ptr = ( unsigned char * ) c->data;
+			sigdata->n_orders = ptr[ 0 ] + 1;
+			if ( sigdata->n_orders + 1 > c->size ) goto error_usd;
+			sigdata->order = malloc( sigdata->n_orders );
+			if ( ! sigdata->order ) goto error_usd;
+			memcpy( sigdata->order, ptr + 1, sigdata->n_orders );
+			break;
+
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			ptr = ( unsigned char * ) c->data;
+			o = ptr[ 1 ] | ( ptr[ 2 ] << 8 ) | ( ptr[ 3 ] << 16 ) | ( ptr[ 4 ] << 24 );
+			if ( it_riff_am_process_pattern( sigdata->pattern + ptr[ 0 ], ptr + 5, o, 1 ) ) goto error_usd;
+			break;
+
+		case DUMB_ID( 'R', 'I', 'F', 'F' ):
+			{
+				struct riff * str = ( struct riff * ) c->data;
+				switch ( str->type )
+				{
+				case DUMB_ID('A', 'I', ' ', ' '):
+					for ( o = 0; o < str->chunk_count; ++o )
+					{
+						struct riff_chunk * chk = str->chunks + o;
+						switch( chk->type )
+						{
+						case DUMB_ID( 'I', 'N', 'S', 'T' ):
+							{
+								struct riff * temp;
+								unsigned size;
+								unsigned sample_found;
+								IT_SAMPLE * sample;
+								ptr = ( unsigned char * ) chk->data;
+								size = ptr[ 0 ] | ( ptr[ 1 ] << 8 ) | ( ptr[ 2 ] << 16 ) | ( ptr[ 3 ] << 24 );
+								temp = riff_parse( ptr + 4 + size, chk->size - size - 4, 1 );
+								sample_found = 0;
+								sample = sigdata->sample + ptr[ 5 ];
+								if ( temp )
+								{
+									if ( temp->type == DUMB_ID( 'A', 'S', ' ', ' ' ) )
+									{
+										for ( p = 0; p < temp->chunk_count; ++p )
+										{
+											struct riff_chunk * c = temp->chunks + p;
+											if ( c->type == DUMB_ID( 'S', 'A', 'M', 'P' ) )
+											{
+												if ( sample_found )
+												{
+													riff_free( temp );
+													goto error_usd;
+												}
+												if ( it_riff_am_process_sample( sigdata->sample + ptr[ 5 ], ( unsigned char * ) c->data, c->size, 1 ) )
+												{
+													riff_free( temp );
+													goto error_usd;
+												}
+												sample_found = 1;
+											}
+										}
+									}
+									riff_free( temp );
+								}
+								if ( ! sample_found )
+								{
+									memcpy( sample->name, ptr + 6, 32 );
+									sample->name[ 32 ] = 0;
+								}
+							}
+						}
+					}
+				}
+			}
+			break;
+		}
+	}
+
+	_dumb_it_fix_invalid_orders( sigdata );
+
+	return sigdata;
+
+error_usd:
+	_dumb_it_unload_sigdata( sigdata );
+	goto error;
+error_sd:
+	free( sigdata );
+error:
+	return NULL;
+}
+
+DUH *dumb_read_riff_amff( struct riff * stream )
+{
+	sigdata_t *sigdata;
+	long length;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_riff_amff_load_sigdata( stream );
+
+	if (!sigdata)
+		return NULL;
+
+	length = 0;/*_dumb_it_build_checkpoints(sigdata, 0);*/
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "RIFF AMFF";
+		return make_duh( length, 2, ( const char * const (*) [ 2 ] ) tag, 1, & descptr, & sigdata );
+	}
+}
+
+DUH *dumb_read_riff_am( struct riff * stream )
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_riff_am_load_sigdata( stream );
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "RIFF AM";
+		return make_duh( -1, 2, ( const char * const (*) [ 2 ] ) tag, 1, & descptr, & sigdata );
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readasy.c Added

@@ -0,0 +1,331 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readasy.c - Code to read an ASYLUM Music Format / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+static int it_asy_read_pattern( IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer )
+{
+	int pos;
+	int channel;
+	int row;
+	IT_ENTRY *entry;
+
+	pattern->n_rows = 64;
+
+	if ( dumbfile_getnc( buffer, 64 * 8 * 4, f ) != 64 * 8 * 4 )
+		return -1;
+
+	/* compute number of entries */
+	pattern->n_entries = 64; /* Account for the row end markers */
+	pos = 0;
+	for ( row = 0; row < 64; ++row ) {
+		for ( channel = 0; channel < 8; ++channel ) {
+			if ( buffer[ pos + 0 ] | buffer[ pos + 1 ] | buffer[ pos + 2 ] | buffer[ pos + 3 ] )
+				++pattern->n_entries;
+			pos += 4;
+		}
+	}
+
+	pattern->entry = malloc( pattern->n_entries * sizeof( *pattern->entry ) );
+	if ( !pattern->entry )
+		return -1;
+
+	entry = pattern->entry;
+	pos = 0;
+	for ( row = 0; row < 64; ++row ) {
+		for ( channel = 0; channel < 8; ++channel ) {
+			if ( buffer[ pos + 0 ] | buffer[ pos + 1 ] | buffer[ pos + 2 ] | buffer[ pos + 3 ] ) {
+				entry->channel = channel;
+				entry->mask = 0;
+
+				if ( buffer[ pos + 0 ] && buffer[ pos + 0 ] < 96 ) {
+					entry->note = buffer[ pos + 0 ];
+					entry->mask |= IT_ENTRY_NOTE;
+				}
+
+				if ( buffer[ pos + 1 ] && buffer[ pos + 1 ] <= 64 ) {
+					entry->instrument = buffer[ pos + 1 ];
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+				}
+
+				_dumb_it_xm_convert_effect( buffer[ pos + 2 ] & 0x0F, buffer[ pos + 3 ], entry, 1 );
+
+				if ( entry->mask ) ++entry;
+			}
+			pos += 4;
+		}
+		IT_SET_END_ROW( entry );
+		++entry;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+
+	return 0;
+}
+
+
+
+static int it_asy_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f )
+{
+	int finetune;
+
+/**
+ 21 22 Chars Sample 1 name. If the name is not a full
+ 22 chars in length, it will be null
+ terminated.
+
+If
+the sample name begins with a '#' character (ASCII $23 (35)) then this is
+assumed not to be an instrument name, and is probably a message.
+*/
+	dumbfile_getnc( sample->name, 22, f );
+	sample->name[22] = 0;
+
+	sample->filename[0] = 0;
+
+/** Each finetune step changes the note 1/8th of a semitone. */
+	finetune = ( signed char ) ( dumbfile_getc( f ) << 4 ) >> 4; /* signed nibble */
+	sample->default_volume = dumbfile_getc( f ); // Should we be setting global_volume to this instead?
+	sample->global_volume = 64;
+	if ( sample->default_volume > 64 ) sample->default_volume = 64;
+	dumbfile_skip( f, 1 ); /* XXX unknown */
+	sample->length = dumbfile_igetl( f );
+	sample->loop_start = dumbfile_igetl( f );
+	sample->loop_end = sample->loop_start + dumbfile_igetl( f );
+
+	if ( sample->length <= 0 ) {
+		sample->flags = 0;
+		return 0;
+	}
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	sample->default_pan = 0;
+	sample->C5_speed = (int)( AMIGA_CLOCK / 214.0 );//( long )( 16726.0 * pow( DUMB_PITCH_BASE, finetune * 32 ) );
+	sample->finetune = finetune * 32;
+	// the above line might be wrong
+
+	if ( ( sample->loop_end - sample->loop_start > 2 ) && ( sample->loop_end <= sample->length ) )
+		sample->flags |= IT_SAMPLE_LOOP;
+
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = 0; // do we have to set _all_ these?
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+
+
+static int it_asy_read_sample_data( IT_SAMPLE *sample, DUMBFILE *f )
+{
+	long truncated_size;
+
+	/* let's get rid of the sample data coming after the end of the loop */
+	if ( ( sample->flags & IT_SAMPLE_LOOP ) && sample->loop_end < sample->length ) {
+		truncated_size = sample->length - sample->loop_end;
+		sample->length = sample->loop_end;
+	} else {
+		truncated_size = 0;
+	}
+
+	sample->data = malloc( sample->length );
+
+	if ( !sample->data )
+		return -1;
+
+	if ( sample->length )
+		dumbfile_getnc( sample->data, sample->length, f );
+
+	dumbfile_skip( f, truncated_size );
+
+	return dumbfile_error( f );
+}
+
+
+
+static DUMB_IT_SIGDATA *it_asy_load_sigdata(DUMBFILE *f)
+{
+	DUMB_IT_SIGDATA *sigdata;
+	int i;
+
+	static const char sig_part[] = "ASYLUM Music Format";
+	static const char sig_rest[] = " V1.0"; /* whee, string space optimization with format type below */
+
+	char signature [32];
+
+	if ( dumbfile_getnc( signature, 32, f ) != 32 ||
+		memcmp( signature, sig_part, 19 ) ||
+		memcmp( signature + 19, sig_rest, 5 ) ) {
+		return NULL;
+	}
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		return NULL;
+	}
+
+	sigdata->speed = dumbfile_getc( f ); /* XXX seems to fit the files I have */
+	sigdata->tempo = dumbfile_getc( f ); /* ditto */
+	sigdata->n_samples = dumbfile_getc( f ); /* ditto */
+	sigdata->n_patterns = dumbfile_getc( f );
+	sigdata->n_orders = dumbfile_getc( f );
+	sigdata->restart_position = dumbfile_getc( f );
+
+	if ( dumbfile_error( f ) || !sigdata->n_samples || sigdata->n_samples > 64 || !sigdata->n_patterns ||
+		!sigdata->n_orders ) {
+		free( sigdata );
+		return NULL;
+	}
+
+	if ( sigdata->restart_position > sigdata->n_orders ) /* XXX */
+		sigdata->restart_position = 0;
+
+	sigdata->order = malloc( sigdata->n_orders );
+	if ( !sigdata->order ) {
+		free( sigdata );
+		return NULL;
+	}
+
+	if ( dumbfile_getnc( sigdata->order, sigdata->n_orders, f ) != sigdata->n_orders ||
+		dumbfile_skip( f, 256 - sigdata->n_orders ) ) {
+		free( sigdata->order );
+		free( sigdata );
+		return NULL;
+	}
+
+	sigdata->sample = malloc( sigdata->n_samples * sizeof( *sigdata->sample ) );
+	if ( !sigdata->sample ) {
+		free( sigdata->order );
+		free( sigdata );
+		return NULL;
+	}
+
+	sigdata->song_message = NULL;
+	sigdata->instrument = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+
+	for ( i = 0; i < sigdata->n_samples; ++i )
+		sigdata->sample[i].data = NULL;
+
+	for ( i = 0; i < sigdata->n_samples; ++i ) {
+		if ( it_asy_read_sample_header( &sigdata->sample[i], f ) ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+	}
+
+	if ( dumbfile_skip( f, 37 * ( 64 - sigdata->n_samples ) ) ) {
+		_dumb_it_unload_sigdata( sigdata );
+		return NULL;
+	}
+
+	sigdata->pattern = malloc( sigdata->n_patterns * sizeof( *sigdata->pattern ) );
+	if ( !sigdata->pattern ) {
+		_dumb_it_unload_sigdata( sigdata );
+		return NULL;
+	}
+	for (i = 0; i < sigdata->n_patterns; ++i)
+		sigdata->pattern[i].entry = NULL;
+
+	/* Read in the patterns */
+	{
+		unsigned char *buffer = malloc( 64 * 8 * 4 ); /* 64 rows * 8 channels * 4 bytes */
+		if ( !buffer ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+		for ( i = 0; i < sigdata->n_patterns; ++i ) {
+			if ( it_asy_read_pattern( &sigdata->pattern[i], f, buffer ) != 0 ) {
+				free( buffer );
+				_dumb_it_unload_sigdata( sigdata );
+				return NULL;
+			}
+		}
+		free( buffer );
+	}
+
+	/* And finally, the sample data */
+	for ( i = 0; i < sigdata->n_samples; ++i ) {
+		if ( it_asy_read_sample_data( &sigdata->sample[i], f ) ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+	}
+
+	/* Now let's initialise the remaining variables, and we're done! */
+	sigdata->flags = IT_WAS_AN_XM | IT_WAS_A_MOD | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_STEREO;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	sigdata->n_pchannels = 8;
+
+	sigdata->name[0] = 0;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 4) {
+		sigdata->channel_pan[i+0] = 16;
+		sigdata->channel_pan[i+1] = 48;
+		sigdata->channel_pan[i+2] = 48;
+		sigdata->channel_pan[i+3] = 16;
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+
+
+DUH *dumb_read_asy_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_asy_load_sigdata(f);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "ASYLUM Music Format";
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readdsmf.c Added

@@ -0,0 +1,373 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readam.c - Code to read a RIFF DSMF module / / \ \
+ * from a parsed RIFF structure. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+#include "internal/riff.h"
+
+static int it_riff_dsmf_process_sample( IT_SAMPLE * sample, const unsigned char * data, int len )
+{
+	int flags;
+
+	memcpy( sample->filename, data, 13 );
+	sample->filename[ 14 ] = 0;
+	
+	flags = data[ 13 ] | ( data[ 14 ] << 8 );
+	sample->default_volume = data[ 15 ];
+	sample->length = data[ 16 ] | ( data[ 17 ] << 8 ) | ( data[ 18 ] << 16 ) | ( data[ 19 ] << 24 );
+	sample->loop_start = data[ 20 ] | ( data[ 21 ] << 8 ) | ( data[ 22 ] << 16 ) | ( data[ 23 ] << 24 );
+	sample->loop_end = data[ 24 ] | ( data[ 25 ] << 8 ) | ( data[ 26 ] << 16 ) | ( data[ 27 ] << 24 );
+	sample->C5_speed = ( data[ 32 ] | ( data[ 33 ] << 8 ) ) * 2;
+	memcpy( sample->name, data + 36, 28 );
+	sample->name[ 28 ] = 0;
+
+	/*if ( data[ 0x38 ] || data[ 0x39 ] || data[ 0x3A ] || data[ 0x3B ] )
+		return -1;*/
+
+	if ( ! sample->length ) {
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return 0;
+	}
+
+	/*if ( flags & ~( 2 | 1 ) )
+		return -1;*/
+
+	if ( sample->length + 64 > len )
+		return -1;
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	sample->default_pan = 0;
+	sample->global_volume = 64;
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	if ( flags & 1 )
+	{
+		if (((unsigned int)sample->loop_end <= (unsigned int)sample->length) &&
+			((unsigned int)sample->loop_start < (unsigned int)sample->loop_end))
+		{
+			sample->length = sample->loop_end;
+			sample->flags |= IT_SAMPLE_LOOP;
+			if ( flags & 0x10 ) sample->flags |= IT_SAMPLE_PINGPONG_LOOP;
+		}
+	}
+
+	sample->data = malloc( sample->length );
+	if ( ! sample->data )
+		return -1;
+
+	memcpy( sample->data, data + 64, sample->length );
+
+	if ( ! ( flags & 2 ) )
+	{
+		for ( flags = 0; flags < sample->length; ++flags )
+			( ( signed char * ) sample->data ) [ flags ] ^= 0x80;
+	}
+
+	return 0;
+}
+
+static int it_riff_dsmf_process_pattern( IT_PATTERN * pattern, const unsigned char * data, int len )
+{
+	int length, row, pos;
+	unsigned flags;
+	IT_ENTRY * entry;
+
+	length = data[ 0 ] | ( data[ 1 ] << 8 );
+	if ( length > len ) return -1;
+
+	data += 2;
+	len = length - 2;
+
+	pattern->n_rows = 64;
+	pattern->n_entries = 64;
+
+	row = 0;
+	pos = 0;
+
+	while ( (row < 64) && (pos < len) ) {
+		if ( ! data[ pos ] ) {
+			++ row;
+			++ pos;
+			continue;
+		}
+
+		flags = data[ pos++ ] & 0xF0;
+
+		if (flags) {
+			++ pattern->n_entries;
+			if (flags & 0x80) pos ++;
+			if (flags & 0x40) pos ++;
+			if (flags & 0x20) pos ++;
+			if (flags & 0x10) pos += 2;
+		}
+	}
+
+	if ( pattern->n_entries == 64 ) return 0;
+
+	pattern->entry = malloc( pattern->n_entries * sizeof( * pattern->entry ) );
+	if ( ! pattern->entry ) return -1;
+
+	entry = pattern->entry;
+
+	row = 0;
+	pos = 0;
+
+	while ( ( row < 64 ) && ( pos < len ) )
+	{
+		if ( ! data[ pos ] )
+		{
+			IT_SET_END_ROW( entry );
+			++ entry;
+			++ row;
+			++ pos;
+			continue;
+		}
+
+		flags = data[ pos++ ];
+		entry->channel = flags & 0x0F;
+		entry->mask = 0;
+
+		if ( flags & 0xF0 )
+		{
+			if ( flags & 0x80 )
+			{
+				if ( data[ pos ] )
+				{
+					entry->mask |= IT_ENTRY_NOTE;
+					entry->note = data[ pos ] - 1;
+				}
+				++ pos;
+			}
+
+			if ( flags & 0x40 )
+			{
+				if ( data[ pos ] )
+				{
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+					entry->instrument = data[ pos ];
+				}
+				++ pos;
+			}
+
+			if ( flags & 0x20 )
+			{
+				entry->mask |= IT_ENTRY_VOLPAN;
+				entry->volpan = data[ pos ];
+				++ pos;
+			}
+
+			if ( flags & 0x10 )
+			{
+				_dumb_it_xm_convert_effect( data[ pos ], data[ pos + 1 ], entry, 0 );
+				pos += 2;
+			}
+
+			if (entry->mask) entry++;
+		}
+	}
+
+	while ( row < 64 )
+	{
+		IT_SET_END_ROW( entry );
+		++ entry;
+		++ row;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+	if ( ! pattern->n_entries ) return -1;
+
+	return 0;
+}
+
+static DUMB_IT_SIGDATA *it_riff_dsmf_load_sigdata( struct riff * stream )
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int n, o, found;
+
+	unsigned char * ptr;
+
+	if ( ! stream ) goto error;
+
+	if ( stream->type != DUMB_ID( 'D', 'S', 'M', 'F' ) ) goto error;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if ( ! sigdata ) goto error;
+
+	sigdata->n_patterns = 0;
+	sigdata->n_samples = 0;
+	sigdata->name[0] = 0;
+
+	found = 0;
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch( c->type )
+		{
+		case DUMB_ID( 'S' ,'O' ,'N' ,'G' ):
+			/* initialization data */
+			if ( ( found ) || ( c->size < 192 ) ) goto error_sd;
+			found = 1;
+			break;
+
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			++ sigdata->n_patterns;
+			break;
+
+		case DUMB_ID( 'I', 'N', 'S', 'T' ):
+			++ sigdata->n_samples;
+			break;
+		}
+	}
+
+	if ( !found || !sigdata->n_samples || !sigdata->n_patterns ) goto error_sd;
+
+	if ( sigdata->n_samples > 255 || sigdata->n_patterns > 255 ) goto error_sd;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	sigdata->n_instruments = 0;
+	sigdata->n_orders = 0;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'S', 'O', 'N', 'G' ):
+			ptr = ( unsigned char * ) c->data;
+			memcpy( sigdata->name, c->data, 28 );
+			sigdata->name[ 28 ] = 0;
+			sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX;
+			sigdata->n_orders = ptr[ 36 ] | ( ptr[ 37 ] << 8 );
+			//sigdata->n_samples = ptr[ 38 ] | ( ptr[ 39 ] << 8 ); // whatever
+			//sigdata->n_patterns = ptr[ 40 ] | ( ptr[ 41 ] << 8 );
+			sigdata->n_pchannels = ptr[ 42 ] | ( ptr[ 43 ] << 8 );
+			sigdata->global_volume = ptr[ 44 ];
+			sigdata->mixing_volume = ptr[ 45 ];
+			sigdata->speed = ptr[ 46 ];
+			sigdata->tempo = ptr[ 47 ];
+
+			for ( o = 0; o < 16; ++o )
+			{
+				sigdata->channel_pan[ o ] = ptr[ 48 + o ] / 2;
+			}
+
+			sigdata->order = malloc( 128 );
+			if ( ! sigdata->order ) goto error_usd;
+			memcpy( sigdata->order, ptr + 64, 128 );
+
+			break;
+		}
+	}
+
+	sigdata->pattern = malloc( sigdata->n_patterns * sizeof( *sigdata->pattern ) );
+	if ( ! sigdata->pattern ) goto error_usd;
+	for ( n = 0; n < sigdata->n_patterns; ++n )
+		sigdata->pattern[ n ].entry = NULL;
+
+	sigdata->sample = malloc( sigdata->n_samples * sizeof( *sigdata->sample ) );
+	if ( ! sigdata->sample ) goto error_usd;
+	for ( n = 0; n < sigdata->n_samples; ++n )
+	{
+		IT_SAMPLE * sample = sigdata->sample + n;
+		sample->data = NULL;
+	}
+
+	sigdata->n_samples = 0;
+	sigdata->n_patterns = 0;
+
+	for ( n = 0; n < stream->chunk_count; ++n )
+	{
+		struct riff_chunk * c = stream->chunks + n;
+		switch ( c->type )
+		{
+		case DUMB_ID( 'P', 'A', 'T', 'T' ):
+			if ( it_riff_dsmf_process_pattern( sigdata->pattern + sigdata->n_patterns, ( unsigned char * ) c->data, c->size ) ) goto error_usd;
+			++ sigdata->n_patterns;
+			break;
+
+		case DUMB_ID( 'I', 'N', 'S', 'T' ):
+			if ( it_riff_dsmf_process_sample( sigdata->sample + sigdata->n_samples, ( unsigned char * ) c->data, c->size ) ) goto error_usd;
+			++ sigdata->n_samples;
+			break;
+		}
+	}
+
+	_dumb_it_fix_invalid_orders( sigdata );
+
+	return sigdata;
+
+error_usd:
+	_dumb_it_unload_sigdata( sigdata );
+	goto error;
+error_sd:
+	free( sigdata );
+error:
+	return NULL;
+}
+
+DUH *dumb_read_riff_dsmf( struct riff * stream )
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_riff_dsmf_load_sigdata( stream );
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "RIFF DSMF";
+		return make_duh( -1, 2, ( const char * const (*) [ 2 ] ) tag, 1, & descptr, & sigdata );
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod.c Added

@@ -0,0 +1,782 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readmod.c - Code to read a good old-fashioned / / \ \
+ * Amiga module from an open file. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+static int it_mod_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, int n_channels, unsigned char *buffer)
+{
+	int pos;
+	int channel;
+	int row;
+	IT_ENTRY *entry;
+
+	pattern->n_rows = 64;
+
+	if (n_channels == 0) {
+		/* Read the first four channels, leaving gaps for the rest. */
+		for (pos = 0; pos < 64*8*4; pos += 8*4)
+			dumbfile_getnc(buffer + pos, 4*4, f);
+		/* Read the other channels into the gaps we left. */
+		for (pos = 4*4; pos < 64*8*4; pos += 8*4)
+			dumbfile_getnc(buffer + pos, 4*4, f);
+
+		n_channels = 8;
+	} else
+		dumbfile_getnc(buffer, 64 * n_channels * 4, f);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	/* compute number of entries */
+	pattern->n_entries = 64; /* Account for the row end markers */
+	pos = 0;
+	for (row = 0; row < 64; row++) {
+		for (channel = 0; channel < n_channels; channel++) {
+			if (buffer[pos+0] | buffer[pos+1] | buffer[pos+2] | buffer[pos+3])
+				pattern->n_entries++;
+			pos += 4;
+		}
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+	if (!pattern->entry)
+		return -1;
+
+	entry = pattern->entry;
+	pos = 0;
+	for (row = 0; row < 64; row++) {
+		for (channel = 0; channel < n_channels; channel++) {
+			if (buffer[pos+0] | buffer[pos+1] | buffer[pos+2] | buffer[pos+3]) {
+				unsigned char sample = (buffer[pos+0] & 0xF0) | (buffer[pos+2] >> 4);
+				int period = ((int)(buffer[pos+0] & 0x0F) << 8) | buffer[pos+1];
+
+				entry->channel = channel;
+				entry->mask = 0;
+
+				if (period) {
+					int note;
+					entry->mask |= IT_ENTRY_NOTE;
+
+					/* frequency = (AMIGA_DIVISOR / 8) / (period * 2)
+					 * C-1: period = 214 -> frequency = 16726
+					 * so, set C5_speed to 16726
+					 * and period = 214 should translate to C5 aka 60
+					 * halve the period, go up an octive
+					 *
+					 * period = 214 / pow(DUMB_SEMITONE_BASE, note - 60)
+					 * pow(DUMB_SEMITONE_BASE, note - 60) = 214 / period
+					 * note - 60 = log(214/period) / log(DUMB_SEMITONE_BASE)
+					 */
+					note = (int)floor(log(214.0/period) / log(DUMB_SEMITONE_BASE) + 60.5);
+					entry->note = MID(0, note, 119);
+					// or should we preserve the period?
+					//entry->note = buffer[pos+0] & 0x0F; /* High nibble */
+					//entry->volpan = buffer[pos+1]; /* Low byte */
+					// and what about finetune?
+				}
+
+				if (sample) {
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+					entry->instrument = sample;
+				}
+
+				_dumb_it_xm_convert_effect(buffer[pos+2] & 0x0F, buffer[pos+3], entry, 1);
+
+				entry++;
+			}
+			pos += 4;
+		}
+		IT_SET_END_ROW(entry);
+		entry++;
+	}
+
+	return 0;
+}
+
+
+
+static int it_mod_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	int finetune, loop_start, loop_length;
+
+/**
+ 21 22 Chars Sample 1 name. If the name is not a full
+ 22 chars in length, it will be null
+ terminated.
+
+If
+the sample name begins with a '#' character (ASCII $23 (35)) then this is
+assumed not to be an instrument name, and is probably a message.
+*/
+	dumbfile_getnc(sample->name, 22, f);
+	sample->name[22] = 0;
+
+	sample->filename[0] = 0;
+
+	sample->length = dumbfile_mgetw(f) << 1;
+	finetune = (signed char)(dumbfile_getc(f) << 4) >> 4; /* signed nibble */
+/** Each finetune step changes the note 1/8th of a semitone. */
+	sample->global_volume = 64;
+	sample->default_volume = dumbfile_getc(f); // Should we be setting global_volume to this instead?
+	loop_start = dumbfile_mgetw(f) << 1;
+	loop_length = dumbfile_mgetw(f) << 1;
+	if ( loop_length > 2 && loop_start + loop_length > sample->length && loop_start / 2 + loop_length <= sample->length )
+		loop_start /= 2;
+	sample->loop_start = loop_start;
+	sample->loop_end = loop_start + loop_length;
+/**
+Once this sample has been played completely from beginning
+to end, if the repeat length (next field) is greater than two bytes it
+will loop back to this position in the sample and continue playing. Once
+it has played for the repeat length, it continues to loop back to the
+repeat start offset. This means the sample continues playing until it is
+told to stop.
+*/
+
+	if (sample->length <= 0) {
+		sample->flags = 0;
+		return 0;
+	}
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	sample->default_pan = 0;
+	sample->C5_speed = (int)( AMIGA_CLOCK / 214.0 ); //(long)(16726.0*pow(DUMB_PITCH_BASE, finetune*32));
+	sample->finetune = finetune * 32;
+	// the above line might be wrong
+
+	if (sample->loop_end > sample->length)
+		sample->loop_end = sample->length;
+
+	if (sample->loop_end - sample->loop_start > 2)
+		sample->flags |= IT_SAMPLE_LOOP;
+
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = 0; // do we have to set _all_ these?
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+
+
+static int it_mod_read_sample_data(IT_SAMPLE *sample, DUMBFILE *f, unsigned long fft)
+{
+	long i;
+	long truncated_size;
+
+	/* let's get rid of the sample data coming after the end of the loop */
+	if ((sample->flags & IT_SAMPLE_LOOP) && sample->loop_end < sample->length) {
+		truncated_size = sample->length - sample->loop_end;
+		sample->length = sample->loop_end;
+	} else {
+		truncated_size = 0;
+	}
+	if (sample->length) {
+		sample->data = malloc(sample->length);
+		if (!sample->data)
+			return -1;
+
+		/* Sample data are stored in "8-bit two's compliment format" (sic). */
+		/*
+		for (i = 0; i < sample->length; i++)
+			((signed char *)sample->left)[i] = dumbfile_getc(f);
+		*/
+		/* F U Olivier Lapicque */
+		if (sample->length >= 5)
+		{
+			i = dumbfile_getnc(sample->data, 5, f);
+			if (i == 5)
+			{
+				if (!memcmp(sample->data, "ADPCM", 5))
+				{
+					if (_dumb_it_read_sample_data_adpcm4(sample, f) < 0)
+						return -1;
+
+					return 0;
+				}
+				else
+				{
+					i += dumbfile_getnc(((char *)sample->data) + 5, sample->length - 5, f);
+				}
+			}
+		}
+		else
+		{
+			i = dumbfile_getnc(sample->data, sample->length, f);
+		}
+		if (i < sample->length)
+		{
+			if (i <= 0)
+			{
+				sample->flags = 0;
+				return 0;
+			}
+			sample->length = i;
+			if (sample->loop_end > i) sample->loop_end = i;
+			// holy crap!
+			if (sample->loop_start > i) sample->flags &= ~IT_SAMPLE_LOOP;
+		}
+		else
+		{
+			/* skip truncated data */
+			int feh = dumbfile_error(f);
+
+			if (truncated_size) dumbfile_skip(f, truncated_size);
+			// Should we be truncating it?
+
+			if (feh)
+				return -1;
+		}
+
+		if (fft == DUMB_ID('M',0,0,0) || fft == DUMB_ID('8',0,0,0)) {
+			int delta = 0;
+			for (i = 0; i < sample->length; i++) {
+				delta += ((signed char *)sample->data)[i];
+				((signed char *)sample->data)[i] = delta;
+			}
+		}
+	}
+
+	return 0;
+}
+
+
+
+typedef struct BUFFERED_MOD BUFFERED_MOD;
+
+struct BUFFERED_MOD
+{
+	unsigned char *buffered;
+	long ptr, len;
+	DUMBFILE *remaining;
+};
+
+
+
+static int buffer_mod_skip(void *f, long n)
+{
+	BUFFERED_MOD *bm = f;
+	if (bm->buffered) {
+		bm->ptr += n;
+		if (bm->ptr >= bm->len) {
+			free(bm->buffered);
+			bm->buffered = NULL;
+			return dumbfile_skip(bm->remaining, bm->ptr - bm->len);
+		}
+		return 0;
+	}
+	return dumbfile_skip(bm->remaining, n);
+}
+
+
+
+static int buffer_mod_getc(void *f)
+{
+	BUFFERED_MOD *bm = f;
+	if (bm->buffered) {
+		int rv = bm->buffered[bm->ptr++];
+		if (bm->ptr >= bm->len) {
+			free(bm->buffered);
+			bm->buffered = NULL;
+		}
+		return rv;
+	}
+	return dumbfile_getc(bm->remaining);
+}
+
+
+
+static long buffer_mod_getnc(char *ptr, long n, void *f)
+{
+	BUFFERED_MOD *bm = f;
+	if (bm->buffered) {
+		int left = bm->len - bm->ptr;
+		if (n >= left) {
+			memcpy(ptr, bm->buffered + bm->ptr, left);
+			free(bm->buffered);
+			bm->buffered = NULL;
+			if (n - left) {
+				int rv = dumbfile_getnc(ptr + left, n - left, bm->remaining);
+				return left + MAX(rv, 0);
+			} else {
+				return left;
+			}
+		}
+		memcpy(ptr, bm->buffered + bm->ptr, n);
+		bm->ptr += n;
+		return n;
+	}
+	return dumbfile_getnc(ptr, n, bm->remaining);
+}
+
+
+
+static void buffer_mod_close(void *f)
+{
+	BUFFERED_MOD *bm = f;
+	if (bm->buffered) free(bm->buffered);
+	/* Do NOT close bm->remaining */
+	free(f);
+}
+
+
+
+DUMBFILE_SYSTEM buffer_mod_dfs = {
+	NULL,
+	&buffer_mod_skip,
+	&buffer_mod_getc,
+	&buffer_mod_getnc,
+	&buffer_mod_close
+};
+
+
+
+#define MOD_FFT_OFFSET (20 + 31*(22+2+1+1+2+2) + 1 + 1 + 128)
+
+static DUMBFILE *dumbfile_buffer_mod(DUMBFILE *f, unsigned long *fft)
+{
+	BUFFERED_MOD *bm = malloc(sizeof(*bm));
+	if (!bm) return NULL;
+
+	bm->buffered = malloc(MOD_FFT_OFFSET + 4);
+	if (!bm->buffered) {
+		free(bm);
+		return NULL;
+	}
+
+	bm->len = dumbfile_getnc(bm->buffered, MOD_FFT_OFFSET + 4, f);
+
+	if (bm->len > 0) {
+		if (bm->len >= MOD_FFT_OFFSET + 4)
+			*fft = (unsigned long)bm->buffered[MOD_FFT_OFFSET ] << 24
+			 | (unsigned long)bm->buffered[MOD_FFT_OFFSET+1] << 16
+			 | (unsigned long)bm->buffered[MOD_FFT_OFFSET+2] << 8
+			 | (unsigned long)bm->buffered[MOD_FFT_OFFSET+3];
+		else
+			*fft = 0;
+		bm->ptr = 0;
+	} else {
+		free(bm->buffered);
+		bm->buffered = NULL;
+	}
+
+	bm->remaining = f;
+
+	return dumbfile_open_ex(bm, &buffer_mod_dfs);
+}
+
+static DUMBFILE *dumbfile_buffer_mod_2(DUMBFILE *f, long *remain)
+{
+	long read;
+	BUFFERED_MOD *bm = malloc(sizeof(*bm));
+	if (!bm) return NULL;
+
+	bm->buffered = malloc(32768);
+	if (!bm->buffered) {
+		free(bm);
+		return NULL;
+	}
+
+	bm->len = 0;
+	*remain = 0;
+
+	read = dumbfile_getnc(bm->buffered, 32768, f);
+
+	if (read >= 0) {
+		bm->len += read;
+		*remain += read;
+
+		while (read >= 32768) {
+			bm->buffered = realloc(bm->buffered, *remain + 32768);
+			if (!bm->buffered) {
+				free(bm);
+				return 0;
+			}
+			read = dumbfile_getnc(bm->buffered + *remain, 32768, f);
+			if (read >= 0) {
+				bm->len += read;
+				*remain += read;
+			}
+		}
+	}
+
+	if (*remain) {
+		bm->ptr = 0;
+	} else {
+		free(bm->buffered);
+		bm->buffered = NULL;
+	}
+
+	bm->remaining = f;
+
+	return dumbfile_open_ex(bm, &buffer_mod_dfs);
+}
+
+
+static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restr)
+{
+	DUMB_IT_SIGDATA *sigdata;
+	int n_channels;
+	int i;
+	unsigned long fft = 0;
+	DUMBFILE *rem;
+
+	f = dumbfile_buffer_mod(f, &fft);
+	if (!f)
+		return NULL;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		dumbfile_close(f);
+		return NULL;
+	}
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		dumbfile_close(f);
+		return NULL;
+	}
+
+	/**
+ 1 20 Chars Title of the song. If the title is not a
+ full 20 chars in length, it will be null-
+ terminated.
+	*/
+	if (dumbfile_getnc(sigdata->name, 20, f) < 20) {
+		free(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+	sigdata->name[20] = 0;
+
+	sigdata->n_samples = 31;
+
+	switch (fft) {
+		case DUMB_ID('M','.','K','.'):
+		case DUMB_ID('M','!','K','!'):
+		case DUMB_ID('M','&','K','!'):
+		case DUMB_ID('N','.','T','.'):
+		case DUMB_ID('N','S','M','S'):
+		case DUMB_ID('F','L','T','4'):
+		case DUMB_ID('M',0,0,0):
+		case DUMB_ID('8',0,0,0):
+			n_channels = 4;
+			break;
+		case DUMB_ID('F','L','T','8'):
+			n_channels = 0;
+			/* 0 indicates a special case; two four-channel patterns must be
+			 * combined into one eight-channel pattern. Pattern indexes must
+			 * be halved. Why oh why do they obfuscate so?
+			 */
+			/*for (i = 0; i < 128; i++)
+				sigdata->order[i] >>= 1;*/
+			break;
+		case DUMB_ID('C','D','8','1'):
+		case DUMB_ID('O','C','T','A'):
+		case DUMB_ID('O','K','T','A'):
+			n_channels = 8;
+			break;
+		case DUMB_ID('1','6','C','N'):
+			n_channels = 16;
+			break;
+		case DUMB_ID('3','2','C','N'):
+			n_channels = 32;
+			break;
+		default:
+			/* If we get an illegal tag, assume 4 channels 15 samples. */
+			if ((fft & 0x0000FFFFL) == DUMB_ID(0,0,'C','H')) {
+				if (fft >= '1' << 24 && fft < '4' << 24) {
+					n_channels = ((fft & 0x00FF0000L) >> 16) - '0';
+					if ((unsigned int)n_channels >= 10) {
+						/* Rightmost character wasn't a digit. */
+						n_channels = 4;
+						sigdata->n_samples = 15;
+					} else {
+						n_channels += (((fft & 0xFF000000L) >> 24) - '0') * 10;
+						/* MODs should really only go up to 32 channels, but we're lenient. */
+						if ((unsigned int)(n_channels - 1) >= DUMB_IT_N_CHANNELS - 1) {
+							/* No channels or too many? Can't be right... */
+							n_channels = 4;
+							sigdata->n_samples = 15;
+						}
+					}
+				} else {
+					n_channels = 4;
+					sigdata->n_samples = 15;
+				}
+			} else if ((fft & 0x00FFFFFFL) == DUMB_ID(0,'C','H','N')) {
+				n_channels = (fft >> 24) - '0';
+				if ((unsigned int)(n_channels - 1) >= 9) {
+					/* Character was '0' or it wasn't a digit */
+					n_channels = 4;
+					sigdata->n_samples = 15;
+				}
+			} else if ((fft & 0xFFFFFF00L) == DUMB_ID('T','D','Z',0)) {
+				n_channels = (fft & 0x000000FFL) - '0';
+				if ((unsigned int)(n_channels - 1) >= 9) {
+					/* We've been very lenient, given that it should have
+					 * been 1, 2 or 3, but this MOD has been very naughty and
+					 * must be punished.
+					 */
+					n_channels = 4;
+					sigdata->n_samples = 15;
+				}
+			} else {
+				n_channels = 4;
+				sigdata->n_samples = 15;
+			}
+	}
+
+	// moo
+	if ( restr && sigdata->n_samples == 15 )
+	{
+		free(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+
+	sigdata->n_pchannels = n_channels ? n_channels : 8; /* special case for 0, see above */
+
+	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) {
+		free(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+
+	for (i = 0; i < sigdata->n_samples; i++)
+		sigdata->sample[i].data = NULL;
+
+	for (i = 0; i < sigdata->n_samples; i++) {
+		if (it_mod_read_sample_header(&sigdata->sample[i], f)) {
+			_dumb_it_unload_sigdata(sigdata);
+			dumbfile_close(f);
+			return NULL;
+		}
+	}
+
+	sigdata->n_orders = dumbfile_getc(f);
+	sigdata->restart_position = dumbfile_getc(f);
+	// what if this is >= 127? what about with Fast Tracker II?
+
+/*	if (sigdata->n_orders <= 0 || sigdata->n_orders > 128) { // is this right?
+		_dumb_it_unload_sigdata(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}*/
+
+	//if (sigdata->restart_position >= sigdata->n_orders)
+		//sigdata->restart_position = 0;
+
+	sigdata->order = malloc(128); /* We may need to scan the extra ones! */
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+	if (dumbfile_getnc(sigdata->order, 128, f) < 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+
+	if (sigdata->n_orders <= 0 || sigdata->n_orders > 128) { // is this right?
+		sigdata->n_orders = 128;
+		//while (sigdata->n_orders > 1 && !sigdata->order[sigdata->n_orders - 1]) sigdata->n_orders--;
+	}
+
+	if ( ! n_channels )
+		for (i = 0; i < 128; i++)
+			sigdata->order[i] >>= 1;
+
+	/* "The old NST format contains only 15 samples (instead of 31). Further
+	 * it doesn't contain a file format tag (id). So Pattern data offset is
+	 * at 20+15*30+1+1+128."
+	 * - Then I shall assume the File Format Tag never exists if there are
+	 * only 15 samples. I hope this isn't a faulty assumption...
+	 */
+	if (sigdata->n_samples == 31)
+		dumbfile_skip(f, 4);
+
+	/* Work out how many patterns there are. */
+	sigdata->n_patterns = -1;
+	for (i = 0; i < 128; i++)
+		if (sigdata->n_patterns < sigdata->order[i])
+			sigdata->n_patterns = sigdata->order[i];
+	sigdata->n_patterns++;
+
+	/* May as well try to save a tiny bit of memory. */
+	if (sigdata->n_orders < 128) {
+		unsigned char *order = realloc(sigdata->order, sigdata->n_orders);
+		if (order) sigdata->order = order;
+	}
+
+	sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+	if (!sigdata->pattern) {
+		_dumb_it_unload_sigdata(sigdata);
+		dumbfile_close(f);
+		return NULL;
+	}
+	for (i = 0; i < sigdata->n_patterns; i++)
+		sigdata->pattern[i].entry = NULL;
+
+	/* Read in the patterns */
+	{
+		unsigned char *buffer = malloc(256 * n_channels); /* 64 rows * 4 bytes */
+		if (!buffer) {
+			_dumb_it_unload_sigdata(sigdata);
+			dumbfile_close(f);
+			return NULL;
+		}
+		for (i = 0; i < sigdata->n_patterns; i++) {
+			if (it_mod_read_pattern(&sigdata->pattern[i], f, n_channels, buffer) != 0) {
+				free(buffer);
+				_dumb_it_unload_sigdata(sigdata);
+				dumbfile_close(f);
+				return NULL;
+			}
+		}
+		free(buffer);
+	}
+
+	rem = NULL;
+
+	/* uggly */
+	if (fft == DUMB_ID('M',0,0,0) || fft == DUMB_ID('8',0,0,0)) {
+		long skip;
+		long remain;
+		rem = f;
+		f = dumbfile_buffer_mod_2(rem, &remain);
+		if (!f) {
+			_dumb_it_unload_sigdata(sigdata);
+			dumbfile_close(rem);
+			return NULL;
+		}
+		for (skip = 0, i = 0; i < sigdata->n_samples; i++) {
+			if (sigdata->sample[i].flags & IT_SAMPLE_EXISTS) {
+				skip += sigdata->sample[i].length;
+			}
+		}
+		if (remain - skip) {
+			if (dumbfile_skip(f, remain - skip)) {
+				_dumb_it_unload_sigdata(sigdata);
+				dumbfile_close(f);
+				dumbfile_close(rem);
+				return NULL;
+			}
+		}
+	}
+
+	/* And finally, the sample data */
+	for (i = 0; i < sigdata->n_samples; i++) {
+		if (it_mod_read_sample_data(&sigdata->sample[i], f, fft)) {
+			_dumb_it_unload_sigdata(sigdata);
+			dumbfile_close(f);
+			if (rem) dumbfile_close(rem);
+			return NULL;
+		}
+	}
+
+	/* w00t! */
+	/*if ( n_channels == 4 &&
+		( sigdata->n_samples == 15 ||
+		( ( fft & 240 ) != DUMB_ID( 0, 0, 'C', 0 ) &&
+		( fft & 240 ) != DUMB_ID( 0, 0, 'H', 0 ) &&
+		( fft & 240 ) != 0 ) ) ) {
+		for ( i = 0; i < sigdata->n_samples; ++i ) {
+			IT_SAMPLE * sample = &sigdata->sample [i];
+			if ( sample && ( sample->flags & IT_SAMPLE_EXISTS ) ) {
+				int n, o;
+				o = sample->length;
+				if ( o > 4 ) o = 4;
+				for ( n = 0; n < o; ++n )
+					( ( char * ) sample->data ) [n] = 0;
+			}
+		}
+	}*/
+
+	dumbfile_close(f); /* Destroy the BUFFERED_MOD DUMBFILE we were using. */
+	/* The DUMBFILE originally passed to our function is intact. */
+	if (rem) dumbfile_close(rem);
+
+	/* Now let's initialise the remaining variables, and we're done! */
+	sigdata->flags = IT_WAS_AN_XM | IT_WAS_A_MOD | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_STEREO;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	/* We want 50 ticks per second; 50/6 row advances per second;
+	 * 50*10=500 row advances per minute; 500/4=125 beats per minute.
+	 */
+	sigdata->speed = 6;
+	sigdata->tempo = 125;
+	sigdata->pan_separation = 128;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 4) {
+		sigdata->channel_pan[i+0] = 16;
+		sigdata->channel_pan[i+1] = 48;
+		sigdata->channel_pan[i+2] = 48;
+		sigdata->channel_pan[i+3] = 16;
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+DUH *dumb_read_mod_quick(DUMBFILE *f, int restr)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_mod_load_sigdata(f, restr);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "MOD";
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readmod2.c - Function to read a good old- / / \ \
+ * fashioned Amiga module from an | < / \_
+ * open file and do an initial | \/ /\ /
+ * run-through. \_ / > /
+ * | \ / /
+ * Split off from readmod.c by entheh. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_mod(DUMBFILE *f, int restr)
+{
+	DUH *duh = dumb_read_mod_quick(f, restr);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmtm.c Added

@@ -0,0 +1,412 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readmtm.c - Code to read a MultiTracker Module / / \ \
+ * from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+size_t strlen_max(const char * ptr, size_t max)
+{
+	const char * end, * start;
+	if (ptr==0) return 0;
+	start = ptr;
+	end = ptr + max;
+	while(*ptr && ptr < end) ptr++;
+	return ptr - start;
+}
+
+static int it_mtm_assemble_pattern(IT_PATTERN *pattern, const unsigned char * track, const unsigned short * sequence, int n_rows)
+{
+	int n, o, note, sample;
+	const unsigned char * t;
+	IT_ENTRY * entry;
+
+	pattern->n_rows = n_rows;
+	pattern->n_entries = n_rows;
+
+	for (n = 0; n < 32; n++) {
+		if (sequence[n]) {
+			t = &track[192 * (sequence[n] - 1)];
+			for (o = 0; o < n_rows; o++) {
+				if (t[0] || t[1] || t[2]) pattern->n_entries++;
+				t += 3;
+			}
+		}
+	}
+
+	entry = malloc(pattern->n_entries * sizeof(*entry));
+	if (!entry) return -1;
+	pattern->entry = entry;
+
+	for (n = 0; n < n_rows; n++) {
+		for (o = 0; o < 32; o++) {
+			if (sequence[o]) {
+				t = &track[192 * (sequence[o] - 1) + (n * 3)];
+				if (t[0] || t[1] || t[2]) {
+					entry->channel = o;
+					entry->mask = 0;
+					note = t[0] >> 2;
+					sample = ((t[0] << 4) | (t[1] >> 4)) & 0x3F;
+
+					if (note) {
+						entry->mask |= IT_ENTRY_NOTE;
+						entry->note = note + 24;
+					}
+
+					if (sample) {
+						entry->mask |= IT_ENTRY_INSTRUMENT;
+						entry->instrument = sample;
+					}
+
+					_dumb_it_xm_convert_effect(t[1] & 0xF, t[2], entry, 1);
+
+					if (entry->mask) entry++;
+				}
+			}
+		}
+		IT_SET_END_ROW(entry);
+		entry++;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+
+	return 0;
+}
+
+static int it_mtm_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	int finetune, flags;
+
+	dumbfile_getnc(sample->name, 22, f);
+	sample->name[22] = 0;
+
+	sample->filename[0] = 0;
+
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = dumbfile_igetl(f);
+	finetune = (signed char)(dumbfile_getc(f) << 4) >> 4; /* signed nibble */
+	sample->global_volume = 64;
+	sample->default_volume = dumbfile_getc(f);
+
+	flags = dumbfile_getc(f);
+
+	if (sample->length <= 0) {
+		sample->flags = 0;
+		return 0;
+	}
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	if (flags & 1) {
+		sample->flags |= IT_SAMPLE_16BIT;
+		sample->length >>= 1;
+		sample->loop_start >>= 1;
+		sample->loop_end >>= 1;
+	}
+
+	sample->default_pan = 0;
+	sample->C5_speed = (int)( AMIGA_CLOCK / 214.0 );//(long)(16726.0*pow(DUMB_PITCH_BASE, finetune*32));
+	sample->finetune = finetune * 32;
+	// the above line might be wrong
+
+	if (sample->loop_end > sample->length)
+		sample->loop_end = sample->length;
+
+	if (sample->loop_end - sample->loop_start > 2)
+		sample->flags |= IT_SAMPLE_LOOP;
+
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = 0; // do we have to set _all_ these?
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+static int it_mtm_read_sample_data(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	long i;
+	long truncated_size;
+
+	/* let's get rid of the sample data coming after the end of the loop */
+	if ((sample->flags & IT_SAMPLE_LOOP) && sample->loop_end < sample->length) {
+		truncated_size = sample->length - sample->loop_end;
+		sample->length = sample->loop_end;
+	} else {
+		truncated_size = 0;
+	}
+
+	sample->data = malloc(sample->length);
+
+	if (!sample->data)
+		return -1;
+
+	dumbfile_getnc((char *)sample->data, sample->length, f);
+	dumbfile_skip(f, truncated_size);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	for (i = 0; i < sample->length; i++)
+		((signed char *)sample->data)[i] ^= 0x80;
+
+	return 0;
+}
+
+static DUMB_IT_SIGDATA *it_mtm_load_sigdata(DUMBFILE *f, int * version)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int n, o, n_tracks, l_comment, n_rows, n_channels;
+
+	unsigned char * track;
+
+	unsigned short * sequence;
+
+	char * comment;
+
+	if (dumbfile_getc(f) != 'M' ||
+		dumbfile_getc(f) != 'T' ||
+		dumbfile_getc(f) != 'M') goto error;
+
+	*version = dumbfile_getc(f);
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) goto error;
+
+	dumbfile_getnc(sigdata->name, 20, f);
+	sigdata->name[20] = 0;
+
+	n_tracks = dumbfile_igetw(f);
+	sigdata->n_patterns = dumbfile_getc(f) + 1;
+	sigdata->n_orders = dumbfile_getc(f) + 1;
+	l_comment = dumbfile_igetw(f);
+	sigdata->n_samples = dumbfile_getc(f);
+	//if (dumbfile_getc(f)) goto error_sd;
+	dumbfile_getc(f);
+	n_rows = dumbfile_getc(f);
+	n_channels = dumbfile_getc(f);
+
+	if (dumbfile_error(f) ||
+		(n_tracks <= 0) ||
+		(sigdata->n_samples <= 0) ||
+		(n_rows <= 0 || n_rows > 64) ||
+		(n_channels <= 0 || n_channels > 32)) goto error_sd;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	if (dumbfile_getnc(sigdata->channel_pan, 32, f) < 32) goto error_sd;
+
+	for (n = 0; n < 32; n++) {
+		if (sigdata->channel_pan[n] <= 15) {
+			sigdata->channel_pan[n] -= (sigdata->channel_pan[n] & 8) >> 3;
+			sigdata->channel_pan[n] = (sigdata->channel_pan[n] * 32) / 7;
+		} else {
+			sigdata->channel_volume[n] = 0;
+			sigdata->channel_pan[n] = 7;
+		}
+	}
+
+	for (n = 32; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) goto error_sd;
+
+	sigdata->flags = IT_WAS_AN_XM | IT_WAS_A_MOD | IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	sigdata->speed = 6;
+	sigdata->tempo = 125;
+	sigdata->pan_separation = 128;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+
+	sigdata->restart_position = 0;
+	sigdata->n_pchannels = n_channels;
+
+	for (n = 0; n < sigdata->n_samples; n++)
+		sigdata->sample[n].data = NULL;
+
+	for (n = 0; n < sigdata->n_samples; n++) {
+		if (it_mtm_read_sample_header(&sigdata->sample[n], f)) goto error_usd;
+	}
+
+	sigdata->order = malloc(sigdata->n_orders);
+	if (!sigdata->order) goto error_usd;
+
+	if (dumbfile_getnc(sigdata->order, sigdata->n_orders, f) < sigdata->n_orders) goto error_usd;
+	if (sigdata->n_orders < 128)
+		if (dumbfile_skip(f, 128 - sigdata->n_orders)) goto error_usd;
+
+	track = malloc(192 * n_tracks);
+	if (!track) goto error_usd;
+
+	if (dumbfile_getnc(track, 192 * n_tracks, f) < 192 * n_tracks) goto error_ft;
+
+	sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+	if (!sigdata->pattern) goto error_ft;
+	for (n = 0; n < sigdata->n_patterns; n++)
+		sigdata->pattern[n].entry = NULL;
+
+	sequence = malloc(sigdata->n_patterns * 32 * sizeof(*sequence));
+	if (!sequence) goto error_ft;
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		for (o = 0; o < 32; o++) {
+			sequence[(n * 32) + o] = dumbfile_igetw(f);
+			if (sequence[(n * 32) + o] > n_tracks)
+			{
+				//goto error_fs;
+				// illegal track number, silence instead of rejecting the file
+				sequence[(n * 32) + o] = 0;
+			}
+		}
+	}
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		if (it_mtm_assemble_pattern(&sigdata->pattern[n], track, &sequence[n * 32], n_rows)) goto error_fs;
+	}
+
+	if (l_comment) {
+		comment = malloc(l_comment);
+		if (!comment) goto error_fs;
+		if (dumbfile_getnc(comment, l_comment, f) < l_comment) goto error_fc;
+
+		/* Time for annoying "logic", yes. We want each line which has text,
+		 * and each blank line in between all the valid lines.
+		 */
+
+		/* Find last actual line. */
+		for (o = -1, n = 0; n < l_comment; n += 40) {
+			if (comment[n]) o = n;
+		}
+
+		if (o >= 0) {
+
+			int l, m;
+
+			for (l = 0, n = 0; n <= o; n += 40) {
+				l += strlen_max(&comment[n], 40) + 2;
+			}
+
+			l -= 1;
+
+			sigdata->song_message = malloc(l);
+			if (!sigdata->song_message) goto error_fc;
+
+			for (m = 0, n = 0; n <= o; n += 40) {
+				int p = strlen_max(&comment[n], 40);
+				if (p) {
+					memcpy(sigdata->song_message + m, &comment[n], p);
+					m += p;
+				}
+				if (l - m > 1) {
+					sigdata->song_message[m++] = 13;
+					sigdata->song_message[m++] = 10;
+				}
+			}
+			
+			sigdata->song_message[m] = 0;
+		}
+
+		free(comment);
+	}
+
+	for (n = 0; n < sigdata->n_samples; n++) {
+		if (it_mtm_read_sample_data(&sigdata->sample[n], f)) goto error_fs;
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	free(sequence);
+	free(track);
+
+	return sigdata;
+
+error_fc:
+	free(comment);
+error_fs:
+	free(sequence);
+error_ft:
+	free(track);
+error_usd:
+	_dumb_it_unload_sigdata(sigdata);
+	return NULL;
+
+error_sd:
+	free(sigdata);
+error:
+	return NULL;
+}
+
+static char hexdigit(int in)
+{
+	if (in < 10) return in + '0';
+	else return in + 'A' - 10;
+}
+
+DUH *dumb_read_mtm_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+	int ver;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_mtm_load_sigdata(f, &ver);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		char version[16];
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		version[0] = 'M';
+		version[1] = 'T';
+		version[2] = 'M';
+		version[3] = ' ';
+		version[4] = 'v';
+		version[5] = hexdigit(ver >> 4);
+		version[6] = '.';
+		version[7] = hexdigit(ver & 15);
+		version[8] = 0;
+		tag[1][1] = (const char *) &version;
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readoldpsm.c Added

@@ -0,0 +1,727 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readpsm.c - Code to read an old Protracker / / \ \
+ * Studio module from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+static int psm_sample_compare(const void *e1, const void *e2)
+{
+	const unsigned char * pa = e1;
+	const unsigned char * pb = e2;
+	int a = pa[37] | (pa[38] << 8) | (pa[39] << 16) | (pa[40] << 24);
+	int b = pb[37] | (pb[38] << 8) | (pb[39] << 16) | (pb[40] << 24);
+	return a - b;
+}
+
+static int it_old_psm_read_samples(IT_SAMPLE ** sample, DUMBFILE * f, int * num, const unsigned char * prebuffer, long data_pos, long data_size)
+{
+	int n, o, pos, count = *num, true_num, snum, offset, flags, finetune, delta;
+
+	unsigned char * buffer, * sbuffer = 0;
+	const unsigned char * sdata;
+
+	buffer = malloc(count * 64);
+	if (!buffer) goto error;
+
+	if (dumbfile_getnc(buffer, count * 64, f) < count * 64) goto error_fb;
+
+	pos = dumbfile_pos(f);
+
+	true_num = 0;
+
+	for (n = 0; n < count; n++) {
+		snum = buffer[(n * 64) + 45] | (buffer[(n * 64) + 46] << 8);
+		if ((snum < 1) || (snum > 255)) goto error_fb;
+		if (true_num < snum) true_num = snum;
+	}
+
+	if (true_num > count) {
+		IT_SAMPLE * meh = realloc(*sample, true_num * sizeof(*meh));
+		if (!meh) goto error_fb;
+		for (n = count; n < true_num; n++) {
+			meh[n].data = NULL;
+		}
+		*sample = meh;
+		*num = true_num;
+	}
+
+	qsort(buffer, count, 64, &psm_sample_compare);
+
+	for (n = 0; n < true_num; n++) {
+		(*sample)[n].flags = 0;
+	}
+
+	for (n = 0; n < count; n++) {
+		IT_SAMPLE * s;
+		snum = buffer[(n * 64) + 45] | (buffer[(n * 64) + 46] << 8);
+		s = &((*sample)[snum - 1]);
+		memcpy(s->filename, buffer + (n * 64), 13);
+		s->filename[13] = 0;
+		memcpy(s->name, buffer + (n * 64) + 13, 24);
+		s->name[24] = 0;
+		offset = buffer[(n * 64) + 37] | (buffer[(n * 64) + 38] << 8) |
+				 (buffer[(n * 64) + 39] << 16) | (buffer[(n * 64) + 40] << 24);
+		flags = buffer[(n * 64) + 47];
+		s->length = buffer[(n * 64) + 48] | (buffer[(n * 64) + 49] << 8) |
+					(buffer[(n * 64) + 50] << 16) | (buffer[(n * 64) + 51] << 24);
+		s->loop_start = buffer[(n * 64) + 52] | (buffer[(n * 64) + 53] << 8) |
+						(buffer[(n * 64) + 54] << 16) | (buffer[(n * 64) + 55] << 24);
+		s->loop_end = buffer[(n * 64) + 56] | (buffer[(n * 64) + 57] << 8) |
+					 (buffer[(n * 64) + 58] << 16) | (buffer[(n * 64) + 59] << 24);
+
+		if (s->length <= 0) continue;
+
+		finetune = buffer[(n * 64) + 60];
+		s->default_volume = buffer[(n * 64) + 61];
+		s->C5_speed = buffer[(n * 64) + 62] | (buffer[(n * 64) + 63] << 8);
+		if (finetune < 16) {
+			if (finetune >= 8) finetune -= 16;
+			//s->C5_speed = (long)((double)s->C5_speed * pow(DUMB_PITCH_BASE, finetune*32));
+			s->finetune = finetune * 32;
+		}
+		else s->finetune = 0;
+
+		s->flags |= IT_SAMPLE_EXISTS;
+		if (flags & 0x41) {
+			s->flags &= ~IT_SAMPLE_EXISTS;
+			continue;
+		}
+		if (flags & 0x20) s->flags |= IT_SAMPLE_PINGPONG_LOOP;
+		if (flags & 4) s->flags |= IT_SAMPLE_16BIT;
+
+		if (flags & 0x80) {
+			s->flags |= IT_SAMPLE_LOOP;
+			if ((unsigned int)s->loop_end > (unsigned int)s->length)
+				s->loop_end = s->length;
+			else if ((unsigned int)s->loop_start >= (unsigned int)s->loop_end)
+				s->flags &= ~IT_SAMPLE_LOOP;
+			else
+				s->length = s->loop_end;
+		}
+
+		s->global_volume = 64;
+
+		s->vibrato_speed = 0;
+		s->vibrato_depth = 0;
+		s->vibrato_rate = 0;
+		s->vibrato_waveform = IT_VIBRATO_SINE;
+		s->max_resampling_quality = -1;
+
+		s->data = malloc(s->length * ((flags & 4) ? 2 : 1));
+		if (!s->data) goto error_fb;
+
+		if ((offset >= data_pos) &&
+			((offset + s->length * ((flags & 4) ? 2 : 1)) <= (data_pos + data_size))) {
+			sdata = prebuffer + offset - data_pos;
+		} else if (offset >= pos) {
+			if (dumbfile_skip(f, offset - pos)) goto error_fb;
+			pos = offset;
+			offset = s->length * ((flags & 4) ? 2 : 1);
+			sbuffer = malloc(offset);
+			if (!sbuffer) goto error_fb;
+			if (dumbfile_getnc(sbuffer, offset, f) < offset) goto error_fsb;
+			sdata = sbuffer;
+		} else
+			goto error_fb;
+
+		if (flags & 0x10) {
+			if (flags & 8) {
+				if (flags & 4) {
+					for (o = 0; o < s->length; o++)
+						((short *)s->data)[o] = (sdata[o * 2] | (sdata[(o * 2) + 1] << 8)) ^ 0x8000;
+				} else {
+					for (o = 0; o < s->length; o++)
+						((signed char *)s->data)[o] = sdata[o] ^ 0x80;
+				}
+			} else {
+				if (flags & 4) {
+					for (o = 0; o < s->length; o++)
+						((short *)s->data)[o] = sdata[o * 2] | (sdata[(o * 2) + 1] << 8);
+				} else {
+					memcpy(s->data, sdata, s->length);
+				}
+			}
+		} else {
+			delta = 0;
+			if (flags & 8) {
+				/* unsigned delta? mehhh, does anything even use this? */
+				if (flags & 4) {
+					for (o = 0; o < s->length; o++) {
+						delta += (short)(sdata[o * 2] | (sdata[(o * 2) + 1] << 8));
+						((short *)s->data)[o] = delta ^ 0x8000;
+					}
+				} else {
+					for (o = 0; o < s->length; o++) {
+						delta += (signed char)sdata[o];
+						((signed char *)s->data)[o] = delta ^ 0x80;
+					}
+				}
+			} else {
+				if (flags & 4) {
+					for (o = 0; o < s->length; o++) {
+						delta += (short)(sdata[o * 2] | (sdata[(o * 2) + 1] << 8));
+						((short *)s->data)[o] = delta;
+					}
+				} else {
+					for (o = 0; o < s->length; o++) {
+						delta += (signed char)sdata[o];
+						((signed char *)s->data)[o] = delta;
+					}
+				}
+			}
+		}
+
+		if (sbuffer) {
+			free(sbuffer);
+			sbuffer = 0;
+		}
+	}
+
+	free(buffer);
+
+	return 0;
+
+error_fsb:
+	if (sbuffer) free(sbuffer);
+error_fb:
+	free(buffer);
+error:
+	return -1;
+}
+
+static int it_old_psm_read_patterns(IT_PATTERN * pattern, DUMBFILE * f, int num, int size, int pchans, int sflags)
+{
+	int n, offset, psize, rows, chans, row, flags, channel;
+
+	unsigned char * buffer, * ptr, * end;
+
+	IT_ENTRY * entry;
+
+	buffer = malloc(size);
+	if (!buffer) goto error;
+
+	if (dumbfile_getnc(buffer, size, f) < size) goto error_fb;
+
+	offset = 0;
+
+	for (n = 0; n < num; n++) {
+		IT_PATTERN * p = &pattern[n];
+
+		if (offset >= size) goto error_fb;
+
+		ptr = buffer + offset;
+		psize = ptr[0] | (ptr[1] << 8);
+		rows = ptr[2];
+		chans = ptr[3];
+
+		if (!rows || !chans) {
+			p->n_rows = 1;
+			p->n_entries = 0;
+			continue;
+		}
+
+		psize = (psize + 15) & ~15;
+
+		end = ptr + psize;
+		ptr += 4;
+
+		p->n_rows = rows;
+		p->n_entries = rows;
+		row = 0;
+
+		while ((row < rows) && (ptr < end)) {
+			flags = *ptr++;
+			if (!flags) {
+				row++;
+				continue;
+			}
+			if (flags & 0xE0) {
+				p->n_entries++;
+				if (flags & 0x80) ptr += 2;
+				if (flags & 0x40) ptr++;
+				if (flags & 0x20) {
+					ptr++;
+					if (*ptr == 40) ptr += 3;
+					else ptr++;
+				}
+			}
+		}
+
+		entry = malloc(p->n_entries * sizeof(*p->entry));
+		if (!entry) goto error_fb;
+
+		p->entry = entry;
+
+		ptr = buffer + offset + 4;
+		row = 0;
+
+		while ((row < rows) && (ptr < end)) {
+			flags = *ptr++;
+			if (!flags) {
+				IT_SET_END_ROW(entry);
+				entry++;
+				row++;
+				continue;
+			}
+			if (flags & 0xE0) {
+				entry->mask = 0;
+				entry->channel = channel = flags & 0x1F;
+				if (channel >= chans)
+				{
+					//channel = 0;
+					goto error_fb;
+				}
+				if (flags & 0x80) {
+					if ((*ptr < 60) && (channel < pchans)) {
+						entry->mask |= IT_ENTRY_NOTE;
+						entry->note = *ptr + 36;
+					}
+					ptr++;
+					if (*ptr) {
+						entry->mask |= IT_ENTRY_INSTRUMENT;
+						entry->instrument = *ptr;
+					}
+					ptr++;
+				}
+				if (flags & 0x40) {
+					if (*ptr <= 64) {
+						entry->mask |= IT_ENTRY_VOLPAN;
+						entry->volpan = *ptr;
+					}
+					ptr++;
+				}
+				if (flags & 0x20) {
+					entry->mask |= IT_ENTRY_EFFECT;
+
+					switch (*ptr) {
+						case 1:
+							entry->effect = IT_XM_FINE_VOLSLIDE_UP;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 2:
+							entry->effect = IT_VOLUME_SLIDE;
+							entry->effectvalue = (ptr[1] << 4) & 0xF0;
+							break;
+
+						case 3:
+							entry->effect = IT_XM_FINE_VOLSLIDE_DOWN;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 4:
+							entry->effect = IT_VOLUME_SLIDE;
+							entry->effectvalue = ptr[1] & 0xF;
+							break;
+
+						case 10:
+							entry->effect = IT_PORTAMENTO_UP;
+							entry->effectvalue = EFFECT_VALUE(0xF, ptr[1]);
+							break;
+
+						case 11:
+							entry->effect = IT_PORTAMENTO_UP;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 12:
+							entry->effect = IT_PORTAMENTO_DOWN;
+							entry->effectvalue = EFFECT_VALUE(ptr[1], 0xF);
+							break;
+
+						case 13:
+							entry->effect = IT_PORTAMENTO_DOWN;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 14:
+							entry->effect = IT_TONE_PORTAMENTO;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 15:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_SET_GLISSANDO_CONTROL, ptr[1] & 15);
+							break;
+
+						case 16:
+							entry->effect = IT_VOLSLIDE_TONEPORTA;
+							entry->effectvalue = ptr[1] << 4;
+							break;
+
+						case 17:
+							entry->effect = IT_VOLSLIDE_TONEPORTA;
+							entry->effectvalue = ptr[1] & 0xF;
+							break;
+
+						case 20:
+							entry->effect = IT_VIBRATO;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 21:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_SET_VIBRATO_WAVEFORM, ptr[1] & 11);
+							break;
+
+						case 22:
+							entry->effect = IT_VOLSLIDE_VIBRATO;
+							entry->effectvalue = ptr[1] << 4;
+							break;
+
+						case 23:
+							entry->effect = IT_VOLSLIDE_VIBRATO;
+							entry->effectvalue = ptr[1] & 0xF;
+							break;
+
+						case 30:
+							entry->effect = IT_TREMOLO;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 31:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_SET_TREMOLO_WAVEFORM, ptr[1] & 11);
+							break;
+
+						case 40:
+							entry->effect = IT_SET_SAMPLE_OFFSET;
+							entry->effectvalue = ptr[2];
+							ptr += 2;
+							break;
+
+						case 41:
+							entry->effect = IT_XM_RETRIGGER_NOTE;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 42:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_DELAYED_NOTE_CUT, ptr[1] & 0xF);
+							break;
+
+						case 43:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_NOTE_DELAY, ptr[1] & 0xF);
+							break;
+
+						case 50:
+							entry->effect = IT_JUMP_TO_ORDER;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 51:
+							entry->effect = IT_BREAK_TO_ROW;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 52:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_PATTERN_LOOP, ptr[1] & 0xF);
+							break;
+
+						case 53:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_PATTERN_DELAY, ptr[1] & 0xF);
+							break;
+
+						case 60:
+							entry->effect = IT_SET_SPEED;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 61:
+							entry->effect = IT_SET_SONG_TEMPO;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 70:
+							entry->effect = IT_ARPEGGIO;
+							entry->effectvalue = ptr[1];
+							break;
+
+						case 71:
+							entry->effect = IT_S;
+							entry->effectvalue = EFFECT_VALUE(IT_S_FINETUNE, ptr[1] & 0xF);
+							break;
+
+						case 72:
+							/* "balance" ... panning? */
+							entry->effect = IT_SET_PANNING;
+							entry->effectvalue = ((ptr[1] - ((ptr[1] & 8) >> 3)) << 5) / 7;
+							break;
+
+						default:
+							entry->mask &= ~IT_ENTRY_EFFECT;
+					}
+
+					ptr += 2;
+				}
+				if (entry->mask) entry++;
+			}
+		}
+
+		p->n_entries = entry - p->entry;
+		offset += psize;
+	}
+
+	free(buffer);
+
+	return 0;
+
+error_fb:
+	free(buffer);
+error:
+	return -1;
+}
+
+#define PSM_COMPONENT_ORDERS 0
+#define PSM_COMPONENT_PANPOS 1
+#define PSM_COMPONENT_PATTERNS 2
+#define PSM_COMPONENT_SAMPLE_HEADERS 3
+#define PSM_COMPONENT_COMMENTS 4
+
+typedef struct PSM_COMPONENT
+{
+	unsigned char type;
+	long offset;
+}
+PSM_COMPONENT;
+
+static int psm_component_compare(const void *e1, const void *e2)
+{
+	return ((const PSM_COMPONENT *)e1)->offset -
+	 ((const PSM_COMPONENT *)e2)->offset;
+}
+
+static DUMB_IT_SIGDATA *it_old_psm_load_sigdata(DUMBFILE *f)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	unsigned char * ptr = 0;
+
+	PSM_COMPONENT *component;
+	int n_components = 0;
+
+	int n, flags, version, pver, n_orders, n_channels, total_pattern_size;
+
+	if (dumbfile_mgetl(f) != DUMB_ID('P','S','M',254)) goto error;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) goto error;
+
+	if (dumbfile_getnc(sigdata->name, 60, f) < 60 ||
+		sigdata->name[59] != 0x1A) goto error_sd;
+	sigdata->name[59] = 0;
+
+	flags = dumbfile_getc(f);
+	version = dumbfile_getc(f);
+	pver = dumbfile_getc(f);
+	sigdata->speed = dumbfile_getc(f);
+	sigdata->tempo = dumbfile_getc(f);
+	sigdata->mixing_volume = dumbfile_getc(f);
+	sigdata->n_orders = dumbfile_igetw(f);
+	n_orders = dumbfile_igetw(f);
+	sigdata->n_patterns = dumbfile_igetw(f);
+	sigdata->n_samples = dumbfile_igetw(f);
+	sigdata->n_pchannels = dumbfile_igetw(f);
+	n_channels = dumbfile_igetw(f);
+
+	if (dumbfile_error(f) ||
+		(flags & 1) ||
+		(version != 1 && version != 0x10) ||
+		(pver) ||
+		(sigdata->n_orders <= 0) ||
+		(sigdata->n_orders > 255) ||
+		(n_orders > 255) ||
+		(n_orders < sigdata->n_orders) ||
+		(sigdata->n_patterns > 255) ||
+		(sigdata->n_samples > 255) ||
+		(sigdata->n_pchannels > DUMB_IT_N_CHANNELS) ||
+		(sigdata->n_pchannels > n_channels) ||
+		(n_channels > DUMB_IT_N_CHANNELS))
+		goto error_sd;
+
+	sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX;
+
+	sigdata->global_volume = 128;
+	sigdata->pan_separation = 128;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+
+	sigdata->restart_position = 0;
+
+	sigdata->order = malloc(sigdata->n_orders);
+	if (!sigdata->order) goto error_usd;
+
+	if (sigdata->n_samples) {
+		sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+		if (!sigdata->sample) goto error_usd;
+		for (n = 0; n < sigdata->n_samples; n++)
+			sigdata->sample[n].data = NULL;
+	}
+
+	if (sigdata->n_patterns) {
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) goto error_usd;
+		for (n = 0; n < sigdata->n_patterns; n++)
+			sigdata->pattern[n].entry = NULL;
+	}
+
+	component = malloc(5 * sizeof(*component));
+	if (!component) goto error_usd;
+
+	for (n = 0; n < 5; n++) {
+		component[n_components].offset = dumbfile_igetl(f);
+		if (component[n_components].offset) {
+			component[n_components].type = n;
+			n_components++;
+		}
+	}
+
+	if (!n_components) goto error_fc;
+
+	total_pattern_size = dumbfile_igetl(f);
+	if (!total_pattern_size) goto error_fc;
+
+	qsort(component, n_components, sizeof(PSM_COMPONENT), &psm_component_compare);
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	for (n = 0; n < n_components; n++)
+	{
+		int o;
+		long data_pos, data_size;
+
+		/* Whee, sample data may be before the sample headers */
+
+		data_pos = dumbfile_pos(f);
+		if (data_pos > component[n].offset) goto error_fc;
+
+		data_size = component[n].offset - data_pos;
+
+		if (data_size) {
+			ptr = malloc(data_size);
+			if (!ptr) goto error_fc;
+
+			if (dumbfile_getnc(ptr, data_size, f) < data_size) goto error_fp;
+		}
+
+		switch (component[n].type) {
+
+			case PSM_COMPONENT_ORDERS:
+				if (dumbfile_getnc(sigdata->order, sigdata->n_orders, f) < sigdata->n_orders) goto error_fp;
+				if (n_orders > sigdata->n_orders)
+					if (dumbfile_skip(f, n_orders - sigdata->n_orders))
+						goto error_fp;
+				if (dumbfile_igetw(f)) goto error_fp;
+				break;
+
+			case PSM_COMPONENT_PANPOS:
+				if (dumbfile_getnc(sigdata->channel_pan, sigdata->n_pchannels, f) < sigdata->n_pchannels) goto error_fp;
+				for (o = 0; o < sigdata->n_pchannels; o++) {
+					sigdata->channel_pan[o] -= (sigdata->channel_pan[o] & 8) >> 3;
+					sigdata->channel_pan[o] = ((int)sigdata->channel_pan[o] << 5) / 7;
+				}
+				break;
+
+			case PSM_COMPONENT_PATTERNS:
+				if (it_old_psm_read_patterns(sigdata->pattern, f, sigdata->n_patterns, total_pattern_size, sigdata->n_pchannels, flags)) goto error_fp;
+				break;
+
+			case PSM_COMPONENT_SAMPLE_HEADERS:
+				if (it_old_psm_read_samples(&sigdata->sample, f, &sigdata->n_samples, ptr, data_pos, data_size)) goto error_fp;
+				break;
+
+			case PSM_COMPONENT_COMMENTS:
+				if (dumbfile_mgetl(f) == DUMB_ID('T','E','X','T')) {
+					o = dumbfile_igetw(f);
+					if (o > 0) {
+						sigdata->song_message = malloc(o + 1);
+						if (dumbfile_getnc(sigdata->song_message, o, f) < o) goto error_fp;
+						sigdata->song_message[o] = 0;
+					}
+				}
+				break;
+		}
+
+		if (ptr) {
+			free(ptr);
+			ptr = 0;
+		}
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	free(component);
+
+	return sigdata;
+
+error_fp:
+	if (ptr) free(ptr);
+error_fc:
+	free(component);
+error_usd:
+	_dumb_it_unload_sigdata(sigdata);
+	return NULL;
+error_sd:
+	free(sigdata);
+error:
+	return NULL;
+}
+
+DUH *dumb_read_old_psm_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_old_psm_load_sigdata(f);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "PSM (old)";
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readpsm.c Added

@@ -0,0 +1,1273 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readpsm.c - Code to read a Protracker Studio / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+#define PSMV_OLD 940730
+#define PSMV_NEW 940902
+
+typedef struct _PSMCHUNK
+{
+	int id;
+	int len;
+	unsigned char * data;
+} PSMCHUNK;
+
+typedef struct _PSMEVENT
+{
+	int type;
+	unsigned char data[8];
+} PSMEVENT;
+
+#define PSM_EVENT_END 0
+#define PSM_EVENT_PLAY_PATTERN 1
+#define PSM_EVENT_JUMP_TO_LINE 4
+#define PSM_EVENT_SET_SPEED 7
+#define PSM_EVENT_SET_BPM 8
+#define PSM_EVENT_SAMPLE_MAP_TABLE 12
+#define PSM_EVENT_CHANGE_PAN 13
+#define PSM_EVENT_CHANGE_VOL 14
+
+static int it_psm_process_sample(IT_SAMPLE * sample, const unsigned char * data, int len, int id, int version) {
+	int flags;
+	int insno;
+	int length;
+	int loopstart;
+	int loopend;
+	int panpos;
+	int defvol;
+	int samplerate;
+
+	if (len < 0x60) return -1;
+
+	flags = data[0];
+
+	if (version == PSMV_OLD) {
+		memcpy(sample->name, data + 0x0D, 34);
+		sample->name[34] = 0;
+
+		insno = data[0x34] | (data[0x35] << 8);
+		length = data[0x36] | (data[0x37] << 8) | (data[0x38] << 16) | (data[0x39] << 24);
+		loopstart = data[0x3A] | (data[0x3B] << 8) | (data[0x3C] << 16) | (data[0x3D] << 24);
+		loopend = data[0x3E] | (data[0x3F] << 8) | (data[0x40] << 16) | (data[0x41] << 24);
+		panpos = data[0x43];
+		defvol = data[0x44];
+		samplerate = data[0x49] | (data[0x4A] << 8) | (data[0x4B] << 16) | (data[0x4C] << 24);
+	} else if (version == PSMV_NEW) {
+		memcpy(sample->name, data + 0x11, 34);
+		sample->name[34] = 0;
+
+		insno = data[0x38] | (data[0x39] << 8);
+		length = data[0x3A] | (data[0x3B] << 8) | (data[0x3C] << 16) | (data[0x3D] << 24);
+		loopstart = data[0x3E] | (data[0x3F] << 8) | (data[0x40] << 16) | (data[0x41] << 24);
+		loopend = data[0x42] | (data[0x43] << 8) | (data[0x44] << 16) | (data[0x45] << 24);
+		panpos = data[0x48];
+		defvol = data[0x49];
+		samplerate = data[0x4E] | (data[0x4F] << 8) | (data[0x50] << 16) | (data[0x51] << 24);
+	}
+
+	if (insno != id) return -1;
+
+	if (!length) {
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return 0;
+	}
+	
+	if ((length > len - 0x60) || ((flags & 0x7F) != 0)) return -1;
+
+	sample->flags = IT_SAMPLE_EXISTS;
+	sample->length = length;
+	sample->loop_start = loopstart;
+	sample->loop_end = loopend;
+	sample->C5_speed = samplerate;
+	sample->default_volume = defvol >> 1;
+	sample->default_pan = 0;
+	sample->filename[0] = 0;
+	sample->global_volume = 64;
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	if (flags & 0x80) {
+		if (((unsigned int)sample->loop_end <= (unsigned int)sample->length) &&
+			((unsigned int)sample->loop_start < (unsigned int)sample->loop_end)) {
+			sample->length = sample->loop_end;
+			sample->flags |= IT_SAMPLE_LOOP;
+		}
+	}
+
+	sample->data = malloc(sample->length);
+	if (!sample->data)
+		return -1;
+
+	flags = 0;
+	data += 0x60;
+
+	for (insno = 0; insno < sample->length; insno++) {
+		flags += (signed char)(*data++);
+		((signed char *)sample->data)[insno] = flags;
+	}
+
+	return 0;
+}
+
+static int it_psm_process_pattern(IT_PATTERN * pattern, const unsigned char * data, int len, int speed, int bpm, const unsigned char * pan, const int * vol, int version) {
+	int length, nrows, row, rowlen, pos;
+	unsigned flags, chan;
+	IT_ENTRY * entry;
+
+	length = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+	if (len > length) len = length;
+
+	if (version == PSMV_OLD) {
+		if (len < 10) return -1;
+		data += 8;
+		len -= 8;
+	} else if (version == PSMV_NEW) {
+		if (len < 14) return -1;
+		data += 12;
+		len -= 12;
+	}
+
+	nrows = data[0] | (data[1] << 8);
+
+	if (!nrows) return 0;
+
+	pattern->n_rows = nrows;
+
+	data += 2;
+	len -= 2;
+
+	pattern->n_entries = 0;
+
+	row = 0;
+	pos = 2;
+	rowlen = data[0] | (data[1] << 8);
+
+	while ((row < nrows) && (pos < len)) {
+		if (pos >= rowlen) {
+			row++;
+			rowlen += data[pos] | (data[pos+1] << 8);
+			pos += 2;
+			continue;
+		}
+
+		flags = data[pos++];
+		chan = data[pos++];
+
+		if (chan > 63) return -1;
+
+		if (flags & 0xF0) {
+			pattern->n_entries++;
+			if (flags & 0x80) pos++;
+			if (flags & 0x40) pos++;
+			if (flags & 0x20) pos++;
+			if (flags & 0x10) {
+				switch (data[pos]) {
+					case 0x29:
+						pos++;
+					case 0x33:
+						pos++;
+					default:
+						pos += 2;
+				}
+			}
+		}
+	}
+
+	if (!pattern->n_entries) return 0;
+
+	pattern->n_entries += nrows;
+	if (speed) pattern->n_entries++;
+	if (bpm >= 0x20) pattern->n_entries++;
+
+	for (pos = 0; pos < 32; pos++) {
+		if (!(pan[pos*2+1] & 0xF9)) pattern->n_entries++;
+		if (vol[pos] != -1) pattern->n_entries++;
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+	if (!pattern->entry) return -1;
+
+	entry = pattern->entry;
+
+	if (speed) {
+		entry->channel = 0;
+		entry->mask = IT_ENTRY_EFFECT;
+		entry->effect = IT_SET_SPEED;
+		entry->effectvalue = speed;
+		entry++;
+	}
+
+	if (bpm >= 0x20) {
+		entry->channel = 0;
+		entry->mask = IT_ENTRY_EFFECT;
+		entry->effect = IT_SET_SONG_TEMPO;
+		entry->effectvalue = bpm;
+		entry++;
+	}
+
+	for (pos = 0; pos < 32; pos++) {
+		if (!(pan[pos*2+1] & 0xF9)) {
+			entry->channel = pos;
+			entry->mask = IT_ENTRY_EFFECT;
+			switch (pan[pos*2+1]) {
+			case 0:
+				entry->effect = IT_SET_PANNING;
+				entry->effectvalue = pan[pos*2] ^ 128;
+				break;
+			case 2:
+				entry->effect = IT_S;
+				entry->effectvalue = EFFECT_VALUE(IT_S_SET_SURROUND_SOUND,1);
+				break;
+			case 4:
+				entry->effect = IT_SET_PANNING;
+				entry->effectvalue = 128;
+				break;
+			}
+			entry++;
+		}
+		if (vol[pos] != -1) {
+			entry->channel = pos;
+			entry->mask = IT_ENTRY_EFFECT;
+			entry->effect = IT_SET_CHANNEL_VOLUME;
+			entry->effectvalue = (vol[pos] + 2) >> 2;
+			entry++;
+		}
+	}
+
+	row = 0;
+	pos = 2;
+	rowlen = data[0] | (data[1] << 8);
+
+	while ((row < nrows) && (pos < len)) {
+		if (pos >= rowlen) {
+			IT_SET_END_ROW(entry);
+			entry++;
+			row++;
+			rowlen += data[pos] | (data[pos+1] << 8);
+			pos += 2;
+			continue;
+		}
+
+		flags = data[pos++];
+		entry->channel = data[pos++];
+		entry->mask = 0;
+
+		if (flags & 0xF0) {
+			if (flags & 0x80) {
+				entry->mask |= IT_ENTRY_NOTE;
+				if (version == PSMV_OLD) {
+					if ((data[pos] < 0x80)) entry->note = (data[pos]>>4)*12+(data[pos]&0x0f)+12;
+					else entry->mask &= ~IT_ENTRY_NOTE;
+				} else if (version == PSMV_NEW) {
+					if ((data[pos]) && (data[pos] < 84)) entry->note = data[pos] + 35;
+					else entry->mask &= ~IT_ENTRY_NOTE;
+				}
+				pos++;
+			}
+
+			if (flags & 0x40) {
+				entry->mask |= IT_ENTRY_INSTRUMENT;
+				entry->instrument = data[pos++] + 1;
+			}
+
+			if (flags & 0x20) {
+				entry->mask |= IT_ENTRY_VOLPAN;
+				entry->volpan = (data[pos++] + 1) >> 1;
+			}
+
+			if (flags & 0x10) {
+				entry->mask |= IT_ENTRY_EFFECT;
+				length = data[pos+1];
+				switch (data[pos]) {
+					case 1:
+						entry->effect = IT_VOLUME_SLIDE;
+						if (version == PSMV_OLD) entry->effectvalue = ((length&0x1e)<<3) | 0xF;
+						else if (version == PSMV_NEW) entry->effectvalue = (length<<4) | 0xF;
+						break;
+
+					case 2:
+						entry->effect = IT_VOLUME_SLIDE;
+						if (version == PSMV_OLD) entry->effectvalue = (length << 3) & 0xF0;
+						else if (version == PSMV_NEW) entry->effectvalue = (length << 4) & 0xF0;
+						break;
+
+					case 3:
+						entry->effect = IT_VOLUME_SLIDE;
+						if (version == PSMV_OLD) entry->effectvalue = (length >> 1) | 0xF0;
+						else if (version == PSMV_NEW) entry->effectvalue = length | 0xF0;
+						break;
+
+					case 4:
+						entry->effect = IT_VOLUME_SLIDE;
+						if (version == PSMV_OLD) entry->effectvalue = (length >> 1) & 0xF;
+						else if (version == PSMV_NEW) entry->effectvalue = length & 0xF;
+						break;
+
+					case 12:
+						entry->effect = IT_PORTAMENTO_UP;
+						if (version == PSMV_OLD) {
+							if (length < 4) entry->effectvalue = length | 0xF0;
+							else entry->effectvalue = length >> 2;
+						} else if (version == PSMV_NEW) {
+							entry->effectvalue = length;
+						}
+						break;
+
+					case 14:
+						entry->effect = IT_PORTAMENTO_DOWN;
+						if (version == PSMV_OLD) {
+							if (length < 4) entry->effectvalue = length | 0xF0;
+							else entry->effectvalue = length >> 2;
+						} else if (version == PSMV_NEW) {
+							entry->effectvalue = length;
+						}
+						break;
+
+					case 15:
+						entry->effect = IT_TONE_PORTAMENTO;
+						if (version == PSMV_OLD) entry->effectvalue = length >> 2;
+						else if (version == PSMV_NEW) entry->effectvalue = length;
+						break;
+
+					case 0x15:
+						entry->effect = IT_VIBRATO;
+						entry->effectvalue = length;
+						break;
+
+					case 0x18:
+						entry->effect = IT_VOLSLIDE_VIBRATO;
+						entry->effectvalue = length;
+						break;
+
+					case 0x29:
+						entry->effect = IT_SET_SAMPLE_OFFSET;
+						entry->effectvalue = data[pos+2];
+						pos += 2;
+						break;
+
+					case 0x2A:
+						entry->effect = IT_RETRIGGER_NOTE;
+						entry->effectvalue = length;
+						break;
+
+					case 0x33:
+#if 0
+						entry->effect = IT_POSITION_JUMP;
+						entry->effectvalue = data[pos+2];
+#else
+						entry->mask &= ~IT_ENTRY_EFFECT;
+#endif
+						pos++;
+						break;
+
+					case 0x34:
+						entry->effect = IT_BREAK_TO_ROW;
+						entry->effectvalue = length;
+						break;
+
+					case 0x3D:
+						entry->effect = IT_SET_SPEED;
+						entry->effectvalue = length;
+						break;
+
+					case 0x3E:
+						if (length >= 0x20) {
+							entry->effect = IT_SET_SONG_TEMPO;
+							entry->effectvalue = length;
+						} else {
+							entry->mask &= ~IT_ENTRY_EFFECT;
+						}
+						break;
+
+					case 0x47:
+						entry->effect = IT_ARPEGGIO;
+						entry->effectvalue = length;
+						break;
+
+					default:
+						return -1;
+				}
+				pos += 2;
+			}
+			if (entry->mask) entry++;
+		}
+	}
+
+	while (row < nrows) {
+		IT_SET_END_ROW(entry);
+		entry++;
+		row++;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+	if (!pattern->n_entries) return -1;
+
+	return 0;
+}
+
+
+static void free_chunks(PSMCHUNK * chunk, int count) {
+	int n;
+
+	for (n = 0; n < count; n++) {
+		if (chunk[n].data)
+			free(chunk[n].data);
+	}
+
+	free(chunk);
+}
+
+static void dumb_it_optimize_orders(DUMB_IT_SIGDATA * sigdata);
+
+static int pattcmp( const unsigned char *, const unsigned char *, size_t );
+
+static DUMB_IT_SIGDATA *it_psm_load_sigdata(DUMBFILE *f, int * ver, int subsong)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	PSMCHUNK *chunk;
+	int n_chunks = 0;
+
+	PSMCHUNK *songchunk;
+	int n_song_chunks = 0;
+
+	PSMEVENT *event = NULL;
+	int n_events = 0;
+
+	unsigned char * ptr;
+
+	int n, length, o;
+
+	int found;
+
+	int n_patterns = 0;
+
+	int first_pattern_line = -1;
+	int first_pattern;
+
+	int speed, bpm;
+	unsigned char pan[64];
+	int vol[32];
+
+	if (dumbfile_mgetl(f) != DUMB_ID('P','S','M',' ')) goto error;
+
+	length = dumbfile_igetl(f);
+
+	if (dumbfile_mgetl(f) != DUMB_ID('F','I','L','E')) goto error;
+
+	chunk = calloc(768, sizeof(*chunk));
+
+	while (length >= 8) {
+		chunk[n_chunks].id = dumbfile_mgetl(f);
+		n = dumbfile_igetl(f);
+		length -= 8;
+		if (n < 0 || n > length)
+			goto error_fc;
+		chunk[n_chunks].len = n;
+		if (n) {
+			ptr = malloc(n);
+			if (!ptr) goto error_fc;
+			if (dumbfile_getnc(ptr, n, f) < n)
+			{
+				free(ptr);
+				goto error_fc;
+			}
+			chunk[n_chunks].data = ptr;
+		}
+		n_chunks++;
+		length -= n;
+	}
+
+	if (!n_chunks) goto error_fc;
+				
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) goto error_fc;
+
+	sigdata->n_patterns = 0;
+	sigdata->n_samples = 0;
+	sigdata->name[0] = 0;
+
+	found = 0;
+
+	for (n = 0; n < n_chunks; n++) {
+		PSMCHUNK * c = &chunk[n];
+		switch(c->id) {
+		case DUMB_ID('S','D','F','T'):
+			/* song data format? */
+			if ((found & 1) || (c->len != 8) || memcmp(c->data, "MAINSONG", 8)) goto error_sd;
+			found |= 1;
+			break;
+
+		case DUMB_ID('S','O','N','G'):
+			if (/*(found & 2) ||*/ (c->len < 11) /*|| memcmp(c->data, "MAINSONG", 8)*/) goto error_sd;
+			found |= 2;
+			break;
+
+		case DUMB_ID('D','S','M','P'):
+			sigdata->n_samples++;
+			break;
+
+		case DUMB_ID('T','I','T','L'):
+			length = min(sizeof(sigdata->name) - 1, c->len);
+			memcpy(sigdata->name, c->data, length);
+			sigdata->name[length] = 0;
+		}
+	}
+
+	if (found != 3 || !sigdata->n_samples) goto error_sd;
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+	sigdata->n_orders = 0;
+
+	for (n = 0; n < n_chunks; n++) {
+		PSMCHUNK * c = &chunk[n];
+		if (c->id == DUMB_ID('S','O','N','G')) {
+			if (subsong == 0) break;
+			subsong--;
+		}
+	}
+
+	if (n == n_chunks) return NULL;
+	subsong = n;
+
+	/*for (n = 0; n < n_chunks; n++) {
+		PSMCHUNK * c = &chunk[n];
+		if (c->id == DUMB_ID('S','O','N','G')) {*/
+	{
+		PSMCHUNK * c = &chunk[subsong];
+		{
+			ptr = c->data;
+			if (ptr[10] > 32) goto error_usd;
+			sigdata->n_pchannels = ptr[10];
+			length = c->len - 11;
+			ptr += 11;
+			songchunk = 0;
+			if (length >= 8) {
+				songchunk = malloc(128 * sizeof(*songchunk));
+				if (!songchunk) goto error_usd;
+				while (length >= 8) {
+					songchunk[n_song_chunks].id = DUMB_ID(ptr[0], ptr[1], ptr[2], ptr[3]);
+					n = ptr[4] | (ptr[5] << 8) | (ptr[6] << 16) | (ptr[7] << 24);
+					length -= 8;
+					if (n > length) goto error_sc;
+					songchunk[n_song_chunks].len = n;
+					songchunk[n_song_chunks].data = ptr + 8;
+					n_song_chunks++;
+					length -= n;
+					ptr += 8 + n;
+				}
+			}
+			/*break;*/
+		}
+	}
+
+	if (!n_song_chunks) goto error_sc;
+
+	found = 0;
+
+	for (n = 0; n < n_song_chunks; n++) {
+		PSMCHUNK * c = &songchunk[n];
+
+		if (c->id == DUMB_ID('D','A','T','E')) {
+			/* date of the library build / format spec */
+			if (c->len == 6) {
+				length = c->len;
+				ptr = c->data;
+				while (length > 0) {
+					if (*ptr >= '0' && *ptr <= '9') {
+						found = (found * 10) + (*ptr - '0');
+					} else {
+						found = 0;
+						break;
+					}
+					ptr++;
+					length--;
+				}
+			}
+			break;
+		}
+	}
+
+	/*
+	if (found != 940506 &&
+		found != 940509 &&
+		found != 940510 &&
+		found != 940530 &&
+		found != 940629 &&
+		found != PSMV_OLD &&
+		found != 941011 &&
+		found != PSMV_NEW &&
+		found != 940906 &&
+		found != 940903 &&
+		found != 940914 &&
+		found != 941213 &&
+		found != 800211) /* WTF?
+		goto error_sc;
+	*/
+
+	*ver = found;
+
+	if (found == 800211 ||
+		found == PSMV_NEW ||
+		found == 940903 ||
+		found == 940906 ||
+		found == 940914 ||
+		found == 941213) found = PSMV_NEW;
+	else found = PSMV_OLD;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+
+	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
+		sigdata->channel_pan[n ] = 16;
+		sigdata->channel_pan[n+1] = 48;
+		sigdata->channel_pan[n+2] = 48;
+		sigdata->channel_pan[n+3] = 16;
+	}
+
+	for (n = 0; n < n_song_chunks; n++) {
+		PSMCHUNK * c = &songchunk[n];
+
+		switch (c->id) {
+			case DUMB_ID('O','P','L','H'):
+				if (c->len < 2) goto error_sc;
+				ptr = c->data;
+				o = ptr[0] | (ptr[1] << 8);
+				if (!o) goto error_sc;
+				event = malloc(o * sizeof(*event));
+				if (!event) goto error_sc;
+				length = c->len - 2;
+				ptr += 2;
+				while ((length > 0) && (n_events < o)) {
+					event[n_events].type = *ptr;
+					switch (*ptr) {
+					case PSM_EVENT_END:
+						ptr++;
+						length--;
+						break;
+
+					case PSM_EVENT_PLAY_PATTERN:
+						if (found == PSMV_OLD) {
+							if (length < 5) goto error_ev;
+							memcpy(event[n_events].data, ptr + 1, 4);
+							ptr += 5;
+							length -= 5;
+						} else if (found == PSMV_NEW) {
+							if (length < 9) goto error_ev;
+							memcpy(event[n_events].data, ptr + 1, 8);
+							ptr += 9;
+							length -= 9;
+						}
+						break;
+
+					case PSM_EVENT_SET_SPEED:
+					case PSM_EVENT_SET_BPM:
+						if (length < 2) goto error_ev;
+						event[n_events].data[0] = ptr[1];
+						ptr += 2;
+						length -= 2;
+						break;
+
+					case PSM_EVENT_JUMP_TO_LINE:
+					case PSM_EVENT_CHANGE_VOL:
+						if (length < 3) goto error_ev;
+						memcpy(event[n_events].data, ptr + 1, 2);
+						ptr += 3;
+						length -= 3;
+						break;
+
+					case PSM_EVENT_SAMPLE_MAP_TABLE:
+						if (length < 7) goto error_ev;
+						memcpy(event[n_events].data, ptr + 1, 6);
+						ptr += 7;
+						length -= 7;
+						break;
+
+					case PSM_EVENT_CHANGE_PAN:
+						if (length < 4) goto error_ev;
+						memcpy(event[n_events].data, ptr + 1, 3);
+						ptr += 4;
+						length -= 4;
+						break;
+
+					default:
+						goto error_ev;
+					}
+					n_events++;
+				}
+				break;
+
+			case DUMB_ID('P','P','A','N'):
+				length = c->len;
+				if (length & 1) goto error_ev;
+				ptr = c->data;
+				o = 0;
+				while (length > 0) {
+					switch (ptr[0]) {
+					case 0:
+						sigdata->channel_pan[o] = ((((int)(signed char)ptr[1]) * 32) / 127) + 32;
+						break;
+					case 2:
+						sigdata->channel_pan[o] = IT_SURROUND;
+						break;
+					case 4:
+						sigdata->channel_pan[o] = 32;
+						break;
+					}
+					ptr += 2;
+					length -= 2;
+					if (++o >= DUMB_IT_N_CHANNELS) break;
+				}
+				break;
+
+			/*
+			case DUMB_ID('P','A','T','T'):
+			case DUMB_ID('D','S','A','M'):
+			*/
+		}
+	}
+
+	sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX;
+
+	sigdata->global_volume = 128;
+	sigdata->speed = 6;
+	sigdata->tempo = 125;
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	speed = 0;
+	bpm = 0;
+	memset(pan, 255, sizeof(pan));
+	memset(vol, 255, sizeof(vol));
+
+	sigdata->n_patterns = n_events;
+	sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+	if (!sigdata->pattern) goto error_ev;
+	for (n = 0; n < sigdata->n_patterns; n++)
+		sigdata->pattern[n].entry = NULL;
+
+	for (n = 0; n < n_events; n++) {
+		PSMEVENT * e = &event[n];
+		switch (e->type) {
+		case PSM_EVENT_END:
+			n = n_events;
+			break;
+
+		case PSM_EVENT_PLAY_PATTERN:
+			for (o = 0; o < n_chunks; o++) {
+				PSMCHUNK * c = &chunk[o];
+				if (c->id == DUMB_ID('P','B','O','D')) {
+					ptr = c->data;
+					length = c->len;
+					if (found == PSMV_OLD) {
+						if (length < 8) goto error_ev;
+						if (!pattcmp(ptr + 4, e->data, 4)) {
+							if (it_psm_process_pattern(&sigdata->pattern[n_patterns], ptr, length, speed, bpm, pan, vol, found)) goto error_ev;
+							if (first_pattern_line < 0) {
+								first_pattern_line = n;
+								first_pattern = o;
+							}
+							e->data[0] = n_patterns;
+							e->data[1] = n_patterns >> 8;
+							n_patterns++;
+							break;
+						}
+					} else if (found == PSMV_NEW) {
+						if (length < 12) goto error_ev;
+						if (!pattcmp(ptr + 4, e->data, 8)) {
+							if (it_psm_process_pattern(&sigdata->pattern[n_patterns], ptr, length, speed, bpm, pan, vol, found)) goto error_ev;
+							if (first_pattern_line < 0) {
+								first_pattern_line = n;
+								first_pattern = o;
+							}
+							e->data[0] = n_patterns;
+							e->data[1] = n_patterns >> 8;
+							n_patterns++;
+							break;
+						}
+					}
+				}
+			}
+			if (o == n_chunks) goto error_ev;
+
+			speed = 0;
+			bpm = 0;
+			memset(pan, 255, sizeof(pan));
+			memset(vol, 255, sizeof(vol));
+
+			e->type = PSM_EVENT_END;
+			break;
+
+		case PSM_EVENT_JUMP_TO_LINE:
+			o = e->data[0] | (e->data[1] << 8);
+			if (o >= n_events) goto error_ev;
+			if (o == 0) {
+				/* whew! easy case! */
+				sigdata->restart_position = 0;
+				n = n_events;
+			} else if (o == n) {
+				/* freeze */
+				n = n_events;
+			} else if (o > n) {
+				/* jump ahead, setting played event numbers to zero will prevent endless looping */
+				n = o - 1;
+			} else if (o >= first_pattern_line) {
+				/* another semi-easy case */
+				sigdata->restart_position = event[o].data[0] | (event[o].data[1] << 8);
+				n = n_events;
+			} else {
+				/* crud, try to simulate rerunning all of the commands from the indicated
+				 * line up to the first pattern, then dupe the first pattern again.
+				 */
+				/*
+				PSMCHUNK * c = &chunk[first_pattern];
+
+				for (; o < first_pattern_line; o++) {
+					PSMEVENT * ev = &event[o];
+					switch (ev->type) {
+					case PSM_EVENT_SET_SPEED:
+						speed = ev->data[0];
+						break;
+					case PSM_EVENT_SET_BPM:
+						bpm = ev->data[0];
+						break;
+					case PSM_EVENT_CHANGE_PAN:
+						if (ev->data[0] > 31) goto error_ev;
+						pan[ev->data[0] * 2] = ev->data[1];
+						pan[ev->data[0] * 2 + 1] = ev->data[2];
+						break;
+					case PSM_EVENT_CHANGE_VOL:
+						if (ev->data[0] > 31) goto error_ev;
+						vol[ev->data[0]] = ev->data[1];
+						break;
+					}
+				}
+
+				if (it_psm_process_pattern(&sigdata->pattern[n_patterns], c->data, c->len, speed, bpm, pan, vol, found)) goto error_ev;
+				n_patterns++;
+				sigdata->restart_position = 1;
+				n = n_events;
+
+				Eh, what the hell? PSM has no panning commands anyway.
+				*/
+				sigdata->restart_position = 0;
+				n = n_events;
+			}
+			e->type = PSM_EVENT_END;
+			break;
+
+		case PSM_EVENT_SET_SPEED:
+			speed = e->data[0];
+			break;
+
+		case PSM_EVENT_SET_BPM:
+			bpm = e->data[0];
+			break;
+
+		case PSM_EVENT_CHANGE_PAN:
+			o = e->data[0];
+			if (o > 31) goto error_ev;
+			pan[o * 2] = e->data[1];
+			pan[o * 2 + 1] = e->data[2];
+			break;
+
+		case PSM_EVENT_CHANGE_VOL:
+			o = e->data[0];
+			if (o > 31) goto error_ev;
+			vol[o] = e->data[1];
+			break;
+
+		case PSM_EVENT_SAMPLE_MAP_TABLE:
+			if (e->data[0] != 0 || e->data[1] != 0xFF ||
+				e->data[2] != 0 || e->data[3] != 0 ||
+				e->data[4] != 1 || e->data[5] != 0)
+				goto error_ev;
+			break;
+		}
+	}
+
+	if (n_patterns > 256) goto error_ev;
+
+	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) goto error_ev;
+	for (n = 0; n < sigdata->n_samples; n++)
+		sigdata->sample[n].data = NULL;
+
+	o = 0;
+	for (n = 0; n < n_chunks; n++) {
+		PSMCHUNK * c = &chunk[n];
+		if (c->id == DUMB_ID('D','S','M','P')) {
+			if (it_psm_process_sample(&sigdata->sample[o], c->data, c->len, o, found)) goto error_ev;
+			o++;
+		}
+	}
+
+	sigdata->n_orders = n_patterns;
+	sigdata->n_patterns = n_patterns;
+
+	sigdata->order = malloc(n_patterns);
+
+	for (n = 0; n < n_patterns; n++) {
+		sigdata->order[n] = n;
+	}
+
+	free(event);
+	free(songchunk);
+	free_chunks(chunk, n_chunks);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	dumb_it_optimize_orders(sigdata);
+
+	return sigdata;
+
+error_ev:
+	free(event);
+error_sc:
+	if (songchunk) free(songchunk);
+error_usd:
+	_dumb_it_unload_sigdata(sigdata);
+	goto error_fc;
+error_sd:
+	free(sigdata);
+error_fc:
+	free_chunks(chunk, n_chunks);
+error:
+	return NULL;
+}
+
+static int it_order_compare(const void *e1, const void *e2) {
+	if (*((const char *)e1) < *((const char *)e2))
+		return -1;
+
+	if (*((const char *)e1) > *((const char *)e2))
+		return 1;
+
+	return 0;
+}
+
+static int it_optimize_compare(const void *e1, const void *e2) {
+	if (((const IT_ENTRY *)e1)->channel < ((const IT_ENTRY *)e2)->channel)
+		return -1;
+
+	if (((const IT_ENTRY *)e1)->channel > ((const IT_ENTRY *)e2)->channel)
+		return 1;
+
+	return 0;
+}
+
+static int it_entry_compare(const IT_ENTRY * e1, const IT_ENTRY * e2) {
+	if (IT_IS_END_ROW(e1) && IT_IS_END_ROW(e2)) return 1;
+	if (e1->channel != e2->channel) return 0;
+	if (e1->mask != e2->mask) return 0;
+	if ((e1->mask & IT_ENTRY_NOTE) && (e1->note != e2->note)) return 0;
+	if ((e1->mask & IT_ENTRY_INSTRUMENT) && (e1->instrument != e2->instrument)) return 0;
+	if ((e1->mask & IT_ENTRY_VOLPAN) && (e1->volpan != e2->volpan)) return 0;
+	if ((e1->mask & IT_ENTRY_EFFECT) && ((e1->effect != e2->effect) || (e1->effectvalue != e2->effectvalue))) return 0;
+	return 1;
+}
+
+/*
+static void dumb_it_optimize_pattern(IT_PATTERN * pattern) {
+	IT_ENTRY * entry, * end;
+	IT_ENTRY * rowstart, * rowend;
+	IT_ENTRY * current;
+
+	if (!pattern->n_entries || !pattern->entry) return;
+
+	current = entry = pattern->entry;
+	end = entry + pattern->n_entries;
+
+	while (entry < end) {
+		rowstart = entry;
+		while (!IT_IS_END_ROW(entry)) entry++;
+		rowend = entry;
+		if (rowend > rowstart + 1)
+			qsort(rowstart, rowend - rowstart, sizeof(IT_ENTRY), &it_optimize_compare);
+		entry = rowstart;
+		while (entry < rowend) {
+			if (!(entry->mask)) {}
+			else if (it_entry_compare(entry, current)) {}
+			else if (!(current->mask) ||
+					 ((entry->channel == current->channel) &&
+					 ((entry->mask | current->mask) == (entry->mask ^ current->mask)))) {
+				current->mask |= entry->mask;
+				if (entry->mask & IT_ENTRY_NOTE) current->note = entry->note;
+				if (entry->mask & IT_ENTRY_INSTRUMENT) current->instrument = entry->instrument;
+				if (entry->mask & IT_ENTRY_VOLPAN) current->volpan = entry->volpan;
+				if (entry->mask & IT_ENTRY_EFFECT) {
+					current->effect = entry->effect;
+					current->effectvalue = entry->effectvalue;
+				}
+			} else {
+				if (++current < entry) *current = *entry;
+			}
+			entry++;
+		}
+		if (++current < entry) *current = *entry;
+		entry++;
+	}
+
+	current++;
+
+	if (current < end) {
+		IT_ENTRY * opt;
+		pattern->n_entries = current - pattern->entry;
+		opt = realloc(pattern->entry, pattern->n_entries * sizeof(*pattern->entry));
+		if (opt) pattern->entry = opt;
+	}
+}
+*/
+
+static int it_pattern_compare(const IT_PATTERN * p1, const IT_PATTERN * p2) {
+	IT_ENTRY * e1, * end;
+	IT_ENTRY * e2;
+
+	if (p1 == p2) return 1;
+	if (p1->n_entries != p2->n_entries) return 0;
+	
+	e1 = p1->entry; end = e1 + p1->n_entries;
+	e2 = p2->entry;
+
+	while (e1 < end) {
+		if (!it_entry_compare(e1, e2)) return 0;
+		e1++; e2++;
+	}
+
+	return 1;
+}
+
+static void dumb_it_optimize_orders(DUMB_IT_SIGDATA * sigdata) {
+	int n, o, p;
+
+	int last_invalid = (sigdata->flags & IT_WAS_AN_XM) ? 255 : 253;
+
+	unsigned char * order_list;
+	int n_patterns;
+
+	IT_PATTERN * pattern;
+
+	if (!sigdata->n_orders || !sigdata->n_patterns) return;
+
+	n_patterns = 0;
+	order_list = malloc(sigdata->n_orders);
+
+	if (!order_list) return;
+
+	for (n = 0; n < sigdata->n_orders; n++) {
+		if (sigdata->order[n] < sigdata->n_patterns) {
+			for (o = 0; o < n_patterns; o++) {
+				if (sigdata->order[n] == order_list[o]) break;
+			}
+			if (o == n_patterns) {
+				order_list[n_patterns++] = sigdata->order[n];
+			}
+		}
+	}
+
+	if (!n_patterns) {
+		free(order_list);
+		return;
+	}
+
+	/*for (n = 0; n < n_patterns; n++) {
+		dumb_it_optimize_pattern(&sigdata->pattern[order_list[n]]);
+	}*/
+
+	for (n = 0; n < n_patterns; n++) {
+		for (o = n + 1; o < n_patterns; o++) {
+			if ((order_list[n] != order_list[o]) &&
+				it_pattern_compare(&sigdata->pattern[order_list[n]], &sigdata->pattern[order_list[o]])) {
+				for (p = 0; p < sigdata->n_orders; p++) {
+					if (sigdata->order[p] == order_list[o]) {
+						sigdata->order[p] = order_list[n];
+					}
+				}
+				for (p = o + 1; p < n_patterns; p++) {
+					if (order_list[p] == order_list[o]) {
+						order_list[p] = order_list[n];
+					}
+				}
+				order_list[o] = order_list[n];
+			}
+		}
+	}
+
+	qsort(order_list, n_patterns, sizeof(*order_list), &it_order_compare);
+
+	for (n = 0, o = 0; n < n_patterns; n++) {
+		if (order_list[n] != order_list[o]) {
+			if (++o < n) order_list[o] = order_list[n];
+		}
+	}
+
+	n_patterns = o + 1;
+
+	pattern = malloc(n_patterns * sizeof(*pattern));
+	if (!pattern) {
+		free(order_list);
+		return;
+	}
+
+	for (n = 0; n < n_patterns; n++) {
+		pattern[n] = sigdata->pattern[order_list[n]];
+	}
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		for (o = 0; o < n_patterns; o++) {
+			if (order_list[o] == n) break;
+		}
+		if (o == n_patterns) {
+			if (sigdata->pattern[n].entry)
+				free(sigdata->pattern[n].entry);
+		}
+	}
+
+	free(sigdata->pattern);
+	sigdata->pattern = pattern;
+	sigdata->n_patterns = n_patterns;
+
+	for (n = 0; n < sigdata->n_orders; n++) {
+		for (o = 0; o < n_patterns; o++) {
+			if (sigdata->order[n] == order_list[o]) {
+				sigdata->order[n] = o;
+				break;
+			}
+		}
+	}
+
+	free(order_list);
+}
+
+int dumb_get_psm_subsong_count(DUMBFILE *f) {
+	int length, subsongs;
+	long l;
+	
+	if (dumbfile_mgetl(f) != DUMB_ID('P','S','M',' ')) return 0;
+
+	length = dumbfile_igetl(f);
+
+	if (dumbfile_mgetl(f) != DUMB_ID('F','I','L','E')) return 0;
+
+	subsongs = 0;
+
+	while (length >= 8 && !dumbfile_error(f)) {
+		if (dumbfile_mgetl(f) == DUMB_ID('S','O','N','G')) subsongs++;
+		l = dumbfile_igetl(f);
+		dumbfile_skip(f, l);
+		length -= l + 8;
+	}
+
+	if (dumbfile_error(f)) return 0;
+
+	return subsongs;
+}
+
+
+
+/* Eww */
+int pattcmp( const unsigned char * a, const unsigned char * b, size_t l )
+{
+	int i, j, na, nb;
+	char * p;
+
+	i = memcmp( a, b, l );
+	if ( !i ) return i;
+
+	/* damnit */
+
+	for ( i = 0; i < l; ++i )
+	{
+		if ( a [i] >= '0' && a [i] <= '9' ) break;
+	}
+
+	if ( i < l )
+	{
+		na = strtoul( a + i, &p, 10 );
+		if ( (const unsigned char *)p == a + i ) return 1;
+	}
+
+	for ( j = 0; j < l; ++j )
+	{
+		if ( b [j] >= '0' && b [j] <= '9' ) break;
+	}
+
+	if ( j < l )
+	{
+		nb = strtoul( b + j, &p, 10 );
+		if ( (const unsigned char *)p == b + j ) return -1;
+	}
+
+	if ( i < j ) return -1;
+	else if ( j > i ) return 1;
+
+	i = memcmp( a, b, j );
+	if ( i ) return i;
+
+	return na - nb;
+}
+
+
+
+DUH *dumb_read_psm_quick(DUMBFILE *f, int subsong)
+{
+	sigdata_t *sigdata;
+	int ver;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_psm_load_sigdata(f, &ver, subsong);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		int n_tags = 2;
+		char version[16];
+		const char *tag[3][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "PSM";
+		if ( ver )
+		{
+			tag[2][0] = "FORMATVERSION";
+			snprintf (version, 10, "%d", ver);
+			tag[2][1] = (const char *) &version;
+			++n_tags;
+		}
+		return make_duh(-1, n_tags, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readptm.c Added

@@ -0,0 +1,574 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readptm.c - Code to read a Poly Tracker v2.03 / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. Based on reads3m.c \_ / > /
+ * by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+// IT_STEREO... :o
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/** WARNING: this is duplicated in itread.c */
+static int it_seek(DUMBFILE *f, long offset)
+{
+	long pos = dumbfile_pos(f);
+
+	if (pos > offset)
+		return -1;
+
+	if (pos < offset)
+		if (dumbfile_skip(f, offset - pos))
+			return -1;
+
+	return 0;
+}
+
+
+
+static int it_ptm_read_sample_header(IT_SAMPLE *sample, long *offset, DUMBFILE *f)
+{
+	int flags;
+
+	flags = dumbfile_getc(f);
+
+	dumbfile_getnc(sample->filename, 12, f);
+	sample->filename[12] = 0;
+
+	sample->default_volume = dumbfile_getc(f);
+
+	sample->C5_speed = dumbfile_igetw(f) << 1;
+
+	dumbfile_skip(f, 2); /* segment */
+
+	*offset = dumbfile_igetl(f);
+
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = dumbfile_igetl(f);
+
+	/* GUSBegin, GUSLStart, GUSLEnd, GUSLoop, reserverd */
+	dumbfile_skip(f, 4+4+4+1+1);
+
+	dumbfile_getnc(sample->name, 28, f);
+	sample->name[28] = 0;
+
+	/*
+	if (dumbfile_mgetl(f) != DUMB_ID('P','T','M','S'))
+		return -1;
+	*/
+
+	/* BLAH! Shit likes to have broken or missing sample IDs */
+	dumbfile_skip(f, 4);
+
+	if ((flags & 3) == 0) {
+		/* Looks like no sample */
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return dumbfile_error(f);
+	}
+
+	sample->global_volume = 64;
+
+	sample->flags = IT_SAMPLE_EXISTS;
+	if (flags & 4) sample->flags |= IT_SAMPLE_LOOP;
+	if (flags & 8) sample->flags |= IT_SAMPLE_PINGPONG_LOOP;
+
+	if (flags & 16) {
+		sample->flags |= IT_SAMPLE_16BIT;
+
+		sample->length >>= 1;
+		sample->loop_start >>= 1;
+		sample->loop_end >>= 1;
+	}
+
+	if (sample->loop_end) sample->loop_end--;
+
+	sample->default_pan = 0; // 0 = don't use, or 160 = centre?
+
+	if (sample->length <= 0)
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+	else if (sample->flags & IT_SAMPLE_LOOP) {
+		if ((unsigned int)sample->loop_end > (unsigned int)sample->length)
+			sample->flags &= ~IT_SAMPLE_LOOP;
+		else if ((unsigned int)sample->loop_start >= (unsigned int)sample->loop_end)
+			sample->flags &= ~IT_SAMPLE_LOOP;
+		else
+			sample->length = sample->loop_end;
+	}
+
+
+	//Do we need to set all these?
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+
+static int it_ptm_read_byte(DUMBFILE *f)
+{
+	int meh = dumbfile_getc(f);
+	if (meh < 0) return 0;
+	return meh;
+}
+
+static int it_ptm_read_sample_data(IT_SAMPLE *sample, int last, DUMBFILE *f)
+{
+	long n;
+	int s;
+
+	sample->data = malloc(sample->length * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1));
+	if (!sample->data)
+		return -1;
+
+	s = 0;
+
+	if (sample->flags & IT_SAMPLE_16BIT) {
+		unsigned char a, b;
+		for (n = 0; n < sample->length; n++) {
+			a = s += (signed char) it_ptm_read_byte(f);
+			b = s += (signed char) it_ptm_read_byte(f);
+			((short *)sample->data)[n] = a | (b << 8);
+		}
+	} else {
+		for (n = 0; n < sample->length; n++) {
+			s += (signed char) it_ptm_read_byte(f);
+			((signed char *)sample->data)[n] = s;
+		}
+	}
+
+	if (dumbfile_error(f) && !last)
+		return -1;
+
+	return 0;
+}
+
+
+
+static int it_ptm_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer, int length)
+{
+	int buflen = 0;
+	int bufpos = 0;
+	int effect, effectvalue;
+
+	IT_ENTRY *entry;
+
+	unsigned char channel;
+
+	if (!length)
+		return -1;
+
+	pattern->n_rows = 0;
+	pattern->n_entries = 0;
+
+	/* Read in the pattern data, little by little, and work out how many
+	 * entries we need room for. Sorry, but this is just so funny...
+	 */
+	for (;;) {
+		unsigned char b = buffer[buflen++] = dumbfile_getc(f);
+
+#if 1
+		static const unsigned char used[8] = {0, 2, 2, 4, 1, 3, 3, 5};
+		channel = b & 31;
+		b >>= 5;
+		pattern->n_entries++;
+		if (b) {
+			if (buflen + used[b] >= 65536) return -1;
+			dumbfile_getnc(buffer + buflen, used[b], f);
+			buflen += used[b];
+		} else {
+			/* End of row */
+			if (++pattern->n_rows == 64) break;
+			if (buflen >= 65536) return -1;
+		}
+#else
+		if (b == 0) {
+			/* End of row */
+			pattern->n_entries++;
+			if (++pattern->n_rows == 64) break;
+			if (buflen >= 65536) return -1;
+		} else {
+			static const unsigned char used[8] = {0, 2, 2, 4, 1, 3, 3, 5};
+			channel = b & 31;
+			b >>= 5;
+			if (b) {
+				pattern->n_entries++;
+				if (buflen + used[b] >= 65536) return -1;
+				dumbfile_getnc(buffer + buflen, used[b], f);
+				buflen += used[b];
+			}
+		}
+#endif
+
+		/* We have ensured that buflen < 65536 at this point, so it is safe
+		 * to iterate and read at least one more byte without checking.
+		 * However, now would be a good time to check for errors reading from
+		 * the file.
+		 */
+
+		if (dumbfile_error(f))
+			return -1;
+
+		/* Great. We ran out of data, but there should be data for more rows.
+		 * Fill the rest with null data...
+		 */
+		if (buflen >= length && pattern->n_rows < 64)
+		{
+			while (pattern->n_rows < 64)
+			{
+				if (buflen >= 65536) return -1;
+				buffer[buflen++] = 0;
+				pattern->n_entries++;
+				pattern->n_rows++;
+			}
+			break;
+		}
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+
+	if (!pattern->entry)
+		return -1;
+
+	entry = pattern->entry;
+
+	while (bufpos < buflen) {
+		unsigned char b = buffer[bufpos++];
+
+		if (b == 0)
+		{
+			/* End of row */
+			IT_SET_END_ROW(entry);
+			entry++;
+			continue;
+		}
+
+		channel = b & 31;
+
+		if (b & 224) {
+			entry->mask = 0;
+			entry->channel = channel;
+
+			if (b & 32) {
+				unsigned char n = buffer[bufpos++];
+				if (n == 254 || (n >= 1 && n <= 120)) {
+					if (n == 254)
+						entry->note = IT_NOTE_CUT;
+					else
+						entry->note = n - 1;
+					entry->mask |= IT_ENTRY_NOTE;
+				}
+
+				entry->instrument = buffer[bufpos++];
+				if (entry->instrument)
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+			}
+
+			if (b & 64) {
+				effect = buffer[bufpos++];
+				effectvalue = buffer[bufpos++];
+				_dumb_it_ptm_convert_effect(effect, effectvalue, entry);
+			}
+
+			if (b & 128) {
+				entry->volpan = buffer[bufpos++];
+				if (entry->volpan <= 64)
+					entry->mask |= IT_ENTRY_VOLPAN;
+			}
+
+			entry++;
+		}
+	}
+
+	ASSERT(entry == pattern->entry + pattern->n_entries);
+
+	return 0;
+}
+
+
+
+/** WARNING: this is duplicated in itread.c - also bad practice to use the same struct name unless they are unified in a header */
+/* Currently we assume the sample data are stored after the sample headers in
+ * module files. This assumption may be unjustified; let me know if you have
+ * trouble.
+ */
+
+#define PTM_COMPONENT_INSTRUMENT 1
+#define PTM_COMPONENT_PATTERN 2
+#define PTM_COMPONENT_SAMPLE 3
+
+typedef struct PTM_COMPONENT
+{
+	unsigned char type;
+	unsigned char n;
+	long offset;
+}
+PTM_COMPONENT;
+
+
+
+static int ptm_component_compare(const void *e1, const void *e2)
+{
+	return ((const PTM_COMPONENT *)e1)->offset -
+	 ((const PTM_COMPONENT *)e2)->offset;
+}
+
+
+
+static DUMB_IT_SIGDATA *it_ptm_load_sigdata(DUMBFILE *f)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	PTM_COMPONENT *component;
+	int n_components = 0;
+
+	int n;
+
+	unsigned char *buffer;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) return NULL;
+
+	/* Skip song name. */
+	dumbfile_getnc(sigdata->name, 28, f);
+	sigdata->name[28] = 0;
+
+	if (dumbfile_getc(f) != 0x1A || dumbfile_igetw(f) != 0x203) {
+		free(sigdata);
+		return NULL;
+	}
+
+	dumbfile_skip(f, 1);
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_orders = dumbfile_igetw(f);
+	sigdata->n_instruments = 0;
+	sigdata->n_samples = dumbfile_igetw(f);
+	sigdata->n_patterns = dumbfile_igetw(f);
+
+	if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_samples > 255 || sigdata->n_patterns > 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->n_pchannels = dumbfile_igetw(f);
+
+	if (dumbfile_igetw(f) != 0) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	dumbfile_skip(f, 2);
+
+	if (dumbfile_mgetl(f) != DUMB_ID('P','T','M','F')) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	dumbfile_skip(f, 16);
+
+	sigdata->order = malloc(sigdata->n_orders);
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (sigdata->n_samples) {
+		sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+		if (!sigdata->sample) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_samples; n++)
+			sigdata->sample[n].data = NULL;
+	}
+
+	if (sigdata->n_patterns) {
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_patterns; n++)
+			sigdata->pattern[n].entry = NULL;
+	}
+
+	/** WARNING: which ones? */
+	sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_A_PTM;
+
+	sigdata->global_volume = 128;
+	sigdata->speed = 6;
+	sigdata->tempo = 125;
+	sigdata->mixing_volume = 48;
+
+	/* Panning positions for 32 channels */
+	{
+		int i;
+		for (i = 0; i < 32; i++) {
+			int c = dumbfile_getc(f);
+			if (c <= 15) {
+				sigdata->channel_volume[i] = 64;
+				sigdata->channel_pan[i] = c;
+			} else {
+				/** WARNING: this could be improved if we support channel muting... */
+				sigdata->channel_volume[i] = 0;
+				sigdata->channel_pan[i] = 7;
+			}
+		}
+	}
+
+	/* Orders, byte each, length = sigdata->n_orders (should be even) */
+	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+	sigdata->restart_position = 0;
+
+	component = malloc(768*sizeof(*component));
+	if (!component) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (it_seek(f, 352)) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		component[n_components].type = PTM_COMPONENT_PATTERN;
+		component[n_components].n = n;
+		component[n_components].offset = dumbfile_igetw(f) << 4;
+		n_components++;
+	}
+
+	if (it_seek(f, 608)) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (n = 0; n < sigdata->n_samples; n++) {
+		if (it_ptm_read_sample_header(&sigdata->sample[n], &component[n_components].offset, f)) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		if (!(sigdata->sample[n].flags & IT_SAMPLE_EXISTS)) continue;
+		component[n_components].type = PTM_COMPONENT_SAMPLE;
+		component[n_components].n = n;
+		n_components++;
+	}
+
+	qsort(component, n_components, sizeof(PTM_COMPONENT), &ptm_component_compare);
+
+	{
+		int i;
+		for (i = 0; i < 32; i++) {
+			sigdata->channel_pan[i] -= (sigdata->channel_pan[i] & 8) >> 3;
+			sigdata->channel_pan[i] = ((int)sigdata->channel_pan[i] << 5) / 7;
+			if (sigdata->channel_pan[i] > 64) sigdata->channel_pan[i] = 64;
+		}
+	}
+
+	sigdata->pan_separation = 128;
+
+	if (dumbfile_error(f)) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	buffer = malloc(65536);
+	if (!buffer) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (n = 0; n < n_components; n++) {
+		if (it_seek(f, component[n].offset)) {
+			free(buffer);
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		switch (component[n].type) {
+
+			case PTM_COMPONENT_PATTERN:
+				if (it_ptm_read_pattern(&sigdata->pattern[component[n].n], f, buffer, (n + 1 < n_components) ? (component[n+1].offset - component[n].offset) : 0)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				break;
+
+			case PTM_COMPONENT_SAMPLE:
+				if (it_ptm_read_sample_data(&sigdata->sample[component[n].n], (n + 1 == n_components), f)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+		}
+	}
+
+	free(buffer);
+	free(component);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+static char hexdigit(int in)
+{
+	if (in < 10) return in + '0';
+	else return in + 'A' - 10;
+}
+
+DUH *dumb_read_ptm_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_ptm_load_sigdata(f);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "PTM";
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readriff.c Added

@@ -0,0 +1,73 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readriff.c - Code to read a RIFF module file / / \ \
+ * from memory. | < / \_
+ * | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+#include "internal/riff.h"
+
+
+DUH *dumb_read_riff_amff( struct riff * stream );
+DUH *dumb_read_riff_am( struct riff * stream );
+DUH *dumb_read_riff_dsmf( struct riff * stream );
+
+/* dumb_read_riff_quick(): reads a RIFF file into a DUH struct, returning a
+ * pointer to the DUH struct. When you have finished with it, you must pass
+ * the pointer to unload_duh() so that the memory can be freed.
+ */
+DUH *dumb_read_riff_quick( DUMBFILE * f )
+{
+	DUH * duh;
+	struct riff * stream;
+
+	{
+		unsigned char * buffer = 0;
+		unsigned size = 0;
+		long read;
+		do
+		{
+			buffer = realloc( buffer, 32768 + size );
+			if ( ! buffer ) return 0;
+			read = dumbfile_getnc( buffer + size, 32768, f );
+			if ( read < 0 )
+			{
+				free( buffer );
+				return 0;
+			}
+			size += read;
+		}
+		while ( read == 32768 );
+		stream = riff_parse( buffer, size, 1 );
+		if ( ! stream ) stream = riff_parse( buffer, size, 0 );
+		free( buffer );
+	}
+
+	if ( ! stream ) return 0;
+
+	if ( stream->type == DUMB_ID( 'A', 'M', ' ', ' ' ) )
+		duh = dumb_read_riff_am( stream );
+	else if ( stream->type == DUMB_ID( 'A', 'M', 'F', 'F' ) )
+		duh = dumb_read_riff_amff( stream );
+	else if ( stream->type == DUMB_ID( 'D', 'S', 'M', 'F' ) )
+		duh = dumb_read_riff_dsmf( stream );
+	else duh = 0;
+
+	riff_free( stream );
+
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/reads3m.c Added

@@ -0,0 +1,864 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * reads3m.c - Code to read a ScreamTracker 3 / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+// IT_STEREO... :o
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+//#define S3M_BROKEN_OVERLAPPED_SAMPLES
+
+/** WARNING: this is duplicated in itread.c */
+static int it_seek(DUMBFILE *f, long offset)
+{
+	long pos = dumbfile_pos(f);
+
+	if (pos > offset) {
+		return -1;
+	}
+
+	if (pos < offset)
+		if (dumbfile_skip(f, offset - pos))
+			return -1;
+
+	return 0;
+}
+
+
+
+static int it_s3m_read_sample_header(IT_SAMPLE *sample, long *offset, unsigned char *pack, int cwtv, DUMBFILE *f)
+{
+	unsigned char type;
+	int flags;
+
+	type = dumbfile_getc(f);
+
+	dumbfile_getnc(sample->filename, 12, f);
+	sample->filename[12] = 0;
+
+	if (type > 1) {
+		/** WARNING: no adlib support */
+		dumbfile_skip(f, 3 + 12 + 1 + 1 + 2 + 2 + 2 + 12);
+		dumbfile_getnc(sample->name, 28, f);
+		sample->name[28] = 0;
+		dumbfile_skip(f, 4);
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return -1; // return error so that another plugin could pick that file up
+	}
+
+	*offset = dumbfile_getc(f) << 20;
+	*offset += dumbfile_igetw(f) << 4;
+
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = dumbfile_igetl(f);
+
+	sample->default_volume = dumbfile_getc(f);
+
+	dumbfile_skip(f, 1);
+
+	flags = dumbfile_getc(f);
+
+	if (flags < 0 || (flags != 0 && flags != 4))
+		/* Sample is packed apparently (or error reading from file). We don't
+		 * know how to read packed samples.
+		 */
+		return -1;
+
+	*pack = flags;
+
+	flags = dumbfile_getc(f);
+
+	sample->C5_speed = dumbfile_igetl(f) << 1;
+
+	/* Skip four unused bytes and three internal variables. */
+	dumbfile_skip(f, 4+2+2+4);
+
+	dumbfile_getnc(sample->name, 28, f);
+	sample->name[28] = 0;
+
+	if (type == 0 || sample->length <= 0) {
+		/* Looks like no-existy. Anyway, there's for sure no 'SCRS' ... */
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		return dumbfile_error(f);
+	}
+
+	if (dumbfile_mgetl(f) != DUMB_ID('S','C','R','S'))
+		return -1;
+
+	sample->global_volume = 64;
+
+	sample->flags = IT_SAMPLE_EXISTS;
+	if (flags & 1) sample->flags |= IT_SAMPLE_LOOP;
+
+	/* The ST3 TECH.DOC is unclear on this, but IMAGO Orpheus is not. Piece of crap. */
+
+	if (flags & 2) {
+		sample->flags |= IT_SAMPLE_STEREO;
+
+		if ((cwtv & 0xF000) == 0x2000) {
+			sample->length >>= 1;
+			sample->loop_start >>= 1;
+			sample->loop_end >>= 1;
+		}
+	}
+
+	if (flags & 4) {
+		sample->flags |= IT_SAMPLE_16BIT;
+
+		if ((cwtv & 0xF000) == 0x2000) {
+			sample->length >>= 1;
+			sample->loop_start >>= 1;
+			sample->loop_end >>= 1;
+		}
+	}
+
+	sample->default_pan = 0; // 0 = don't use, or 160 = centre?
+
+	if (sample->flags & IT_SAMPLE_LOOP) {
+		if ((unsigned int)sample->loop_end > (unsigned int)sample->length)
+			/*sample->flags &= ~IT_SAMPLE_LOOP;*/
+			sample->loop_end = sample->length;
+		else if ((unsigned int)sample->loop_start >= (unsigned int)sample->loop_end)
+			sample->flags &= ~IT_SAMPLE_LOOP;
+		else
+			/* ScreamTracker seems not to save what comes after the loop end
+			 * point, but rather to assume it is a duplicate of what comes at
+			 * the loop start point. I am not completely sure of this though.
+			 * It is easy to evade; simply truncate the sample.
+			 */
+			sample->length = sample->loop_end;
+	}
+
+
+	//Do we need to set all these?
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+
+
+static int it_s3m_read_sample_data(IT_SAMPLE *sample, int ffi, unsigned char pack, DUMBFILE *f)
+{
+	long n;
+
+	long datasize = sample->length;
+	if (sample->flags & IT_SAMPLE_STEREO) datasize <<= 1;
+
+	sample->data = malloc(datasize * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1));
+	if (!sample->data)
+		return -1;
+
+	if (pack == 4) {
+		if (_dumb_it_read_sample_data_adpcm4(sample, f) < 0)
+			return -1;
+	}
+	else if (sample->flags & IT_SAMPLE_STEREO) {
+		if (sample->flags & IT_SAMPLE_16BIT) {
+			for (n = 0; n < datasize; n += 2)
+				((short *)sample->data)[n] = dumbfile_igetw(f);
+			for (n = 1; n < datasize; n += 2)
+				((short *)sample->data)[n] = dumbfile_igetw(f);
+		} else {
+			for (n = 0; n < datasize; n += 2)
+				((signed char *)sample->data)[n] = dumbfile_getc(f);
+			for (n = 1; n < datasize; n += 2)
+				((signed char *)sample->data)[n] = dumbfile_getc(f);
+		}
+	} else if (sample->flags & IT_SAMPLE_16BIT)
+		for (n = 0; n < sample->length; n++)
+			((short *)sample->data)[n] = dumbfile_igetw(f);
+	else
+		for (n = 0; n < sample->length; n++)
+			((signed char *)sample->data)[n] = dumbfile_getc(f);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	if (ffi != 1) {
+		/* Convert to signed. */
+		if (sample->flags & IT_SAMPLE_16BIT)
+			for (n = 0; n < datasize; n++)
+				((short *)sample->data)[n] ^= 0x8000;
+		else
+			for (n = 0; n < datasize; n++)
+				((signed char *)sample->data)[n] ^= 0x80;
+	}
+
+	return 0;
+}
+
+
+
+static int it_s3m_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer, int maxlen)
+{
+	int length;
+	int buflen = 0;
+	int bufpos = 0;
+
+	IT_ENTRY *entry;
+
+	unsigned char channel;
+
+	/* Haha, this is hilarious!
+	 *
+	 * Well, after some experimentation, it seems that different S3M writers
+	 * define the format in different ways. The S3M docs say that the first
+	 * two bytes hold the "length of [the] packed pattern", and the packed
+	 * pattern data follow. Judging by the contents of ARMANI.S3M, packaged
+	 * with ScreamTracker itself, the measure of length _includes_ the two
+	 * bytes used to store the length; in other words, we should read
+	 * (length - 2) more bytes. However, aryx.s3m, packaged with ModPlug
+	 * Tracker, excludes these two bytes, so (length) more bytes must be
+	 * read.
+	 *
+	 * Call me crazy, but I just find it insanely funny that the format was
+	 * misunderstood in this way :D
+	 *
+	 * Now we can't just risk reading two extra bytes, because then we
+	 * overshoot, and DUMBFILEs don't support backward seeking (for a good
+	 * reason). Luckily, there is a way. We can read the data little by
+	 * little, and stop when we have 64 rows in memory. Provided we protect
+	 * against buffer overflow, this method should work with all sensibly
+	 * written S3M files. If you find one for which it does not work, please
+	 * let me know at entheh@users.sf.net so I can look at it.
+	 */
+
+	/* Discard the length. */
+	/* read at most length bytes, in case of retarded crap */
+	length = dumbfile_igetw(f);
+	
+	if (maxlen)
+	{
+		maxlen -= 2;
+		if (length > maxlen) length = maxlen;
+	}
+
+	if (dumbfile_error(f) || !length)
+		return -1;
+
+	pattern->n_rows = 0;
+	pattern->n_entries = 0;
+
+	/* Read in the pattern data, little by little, and work out how many
+	 * entries we need room for. Sorry, but this is just so funny...
+	 */
+	for (;;) {
+		unsigned char b = buffer[buflen++] = dumbfile_getc(f);
+
+#if 1
+		static const unsigned char used[8] = {0, 2, 1, 3, 2, 4, 3, 5};
+		channel = b & 31;
+		b >>= 5;
+		pattern->n_entries++;
+		if (b) {
+			if (buflen + used[b] >= 65536) return -1;
+			if (buflen + used[b] <= length)
+				dumbfile_getnc(buffer + buflen, used[b], f);
+			else
+				memset(buffer + buflen, 0, used[b]);
+			buflen += used[b];
+		} else {
+			/* End of row */
+			if (++pattern->n_rows == 64) break;
+			if (buflen >= 65536) return -1;
+		}
+#else
+		if (b == 0) {
+			/* End of row */
+			pattern->n_entries++;
+			if (++pattern->n_rows == 64) break;
+			if (buflen >= 65536) return -1;
+		} else {
+			static const unsigned char used[8] = {0, 2, 1, 3, 2, 4, 3, 5};
+			channel = b & 31;
+			b >>= 5;
+			if (b) {
+				pattern->n_entries++;
+				if (buflen + used[b] >= 65536) return -1;
+				dumbfile_getnc(buffer + buflen, used[b], f);
+				buflen += used[b];
+			}
+		}
+#endif
+
+		/* We have ensured that buflen < 65536 at this point, so it is safe
+		 * to iterate and read at least one more byte without checking.
+		 * However, now would be a good time to check for errors reading from
+		 * the file.
+		 */
+
+		if (dumbfile_error(f))
+			return -1;
+
+		/* Great. We ran out of data, but there should be data for more rows.
+		 * Fill the rest with null data...
+		 */
+		if (buflen >= length && pattern->n_rows < 64)
+		{
+			while (pattern->n_rows < 64)
+			{
+				if (buflen >= 65536) return -1;
+				buffer[buflen++] = 0;
+				pattern->n_entries++;
+				pattern->n_rows++;
+			}
+			break;
+		}
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+
+	if (!pattern->entry)
+		return -1;
+
+	entry = pattern->entry;
+
+	while (bufpos < buflen) {
+		unsigned char b = buffer[bufpos++];
+
+#if 1
+		if (!(b & ~31))
+#else
+		if (b == 0)
+#endif
+		{
+			/* End of row */
+			IT_SET_END_ROW(entry);
+			entry++;
+			continue;
+		}
+
+		channel = b & 31;
+
+		if (b & 224) {
+			entry->mask = 0;
+			entry->channel = channel;
+
+			if (b & 32) {
+				unsigned char n = buffer[bufpos++];
+				if (n != 255) {
+					if (n == 254)
+						entry->note = IT_NOTE_CUT;
+					else
+						entry->note = (n >> 4) * 12 + (n & 15);
+					entry->mask |= IT_ENTRY_NOTE;
+				}
+
+				entry->instrument = buffer[bufpos++];
+				if (entry->instrument)
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+			}
+
+			if (b & 64) {
+				entry->volpan = buffer[bufpos++];
+				if (entry->volpan != 255)
+					entry->mask |= IT_ENTRY_VOLPAN;
+			}
+
+			if (b & 128) {
+				entry->effect = buffer[bufpos++];
+				entry->effectvalue = buffer[bufpos++];
+				// XXX woot
+				if (entry->effect && entry->effect < IT_MIDI_MACRO /*!= 255*/) {
+					entry->mask |= IT_ENTRY_EFFECT;
+					switch (entry->effect) {
+					case IT_BREAK_TO_ROW:
+						entry->effectvalue -= (entry->effectvalue >> 4) * 6;
+						break;
+
+					case IT_SET_CHANNEL_VOLUME:
+					case IT_CHANNEL_VOLUME_SLIDE:
+					case IT_PANNING_SLIDE:
+					case IT_GLOBAL_VOLUME_SLIDE:
+					case IT_PANBRELLO:
+					case IT_MIDI_MACRO:
+						entry->mask &= ~IT_ENTRY_EFFECT;
+						break;
+
+					case IT_S:
+						switch (entry->effectvalue >> 4) {
+						case IT_S_SET_PANBRELLO_WAVEFORM:
+						case IT_S_FINE_PATTERN_DELAY:
+						case IT_S7:
+						case IT_S_SET_SURROUND_SOUND:
+						case IT_S_SET_MIDI_MACRO:
+							entry->mask &= ~IT_ENTRY_EFFECT;
+							break;
+						}
+						break;
+					}
+				}
+				/** WARNING: ARGH! CONVERT TEH EFFECTS!@~ */
+			}
+
+			entry++;
+		}
+	}
+
+	ASSERT(entry == pattern->entry + pattern->n_entries);
+
+	return 0;
+}
+
+
+
+/** WARNING: this is duplicated in itread.c - also bad practice to use the same struct name unless they are unified in a header */
+/* Currently we assume the sample data are stored after the sample headers in
+ * module files. This assumption may be unjustified; let me know if you have
+ * trouble.
+ */
+
+#define S3M_COMPONENT_INSTRUMENT 1
+#define S3M_COMPONENT_PATTERN 2
+#define S3M_COMPONENT_SAMPLE 3
+
+typedef struct S3M_COMPONENT
+{
+	unsigned char type;
+	unsigned char n;
+	long offset;
+	short sampfirst; /* component[sampfirst] = first sample data after this */
+	short sampnext; /* sampnext is used to create linked lists of sample data */
+}
+S3M_COMPONENT;
+
+
+
+static int s3m_component_compare(const void *e1, const void *e2)
+{
+	return ((const S3M_COMPONENT *)e1)->offset -
+	 ((const S3M_COMPONENT *)e2)->offset;
+}
+
+
+
+static DUMB_IT_SIGDATA *it_s3m_load_sigdata(DUMBFILE *f, int * cwtv)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	int flags, ffi;
+	int default_pan_present;
+
+	int master_volume;
+
+	unsigned char sample_pack[256];
+
+	S3M_COMPONENT *component;
+	int n_components = 0;
+
+	int n;
+
+	unsigned char *buffer;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) return NULL;
+
+	dumbfile_getnc(sigdata->name, 28, f);
+	sigdata->name[28] = 0;
+
+	n = dumbfile_getc(f);
+
+	if (n != 0x1A && n != 0) {
+		free(sigdata);
+		return NULL;
+	}
+
+	if (dumbfile_getc(f) != 16) {
+		free(sigdata);
+		return NULL;
+	}
+
+	dumbfile_skip(f, 2);
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_orders = dumbfile_igetw(f);
+	sigdata->n_instruments = 0;
+	sigdata->n_samples = dumbfile_igetw(f);
+	sigdata->n_patterns = dumbfile_igetw(f);
+
+	if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_samples > 256 || sigdata->n_patterns > 256) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->order = malloc(sigdata->n_orders);
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if (sigdata->n_samples) {
+		sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+		if (!sigdata->sample) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_samples; n++)
+			sigdata->sample[n].data = NULL;
+	}
+
+	if (sigdata->n_patterns) {
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_patterns; n++)
+			sigdata->pattern[n].entry = NULL;
+	}
+
+	flags = dumbfile_igetw(f);
+
+	*cwtv = dumbfile_igetw(f);
+
+	if (*cwtv == 0x1300) {
+		/** WARNING: volume slides on every frame */
+	}
+
+	ffi = dumbfile_igetw(f);
+
+	/** WARNING: which ones? */
+	sigdata->flags = IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_AN_S3M;
+
+	if (dumbfile_mgetl(f) != DUMB_ID('S','C','R','M')) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->global_volume = dumbfile_getc(f) << 1;
+	if ( !sigdata->global_volume || sigdata->global_volume > 128 ) sigdata->global_volume = 128;
+	sigdata->speed = dumbfile_getc(f);
+	if (sigdata->speed == 0) sigdata->speed = 6; // Should we? What about tempo?
+	sigdata->tempo = dumbfile_getc(f);
+	master_volume = dumbfile_getc(f); // 7 bits; +128 for stereo
+	//what do we do with master_volume? it's not the same as mixing volume...
+	sigdata->mixing_volume = 48;
+
+	if (master_volume & 128) sigdata->flags |= IT_STEREO;
+
+	/* Skip GUS Ultra Click Removal byte. */
+	dumbfile_getc(f);
+
+	default_pan_present = dumbfile_getc(f);
+
+	dumbfile_skip(f, 8);
+
+	/* Skip Special Custom Data Pointer. */
+	/** WARNING: investigate this? */
+	dumbfile_igetw(f);
+
+	sigdata->n_pchannels = 0;
+	/* Channel settings for 32 channels, 255=unused, +128=disabled */
+	{
+		int i;
+		for (i = 0; i < 32; i++) {
+			int c = dumbfile_getc(f);
+			if (!(c & (128 | 16))) { /* +128=disabled, +16=Adlib */
+				if (sigdata->n_pchannels n_pchannels = i + 1;
+				sigdata->channel_volume[i] = 64;
+				sigdata->channel_pan[i] = c & 8 ? 12 : 3;
+				/** WARNING: ah, but it should be 7 for mono... */
+			} else {
+				/** WARNING: this could be improved if we support channel muting... */
+				sigdata->channel_volume[i] = 0;
+				sigdata->channel_pan[i] = 7;
+			}
+		}
+	}
+
+	/* Orders, byte each, length = sigdata->n_orders (should be even) */
+	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+	sigdata->restart_position = 0;
+
+	component = malloc(768*sizeof(*component));
+	if (!component) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	for (n = 0; n < sigdata->n_samples; n++) {
+		component[n_components].type = S3M_COMPONENT_SAMPLE;
+		component[n_components].n = n;
+		component[n_components].offset = dumbfile_igetw(f) << 4;
+		component[n_components].sampfirst = -1;
+		n_components++;
+	}
+
+	for (n = 0; n < sigdata->n_patterns; n++) {
+		long offset = dumbfile_igetw(f) << 4;
+		if (offset) {
+			component[n_components].type = S3M_COMPONENT_PATTERN;
+			component[n_components].n = n;
+			component[n_components].offset = offset;
+			component[n_components].sampfirst = -1;
+			n_components++;
+		} else {
+			/** WARNING: Empty 64-row pattern ... ? (this does happen!) */
+			sigdata->pattern[n].n_rows = 64;
+			sigdata->pattern[n].n_entries = 0;
+		}
+	}
+
+	qsort(component, n_components, sizeof(S3M_COMPONENT), &s3m_component_compare);
+
+	/* I found a really dumb S3M file that claimed to contain default pan
+	 * data but didn't contain any. Programs would load it by reading part of
+	 * the first instrument header, assuming the data to be default pan
+	 * positions, and then rereading the instrument module. We cannot do this
+	 * without obfuscating the file input model, so we insert an extra check
+	 * here that we won't overrun the start of the first component.
+	 */
+	if (default_pan_present == 252 && component[0].offset >= dumbfile_pos(f) + 32) {
+		/* Channel default pan positions */
+		int i;
+		for (i = 0; i < 32; i++) {
+			int c = dumbfile_getc(f);
+			if (c & 32)
+				sigdata->channel_pan[i] = c & 15;
+		}
+	}
+
+	{
+		int i;
+		for (i = 0; i < 32; i++) {
+			sigdata->channel_pan[i] -= (sigdata->channel_pan[i] & 8) >> 3;
+			sigdata->channel_pan[i] = ((int)sigdata->channel_pan[i] << 5) / 7;
+		}
+	}
+
+	sigdata->pan_separation = 128;
+
+	if (dumbfile_error(f)) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	buffer = malloc(65536);
+	if (!buffer) {
+		free(component);
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	/* Voila, I must deal with a very dumb S3M myself. This file refers to the same file offset twice
+	 * for two different patterns. Solution: Eliminate it.
+	 */
+
+	for (n = 0; n < n_components; n++) {
+		if (component[n].type == S3M_COMPONENT_PATTERN) {
+			int m;
+			for (m = n + 1; m < n_components; m++) {
+				if (component[m].type == S3M_COMPONENT_PATTERN) {
+					if (component[n].offset == component[m].offset) {
+						int o, pattern;
+						pattern = component[m].n;
+						n_components--;
+						for (o = m; o < n_components; o++) {
+							component[o] = component[o + 1];
+						}
+						for (o = 0; o < sigdata->n_orders; o++) {
+							if (sigdata->order[o] == pattern) {
+								sigdata->order[o] = component[n].n;
+							}
+						}
+						sigdata->pattern[pattern].n_rows = 64;
+						sigdata->pattern[pattern].n_entries = 0;
+						m--;
+					} else
+						break;
+				}
+			}
+		}
+	}
+
+	for (n = 0; n < n_components; n++) {
+		long offset;
+		int m;
+#ifdef S3M_BROKEN_OVERLAPPED_SAMPLES
+		int last;
+#endif
+
+		if (it_seek(f, component[n].offset)) {
+			free(buffer);
+			free(component);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		switch (component[n].type) {
+
+			case S3M_COMPONENT_PATTERN:
+				if (it_s3m_read_pattern(&sigdata->pattern[component[n].n], f, buffer, (n + 1 < n_components) ? (component[n+1].offset - component[n].offset) : 0)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				break;
+
+			case S3M_COMPONENT_SAMPLE:
+ {
+ int err = it_s3m_read_sample_header(&sigdata->sample[component[n].n], &offset, &sample_pack[component[n].n], *cwtv, f);
+				if (err) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+ }
+
+				if (sigdata->sample[component[n].n].flags & IT_SAMPLE_EXISTS) {
+					short *sample;
+
+					for (m = n + 1; m < n_components; m++)
+						if (component[m].offset > offset)
+							break;
+					m--;
+
+					sample = &component[m].sampfirst;
+
+					while (*sample >= 0 && component[*sample].offset <= offset)
+						sample = &component[*sample].sampnext;
+
+					component[n].sampnext = *sample;
+					*sample = n;
+
+					component[n].offset = offset;
+				}
+		}
+
+		m = component[n].sampfirst;
+
+#ifdef S3M_BROKEN_OVERLAPPED_SAMPLES
+		last = -1;
+#endif
+
+		while (m >= 0) {
+			// XXX
+#ifdef S3M_BROKEN_OVERLAPPED_SAMPLES
+			if ( last >= 0 ) {
+				if ( dumbfile_pos( f ) > component[m].offset ) {
+					IT_SAMPLE * s1 = &sigdata->sample[component[last].n];
+					IT_SAMPLE * s2 = &sigdata->sample[component[m].n];
+					if ( ( s1->flags | s2->flags ) & ( IT_SAMPLE_16BIT | IT_SAMPLE_STEREO ) ) {
+						free(buffer);
+						free(component);
+						_dumb_it_unload_sigdata(sigdata);
+						return NULL;
+					}
+					if ( component[m].offset >= component[last].offset &&
+						component[m].offset + s2->length <= component[last].offset + s1->length ) {
+						s2->left = malloc( s2->length );
+						if ( ! s2->left ) {
+							free(buffer);
+							free(component);
+							_dumb_it_unload_sigdata(sigdata);
+							return NULL;
+						}
+						memcpy( s2->left, ( const char * ) s1->left + component[m].offset - component[last].offset, s2->length );
+						last = -1;
+					}
+				}
+			} else last = 0;
+
+			if ( last >= 0 ) {
+#endif
+				if (it_seek(f, component[m].offset)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+
+				if (it_s3m_read_sample_data(&sigdata->sample[component[m].n], ffi, sample_pack[component[m].n], f)) {
+					free(buffer);
+					free(component);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+
+#ifdef S3M_BROKEN_OVERLAPPED_SAMPLES
+				last = m;
+			}
+#endif
+
+			m = component[m].sampnext;
+		}
+	}
+
+	free(buffer);
+	free(component);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+static char hexdigit(int in)
+{
+	if (in < 10) return in + '0';
+	else return in + 'A' - 10;
+}
+
+DUH *dumb_read_s3m_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+	int cwtv;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_s3m_load_sigdata(f, &cwtv);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		char version[8];
+		const char *tag[3][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "S3M";
+		tag[2][0] = "TRACKERVERSION";
+		version[0] = hexdigit((cwtv >> 8) & 15);
+		version[1] = '.';
+		version[2] = hexdigit((cwtv >> 4) & 15);
+		version[3] = hexdigit(cwtv & 15);
+		version[4] = 0;
+		tag[2][1] = (const char *) &version;
+		return make_duh(-1, 3, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/reads3m2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * reads3m2.c - Function to read a ScreamTracker 3 / / \ \
+ * module from an open file and do an | < / \_
+ * initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from reads3m.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_s3m(DUMBFILE *f)
+{
+	DUH *duh = dumb_read_s3m_quick(f);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readstm.c Added

@@ -0,0 +1,397 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readstm.c - Code to read a ScreamTracker 2 / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+// IT_STEREO... :o
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+/** WARNING: this is duplicated in itread.c */
+static int it_seek(DUMBFILE *f, long offset)
+{
+	long pos = dumbfile_pos(f);
+
+	if (pos > offset) {
+		return -1;
+	}
+
+	if (pos < offset)
+		if (dumbfile_skip(f, offset - pos))
+			return -1;
+
+	return 0;
+}
+
+static int it_stm_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f )
+{
+	dumbfile_getnc( sample->filename, 12, f );
+	sample->filename[12] = 0;
+
+	memcpy( sample->name, sample->filename, 13 );
+
+	dumbfile_skip( f, 2 + 2 );
+
+	sample->length = dumbfile_igetw( f );
+	sample->loop_start = dumbfile_igetw( f );
+	sample->loop_end = dumbfile_igetw( f );
+
+	sample->default_volume = dumbfile_getc( f );
+
+	dumbfile_skip( f, 1 );
+
+	sample->C5_speed = dumbfile_igetw( f ) << 3;
+
+	dumbfile_skip( f, 6 );
+
+	if ( sample->length < 4 || !sample->default_volume ) {
+		/* Looks like no-existy. */
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+		sample->length = 0;
+		return dumbfile_error( f );
+	}
+
+	sample->flags = IT_SAMPLE_EXISTS;
+	sample->global_volume = 64;
+	sample->default_pan = 0; // 0 = don't use, or 160 = centre?
+
+	if ( ( sample->loop_start < sample->length ) &&
+		( sample->loop_end > sample->loop_start ) &&
+		( sample->loop_end != 0xFFFF ) ) {
+		sample->flags |= IT_SAMPLE_LOOP;
+		if ( sample->loop_end > sample->length ) sample->loop_end = sample->length;
+	}
+
+	//Do we need to set all these?
+	sample->vibrato_speed = 0;
+	sample->vibrato_depth = 0;
+	sample->vibrato_rate = 0;
+	sample->vibrato_waveform = IT_VIBRATO_SINE;
+	sample->finetune = 0;
+	sample->max_resampling_quality = -1;
+
+	return dumbfile_error(f);
+}
+
+static int it_stm_read_sample_data( IT_SAMPLE *sample, DUMBFILE *f )
+{
+	long n;
+
+	if ( ! sample->length ) return 0;
+
+	n = dumbfile_pos( f );
+	if ( n & 15 ) {
+		if ( dumbfile_skip( f, 16 - ( n & 15 ) ) )
+			return -1;
+	}
+
+	sample->data = malloc( sample->length );
+	if (!sample->data)
+		return -1;
+
+	if ( dumbfile_getnc( sample->data, sample->length, f ) != sample->length )
+		return -1;
+
+	return 0;
+}
+
+static int it_stm_read_pattern( IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer )
+{
+	int pos;
+	int channel;
+	int row;
+	IT_ENTRY *entry;
+
+	pattern->n_rows = 64;
+
+	if ( dumbfile_getnc( buffer, 64 * 4 * 4, f ) != 64 * 4 * 4 )
+		return -1;
+
+	pattern->n_entries = 64;
+	pos = 0;
+	for ( row = 0; row < 64; ++row ) {
+		for ( channel = 0; channel < 4; ++channel ) {
+			if ( buffer[ pos + 0 ] | buffer[ pos + 1 ] | buffer[ pos + 2 ] | buffer[ pos + 3 ] )
+				++pattern->n_entries;
+			pos += 4;
+		}
+	}
+
+	pattern->entry = malloc( pattern->n_entries * sizeof( *pattern->entry ) );
+	if ( !pattern->entry )
+		return -1;
+
+	entry = pattern->entry;
+	pos = 0;
+	for ( row = 0; row < 64; ++row ) {
+		for ( channel = 0; channel < 4; ++channel ) {
+			if ( buffer[ pos + 0 ] | buffer[ pos + 1 ] | buffer[ pos + 2 ] | buffer[ pos + 3 ] ) {
+				unsigned note;
+				note = buffer[ pos + 0 ];
+				entry->channel = channel;
+				entry->mask = 0;
+				entry->instrument = buffer[ pos + 1 ] >> 3;
+				entry->volpan = ( buffer[ pos + 1 ] & 0x07 ) + ( buffer[ pos + 2 ] >> 1 );
+				entry->effect = buffer[ pos + 2 ] & 0x0F;
+				entry->effectvalue = buffer[ pos + 3 ];
+				if ( entry->instrument && entry->instrument < 32 )
+					entry->mask |= IT_ENTRY_INSTRUMENT;
+				if ( note == 0xFC || note == 0xFE ) {
+					entry->mask |= IT_ENTRY_NOTE;
+					entry->note = IT_NOTE_CUT;
+				}
+				if ( note < 251 ) {
+					entry->mask |= IT_ENTRY_NOTE;
+					entry->note = ( note >> 4 ) * 12 + ( note & 0x0F );
+				}
+				if ( entry->volpan <= 64 )
+					entry->mask |= IT_ENTRY_VOLPAN;
+				entry->mask |= IT_ENTRY_EFFECT;
+				switch ( entry->effect ) {
+					case IT_SET_SPEED:
+						entry->effectvalue >>= 4;
+						break;
+
+					case IT_BREAK_TO_ROW:
+						entry->effectvalue -= (entry->effectvalue >> 4) * 6;
+						break;
+
+					case IT_JUMP_TO_ORDER:
+					case IT_VOLUME_SLIDE:
+					case IT_PORTAMENTO_DOWN:
+					case IT_PORTAMENTO_UP:
+					case IT_TONE_PORTAMENTO:
+					case IT_VIBRATO:
+					case IT_TREMOR:
+					case IT_ARPEGGIO:
+					case IT_VOLSLIDE_VIBRATO:
+					case IT_VOLSLIDE_TONEPORTA:
+						break;
+
+					default:
+						entry->mask &= ~IT_ENTRY_EFFECT;
+						break;
+				}
+				if ( entry->mask ) ++entry;
+			}
+			pos += 4;
+		}
+		IT_SET_END_ROW(entry);
+		++entry;
+	}
+
+	pattern->n_entries = entry - pattern->entry;
+
+	return 0;
+}
+
+
+
+static DUMB_IT_SIGDATA *it_stm_load_sigdata(DUMBFILE *f /*, int * version*/)
+{
+	DUMB_IT_SIGDATA *sigdata;
+
+	char tracker_name[ 8 ];
+
+	int n;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) return NULL;
+
+	/* Skip song name. */
+	dumbfile_getnc(sigdata->name, 20, f);
+	sigdata->name[20] = 0;
+
+	dumbfile_getnc(tracker_name, 8, f);
+	n = dumbfile_getc(f);
+	if ( n != 0x02 && n != 0x1A && n != 0x1B )
+	{
+		free( sigdata );
+		return NULL;
+	}
+	if ( dumbfile_getc(f) != 2 ) /* only support modules */
+	{
+		free( sigdata );
+		return NULL;
+	}
+	if ( strncasecmp( tracker_name, "!Scream!", 8 ) &&
+		strncasecmp( tracker_name, "BMOD2STM", 8 ) &&
+		strncasecmp( tracker_name, "WUZAMOD!", 8 ) )
+	{
+		free( sigdata );
+		return NULL;
+	}
+
+	/* *version = dumbfile_mgetw(f); */
+	dumbfile_skip( f, 2 );
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_instruments = 0;
+	sigdata->n_samples = 31;
+	sigdata->n_pchannels = 4;
+
+	sigdata->tempo = 125;
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	/** WARNING: which ones? */
+	sigdata->flags = IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_AN_S3M;
+
+	sigdata->speed = dumbfile_getc(f) >> 4;
+	if ( sigdata->speed < 1 ) sigdata->speed = 1;
+	sigdata->n_patterns = dumbfile_getc(f);
+	sigdata->global_volume = dumbfile_getc(f) << 1;
+	if ( sigdata->global_volume > 128 ) sigdata->global_volume = 128;
+	
+	dumbfile_skip(f, 13);
+
+	if ( dumbfile_error(f) || sigdata->n_patterns < 1 || sigdata->n_patterns > 99 ) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	for (n = 0; n < sigdata->n_samples; n++)
+		sigdata->sample[n].data = NULL;
+
+	if (sigdata->n_patterns) {
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (n = 0; n < sigdata->n_patterns; n++)
+			sigdata->pattern[n].entry = NULL;
+	}
+
+	memset( sigdata->channel_volume, 64, 4 );
+	sigdata->channel_pan[ 0 ] = 48;
+	sigdata->channel_pan[ 1 ] = 16;
+	sigdata->channel_pan[ 2 ] = 48;
+	sigdata->channel_pan[ 3 ] = 16;
+
+	for ( n = 0; n < sigdata->n_samples; ++n ) {
+		if ( it_stm_read_sample_header( &sigdata->sample[ n ], f ) ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+	}
+
+	sigdata->order = malloc( 128 );
+	if ( !sigdata->order ) {
+		_dumb_it_unload_sigdata( sigdata );
+		return NULL;
+	}
+
+	/* Orders, byte each, length = sigdata->n_orders (should be even) */
+	dumbfile_getnc( sigdata->order, 128, f );
+	sigdata->restart_position = 0;
+
+	for ( n = 127; n >= 0; --n ) {
+		if ( sigdata->order[ n ] < sigdata->n_patterns ) break;
+	}
+	if ( n < 0 ) {
+		_dumb_it_unload_sigdata( sigdata );
+		return NULL;
+	}
+	sigdata->n_orders = n + 1;
+
+	for ( n = 0; n < 128; ++n ) {
+		if ( sigdata->order[ n ] >= 99 ) sigdata->order[ n ] = 0xFF;
+	}
+
+	if ( sigdata->n_patterns ) {
+		unsigned char * buffer = malloc( 64 * 4 * 4 );
+		if ( ! buffer ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+		for ( n = 0; n < sigdata->n_patterns; ++n ) {
+			if ( it_stm_read_pattern( &sigdata->pattern[ n ], f, buffer ) ) {
+				free( buffer );
+				_dumb_it_unload_sigdata( sigdata );
+				return NULL;
+			}
+		}
+		free( buffer );
+	}
+
+	for ( n = 0; n < sigdata->n_samples; ++n ) {
+		if ( it_stm_read_sample_data( &sigdata->sample[ n ], f ) ) {
+			_dumb_it_unload_sigdata( sigdata );
+			return NULL;
+		}
+	}
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+/*static char hexdigit(int in)
+{
+	if (in < 10) return in + '0';
+	else return in + 'A' - 10;
+}*/
+
+DUH *dumb_read_stm_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+	/*int ver;*/
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_stm_load_sigdata(f /*, &ver*/);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		/*char version[16];*/
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		tag[1][1] = "STM";
+		/*version[0] = 'S';
+		version[1] = 'T';
+		version[2] = 'M';
+		version[3] = ' ';
+		version[4] = 'v';
+		version[5] = hexdigit((ver >> 8) & 15);
+		version[6] = '.';
+		version[7] = hexdigit((ver >> 4) & 15);
+		version[8] = hexdigit(ver & 15);
+		version[9] = 0;
+		tag[1][1] = (const char *) &version;*/
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readstm2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readstm2.c - Function to read a ScreamTracker 2 / / \ \
+ * module from an open file and do an | < / \_
+ * initial run-through. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_stm(DUMBFILE *f)
+{
+	DUH *duh = dumb_read_stm_quick(f);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readxm.c Added

@@ -0,0 +1,1216 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readxm.c - Code to read a Fast Tracker II / / \ \
+ * module from an open file. | < / \_
+ * | \/ /\ /
+ * By Julien Cugniere. Some bits of code taken \_ / > /
+ * from reads3m.c. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/** TODO:
+
+ * XM_TREMOLO doesn't sound quite right...
+ * XM_E_SET_FINETUNE done but not tested yet.
+ * XM_SET_ENVELOPE_POSITION todo.
+
+ * VIBRATO conversion needs to be checked (sample/effect/volume). Plus check
+ that effect memory is correct when using XM_VOLSLIDE_VIBRATO.
+ - sample vibrato (instrument vibrato) is now handled correctly. - entheh
+
+ * XM_E_SET_VIBRATO/TREMOLO_CONTROL: effectvalue&4 -> don't retrig wave when
+ a new instrument is played. In retrigger_note()?. Is it worth implementing?
+
+ * Lossy fadeout approximation. 0..31 converted to 0 --> won't fade at all.
+
+ * Replace DUMB's sawtooth by ramp_down/ramp_up. Update XM loader.
+
+ * A lot of things need to be reset when the end of the song is reached.
+
+ * It seems that IT and XM don't behave the same way when dealing with
+ mixed loops. When IT encounters multiple SBx (x>0) commands on the same
+ row, it decrements the loop count for all, but only execute the loop of
+ the last one (highest channel). FT2 only decrements the loop count of the
+ last one. Not that I know of any modules using so convoluted combinations!
+
+ * Maybe we could remove patterns that don't appear in the order table ? Or
+ provide a function to "optimize" a DUMB_IT_SIGDATA ?
+
+*/
+
+
+
+#define XM_LINEAR_FREQUENCY 1 /* otherwise, use amiga slides */
+
+#define XM_ENTRY_PACKED 128
+#define XM_ENTRY_NOTE 1
+#define XM_ENTRY_INSTRUMENT 2
+#define XM_ENTRY_VOLUME 4
+#define XM_ENTRY_EFFECT 8
+#define XM_ENTRY_EFFECTVALUE 16
+
+#define XM_NOTE_OFF 97
+
+#define XM_ENVELOPE_ON 1
+#define XM_ENVELOPE_SUSTAIN 2
+#define XM_ENVELOPE_LOOP 4
+
+#define XM_SAMPLE_NO_LOOP 0
+#define XM_SAMPLE_FORWARD_LOOP 1
+#define XM_SAMPLE_PINGPONG_LOOP 2
+#define XM_SAMPLE_16BIT 16
+#define XM_SAMPLE_STEREO 32
+
+#define XM_VIBRATO_SINE 0
+#define XM_VIBRATO_SQUARE 1
+#define XM_VIBRATO_RAMP_DOWN 2
+#define XM_VIBRATO_RAMP_UP 3
+
+
+
+/* Probably useless :) */
+const char xm_convert_vibrato[] = {
+	IT_VIBRATO_SINE,
+	IT_VIBRATO_XM_SQUARE,
+	IT_VIBRATO_RAMP_DOWN,
+	IT_VIBRATO_RAMP_UP,
+	IT_VIBRATO_RANDOM
+};
+
+
+
+#define XM_MAX_SAMPLES_PER_INSTRUMENT 16
+
+
+
+/* Extra data that doesn't fit inside IT_INSTRUMENT */
+typedef struct XM_INSTRUMENT_EXTRA
+{
+	int n_samples;
+	int vibrato_type;
+	int vibrato_sweep; /* 0-0xFF */
+	int vibrato_depth; /* 0-0x0F */
+	int vibrato_speed; /* 0-0x3F */
+}
+XM_INSTRUMENT_EXTRA;
+
+
+
+/* Frees the original block if it can't resize it or if size is 0, and acts
+ * as malloc if ptr is NULL.
+ */
+static void *safe_realloc(void *ptr, size_t size)
+{
+	if (ptr == NULL)
+		return malloc(size);
+
+	if (size == 0) {
+		free(ptr);
+		return NULL;
+	} else {
+		void *new_block = realloc(ptr, size);
+		if (!new_block)
+			free(ptr);
+		return new_block;
+	}
+}
+
+
+
+/* The interpretation of the XM volume column is left to the player. Here, we
+ * just filter bad values.
+ */
+// This function is so tiny now, should we inline it?
+static void it_xm_convert_volume(int volume, IT_ENTRY *entry)
+{
+	entry->mask |= IT_ENTRY_VOLPAN;
+	entry->volpan = volume;
+
+	switch (volume >> 4) {
+		case 0xA: /* set vibrato speed */
+		case 0xB: /* vibrato */
+		case 0xF: /* tone porta */
+		case 0x6: /* vol slide up */
+		case 0x7: /* vol slide down */
+		case 0x8: /* fine vol slide up */
+		case 0x9: /* fine vol slide down */
+		case 0xC: /* set panning */
+		case 0xD: /* pan slide left */
+		case 0xE: /* pan slide right */
+		case 0x1: /* set volume */
+		case 0x2: /* set volume */
+		case 0x3: /* set volume */
+		case 0x4: /* set volume */
+			break;
+
+		case 0x5:
+			if (volume == 0x50)
+				break; /* set volume */
+			/* else fall through */
+
+		default:
+			entry->mask &= ~IT_ENTRY_VOLPAN;
+			break;
+	}
+}
+
+
+
+static int it_xm_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, int n_channels, unsigned char *buffer, int version)
+{
+	int size;
+	int pos;
+	int channel;
+	int row;
+	int effect, effectvalue;
+	IT_ENTRY *entry;
+
+	/* pattern header size */
+	if (dumbfile_igetl(f) != ( version == 0x0102 ? 0x08 : 0x09 ) ) {
+		TRACE("XM error: unexpected pattern header size\n");
+		return -1;
+	}
+
+	/* pattern data packing type */
+	if (dumbfile_getc(f) != 0) {
+		TRACE("XM error: unexpected pattern packing type\n");
+		return -1;
+	}
+
+	if ( version == 0x0102 )
+		pattern->n_rows = dumbfile_getc(f) + 1;
+	else
+		pattern->n_rows = dumbfile_igetw(f); /* 1..256 */
+	size = dumbfile_igetw(f);
+	pattern->n_entries = 0;
+
+	if (dumbfile_error(f))
+		return -1;
+
+	if (size == 0)
+		return 0;
+
+	if (size > 1280 * n_channels) {
+		TRACE("XM error: pattern data size > %d bytes\n", 1280 * n_channels);
+		return -1;
+	}
+
+	if (dumbfile_getnc(buffer, size, f) < size)
+		return -1;
+
+	/* compute number of entries */
+	pattern->n_entries = 0;
+	pos = channel = row = 0;
+	while (pos < size) {
+		if (!(buffer[pos] & XM_ENTRY_PACKED) || (buffer[pos] & 31))
+			pattern->n_entries++;
+
+		channel++;
+		if (channel >= n_channels) {
+			channel = 0;
+			row++;
+			pattern->n_entries++;
+		}
+
+		if (buffer[pos] & XM_ENTRY_PACKED) {
+			static const char offset[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+			 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5 };
+			pos += 1 + offset[buffer[pos] & 31];
+		} else {
+			pos += 5;
+		}
+	}
+
+	if (row > pattern->n_rows) {
+		TRACE("XM error: wrong number of rows in pattern data\n");
+		return -1;
+	}
+
+	/* Whoops, looks like some modules may be short, a few channels, maybe even rows... */
+
+	while (row < pattern->n_rows)
+	{
+		pattern->n_entries++;
+		row++;
+	}
+
+	pattern->entry = malloc(pattern->n_entries * sizeof(*pattern->entry));
+	if (!pattern->entry)
+		return -1;
+
+	/* read the entries */
+	entry = pattern->entry;
+	pos = channel = row = 0;
+	while (pos < size) {
+		unsigned char mask;
+
+		if (buffer[pos] & XM_ENTRY_PACKED)
+			mask = buffer[pos++] & 31;
+		else
+			mask = 31;
+
+		if (mask) {
+			ASSERT(entry < pattern->entry + pattern->n_entries);
+
+			entry->channel = channel;
+			entry->mask = 0;
+
+			if (mask & XM_ENTRY_NOTE) {
+				int note = buffer[pos++]; /* 1-96 <=> C0-B7 */
+				entry->note = (note == XM_NOTE_OFF) ? (IT_NOTE_OFF) : (note-1);
+				entry->mask |= IT_ENTRY_NOTE;
+			}
+
+			if (mask & XM_ENTRY_INSTRUMENT) {
+				entry->instrument = buffer[pos++]; /* 1-128 */
+				entry->mask |= IT_ENTRY_INSTRUMENT;
+			}
+
+			if (mask & XM_ENTRY_VOLUME)
+				it_xm_convert_volume(buffer[pos++], entry);
+
+			effect = effectvalue = 0;
+			if (mask & XM_ENTRY_EFFECT) effect = buffer[pos++];
+			if (mask & XM_ENTRY_EFFECTVALUE) effectvalue = buffer[pos++];
+			_dumb_it_xm_convert_effect(effect, effectvalue, entry, 0);
+
+			entry++;
+		}
+
+		channel++;
+		if (channel >= n_channels) {
+			channel = 0;
+			row++;
+			IT_SET_END_ROW(entry);
+			entry++;
+		}
+	}
+
+	while (row < pattern->n_rows)
+	{
+		row++;
+		IT_SET_END_ROW(entry);
+		entry++;
+	}
+
+	return 0;
+}
+
+
+
+static int it_xm_make_envelope(IT_ENVELOPE *envelope, const unsigned short *data, int y_offset)
+{
+	int i, pos;
+
+	if (envelope->n_nodes > 12) {
+		/* XXX
+		TRACE("XM error: wrong number of envelope nodes (%d)\n", envelope->n_nodes);
+		envelope->n_nodes = 0;
+		return -1; */
+		envelope->n_nodes = 12;
+	}
+
+	if (envelope->sus_loop_start >= 12) envelope->flags &= ~IT_ENVELOPE_SUSTAIN_LOOP;
+	if (envelope->loop_end >= 12) envelope->loop_end = 0;
+	if (envelope->loop_start >= envelope->loop_end) envelope->flags &= ~IT_ENVELOPE_LOOP_ON;
+
+	pos = 0;
+	for (i = 0; i < envelope->n_nodes; i++) {
+		envelope->node_t[i] = data[pos++];
+		if (data[pos] > 64) {
+			TRACE("XM error: out-of-range envelope node (node_y[%d]=%d)\n", i, data[pos]);
+			envelope->n_nodes = 0;
+			return -1;
+		}
+		envelope->node_y[i] = (signed char)(data[pos++] + y_offset);
+	}
+
+	return 0;
+}
+
+
+
+static int it_xm_read_instrument(IT_INSTRUMENT *instrument, XM_INSTRUMENT_EXTRA *extra, DUMBFILE *f)
+{
+	unsigned long size, bytes_read;
+	unsigned short vol_points[24];
+	unsigned short pan_points[24];
+	int i, type;
+
+	/* Header size. Tends to be more than the actual size of the structure.
+	 * So unread bytes must be skipped before reading the first sample
+	 * header.
+	 */
+	size = dumbfile_igetl(f);
+
+	dumbfile_getnc(instrument->name, 22, f);
+	instrument->name[22] = 0;
+	instrument->filename[0] = 0;
+	dumbfile_skip(f, 1); /* Instrument type. Should be 0, but seems random. */
+	extra->n_samples = dumbfile_igetw(f);
+
+	if (dumbfile_error(f) || (unsigned int)extra->n_samples > XM_MAX_SAMPLES_PER_INSTRUMENT)
+		return -1;
+
+	bytes_read = 4 + 22 + 1 + 2;
+
+	if (extra->n_samples) {
+		/* sample header size */
+		dumbfile_skip(f, 4); // XXX can't be trusted, as there are trackers that write the wrong value here
+		/*i = dumbfile_igetl(f);
+		if (i && i != 0x28) { // XXX some crap with 0 here
+			TRACE("XM error: unexpected sample header size\n");
+			return -1;
+		}*/
+
+		/* sample map */
+		for (i = 0; i < 96; i++) {
+			instrument->map_sample[i] = dumbfile_getc(f) + 1;
+			instrument->map_note[i] = i;
+		}
+
+		if (dumbfile_error(f))
+			return 1;
+
+		/* volume/panning envelopes */
+		for (i = 0; i < 24; i++)
+			vol_points[i] = dumbfile_igetw(f);
+		for (i = 0; i < 24; i++)
+			pan_points[i] = dumbfile_igetw(f);
+
+		instrument->volume_envelope.n_nodes = dumbfile_getc(f);
+		instrument->pan_envelope.n_nodes = dumbfile_getc(f);
+
+		if (dumbfile_error(f))
+			return -1;
+
+		instrument->volume_envelope.sus_loop_start = dumbfile_getc(f);
+		instrument->volume_envelope.loop_start = dumbfile_getc(f);
+		instrument->volume_envelope.loop_end = dumbfile_getc(f);
+
+		instrument->pan_envelope.sus_loop_start = dumbfile_getc(f);
+		instrument->pan_envelope.loop_start = dumbfile_getc(f);
+		instrument->pan_envelope.loop_end = dumbfile_getc(f);
+
+		/* The envelope handler for XM files won't use sus_loop_end. */
+
+		type = dumbfile_getc(f);
+		instrument->volume_envelope.flags = 0;
+		if ((type & XM_ENVELOPE_ON) && instrument->volume_envelope.n_nodes)
+			instrument->volume_envelope.flags |= IT_ENVELOPE_ON;
+		if (type & XM_ENVELOPE_LOOP) instrument->volume_envelope.flags |= IT_ENVELOPE_LOOP_ON;
+#if 1
+		if (type & XM_ENVELOPE_SUSTAIN) instrument->volume_envelope.flags |= IT_ENVELOPE_SUSTAIN_LOOP;
+#else // This is now handled in itrender.c
+		/* let's avoid fading out when reaching the last envelope node */
+		if (!(type & XM_ENVELOPE_LOOP)) {
+			instrument->volume_envelope.loop_start = instrument->volume_envelope.n_nodes-1;
+			instrument->volume_envelope.loop_end = instrument->volume_envelope.n_nodes-1;
+		}
+		instrument->volume_envelope.flags |= IT_ENVELOPE_LOOP_ON;
+#endif
+
+		type = dumbfile_getc(f);
+		instrument->pan_envelope.flags = 0;
+		if ((type & XM_ENVELOPE_ON) && instrument->pan_envelope.n_nodes)
+			instrument->pan_envelope.flags |= IT_ENVELOPE_ON;
+		if (type & XM_ENVELOPE_LOOP) instrument->pan_envelope.flags |= IT_ENVELOPE_LOOP_ON; // should this be here?
+		if (type & XM_ENVELOPE_SUSTAIN) instrument->pan_envelope.flags |= IT_ENVELOPE_SUSTAIN_LOOP;
+
+		if (it_xm_make_envelope(&instrument->volume_envelope, vol_points, 0) != 0) {
+			TRACE("XM error: volume envelope\n");
+			if (instrument->volume_envelope.flags & IT_ENVELOPE_ON) return -1;
+		}
+
+		if (it_xm_make_envelope(&instrument->pan_envelope, pan_points, -32) != 0) {
+			TRACE("XM error: pan envelope\n");
+			if (instrument->pan_envelope.flags & IT_ENVELOPE_ON) return -1;
+		}
+
+		instrument->pitch_envelope.flags = 0;
+
+		extra->vibrato_type = dumbfile_getc(f);
+		extra->vibrato_sweep = dumbfile_getc(f);
+		extra->vibrato_depth = dumbfile_getc(f);
+		extra->vibrato_speed = dumbfile_getc(f);
+
+		if (dumbfile_error(f) || extra->vibrato_type > 4) // XXX
+			return -1;
+
+		/** WARNING: lossy approximation */
+		instrument->fadeout = (dumbfile_igetw(f)*128 + 64)/0xFFF;
+
+		dumbfile_skip(f, 2); /* reserved */
+
+		bytes_read += 4 + 96 + 48 + 48 + 14*1 + 2 + 2;
+	} else
+		for (i = 0; i < 96; i++)
+			instrument->map_sample[i] = 0;
+
+	if (dumbfile_skip(f, size - bytes_read))
+		return -1;
+
+	instrument->new_note_action = NNA_NOTE_CUT;
+	instrument->dup_check_type = DCT_OFF;
+	instrument->dup_check_action = DCA_NOTE_CUT;
+	instrument->pp_separation = 0;
+	instrument->pp_centre = 60; /* C-5 */
+	instrument->global_volume = 128;
+	instrument->default_pan = 32;
+	instrument->random_volume = 0;
+	instrument->random_pan = 0;
+	instrument->filter_cutoff = 0;
+	instrument->filter_resonance = 0;
+
+	return 0;
+}
+
+
+
+/* I (entheh) have two XM files saved by a very naughty program. After a
+ * 16-bit sample, it saved a rogue byte. The length of the sample was indeed
+ * an odd number, incremented to include the rogue byte.
+ *
+ * In this function we are converting sample lengths and loop points so they
+ * are measured in samples. This means we forget about the extra bytes, and
+ * they don't get skipped. So we fail trying to read the next instrument.
+ *
+ * To get around this, this function returns the number of rogue bytes that
+ * won't be accounted for by reading sample->length samples. It returns a
+ * negative number on failure.
+ */
+static int it_xm_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
+{
+	int type;
+	int relative_note_number; /* relative to C4 */
+	int finetune;
+	int roguebytes;
+	int roguebytesmask;
+	int reserved;
+
+	sample->length = dumbfile_igetl(f);
+	sample->loop_start = dumbfile_igetl(f);
+	sample->loop_end = sample->loop_start + dumbfile_igetl(f);
+	sample->global_volume = 64;
+	sample->default_volume = dumbfile_getc(f);
+	finetune = (signed char)dumbfile_getc(f); /* -128..127 <=> -1 semitone .. +127/128 of a semitone */
+	type = dumbfile_getc(f);
+	sample->default_pan = dumbfile_getc(f); /* 0-255 */
+	relative_note_number = (signed char)dumbfile_getc(f);
+
+	reserved = dumbfile_getc(f);
+
+	dumbfile_getnc(sample->name, 22, f);
+	sample->name[22] = 0;
+
+	sample->filename[0] = 0;
+
+	if (dumbfile_error(f))
+		return -1;
+
+	sample->C5_speed = (long)(16726.0*pow(DUMB_SEMITONE_BASE, relative_note_number) /**pow(DUMB_PITCH_BASE, )*/ );
+	sample->finetune = finetune*2;
+
+	sample->flags = IT_SAMPLE_EXISTS;
+
+	if (reserved == 0xAD &&
+		(!(type & (XM_SAMPLE_16BIT | XM_SAMPLE_STEREO))))
+	{
+		/* F U Olivier Lapicque */
+		roguebytes = 4;
+		roguebytesmask = 4 << 2;
+	}
+	else
+	{
+		roguebytes = (int)sample->length;
+		roguebytesmask = 3;
+	}
+
+	if (type & XM_SAMPLE_16BIT) {
+		sample->flags |= IT_SAMPLE_16BIT;
+		sample->length >>= 1;
+		sample->loop_start >>= 1;
+		sample->loop_end >>= 1;
+	} else
+		roguebytesmask >>= 1;
+
+	if (type & XM_SAMPLE_STEREO) {
+		sample->flags |= IT_SAMPLE_STEREO;
+		sample->length >>= 1;
+		sample->loop_start >>= 1;
+		sample->loop_end >>= 1;
+	} else
+		roguebytesmask >>= 1;
+
+	roguebytes &= roguebytesmask;
+
+	if ((unsigned int)sample->loop_start < (unsigned int)sample->loop_end) {
+		if (type & XM_SAMPLE_FORWARD_LOOP) sample->flags |= IT_SAMPLE_LOOP;
+		if (type & XM_SAMPLE_PINGPONG_LOOP) sample->flags |= IT_SAMPLE_LOOP | IT_SAMPLE_PINGPONG_LOOP;
+	}
+
+	if (sample->length <= 0)
+		sample->flags &= ~IT_SAMPLE_EXISTS;
+	else if ((unsigned int)sample->loop_end > (unsigned int)sample->length)
+		sample->flags &= ~IT_SAMPLE_LOOP;
+	else if ((unsigned int)sample->loop_start >= (unsigned int)sample->loop_end)
+		sample->flags &= ~IT_SAMPLE_LOOP;
+
+	return roguebytes;
+}
+
+
+
+static int it_xm_read_sample_data(IT_SAMPLE *sample, unsigned char roguebytes, DUMBFILE *f)
+{
+	int old;
+	long i;
+	long truncated_size;
+	int n_channels;
+	long datasize;
+
+	if (!(sample->flags & IT_SAMPLE_EXISTS))
+		return dumbfile_skip(f, roguebytes);
+
+	/* let's get rid of the sample data coming after the end of the loop */
+	if ((sample->flags & IT_SAMPLE_LOOP) && sample->loop_end < sample->length && roguebytes != 4) {
+		truncated_size = sample->length - sample->loop_end;
+		sample->length = sample->loop_end;
+	} else {
+		truncated_size = 0;
+	}
+
+	n_channels = sample->flags & IT_SAMPLE_STEREO ? 2 : 1;
+	datasize = sample->length * n_channels;
+
+	sample->data = malloc(datasize * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1));
+	if (!sample->data)
+		return -1;
+
+	if (roguebytes == 4)
+	{
+		if (_dumb_it_read_sample_data_adpcm4(sample, f) < 0)
+			return -1;
+		roguebytes = 0;
+	}
+	else
+	{
+		/* sample data is stored as signed delta values */
+		old = 0;
+		if (sample->flags & IT_SAMPLE_16BIT)
+			for (i = 0; i < sample->length; i++)
+				((short *)sample->data)[i*n_channels] = old += dumbfile_igetw(f);
+		else
+			for (i = 0; i < sample->length; i++)
+				((signed char *)sample->data)[i*n_channels] = old += dumbfile_getc(f);
+	}
+
+	/* skip truncated data */
+	dumbfile_skip(f, (sample->flags & IT_SAMPLE_16BIT) ? (2*truncated_size) : (truncated_size));
+
+	if (sample->flags & IT_SAMPLE_STEREO) {
+		old = 0;
+		if (sample->flags & IT_SAMPLE_16BIT)
+			for (i = 1; i < datasize; i += 2)
+				((short *)sample->data)[i] = old += dumbfile_igetw(f);
+		else
+			for (i = 1; i < datasize; i += 2)
+				((signed char *)sample->data)[i] = old += dumbfile_getc(f);
+
+		/* skip truncated data */
+		dumbfile_skip(f, (sample->flags & IT_SAMPLE_16BIT) ? (2*truncated_size) : (truncated_size));
+	}
+
+	dumbfile_skip(f, roguebytes);
+
+	if (dumbfile_error(f))
+		return -1;
+
+	return 0;
+}
+
+
+
+/* "Real programmers don't document. If it was hard to write,
+ * it should be hard to understand."
+ *
+ * (Never trust the documentation provided with a tracker.
+ * Real files are the only truth...)
+ */
+static DUMB_IT_SIGDATA *it_xm_load_sigdata(DUMBFILE *f, int * version)
+{
+	DUMB_IT_SIGDATA *sigdata;
+	char id_text[18];
+
+	int header_size;
+	int flags;
+	int n_channels;
+	int total_samples;
+	int i, j;
+
+	/* check ID text */
+	if (dumbfile_getnc(id_text, 17, f) < 17)
+		return NULL;
+	id_text[17] = 0;
+	if (strcmp(id_text, "Extended Module: ") != 0) {
+		TRACE("XM error: Not an Extended Module\n");
+		return NULL;
+	}
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata)
+		return NULL;
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata)
+		return NULL;
+
+	/* song name */
+	if (dumbfile_getnc(sigdata->name, 20, f) < 20) {
+		free(sigdata);
+		return NULL;
+	}
+	sigdata->name[20] = 0;
+
+	if (dumbfile_getc(f) != 0x1A) {
+		TRACE("XM error: 0x1A not found\n");
+		free(sigdata);
+		return NULL;
+	}
+
+	/* tracker name */
+	if (dumbfile_skip(f, 20)) {
+		free(sigdata);
+		return NULL;
+	}
+
+	/* version number */
+	* version = dumbfile_igetw(f);
+	if (* version > 0x0104 || * version < 0x0102) {
+		TRACE("XM error: wrong format version\n");
+		free(sigdata);
+		return NULL;
+	}
+
+	/*
+		------------------
+		--- Header ---
+		------------------
+	*/
+
+	/* header size */
+	header_size = dumbfile_igetl(f);
+	if (header_size < (4 + 2*8 + 1) || header_size > 0x114) {
+		TRACE("XM error: unexpected header size\n");
+		free(sigdata);
+		return NULL;
+	}
+
+	sigdata->song_message = NULL;
+	sigdata->order = NULL;
+	sigdata->instrument = NULL;
+	sigdata->sample = NULL;
+	sigdata->pattern = NULL;
+	sigdata->midi = NULL;
+	sigdata->checkpoint = NULL;
+
+	sigdata->n_samples = 0;
+	sigdata->n_orders = dumbfile_igetw(f);
+	sigdata->restart_position = dumbfile_igetw(f);
+	n_channels = dumbfile_igetw(f); /* max 32 but we'll be lenient */
+	sigdata->n_pchannels = n_channels;
+	sigdata->n_patterns = dumbfile_igetw(f);
+	sigdata->n_instruments = dumbfile_igetw(f); /* max 128 */ /* XXX upped to 256 */
+	flags = dumbfile_igetw(f);
+	sigdata->speed = dumbfile_igetw(f);
+	if (sigdata->speed == 0) sigdata->speed = 6; // Should we? What about tempo?
+	sigdata->tempo = dumbfile_igetw(f);
+
+	/* sanity checks */
+	// XXX
+	i = header_size - 4 - 2 * 8; /* Maximum number of orders expected */
+	if (dumbfile_error(f) || sigdata->n_orders <= 0 || sigdata->n_orders > i || sigdata->n_patterns > 256 || sigdata->n_instruments > 256 || n_channels > DUMB_IT_N_CHANNELS) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	//if (sigdata->restart_position >= sigdata->n_orders)
+		//sigdata->restart_position = 0;
+
+	/* order table */
+	sigdata->order = malloc(sigdata->n_orders*sizeof(*sigdata->order));
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+	dumbfile_skip(f, i - sigdata->n_orders);
+
+	if (dumbfile_error(f)) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
+
+	if ( * version > 0x103 ) {
+		/*
+			--------------------
+			--- Patterns ---
+			--------------------
+		*/
+
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (i = 0; i < sigdata->n_patterns; i++)
+			sigdata->pattern[i].entry = NULL;
+
+		{
+			unsigned char *buffer = malloc(1280 * n_channels); /* 256 rows * 5 bytes */
+			if (!buffer) {
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+			for (i = 0; i < sigdata->n_patterns; i++) {
+				if (it_xm_read_pattern(&sigdata->pattern[i], f, n_channels, buffer, * version) != 0) {
+					free(buffer);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+			}
+			free(buffer);
+		}
+
+		/*
+		-----------------------------------
+		--- Instruments and Samples ---
+		-----------------------------------
+		*/
+
+		sigdata->instrument = malloc(sigdata->n_instruments * sizeof(*sigdata->instrument));
+		if (!sigdata->instrument) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		/* With XM, samples are not global, they're part of an instrument. In a
+		* file, each instrument is stored with its samples. Because of this, I
+		* don't know how to find how many samples are present in the file. Thus
+		* I have to do n_instruments reallocation on sigdata->sample.
+		* Looking at FT2, it doesn't seem possible to have more than 16 samples
+		* per instrument (even though n_samples is stored as 2 bytes). So maybe
+		* we could allocate a 128*16 array of samples, and shrink it back to the
+		* correct size when we know it?
+		* Alternatively, I could allocate samples by blocks of N (still O(n)),
+		* or double the number of allocated samples when I need more (O(log n)).
+		*/
+		total_samples = 0;
+		sigdata->sample = NULL;
+
+		for (i = 0; i < sigdata->n_instruments; i++) {
+			XM_INSTRUMENT_EXTRA extra;
+
+			if (it_xm_read_instrument(&sigdata->instrument[i], &extra, f) < 0) {
+				// XXX
+				if ( ! i )
+				{
+					TRACE("XM error: instrument %d\n", i+1);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				else
+				{
+					sigdata->n_instruments = i;
+					break;
+				}
+			}
+
+			if (extra.n_samples) {
+				unsigned char roguebytes[XM_MAX_SAMPLES_PER_INSTRUMENT];
+
+				/* adjust instrument sample map (make indices absolute) */
+				for (j = 0; j < 96; j++)
+					sigdata->instrument[i].map_sample[j] += total_samples;
+
+				sigdata->sample = safe_realloc(sigdata->sample, sizeof(*sigdata->sample)*(total_samples+extra.n_samples));
+				if (!sigdata->sample) {
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				for (j = total_samples; j < total_samples+extra.n_samples; j++)
+					sigdata->sample[j].data = NULL;
+
+				/* read instrument's samples */
+				for (j = 0; j < extra.n_samples; j++) {
+					IT_SAMPLE *sample = &sigdata->sample[total_samples+j];
+					int b = it_xm_read_sample_header(sample, f);
+					if (b < 0) {
+						_dumb_it_unload_sigdata(sigdata);
+						return NULL;
+					}
+					roguebytes[j] = b;
+					// Any reason why these can't be set inside it_xm_read_sample_header()?
+					sample->vibrato_speed = extra.vibrato_speed;
+					sample->vibrato_depth = extra.vibrato_depth;
+					sample->vibrato_rate = extra.vibrato_sweep;
+					/* Rate and sweep don't match, but the difference is
+					* accounted for in itrender.c.
+				 */
+					sample->vibrato_waveform = xm_convert_vibrato[extra.vibrato_type];
+					sample->max_resampling_quality = -1;
+				}
+				for (j = 0; j < extra.n_samples; j++) {
+					if (it_xm_read_sample_data(&sigdata->sample[total_samples+j], roguebytes[j], f) != 0) {
+						_dumb_it_unload_sigdata(sigdata);
+						return NULL;
+					}
+				}
+				total_samples += extra.n_samples;
+			}
+		}
+
+		sigdata->n_samples = total_samples;
+	} else {
+		// ahboy! old layout!
+		// first instruments and sample headers, then patterns, then sample data!
+
+		/*
+		-----------------------------------
+		--- Instruments and Samples ---
+		-----------------------------------
+		*/
+
+		unsigned char * roguebytes = malloc( sigdata->n_instruments * XM_MAX_SAMPLES_PER_INSTRUMENT );
+		if (!roguebytes) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		sigdata->instrument = malloc(sigdata->n_instruments * sizeof(*sigdata->instrument));
+		if (!sigdata->instrument) {
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+
+		total_samples = 0;
+		sigdata->sample = NULL;
+
+		for (i = 0; i < sigdata->n_instruments; i++) {
+			XM_INSTRUMENT_EXTRA extra;
+
+			if (it_xm_read_instrument(&sigdata->instrument[i], &extra, f) < 0) {
+				TRACE("XM error: instrument %d\n", i+1);
+				free(roguebytes);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+			for (j = total_samples; j < total_samples+extra.n_samples; j++)
+				sigdata->sample[j].data = NULL;
+
+			if (extra.n_samples) {
+				/* adjust instrument sample map (make indices absolute) */
+				for (j = 0; j < 96; j++)
+					sigdata->instrument[i].map_sample[j] += total_samples;
+
+				sigdata->sample = safe_realloc(sigdata->sample, sizeof(*sigdata->sample)*(total_samples+extra.n_samples));
+				if (!sigdata->sample) {
+					free(roguebytes);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+				for (j = total_samples; j < total_samples+extra.n_samples; j++)
+					sigdata->sample[j].data = NULL;
+
+				/* read instrument's samples */
+				for (j = 0; j < extra.n_samples; j++) {
+					IT_SAMPLE *sample = &sigdata->sample[total_samples+j];
+					int b = it_xm_read_sample_header(sample, f);
+					if (b < 0) {
+						free(roguebytes);
+						_dumb_it_unload_sigdata(sigdata);
+						return NULL;
+					}
+					roguebytes[total_samples+j] = b;
+					// Any reason why these can't be set inside it_xm_read_sample_header()?
+					sample->vibrato_speed = extra.vibrato_speed;
+					sample->vibrato_depth = extra.vibrato_depth;
+					sample->vibrato_rate = extra.vibrato_sweep;
+					/* Rate and sweep don't match, but the difference is
+					* accounted for in itrender.c.
+				 */
+					sample->vibrato_waveform = xm_convert_vibrato[extra.vibrato_type];
+					sample->max_resampling_quality = -1;
+				}
+				total_samples += extra.n_samples;
+			}
+		}
+
+		sigdata->n_samples = total_samples;
+
+		/*
+			--------------------
+			--- Patterns ---
+			--------------------
+		*/
+
+		sigdata->pattern = malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+		if (!sigdata->pattern) {
+			free(roguebytes);
+			_dumb_it_unload_sigdata(sigdata);
+			return NULL;
+		}
+		for (i = 0; i < sigdata->n_patterns; i++)
+			sigdata->pattern[i].entry = NULL;
+
+		{
+			unsigned char *buffer = malloc(1280 * n_channels); /* 256 rows * 5 bytes */
+			if (!buffer) {
+				free(roguebytes);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+			for (i = 0; i < sigdata->n_patterns; i++) {
+				if (it_xm_read_pattern(&sigdata->pattern[i], f, n_channels, buffer, * version) != 0) {
+					free(buffer);
+					free(roguebytes);
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+			}
+			free(buffer);
+		}
+
+		// and now we load the sample data
+		for (j = 0; j < total_samples; j++) {
+			if (it_xm_read_sample_data(&sigdata->sample[j], roguebytes[j], f) != 0) {
+				free(roguebytes);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+		}
+
+		free(roguebytes);
+	}
+
+
+	sigdata->flags = IT_WAS_AN_XM | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_STEREO | IT_USE_INSTRUMENTS;
+	// Are we OK with IT_COMPATIBLE_GXX off?
+	//
+	// When specifying note + instr + tone portamento, and an old note is still playing (even after note off):
+	// - If Compatible Gxx is on, the new note will be triggered only if the instrument _changes_.
+	// - If Compatible Gxx is off, the new note will always be triggered, provided the instrument is specified.
+	// - FT2 seems to do the latter (unconfirmed).
+
+	// Err, wait. XM playback has its own code. The change made to the IT
+	// playbackc code didn't affect XM playback. Forget this then. There's
+	// still a bug in XM playback though, and it'll need some investigation...
+	// tomorrow...
+
+	// UPDATE: IT_COMPATIBLE_GXX is required to be on, so that tone porta has
+	// separate memory from portamento.
+
+	if (flags & XM_LINEAR_FREQUENCY)
+		sigdata->flags |= IT_LINEAR_SLIDES;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+	memset(sigdata->channel_pan, 32, DUMB_IT_N_CHANNELS);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+
+
+#if 0 // no fucking way, dude!
+
+/* The length returned is the time required to play from the beginning of the
+ * file to the last row of the last order (which is when the player will
+ * loop). Depending on the song, the sound might stop sooner.
+ * Due to fixed point roundoffs, I think this is only reliable to the second.
+ * Full precision could be achieved by using a double during the computation,
+ * or maybe a LONG_LONG.
+ */
+long it_compute_length(const DUMB_IT_SIGDATA *sigdata)
+{
+	IT_PATTERN *pattern;
+	int tempo, speed;
+	int loop_start[IT_N_CHANNELS];
+	char loop_count[IT_N_CHANNELS];
+	int order, entry;
+	int row_first_entry = 0;
+	int jump, jump_dest;
+	int delay, fine_delay;
+	int i;
+	long t;
+
+	if (!sigdata)
+		return 0;
+
+	tempo = sigdata->tempo;
+	speed = sigdata->speed;
+	order = entry = 0;
+	jump = jump_dest = 0;
+	t = 0;
+
+	/* for each PATTERN */
+	for (order = 0; order < sigdata->n_orders; order++) {
+
+		if (sigdata->order[order] == IT_ORDER_END) break;
+		if (sigdata->order[order] == IT_ORDER_SKIP) continue;
+
+		for (i = 0; i < IT_N_CHANNELS; i++)
+			loop_count[i] = -1;
+
+		pattern = &sigdata->pattern[ sigdata->order[order] ];
+		entry = 0;
+		if (jump == IT_BREAK_TO_ROW) {
+			int row = 0;
+			while (row < jump_dest)
+				if (pattern->entry[entry++].channel >= IT_N_CHANNELS)
+					row++;
+		}
+
+		/* for each ROW */
+		while (entry < pattern->n_entries) {
+			row_first_entry = entry;
+			delay = fine_delay = 0;
+			jump = 0;
+
+			/* for each note NOTE */
+			while (entry < pattern->n_entries && pattern->entry[entry].channel < IT_N_CHANNELS) {
+				int value = pattern->entry[entry].effectvalue;
+				int channel = pattern->entry[entry].channel;
+
+				switch (pattern->entry[entry].effect) {
+
+					case IT_SET_SPEED: speed = value; break;
+
+					case IT_JUMP_TO_ORDER:
+						if (value <= order) /* infinite loop */
+							return 0;
+						jump = IT_JUMP_TO_ORDER;
+						jump_dest = value;
+						break;
+
+					case IT_BREAK_TO_ROW:
+						jump = IT_BREAK_TO_ROW;
+						jump_dest = value;
+						break;
+
+					case IT_S:
+						switch (HIGH(value)) {
+							case IT_S_PATTERN_DELAY: delay = LOW(value); break;
+							case IT_S_FINE_PATTERN_DELAY: fine_delay = LOW(value); break;
+							case IT_S_PATTERN_LOOP:
+								if (LOW(value) == 0) {
+									loop_start[channel] = row_first_entry;
+								} else {
+									if (loop_count[channel] == -1)
+										loop_count[channel] = LOW(value);
+
+									if (loop_count[channel]) {
+										jump = IT_S_PATTERN_LOOP;
+										jump_dest = loop_start[channel];
+									}
+									loop_count[channel]--;
+								}
+								break;
+						}
+						break;
+
+					case IT_SET_SONG_TEMPO:
+						switch (HIGH(value)) { /* slides happen every non-row frames */
+							case 0: tempo = tempo - LOW(value)*(speed-1); break;
+							case 1: tempo = tempo + LOW(value)*(speed-1); break;
+							default: tempo = value;
+						}
+						tempo = MID(32, tempo, 255);
+						break;
+				}
+
+				entry++;
+			}
+
+			/* end of ROW */
+			entry++;
+			t += TICK_TIME_DIVIDEND * (speed*(1+delay) + fine_delay) / tempo;
+
+			if (jump == IT_JUMP_TO_ORDER) {
+				order = jump_dest - 1;
+				break;
+			} else if (jump == IT_BREAK_TO_ROW)
+				break;
+			else if (jump == IT_S_PATTERN_LOOP)
+				entry = jump_dest - 1;
+		}
+
+		/* end of PATTERN */
+	}
+
+	return t;
+}
+
+#endif /* 0 */
+
+
+static char hexdigit(int in)
+{
+	if (in < 10) return in + '0';
+	else return in + 'A' - 10;
+}
+
+DUH *dumb_read_xm_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+	int ver;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	sigdata = it_xm_load_sigdata(f, &ver);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		char version[16];
+		const char *tag[2][2];
+		tag[0][0] = "TITLE";
+		tag[0][1] = ((DUMB_IT_SIGDATA *)sigdata)->name;
+		tag[1][0] = "FORMAT";
+		version[0] = 'X';
+		version[1] = 'M';
+		version[2] = ' ';
+		version[3] = 'v';
+		version[4] = hexdigit( ( ver >> 8 ) & 15 );
+		version[5] = '.';
+		version[6] = hexdigit( ( ver >> 4 ) & 15 );
+		version[7] = hexdigit( ver & 15 );
+		version[8] = 0;
+		tag[1][1] = ( const char * ) & version;
+		return make_duh(-1, 2, (const char *const (*)[2])tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readxm2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readxm2.c - Function to read a Fast Tracker II / / \ \
+ * module from an open file and do an | < / \_
+ * initial run-through. | \/ /\ /
+ * \_ / > /
+ * Split off from readxm.c by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_xm(DUMBFILE *f)
+{
+	DUH *duh = dumb_read_xm_quick(f);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/xmeffect.c Added

@@ -0,0 +1,243 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * xmeffect.c - Code for converting MOD/XM / / \ \
+ * effects to IT effects. | < / \_
+ * | \/ /\ /
+ * By Julien Cugniere. Ripped out of readxm.c \_ / > /
+ * by entheh. | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/it.h"
+
+#if 0
+unsigned char **_dumb_malloc2(int w, int h)
+{
+	unsigned char **line = malloc(h * sizeof(*line));
+	int i;
+	if (!line) return NULL;
+
+	line[0] = malloc(w * h * sizeof(*line[0]));
+	if (!line[0]) {
+		free(line);
+		return NULL;
+	}
+
+	for (i = 1; i < h; i++)
+		line[i] = line[i-1] + w;
+
+	memset(line[0], 0, w*h);
+
+	return line;
+}
+
+
+
+void _dumb_free2(unsigned char **line)
+{
+	if (line) {
+		if (line[0])
+			free(line[0]);
+		free(line);
+	}
+}
+
+
+
+/* Effects having a memory. 2 means that the two parts of the effectvalue
+ * should be handled separately.
+ */
+static const char xm_has_memory[] = {
+/*	0 1 2 3 4 5 6 7 8 9 A B C D (E) F G H K L P R T (X) */
+	0, 1, 1, 1, 2, 1, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
+
+/* E0 E1 E2 E3 E4 E5 E6 E7 E9 EA EB EC ED EE X1 X2 */
+	0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+#endif
+
+
+
+/* Effects marked with 'special' are handled specifically in itrender.c */
+void _dumb_it_xm_convert_effect(int effect, int value, IT_ENTRY *entry, int mod)
+{
+const int log = 0;
+
+	if ((!effect && !value) || (effect >= XM_N_EFFECTS))
+		return;
+
+if (log) printf("%c%02X", (effect<10)?('0'+effect):('A'+effect-10), value);
+
+	/* Linearisation of the effect number... */
+	if (effect == XM_E) {
+		effect = EBASE + HIGH(value);
+		value = LOW(value);
+	} else if (effect == XM_X) {
+		effect = XBASE + HIGH(value);
+		value = LOW(value);
+	}
+
+if (log) printf(" - %2d %02X", effect, value);
+
+#if 0 // This should be handled in itrender.c!
+	/* update effect memory */
+	switch (xm_has_memory[effect]) {
+		case 1:
+			if (!value)
+				value = memory[entry->channel][effect];
+			else
+				memory[entry->channel][effect] = value;
+			break;
+
+		case 2:
+			if (!HIGH(value))
+				SET_HIGH(value, HIGH(memory[entry->channel][effect]));
+			else
+				SET_HIGH(memory[entry->channel][effect], HIGH(value));
+
+			if (!LOW(value))
+				SET_LOW(value, LOW(memory[entry->channel][effect]));
+			else
+				SET_LOW(memory[entry->channel][effect], LOW(value));
+			break;
+	}
+#endif
+
+	/* convert effect */
+	entry->mask |= IT_ENTRY_EFFECT;
+	switch (effect) {
+
+		case XM_APPREGIO: effect = IT_ARPEGGIO; break;
+		case XM_VIBRATO: effect = IT_VIBRATO; break;
+		case XM_TONE_PORTAMENTO: effect = IT_TONE_PORTAMENTO; break;
+		case XM_TREMOLO: effect = IT_TREMOLO; break;
+		case XM_SET_PANNING: effect = IT_SET_PANNING; break;
+		case XM_SAMPLE_OFFSET: effect = IT_SET_SAMPLE_OFFSET; break;
+		case XM_POSITION_JUMP: effect = IT_JUMP_TO_ORDER; break;
+		case XM_MULTI_RETRIG: effect = IT_RETRIGGER_NOTE; break;
+		case XM_TREMOR: effect = IT_TREMOR; break;
+		case XM_PORTAMENTO_UP: effect = IT_XM_PORTAMENTO_UP; break;
+		case XM_PORTAMENTO_DOWN: effect = IT_XM_PORTAMENTO_DOWN; break;
+		case XM_SET_CHANNEL_VOLUME: effect = IT_SET_CHANNEL_VOLUME; break; /* special */
+		case XM_VOLSLIDE_TONEPORTA: effect = IT_VOLSLIDE_TONEPORTA; break; /* special */
+		case XM_VOLSLIDE_VIBRATO: effect = IT_VOLSLIDE_VIBRATO; break; /* special */
+
+		case XM_PATTERN_BREAK:
+			effect = IT_BREAK_TO_ROW;
+			value = BCD_TO_NORMAL(value);
+			if (value > 63) value = 0; /* FT2, maybe ProTracker? */
+			break;
+
+		case XM_VOLUME_SLIDE: /* special */
+			effect = IT_VOLUME_SLIDE;
+			value = HIGH(value) ? EFFECT_VALUE(HIGH(value), 0) : EFFECT_VALUE(0, LOW(value));
+			break;
+
+		case XM_PANNING_SLIDE:
+			effect = IT_PANNING_SLIDE;
+			//value = HIGH(value) ? EFFECT_VALUE(HIGH(value), 0) : EFFECT_VALUE(0, LOW(value));
+			value = HIGH(value) ? EFFECT_VALUE(0, HIGH(value)) : EFFECT_VALUE(LOW(value), 0);
+			break;
+
+		case XM_GLOBAL_VOLUME_SLIDE: /* special */
+			effect = IT_GLOBAL_VOLUME_SLIDE;
+			value = HIGH(value) ? EFFECT_VALUE(HIGH(value), 0) : EFFECT_VALUE(0, LOW(value));
+			break;
+
+		case XM_SET_TEMPO_BPM:
+			if (mod) effect = (value <= 0x20) ? (IT_SET_SPEED) : (IT_SET_SONG_TEMPO);
+			else effect = (value < 0x20) ? (IT_SET_SPEED) : (IT_SET_SONG_TEMPO);
+			break;
+
+		case XM_SET_GLOBAL_VOLUME:
+			effect = IT_SET_GLOBAL_VOLUME;
+			value *= 2;
+			break;
+
+		case XM_KEY_OFF:
+			effect = IT_XM_KEY_OFF;
+			break;
+
+		case XM_SET_ENVELOPE_POSITION:
+			effect = IT_XM_SET_ENVELOPE_POSITION;
+			break;
+
+		case EBASE+XM_E_SET_FILTER: effect = SBASE+IT_S_SET_FILTER; break;
+		case EBASE+XM_E_SET_GLISSANDO_CONTROL: effect = SBASE+IT_S_SET_GLISSANDO_CONTROL; break; /** TODO */
+		case EBASE+XM_E_SET_FINETUNE: effect = SBASE+IT_S_FINETUNE; break;
+		case EBASE+XM_E_SET_LOOP: effect = SBASE+IT_S_PATTERN_LOOP; break;
+		case EBASE+XM_E_NOTE_CUT: effect = SBASE+IT_S_DELAYED_NOTE_CUT; break;
+		case EBASE+XM_E_NOTE_DELAY: effect = SBASE+IT_S_NOTE_DELAY; break;
+		case EBASE+XM_E_PATTERN_DELAY: effect = SBASE+IT_S_PATTERN_DELAY; break;
+		case EBASE+XM_E_SET_PANNING: effect = SBASE+IT_S_SET_PAN; break;
+		case EBASE+XM_E_FINE_VOLSLIDE_UP: effect = IT_XM_FINE_VOLSLIDE_UP; break;
+		case EBASE+XM_E_FINE_VOLSLIDE_DOWN: effect = IT_XM_FINE_VOLSLIDE_DOWN; break;
+
+		case EBASE + XM_E_FINE_PORTA_UP:
+			effect = IT_PORTAMENTO_UP;
+			value = EFFECT_VALUE(0xF, value);
+			break;
+
+		case EBASE + XM_E_FINE_PORTA_DOWN:
+			effect = IT_PORTAMENTO_DOWN;
+			value = EFFECT_VALUE(0xF, value);
+			break;
+
+		case EBASE + XM_E_RETRIG_NOTE:
+			effect = IT_XM_RETRIGGER_NOTE;
+			value = EFFECT_VALUE(0, value);
+			break;
+
+		case EBASE + XM_E_SET_VIBRATO_CONTROL:
+			effect = SBASE+IT_S_SET_VIBRATO_WAVEFORM;
+			value &= ~4;
+			break;
+
+		case EBASE + XM_E_SET_TREMOLO_CONTROL:
+			effect = SBASE+IT_S_SET_TREMOLO_WAVEFORM;
+			value &= ~4;
+			break;
+
+		case XBASE + XM_X_EXTRAFINE_PORTA_UP:
+			effect = IT_PORTAMENTO_UP;
+			value = EFFECT_VALUE(0xE, value);
+			break;
+
+		case XBASE + XM_X_EXTRAFINE_PORTA_DOWN:
+			effect = IT_PORTAMENTO_DOWN;
+			value = EFFECT_VALUE(0xE, value);
+			break;
+
+		default:
+			/* user effect (often used in demos for synchronisation) */
+			entry->mask &= ~IT_ENTRY_EFFECT;
+	}
+
+if (log) printf(" - %2d %02X", effect, value);
+
+	/* Inverse linearisation... */
+	if (effect >= SBASE && effect < SBASE+16) {
+		value = EFFECT_VALUE(effect-SBASE, value);
+		effect = IT_S;
+	}
+
+if (log) printf(" - %c%02X\n", 'A'+effect-1, value);
+
+	entry->effect = effect;
+	entry->effectvalue = value;
+}

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/tools Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/tools/it Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/src/tools/it/modulus.h Added

@@ -0,0 +1,193 @@
+
+#define MUSIC_IT AL_ID('I','M','P','M')
+
+typedef struct MODULUS_MUSIC_INFO {
+	char Name[29];
+    int Type;
+} MODULUS_MUSIC_INFO;
+
+#define ENVELOPE_ON 1
+#define ENVELOPE_LOOP_ON 2
+#define ENVELOPE_SUSTAINLOOP 4
+
+typedef struct MODULUS_ENVELOPE {
+	unsigned char Flag,
+    	NumNodes,
+        LoopBegin, LoopEnd, SustainLoopBegin, SustainLoopEnd; //in nodes.
+    char NodeY[25];
+    short NodeTick[25];
+} MODULUS_ENVELOPE;
+
+typedef struct MODULUS_VENVELOPE {
+    char CurNode;
+    unsigned char CurTick;
+	char End;
+    //float CVolume;
+    MODULUS_ENVELOPE *Envelope;
+} MODULUS_VENVELOPE;
+
+#define NNA_NOTECUT      1
+#define NNA_NOTECONTINUE 2
+#define NNA_NOTEOFF      3
+#define NNA_NOTEFADE     4
+
+#define DCT_OFF 0
+#define DCT_NOTE 1
+#define DCT_SAMPLE 2
+#define DCT_INSTRUMENT 3
+
+#define DCA_CUT 0
+#define DCA_NOTEOFF 1
+#define DCA_NOTEFADE 2
+
+typedef struct MOULUS_INSTRUMENT {
+	unsigned char Flag;
+    char VolumeLoopNodeStart, VolumeLoopNodeEnd;
+    char SustainLoopNodeStart, SustainLoopNodeEnd;
+    char DuplicateCheckType;
+    char DuplicateCheckAction;
+    char NewNoteAction;
+    int FadeOut;
+
+    unsigned char PitchPanSeperation, //0->64, Bit7: Don't use
+    	PitchPanCenter; //Note, from C-0 to B-9
+    unsigned char GlobalVolume, //0->128
+    	DefaultPan; //0->64, Bit7: Don't use
+    
+
+    unsigned char NoteSample[120];
+    unsigned char NoteNote[120];
+
+    MODULUS_ENVELOPE VolumeEnvelope, PanningEnvelope, PitchEnvelope;
+} MODULUS_INSTRUMENT;
+
+#define SAMPLE_HASSAMPLE       1
+#define SAMPLE_16BIT           2
+#define SAMPLE_STEREO          4
+#define SAMPLE_USELOOP        16
+#define SAMPLE_USESUSTAINLOOP 32
+#define SAMPLE_PINGPONGLOOP   64
+#define SAMPLE_PINGPONGSUSTAINLOOP 128
+
+#define VIBRATO_SINE 0
+#define VIBRATO_RAMPDOWN 1
+#define VIBRATO_SQUARE 2
+#define VIBRATO_RANDOM 3
+
+typedef struct MODULUS_SAMPLE {
+	unsigned char GlobalVolume; //0->64
+    unsigned char Flag;
+    unsigned char Volume;
+    int SampleLength; //in samples, not bytes !
+    int LoopBegin, LoopEnd; //in samples
+    int SustainLoopBegin, SustainLoopEnd;
+    int C5Speed; //Number of bytes/sec for C-5
+
+    SAMPLE *Sample;
+
+    char VibratoSpeed; //0->64
+    char VibratoDepth; //0->64
+    char VibratoWaveForm;
+    char VibratoRate; //0->64
+} MODULUS_SAMPLE;
+
+typedef struct MODULUS_NOTE {
+	char Mask; //If Bit0: Note, Bit1: Instrument, Bit2: Volume, Bit3: Panning, Bit4: Command
+	char Channel; //if -1, then end of row.    
+    unsigned char Note;
+    char Instrument;
+    unsigned char Volume, Panning;
+    unsigned char Command, CommandValue;
+} MODULUS_NOTE;
+
+typedef struct MODULUS_PATTERN {
+	int NumRows;
+    int NumNotes;
+    MODULUS_NOTE *Note;
+} MODULUS_PATTERN;
+
+typedef struct MODULUS_VCHANNEL {
+	MODULUS_SAMPLE *Sample;  //NULL is unused
+    char voice;
+    char ChannelVolume;
+    char NoteOn;
+    char NNA;
+    short FadeOutCount, FadeOut;
+    float MixVolume, MixPan;
+    MODULUS_VENVELOPE *VVolumeEnvelope, *VPanningEnvelope, *VPitchEnvelope;
+    MODULUS_VCHANNEL *next, *prev;
+} MODULUS_VCHANNEL;
+
+typedef struct MODULUS_CHANNEL {
+	unsigned char Volume; //0->64
+    unsigned char Pan;    //0->32->64, 100 = surround, Bit7: Disable
+    char LastNote, LastInstrument, LastSample;    
+    MODULUS_VCHANNEL *VChannel;
+} MODULUS_CHANNEL;
+
+#define FLAG_STEREO         1
+#define FLAG_USEINSTRUMENTS 4
+#define FLAG_LINEARSLIDES   8
+#define FLAG_OLDEFFECT     16
+
+typedef struct MODULUS {
+	MODULUS_INSTRUMENT *Instrument;
+    MODULUS_SAMPLE *Sample;
+    MODULUS_PATTERN *Pattern;
+
+	int NumOrders;
+    int NumInstruments;
+    int NumSamples;
+    int NumPatterns;
+    int Flags;
+    short Version;
+    char GlobalVolume;
+    char MixVolume;
+    unsigned char Speed, Tempo;
+    char PanningSeperation;
+
+    unsigned char *Order;
+
+    MODULUS_CHANNEL Channel[64];
+
+} MODULUS;
+
+#define COMMAND_SET_SONG_SPEED        1
+#define COMMAND_JUMP_TO_ORDER         2
+#define COMMAND_PATTERN_BREAK_TO_ROW  3
+#define COMMAND_SET_CHANNEL_VOLUME   13
+#define COMMAND_SET_SONG_TEMPO       20
+#define COMMAND_SET_GLOBAL_VOLUME    22
+
+typedef struct MODULUS_PLAY {
+	MODULUS *Music;
+    int Loop, Tick;
+    int CurOrder, CurPattern, CurPos;
+    int Command, CommandVal0, CommandVal1, CommandVal2;
+    int pos;
+} MODULUS_PLAY;
+extern MODULUS_PLAY *song;
+
+extern int IT_Play_Method;
+
+MODULUS *load_it(char*);
+int get_module_size(MODULUS *);
+
+int play_it(MODULUS *j, int loop);
+void install_modulus();
+void set_mix_volume(int i);
+
+void stop_it();
+int is_music_done();
+void destroy_it(MODULUS *j);
+
+//Should be internal:
+extern MODULUS_PLAY *song;
+extern int note_freq[120];
+
+extern void MOD_Interrupt(...);
+extern int MOD_Poller(void*);
+
+#define IT_TIMER 0
+#define IT_POLL  1
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbdesk.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbgui.h Added

@@ -0,0 +1,82 @@
+#ifndef INCLUDED_DUMBGUI_H
+#define INCLUDED_DUMBGUI_H
+
+
+/* GUI_FINISHED_WITH: Set this in your update, key or mouse function when you
+ *                    don't need the object any more. It will be destroyed
+ *                    before redrawing or any subsequent updates take place.
+ * GUI_OTHER:         Any powers of two greater than or equal to this are
+ *                    free for use by objects for specific purposes.
+ */
+#define GUI_FINISHED_WITH 1
+#define GUI_OTHER         2
+
+
+typedef struct GUI GUI;
+
+
+/* GUI_CREATE:    Create a GUI object.
+ * GUI_DESTROY:   Destroy the GUI object.
+ * GUI_KEY:       Respond to a key.
+ * GUI_UPDATE:    Process any real-time activity.
+ * GUI_DRAW:      Draw any parts of the GUI that have changed. This may be
+ *                called more than once with different clipping rectangles,
+ *                so don't clear any flags here.
+ * GUI_DRAWN:     Clear any redraw flags.
+ * GUI_CHANGED_*: Set flags to redraw parts of the object as necessary for
+ *                the change that has occurred.
+ */
+typedef void (*GUI_CREATE)(GUI *gui, void *param);
+typedef void (*GUI_DESTROY)(GUI *gui);
+typedef void (*GUI_KEY)(GUI *gui, int k);
+typedef void (*GUI_UPDATE)(GUI *gui);
+typedef void (*GUI_DRAW)(GUI *gui);
+typedef void (*GUI_DRAWN)(GUI *gui);
+typedef void (*GUI_CHANGED_ALL)(GUI *gui);
+typedef void (*GUI_CHANGED_ACTIVE)(GUI *gui);
+
+
+typedef struct GUI_COMMANDS
+{
+	GUI_CREATE create;
+	GUI_DESTROY destroy;
+	GUI_KEY key;
+	GUI_UPDATE update;
+	GUI_DRAW draw;
+	GUI_DRAWN drawn;
+	GUI_CHANGED_ALL changed_all;
+	GUI_CHANGED_ACTIVE changed_active;
+}
+GUI_COMMANDS;
+
+
+struct GUI
+{
+	GUI_COMMANDS *com;
+
+	GUI *parent;
+
+	int x, y, w, h;
+	int flags;
+
+	void *data;
+};
+
+
+extern GUI *gui_active;
+
+void gui_set_active(GUI *gui);
+
+GUI *gui_create(GUI_COMMANDS *com, GUI *parent, int x, int y, int w, int h, void *param);
+void gui_destroy(GUI *gui);
+void gui_key(GUI *gui, int k);
+void gui_update(GUI *gui);
+void gui_draw(GUI *gui);
+void gui_draw_void(void *gui);
+void gui_drawn(GUI *gui);
+void gui_changed_all(GUI *gui);
+void gui_changed_active(GUI *gui);
+
+
+#endif /* INCLUDED_DUMBGUI_H */
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbmenu.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/guiproc.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/guitop.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/main.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/options.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/subclip.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/todo.txt Added

@@ -0,0 +1,141 @@
+al_duh_get_volume()
+
+* [23:25:12] <Mahogny> I prefer an API datagram :)
+
+* Create a glossary of terms like 'render', 'sigrenderer', etc.?
+
+* Consider the order in which stuff appears in dumb.h, and dumb.txt?
+
+
+PROPOSED CHANGE OF TERMINOLOGY:
+
+Current situation:
+
+ A DUH comprises a number of "signals". A signal is an entity capable of
+ producing a stream of audio. When a signal is called upon to generate
+ sound, it may in turn call upon any other signals in the DUH and use the
+ sound from those in generating its own.
+
+ There are a number of "sigtypes", including 'SAMP' (a sample) and 'SEQU'
+ (a sequence). Every signal in a DUH must be of one of these known types.
+ Every sigtype is characterised by a four-byte identifier and the
+ following function prototypes:
+
+ typedef void signal_t;
+ typedef void sampinfo_t;
+
+ signal_t *load_signal(DUH *duh, DUMBFILE *file);
+ sampinfo_t *start_samples(DUH *duh, signal_t *signal, int n_channels, long pos);
+ void set_parameter(sampinfo_t *sampinfo, unsigned char id, long value);
+ long render_samples(sampinfo_t *sampinfo, float volume, float delta, long size, sample_t **samples);
+ void end_samples(sampinfo_t *sampinfo);
+ void unload_signal(signal_t *signal);
+
+ When a signal in a DUH needs to be loaded, DUMB's core first checks the
+ identifier. If it is unknown, load_duh() fails. Each known sigtype will
+ have pointers to the above functions, so DUMB's core will then call the
+ load_signal() function. This loads the "signal", which could consist of
+ sample data, or sequence data (like the patterns in a music module).
+ (There's ambiguity here; we use the word "signal" for the whole entity
+ and also for the specific data that distinguish it from other signals of
+ the same sigtype.)
+
+ Once a signal is in memory, it can be used to generate sound. Its
+ start_samples() function is called for that, and a "sampinfo" block is
+ returned; this will contain the current position and any necessary state
+ information. render_samples() generates sound, and end_samples() destroys
+ the sampinfo block.
+
+ DUMB's support for existing file formats is implemented as follows. First
+ a signal_t is constructed manually by reading the file. Then the special
+ make_duh() function is called. This creates a DUH struct with just one
+ signal in it, the one we just created. We provide all the above
+ functions, except load_signal(), since that has been bypassed. DUMB's
+ core now has our start_samples() etc. function for generating the sound,
+ and it has our unload_signal() function for getting the file out of
+ memory when we're done.
+
+ It is possible with some sigtypes to adjust their sound using
+ "parameters". set_parameter() is called for this. An example would be
+ changing the cut-off frequency for a signal that acts as a filter. I plan
+ to add a second version of this function that takes a pointer. This would
+ be used when manipulating DUHs in code; an example is when installing a
+ callback function for a music module file. It couldn't be used by a file
+ on disk.
+
+This terminology is far from intuitive. Here are some proposals:
+
+- The things DUHs are made of can still be called "signals".
+- The types of signal can still be called "sigtypes" ("signal types").
+- The signal-specific data can be called the "sigdata" ("signal data").
+- The sampinfo block can be renamed to a "sigrenderer" ("signal renderer").
+- The parameters can be called "sigparams" ("signal parameters").
+
+This way we have some consistency between different parts of the library;
+the API for rendering a DUH as a whole uses the term "renderer". We also
+have a full name and an abbreviation for each term.
+
+Any advances on this?
+
+---
+
+Todo/Wishlist:
+
+* MOD/XM loading - change the effect memory system; it isn't robust when it
+ comes to remembering stuff from one pattern to the next.
+* --- IMPORTANT --- Put link to IT in docs: http://www.noisemusic.org/it/
+* --- IMPORTANT --- Twist the sample decompression algorithm around, since
+ it was derived from a GPL'd algorithm. We don't want
+ to have to put it under GPL! :) ... or, find out that it
+ wasn't originally written under the GPL and then credit
+ the bloke who wrote it :)
+* MMX resamplers and downsamplers
+* Ability to load *.it, *.xm directly into DUH structs (IT done)
+* Ability to embed IT compressed samples... no, it's copyrighted. Let's do
+ our own :)
+* Ability to embed ITs themselves (? not sure how useful that is)
+* Remove cit.c
+* Check all return values. I think the Winamp plug-in needs looking at...
+* resample.c - it seems x*y is safe if 0<=x<=65535 and -32768<=y<=32768 or
+ vice versa. Check this is true on all compilers. If so, make
+			 use of it to gain more accuracy.
+* DUMB_IDs should always be long or always be int...
+* Decide whether the load_signal function really needs the DUH parameter...
+* Allow for DUH modularity; different pieces share samples etc.
+
+* Fix makefile so it can manage without alld - or put note in the FAQ that
+ ppl must build alld
+* Arrange to detect file types by extension (probably not by content though)
+* Change aldmbd to aldmd in makefiles to maintain 8.3 compatibility
+* Put dumb_resampling_quality and dumb_it_max_to_mix in howto.txt
+* More info in howto.txt, in particular that install_sound() is needed...
+* Add a sanity check for restart_position?
+* Note in docs to let entheh know if you release a game using DUMB
+
+
+STUFF TO FIX FOR THE FIRST RELEASE
+==================================
+
+General
+-------
+* Naming is a bit confusing sometimes...
+* What to do about ASSERT() and TRACE() - they were hacked in when
+ the lib was split from Allegro, and they need replacing.
+* Add some constants to dumb.h (DUMB_VERSION_STR etc.)
+
+entheh
+------
+* Update docs, write more docs (a lot to do here!)
+* Go through, eliminate warnings, resolve some "/** WARNING" comments
+ (they used to be #warning but Bob complained :)
+* Program it to calculate the length of IT and S3M files (currently
+ always set to 10 minutes IIRC)
+
+Bob
+---
+* dumb_resample() now has a volume parameter, so there are some extra
+ floating-point multiply ops that could possibly be optimised.
+
+tjaden
+------
+* Test on Linux when it's all ready plz :)

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/gui.h Added

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/in2.h Added

@@ -0,0 +1,123 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * in2.h - Winamp plug-in header file / / \ \
+ * | < / \_
+ * By Bob. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+
+#include "out.h"
+
+// note: exported symbol is now winampGetInModule2.
+
+#define IN_VER 0x100
+
+typedef struct 
+{
+	int version;				// module type (IN_VER)
+	char *description;			// description of module, with version string
+
+	HWND hMainWindow;			// winamp's main window (filled in by winamp)
+	HINSTANCE hDllInstance;		// DLL instance handle (Also filled in by winamp)
+
+	char *FileExtensions;		// "mp3\0Layer 3 MPEG\0mp2\0Layer 2 MPEG\0mpg\0Layer 1 MPEG\0"
+								// May be altered from Config, so the user can select what they want
+	
+	int is_seekable;			// is this stream seekable? 
+	int UsesOutputPlug;			// does this plug-in use the output plug-ins? (musn't ever change, ever :)
+
+	void (*Config)(HWND hwndParent); // configuration dialog
+	void (*About)(HWND hwndParent); // about dialog
+
+	void (*Init)();				// called at program init
+	void (*Quit)();				// called at program quit
+
+	void (*GetFileInfo)(char *file, char *title, int *length_in_ms); // if file == NULL, current playing is used
+	int (*InfoBox)(char *file, HWND hwndParent);
+	
+	int (*IsOurFile)(char *fn);	// called before extension checks, to allow detection of mms://, etc
+	// playback stuff
+	int (*Play)(char *fn);		// return zero on success, -1 on file-not-found, some other value on other (stopping winamp) error
+	void (*Pause)();			// pause stream
+	void (*UnPause)();			// unpause stream
+	int (*IsPaused)();			// ispaused? return 1 if paused, 0 if not
+	void (*Stop)();				// stop (unload) stream
+
+	// time stuff
+	int (*GetLength)();			// get length in ms
+	int (*GetOutputTime)();		// returns current output time in ms. (usually returns outMod->GetOutputTime()
+	void (*SetOutputTime)(int time_in_ms);	// seeks to point in stream (in ms). Usually you signal yoru thread to seek, which seeks and calls outMod->Flush()..
+
+	// volume stuff
+	void (*SetVolume)(int volume);	// from 0 to 255.. usually just call outMod->SetVolume
+	void (*SetPan)(int pan);	// from -127 to 127.. usually just call outMod->SetPan
+	
+	// in-window builtin vis stuff
+
+	void (*SAVSAInit)(int maxlatency_in_ms, int srate);		// call once in Play(). maxlatency_in_ms should be the value returned from outMod->Open()
+	// call after opening audio device with max latency in ms and samplerate
+	void (*SAVSADeInit)();	// call in Stop()
+
+
+	// simple vis supplying mode
+	void (*SAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); 
+											// sets the spec data directly from PCM data
+											// quick and easy way to get vis working :)
+											// needs at least 576 samples :)
+
+	// advanced vis supplying mode, only use if you're cool. Use SAAddPCMData for most stuff.
+	int (*SAGetMode)();		// gets csa (the current type (4=ws,2=osc,1=spec))
+							// use when calling SAAdd()
+	void (*SAAdd)(void *data, int timestamp, int csa); // sets the spec data, filled in by winamp
+
+
+	// vis stuff (plug-in)
+	// simple vis supplying mode
+	void (*VSAAddPCMData)(void *PCMData, int nch, int bps, int timestamp); // sets the vis data directly from PCM data
+											// quick and easy way to get vis working :)
+											// needs at least 576 samples :)
+
+	// advanced vis supplying mode, only use if you're cool. Use VSAAddPCMData for most stuff.
+	int (*VSAGetMode)(int *specNch, int *waveNch); // use to figure out what to give to VSAAdd
+	void (*VSAAdd)(void *data, int timestamp); // filled in by winamp, called by plug-in
+
+
+	// call this in Play() to tell the vis plug-ins the current output params. 
+	void (*VSASetInfo)(int nch, int srate);
+
+
+	// dsp plug-in processing: 
+	// (filled in by winamp, called by input plug)
+
+	// returns 1 if active (which means that the number of samples returned by dsp_dosamples
+	// could be greater than went in.. Use it to estimate if you'll have enough room in the
+	// output buffer
+	int (*dsp_isactive)(); 
+
+	// returns number of samples to output. This can be as much as twice numsamples. 
+	// be sure to allocate enough buffer for samples, then.
+	int (*dsp_dosamples)(short int *samples, int numsamples, int bps, int nch, int srate);
+
+
+	// eq stuff
+	void (*EQSet)(int on, char data[10], int preamp); // 0-64 each, 31 is +0, 0 is +12, 63 is -12. Do nothing to ignore.
+
+	// info setting (filled in by winamp)
+	void (*SetInfo)(int bitrate, int srate, int stereo, int synched); // if -1, changes ignored? :)
+
+	Out_Module *outMod; // filled in by winamp, optionally used :)
+} In_Module;
+
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/in_duh.h Added

@@ -0,0 +1,40 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * in_duh.h - Winamp plug-in header file. / / \ \
+ * | < / \_
+ * By Bob. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <windows.h>
+//#include <mmreg.h>
+//#include <msacm.h>
+#include <math.h>
+
+#include "in2.h"
+
+#include "../include/dumb.h"
+
+
+/******************
+ * Plug in config */
+
+#define VERSION "0.1"
+
+
+#define STREAM_SIZE 576
+#define STREAM_FREQ 44100
+
+
+extern In_Module mod;

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/out.h Added

@@ -0,0 +1,71 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * out.h - Winamp plug-in header file. / / \ \
+ * | < / \_
+ * By Bob. | \/ /\ /
+ * \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#define OUT_VER 0x10
+
+typedef struct 
+{
+	int version;				// module version (OUT_VER)
+	char *description;			// description of module, with version string
+	int id;						// module id. each input module gets its own. non-nullsoft modules should
+								// be >= 65536. 
+
+	HWND hMainWindow;			// winamp's main window (filled in by winamp)
+	HINSTANCE hDllInstance;		// DLL instance handle (filled in by winamp)
+
+	void (*Config)(HWND hwndParent); // configuration dialog 
+	void (*About)(HWND hwndParent); // about dialog
+
+	void (*Init)();				// called when loaded
+	void (*Quit)();				// called when unloaded
+
+	int (*Open)(int samplerate, int numchannels, int bitspersamp, int bufferlenms, int prebufferms); 
+					// returns >=0 on success, <0 on failure
+					// NOTENOTENOTE: bufferlenms and prebufferms are ignored in most if not all output plug-ins. 
+					// ... so don't expect the max latency returned to be what you asked for.
+					// returns max latency in ms (0 for diskwriters, etc)
+					// bufferlenms and prebufferms must be in ms. 0 to use defaults. 
+					// prebufferms must be <= bufferlenms
+
+	void (*Close)();	// close the ol' output device.
+
+	int (*Write)(char *buf, int len);	
+					// 0 on success. Len == bytes to write (<= 8192 always). buf is straight audio data. 
+					// 1 returns not able to write (yet). Non-blocking, always.
+
+	int (*CanWrite)();	// returns number of bytes possible to write at a given time. 
+						// Never will decrease unless you call Write (or Close, heh)
+
+	int (*IsPlaying)(); // non0 if output is still going or if data in buffers waiting to be
+						// written (i.e. closing while IsPlaying() returns 1 would truncate the song
+
+	int (*Pause)(int pause); // returns previous pause state
+
+	void (*SetVolume)(int volume); // volume is 0-255
+	void (*SetPan)(int pan); // pan is -128 to 128
+
+	void (*Flush)(int t);	// flushes buffers and restarts output at time t (in ms) 
+							// (used for seeking)
+
+	int (*GetOutputTime)(); // returns played time in MS
+	int (*GetWrittenTime)(); // returns time written in MS (used for synching up vis stuff)
+
+} Out_Module;
+
+

deadbeef-0.5.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/resource.h Added

@@ -0,0 +1,36 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by config.rc
+//
+#define IDD_CONFIG                      102
+#define IDC_8BPS                        1000
+#define IDC_16BPS                       1001
+#define IDC_STEREO                      1002
+#define IDC_ALIASING                    1003
+#define IDC_LINEAR                      1004
+#define IDC_LINEAR_LOW_PASS             1005
+#define IDC_QUADRATIC                   1006
+#define IDC_CUBIC                       1007
+#define IDC_THREAD_PRI                  1008
+#define IDC_11KHZ                       1009
+#define IDC_22KHZ                       1010
+#define IDC_44KHZ                       1011
+#define IDC_48KHZ                       1012
+#define IDC_OK                          1013
+#define IDC_CANCEL                      1014
+#define IDC_BUFFERSIZE                  1015
+#define IDC_BUFFERSIZE2                 1016
+#define IDC_DEFAULT                     1017
+#define IDC_NICEST                      1018
+#define IDC_FASTEST                     1019
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1020
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

deadbeef-0.5.1.tar.bz2/plugins/ffap/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/ffap/Makefile.am Changed

deadbeef-0.5.1.tar.bz2/plugins/ffap/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/ffap/Makefile.in Changed

@@ -69,12 +69,16 @@
 am__installdirs = "$(DESTDIR)$(pkglibdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 ffap_la_LIBADD =
-am__ffap_la_SOURCES_DIST = ffap.c
-@HAVE_FFAP_TRUE@am_ffap_la_OBJECTS = ffap.lo
+am__ffap_la_SOURCES_DIST = ffap.c dsputil_yasm.asm
+@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE@am__objects_1 = dsputil_yasm.lo
+@HAVE_FFAP_TRUE@am_ffap_la_OBJECTS = ffap.lo $(am__objects_1)
 ffap_la_OBJECTS = $(am_ffap_la_OBJECTS)
-ffap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ffap_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ffap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ffap_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FFAP_TRUE@am_ffap_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -82,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(ffap_la_SOURCES)
 DIST_SOURCES = $(am__ffap_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -312,13 +333,19 @@
 top_srcdir = @top_srcdir@
 @HAVE_FFAP_TRUE@ffapdir = $(libdir)/$(PACKAGE)
 @HAVE_FFAP_TRUE@pkglib_LTLIBRARIES = ffap.la
-@HAVE_FFAP_TRUE@ffap_la_SOURCES = ffap.c
-@HAVE_FFAP_TRUE@ffap_la_LDFLAGS = -module
-@HAVE_FFAP_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+@HAVE_FFAP_TRUE@topsrcdir = @top_srcdir@
+@HAVE_FFAP_TRUE@YASM = $(topsrcdir)/yasmwrapper.sh
+@HAVE_FFAP_TRUE@EXTRA_DIST = dsputil_yasm.asm x86inc.asm
+@HAVE_FFAP_TRUE@SUFFIXES = .asm
+@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE@INTEL_SRC = dsputil_yasm.asm
+@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE@ffap_la_DEPENDENCIES = dsputil_yasm.lo
+@HAVE_FFAP_TRUE@ffap_la_SOURCES = ffap.c $(INTEL_SRC)
+@HAVE_FFAP_TRUE@ffap_la_LDFLAGS = -module -lm
+@HAVE_FFAP_TRUE@AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .asm .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
 	@for dep in $?; do \
 	 case '$(am__configure_deps)' in \
@@ -381,7 +408,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 ffap.la: $(ffap_la_OBJECTS) $(ffap_la_DEPENDENCIES) 
-	$(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ffap_la_LINK) $(am_ffap_la_rpath) $(ffap_la_OBJECTS) $(ffap_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -392,22 +419,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffap.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -620,6 +650,9 @@
 	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
 
 
+@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE@.asm.lo:
+@HAVE_FFAP_TRUE@@HAVE_YASM_TRUE@	$(LIBTOOL) --tag=CC --mode=compile $(YASM) $(YASM_FLAGS) -o $@ $<
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

deadbeef-0.5.2.tar.bz2/plugins/ffap/dsputil_yasm.asm Added

@@ -0,0 +1,423 @@
+;******************************************************************************
+;* MMX optimized DSP utils
+;* Copyright (c) 2008 Loren Merritt
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg 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.
+;*
+;* FFmpeg 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 FFmpeg; if not, write to the Free Software
+;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "x86inc.asm"
+
+SECTION_RODATA
+pb_f: times 16 db 15
+pb_zzzzzzzz77777777: times 8 db -1
+pb_7: times 8 db 7
+pb_zzzz3333zzzzbbbb: db -1,-1,-1,-1,3,3,3,3,-1,-1,-1,-1,11,11,11,11
+pb_zz11zz55zz99zzdd: db -1,-1,1,1,-1,-1,5,5,-1,-1,9,9,-1,-1,13,13
+
+section .text align=16
+
+%macro PSWAPD_SSE 2
+ pshufw %1, %2, 0x4e
+%endmacro
+%macro PSWAPD_3DN1 2
+ movq %1, %2
+ psrlq %1, 32
+ punpckldq %1, %2
+%endmacro
+
+%macro FLOAT_TO_INT16_INTERLEAVE6 1
+; void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len)
+cglobal float_to_int16_interleave6_%1, 2,7,0, dst, src, src1, src2, src3, src4, src5
+%ifdef ARCH_X86_64
+ %define lend r10d
+ mov lend, r2d
+%else
+ %define lend dword r2m
+%endif
+ mov src1q, [srcq+1*gprsize]
+ mov src2q, [srcq+2*gprsize]
+ mov src3q, [srcq+3*gprsize]
+ mov src4q, [srcq+4*gprsize]
+ mov src5q, [srcq+5*gprsize]
+ mov srcq, [srcq]
+ sub src1q, srcq
+ sub src2q, srcq
+ sub src3q, srcq
+ sub src4q, srcq
+ sub src5q, srcq
+.loop:
+ cvtps2pi mm0, [srcq]
+ cvtps2pi mm1, [srcq+src1q]
+ cvtps2pi mm2, [srcq+src2q]
+ cvtps2pi mm3, [srcq+src3q]
+ cvtps2pi mm4, [srcq+src4q]
+ cvtps2pi mm5, [srcq+src5q]
+ packssdw mm0, mm3
+ packssdw mm1, mm4
+ packssdw mm2, mm5
+ pswapd mm3, mm0
+ punpcklwd mm0, mm1
+ punpckhwd mm1, mm2
+ punpcklwd mm2, mm3
+ pswapd mm3, mm0
+ punpckldq mm0, mm2
+ punpckhdq mm2, mm1
+ punpckldq mm1, mm3
+ movq [dstq ], mm0
+ movq [dstq+16], mm2
+ movq [dstq+ 8], mm1
+ add srcq, 8
+ add dstq, 24
+ sub lend, 2
+ jg .loop
+ emms
+ RET
+%endmacro ; FLOAT_TO_INT16_INTERLEAVE6
+
+%define pswapd PSWAPD_SSE
+FLOAT_TO_INT16_INTERLEAVE6 sse
+%define cvtps2pi pf2id
+%define pswapd PSWAPD_3DN1
+FLOAT_TO_INT16_INTERLEAVE6 3dnow
+%undef pswapd
+FLOAT_TO_INT16_INTERLEAVE6 3dn2
+%undef cvtps2pi
+
+
+
+%macro SCALARPRODUCT 1
+; int scalarproduct_int16(int16_t *v1, int16_t *v2, int order, int shift)
+cglobal scalarproduct_int16_%1, 3,3,4, v1, v2, order, shift
+ shl orderq, 1
+ add v1q, orderq
+ add v2q, orderq
+ neg orderq
+ movd m3, shiftm
+ pxor m2, m2
+.loop:
+ movu m0, [v1q + orderq]
+ movu m1, [v1q + orderq + mmsize]
+ pmaddwd m0, [v2q + orderq]
+ pmaddwd m1, [v2q + orderq + mmsize]
+ paddd m2, m0
+ paddd m2, m1
+ add orderq, mmsize*2
+ jl .loop
+%if mmsize == 16
+ movhlps m0, m2
+ paddd m2, m0
+ psrad m2, m3
+ pshuflw m0, m2, 0x4e
+%else
+ psrad m2, m3
+ pshufw m0, m2, 0x4e
+%endif
+ paddd m2, m0
+ movd eax, m2
+ RET
+
+; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)
+cglobal scalarproduct_and_madd_int16_%1, 4,4,8, v1, v2, v3, order, mul
+ shl orderq, 1
+ movd m7, mulm
+%if mmsize == 16
+ pshuflw m7, m7, 0
+ punpcklqdq m7, m7
+%else
+ pshufw m7, m7, 0
+%endif
+ pxor m6, m6
+ add v1q, orderq
+ add v2q, orderq
+ add v3q, orderq
+ neg orderq
+.loop:
+ movu m0, [v2q + orderq]
+ movu m1, [v2q + orderq + mmsize]
+ mova m4, [v1q + orderq]
+ mova m5, [v1q + orderq + mmsize]
+ movu m2, [v3q + orderq]
+ movu m3, [v3q + orderq + mmsize]
+ pmaddwd m0, m4
+ pmaddwd m1, m5
+ pmullw m2, m7
+ pmullw m3, m7
+ paddd m6, m0
+ paddd m6, m1
+ paddw m2, m4
+ paddw m3, m5
+ mova [v1q + orderq], m2
+ mova [v1q + orderq + mmsize], m3
+ add orderq, mmsize*2
+ jl .loop
+%if mmsize == 16
+ movhlps m0, m6
+ paddd m6, m0
+ pshuflw m0, m6, 0x4e
+%else
+ pshufw m0, m6, 0x4e
+%endif
+ paddd m6, m0
+ movd eax, m6
+ RET
+%endmacro
+
+INIT_MMX
+SCALARPRODUCT mmx2
+INIT_XMM
+SCALARPRODUCT sse2
+
+%macro SCALARPRODUCT_LOOP 1
+align 16
+.loop%1:
+ sub orderq, mmsize*2
+%if %1
+ mova m1, m4
+ mova m4, [v2q + orderq]
+ mova m0, [v2q + orderq + mmsize]
+ palignr m1, m0, %1
+ palignr m0, m4, %1
+ mova m3, m5
+ mova m5, [v3q + orderq]
+ mova m2, [v3q + orderq + mmsize]
+ palignr m3, m2, %1
+ palignr m2, m5, %1
+%else
+ mova m0, [v2q + orderq]
+ mova m1, [v2q + orderq + mmsize]
+ mova m2, [v3q + orderq]
+ mova m3, [v3q + orderq + mmsize]
+%endif
+ %define t0 [v1q + orderq]
+ %define t1 [v1q + orderq + mmsize]
+%ifdef ARCH_X86_64
+ mova m8, t0
+ mova m9, t1
+ %define t0 m8
+ %define t1 m9
+%endif
+ pmaddwd m0, t0
+ pmaddwd m1, t1
+ pmullw m2, m7
+ pmullw m3, m7
+ paddw m2, t0
+ paddw m3, t1
+ paddd m6, m0
+ paddd m6, m1
+ mova [v1q + orderq], m2
+ mova [v1q + orderq + mmsize], m3
+ jg .loop%1
+%if %1
+ jmp .end
+%endif
+%endmacro
+
+; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)
+cglobal scalarproduct_and_madd_int16_ssse3, 4,5,10, v1, v2, v3, order, mul
+ shl orderq, 1
+ movd m7, mulm
+ pshuflw m7, m7, 0
+ punpcklqdq m7, m7
+ pxor m6, m6
+ mov r4d, v2d
+ and r4d, 15
+ and v2q, ~15
+ and v3q, ~15
+ mova m4, [v2q + orderq]
+ mova m5, [v3q + orderq]
+ ; linear is faster than branch tree or jump table, because the branches taken are cyclic (i.e. predictable)
+ cmp r4d, 0
+ je .loop0
+ cmp r4d, 2
+ je .loop2
+ cmp r4d, 4
+ je .loop4
+ cmp r4d, 6
+ je .loop6
+ cmp r4d, 8
+ je .loop8
+ cmp r4d, 10
+ je .loop10
+ cmp r4d, 12
+ je .loop12
+SCALARPRODUCT_LOOP 14
+SCALARPRODUCT_LOOP 12
+SCALARPRODUCT_LOOP 10
+SCALARPRODUCT_LOOP 8
+SCALARPRODUCT_LOOP 6
+SCALARPRODUCT_LOOP 4
+SCALARPRODUCT_LOOP 2
+SCALARPRODUCT_LOOP 0
+.end:
+ movhlps m0, m6
+ paddd m6, m0
+ pshuflw m0, m6, 0x4e
+ paddd m6, m0
+ movd eax, m6
+ RET
+
+
+
+; void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top)
+cglobal add_hfyu_median_prediction_mmx2, 6,6,0, dst, top, diff, w, left, left_top
+ movq mm0, [topq]
+ movq mm2, mm0
+ movd mm4, [left_topq]
+ psllq mm2, 8
+ movq mm1, mm0
+ por mm4, mm2
+ movd mm3, [leftq]
+ psubb mm0, mm4 ; t-tl
+ add dstq, wq
+ add topq, wq
+ add diffq, wq
+ neg wq
+ jmp .skip
+.loop:
+ movq mm4, [topq+wq]
+ movq mm0, mm4
+ psllq mm4, 8
+ por mm4, mm1
+ movq mm1, mm0 ; t
+ psubb mm0, mm4 ; t-tl
+.skip:
+ movq mm2, [diffq+wq]
+%assign i 0
+%rep 8
+ movq mm4, mm0
+ paddb mm4, mm3 ; t-tl+l
+ movq mm5, mm3
+ pmaxub mm3, mm1
+ pminub mm5, mm1
+ pminub mm3, mm4
+ pmaxub mm3, mm5 ; median
+ paddb mm3, mm2 ; +residual
+%if i==0
+ movq mm7, mm3
+ psllq mm7, 56
+%else
+ movq mm6, mm3
+ psrlq mm7, 8
+ psllq mm6, 56
+ por mm7, mm6
+%endif
+%if i<7
+ psrlq mm0, 8
+ psrlq mm1, 8
+ psrlq mm2, 8
+%endif
+%assign i i+1
+%endrep
+ movq [dstq+wq], mm7
+ add wq, 8
+ jl .loop
+ movzx r2d, byte [dstq-1]
+ mov [leftq], r2d
+ movzx r2d, byte [topq-1]
+ mov [left_topq], r2d
+ RET
+
+
+%macro ADD_HFYU_LEFT_LOOP 1 ; %1 = is_aligned
+ add srcq, wq
+ add dstq, wq
+ neg wq
+%%.loop:
+ mova m1, [srcq+wq]
+ mova m2, m1
+ psllw m1, 8
+ paddb m1, m2
+ mova m2, m1
+ pshufb m1, m3
+ paddb m1, m2
+ pshufb m0, m5
+ mova m2, m1
+ pshufb m1, m4
+ paddb m1, m2
+%if mmsize == 16
+ mova m2, m1
+ pshufb m1, m6
+ paddb m1, m2
+%endif
+ paddb m0, m1
+%if %1
+ mova [dstq+wq], m0
+%else
+ movq [dstq+wq], m0
+ movhps [dstq+wq+8], m0
+%endif
+ add wq, mmsize
+ jl %%.loop
+ mov eax, mmsize-1
+ sub eax, wd
+ movd m1, eax
+ pshufb m0, m1
+ movd eax, m0
+ RET
+%endmacro
+
+; int ff_add_hfyu_left_prediction(uint8_t *dst, const uint8_t *src, int w, int left)
+INIT_MMX
+cglobal add_hfyu_left_prediction_ssse3, 3,3,7, dst, src, w, left
+.skip_prologue:
+ mova m5, [pb_7 GLOBAL]
+ mova m4, [pb_zzzz3333zzzzbbbb GLOBAL]
+ mova m3, [pb_zz11zz55zz99zzdd GLOBAL]
+ movd m0, leftm
+ psllq m0, 56
+ ADD_HFYU_LEFT_LOOP 1
+
+INIT_XMM
+cglobal add_hfyu_left_prediction_sse4, 3,3,7, dst, src, w, left
+ mova m5, [pb_f GLOBAL]
+ mova m6, [pb_zzzzzzzz77777777 GLOBAL]
+ mova m4, [pb_zzzz3333zzzzbbbb GLOBAL]
+ mova m3, [pb_zz11zz55zz99zzdd GLOBAL]
+ movd m0, leftm
+ pslldq m0, 15
+ test srcq, 15
+ jnz add_hfyu_left_prediction_ssse3.skip_prologue
+ test dstq, 15
+ jnz .unaligned
+ ADD_HFYU_LEFT_LOOP 1
+.unaligned:
+ ADD_HFYU_LEFT_LOOP 0
+
+
+; float ff_scalarproduct_float_sse(const float *v1, const float *v2, int len)
+cglobal scalarproduct_float_sse, 3,3,2, v1, v2, offset
+ neg offsetq
+ shl offsetq, 2
+ sub v1q, offsetq
+ sub v2q, offsetq
+ xorps xmm0, xmm0
+ .loop:
+ movaps xmm1, [v1q+offsetq]
+ mulps xmm1, [v2q+offsetq]
+ addps xmm0, xmm1
+ add offsetq, 16
+ js .loop
+ movhlps xmm1, xmm0
+ addps xmm0, xmm1
+ movss xmm1, xmm0
+ shufps xmm0, xmm0, 1
+ addss xmm0, xmm1
+%ifndef ARCH_X86_64
+ movd r0m, xmm0
+ fld dword r0m
+%endif
+ RET

deadbeef-0.5.1.tar.bz2/plugins/ffap/ffap.c -> deadbeef-0.5.2.tar.bz2/plugins/ffap/ffap.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
 based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>
 based upon libdemac from Dave Chapman.
 
@@ -41,7 +41,7 @@
 
 #ifdef TARGET_ANDROID
 int posix_memalign (void **memptr, size_t alignment, size_t size) {
- *memptr = malloc (size);
+ *memptr = memalign (alignment, size);
 return *memptr ? 0 : -1;
 }
 #endif
@@ -1275,111 +1275,20 @@
 typedef struct { uint64_t a, b; } xmm_reg;
 #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
 #define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v)
-static int32_t scalarproduct_int16_sse2 (int16_t * v1, int16_t * v2, int order, int shift)
-{
- int res = 0;
- DECLARE_ALIGNED_16(xmm_reg, sh);
- x86_reg o = -(order << 1);
-
- v1 += order;
- v2 += order;
- sh.a = shift;
- __asm__ volatile(
- "pxor %%xmm7, %%xmm7 \n\t"
- "1: \n\t"
- "movdqu (%0,%3), %%xmm0 \n\t"
- "movdqu 16(%0,%3), %%xmm1 \n\t"
- "pmaddwd (%1,%3), %%xmm0 \n\t"
- "pmaddwd 16(%1,%3), %%xmm1 \n\t"
- "paddd %%xmm0, %%xmm7 \n\t"
- "paddd %%xmm1, %%xmm7 \n\t"
- "add $32, %3 \n\t"
- "js 1b \n\t"
- "movhlps %%xmm7, %%xmm2 \n\t"
- "paddd %%xmm2, %%xmm7 \n\t"
- "psrad %4, %%xmm7 \n\t"
- "pshuflw $0x4E, %%xmm7,%%xmm2 \n\t"
- "paddd %%xmm2, %%xmm7 \n\t"
- "movd %%xmm7, %2 \n\t"
- : "+r"(v1), "+r"(v2), "=r"(res), "+r"(o)
- : "m"(sh)
- );
- return res;
-}
-static void add_int16_sse2(int16_t * v1, int16_t * v2, int order)
-{
- x86_reg o = -(order << 1);
- v1 += order;
- v2 += order;
- __asm__ volatile(
- "1: \n\t"
- "movdqu (%1,%2), %%xmm0 \n\t"
- "movdqu 16(%1,%2), %%xmm1 \n\t"
- "paddw (%0,%2), %%xmm0 \n\t"
- "paddw 16(%0,%2), %%xmm1 \n\t"
- "movdqa %%xmm0, (%0,%2) \n\t"
- "movdqa %%xmm1, 16(%0,%2) \n\t"
- "add $32, %2 \n\t"
- "js 1b \n\t"
- : "+r"(v1), "+r"(v2), "+r"(o)
- );
-}
-
-static void sub_int16_sse2(int16_t * v1, int16_t * v2, int order)
-{
- x86_reg o = -(order << 1);
- v1 += order;
- v2 += order;
- __asm__ volatile(
- "1: \n\t"
- "movdqa (%0,%2), %%xmm0 \n\t"
- "movdqa 16(%0,%2), %%xmm2 \n\t"
- "movdqu (%1,%2), %%xmm1 \n\t"
- "movdqu 16(%1,%2), %%xmm3 \n\t"
- "psubw %%xmm1, %%xmm0 \n\t"
- "psubw %%xmm3, %%xmm2 \n\t"
- "movdqa %%xmm0, (%0,%2) \n\t"
- "movdqa %%xmm2, 16(%0,%2) \n\t"
- "add $32, %2 \n\t"
- "js 1b \n\t"
- : "+r"(v1), "+r"(v2), "+r"(o)
- );
-}
 #endif
 
-static int32_t
-scalarproduct_int16_c(int16_t * v1, int16_t * v2, int order, int shift)
+static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul)
 {
 int res = 0;
-
- while (order--)
- res += (*v1++ * *v2++) >> shift;
-
- return res;
-}
-
-static void
-add_int16_c (int16_t *v1/*align 16*/, int16_t *v2, int len) {
- while (len--) {
- *v1++ += *v2++;
- }
-}
-
-static void
-sub_int16_c (int16_t *v1/*align 16*/, int16_t *v2, int len) {
- while (len--) {
- *v1++ -= *v2++;
+ while (order--) {
+ res += *v1 * *v2++;
+ *v1++ += mul * *v3++;
 }
+ return res;
 }
 
 static int32_t
-(*scalarproduct_int16)(int16_t * v1, int16_t * v2, int order, int shift);
-
-static void
-(*add_int16) (int16_t *v1/*align 16*/, int16_t *v2, int len);
-
-static void
-(*sub_int16) (int16_t *v1/*align 16*/, int16_t *v2, int len);
+(*scalarproduct_and_madd_int16)(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul);
 
 static inline int16_t clip_int16(int a)
 {
@@ -1412,15 +1321,8 @@
 int absres;
 
 while (count--) {
- /* round fixedpoint scalar product */
- res = (scalarproduct_int16(f->delay - order, f->coeffs, order, 0) + (1 << (fracbits - 1))) >> fracbits;
-
-
- if (*data < 0)
- add_int16(f->coeffs, f->adaptcoeffs - order, order);
- else if (*data > 0)
- sub_int16(f->coeffs, f->adaptcoeffs - order, order);
-
+ res = scalarproduct_and_madd_int16(f->coeffs, f->delay - order, f->adaptcoeffs - order, order, APESIGN(*data));
+ res = (res + (1 << (fracbits - 1))) >> fracbits;
 res += *data;
 
 *data++ = res;
@@ -1968,7 +1870,7 @@
 .plugin.name = "Monkey's Audio (APE) decoder",
 .plugin.descr = "APE player based on code from libavc and rockbox",
 .plugin.copyright = 
- "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
 "\n"
 "based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>\n"
 "based upon libdemac from Dave Chapman.\n"
@@ -2002,6 +1904,8 @@
 
 #if HAVE_SSE2 && !ARCH_UNKNOWN
 
+int32_t ff_scalarproduct_and_madd_int16_sse2(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul);
+
 #define FF_MM_MMX 0x0001 ///< standard MMX
 #define FF_MM_3DNOW 0x0004 ///< AMD 3DNOW
 #define FF_MM_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
@@ -2103,29 +2007,32 @@
 }
 #endif
 
+#if ARCH_ARM
+int32_t EXTERN_ASMff_scalarproduct_int16_neon(int16_t *v1, int16_t *v2, int len,
+ int shift);
+int32_t EXTERN_ASMff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2, const int16_t *v3, int order, int mul);
+
+#endif
+
 DB_plugin_t *
 ffap_load (DB_functions_t *api) {
 // detect sse2
-#if HAVE_SSE2 && !ARCH_UNKNOWN
+#if ARCH_ARM
+ scalarproduct_and_madd_int16 = EXTERN_ASMff_scalarproduct_and_madd_int16_neon;
+#elif HAVE_SSE2 && !ARCH_UNKNOWN
 trace ("ffap: was compiled with sse2 support\n");
 int mm_flags = mm_support ();
 if (mm_flags & FF_MM_SSE2) {
 trace ("ffap: sse2 support detected\n");
- scalarproduct_int16 = scalarproduct_int16_sse2;
- add_int16 = add_int16_sse2;
- sub_int16 = sub_int16_sse2;
+ scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2;
 }
 else {
 trace ("ffap: sse2 is not supported by CPU\n");
- scalarproduct_int16 = scalarproduct_int16_c;
- add_int16 = add_int16_c;
- sub_int16 = sub_int16_c;
+ scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c;
 }
 #else
- trace ("ffap: sse2 support was not compiled in\n");
- scalarproduct_int16 = scalarproduct_int16_c;
- add_int16 = add_int16_c;
- sub_int16 = sub_int16_c;
+// trace ("ffap: sse2 support was not compiled in\n");
+ scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_c;
 #endif
 deadbeef = api;
 return DB_PLUGIN (&plugin);

deadbeef-0.5.2.tar.bz2/plugins/ffap/x86inc.asm Added

@@ -0,0 +1,625 @@
+;*****************************************************************************
+;* x86inc.asm
+;*****************************************************************************
+;* Copyright (C) 2005-2008 Loren Merritt <lorenm@u.washington.edu>
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg 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.
+;*
+;* FFmpeg 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 FFmpeg; if not, write to the Free Software
+;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;*****************************************************************************
+
+%ifdef ARCH_X86_64
+ %ifidn __OUTPUT_FORMAT__,win32
+ %define WIN64
+ %else
+ %define UNIX64
+ %endif
+%endif
+
+; FIXME: All of the 64bit asm functions that take a stride as an argument
+; via register, assume that the high dword of that register is filled with 0.
+; This is true in practice (since we never do any 64bit arithmetic on strides,
+; and x264's strides are all positive), but is not guaranteed by the ABI.
+
+; Name of the .rodata section.
+; Kludge: Something on OS X fails to align .rodata even given an align attribute,
+; so use a different read-only section.
+%macro SECTION_RODATA 0-1 16
+ %ifidn __OUTPUT_FORMAT__,macho64
+ SECTION .text align=%1
+ %elifidn __OUTPUT_FORMAT__,macho
+ SECTION .text align=%1
+ fakegot:
+ %else
+ SECTION .rodata align=%1
+ %endif
+%endmacro
+
+; PIC support macros.
+; x86_64 can't fit 64bit address literals in most instruction types,
+; so shared objects (under the assumption that they might be anywhere
+; in memory) must use an address mode that does fit.
+; So all accesses to global variables must use this macro, e.g.
+; mov eax, [foo GLOBAL]
+; instead of
+; mov eax, [foo]
+;
+; x86_32 doesn't require PIC.
+; Some distros prefer shared objects to be PIC, but nothing breaks if
+; the code contains a few textrels, so we'll skip that complexity.
+
+%ifdef WIN64
+ %define PIC
+%elifndef ARCH_X86_64
+ %undef PIC
+%endif
+%ifdef PIC
+ %define GLOBAL wrt rip
+%else
+ %define GLOBAL
+%endif
+
+; Macros to eliminate most code duplication between x86_32 and x86_64:
+; Currently this works only for leaf functions which load all their arguments
+; into registers at the start, and make no other use of the stack. Luckily that
+; covers most of x264's asm.
+
+; PROLOGUE:
+; %1 = number of arguments. loads them from stack if needed.
+; %2 = number of registers used. pushes callee-saved regs if needed.
+; %3 = number of xmm registers used. pushes callee-saved xmm regs if needed.
+; %4 = list of names to define to registers
+; PROLOGUE can also be invoked by adding the same options to cglobal
+
+; e.g.
+; cglobal foo, 2,3,0, dst, src, tmp
+; declares a function (foo), taking two args (dst and src) and one local variable (tmp)
+
+; TODO Some functions can use some args directly from the stack. If they're the
+; last args then you can just not declare them, but if they're in the middle
+; we need more flexible macro.
+
+; RET:
+; Pops anything that was pushed by PROLOGUE
+
+; REP_RET:
+; Same, but if it doesn't pop anything it becomes a 2-byte ret, for athlons
+; which are slow when a normal ret follows a branch.
+
+; registers:
+; rN and rNq are the native-size register holding function argument N
+; rNd, rNw, rNb are dword, word, and byte size
+; rNm is the original location of arg N (a register or on the stack), dword
+; rNmp is native size
+
+%macro DECLARE_REG 6
+ %define r%1q %2
+ %define r%1d %3
+ %define r%1w %4
+ %define r%1b %5
+ %define r%1m %6
+ %ifid %6 ; i.e. it's a register
+ %define r%1mp %2
+ %elifdef ARCH_X86_64 ; memory
+ %define r%1mp qword %6
+ %else
+ %define r%1mp dword %6
+ %endif
+ %define r%1 %2
+%endmacro
+
+%macro DECLARE_REG_SIZE 2
+ %define r%1q r%1
+ %define e%1q r%1
+ %define r%1d e%1
+ %define e%1d e%1
+ %define r%1w %1
+ %define e%1w %1
+ %define r%1b %2
+ %define e%1b %2
+%ifndef ARCH_X86_64
+ %define r%1 e%1
+%endif
+%endmacro
+
+DECLARE_REG_SIZE ax, al
+DECLARE_REG_SIZE bx, bl
+DECLARE_REG_SIZE cx, cl
+DECLARE_REG_SIZE dx, dl
+DECLARE_REG_SIZE si, sil
+DECLARE_REG_SIZE di, dil
+DECLARE_REG_SIZE bp, bpl
+
+; t# defines for when per-arch register allocation is more complex than just function arguments
+
+%macro DECLARE_REG_TMP 1-*
+ %assign %%i 0
+ %rep %0
+ CAT_XDEFINE t, %%i, r%1
+ %assign %%i %%i+1
+ %rotate 1
+ %endrep
+%endmacro
+
+%macro DECLARE_REG_TMP_SIZE 0-*
+ %rep %0
+ %define t%1q t%1 %+ q
+ %define t%1d t%1 %+ d
+ %define t%1w t%1 %+ w
+ %define t%1b t%1 %+ b
+ %rotate 1
+ %endrep
+%endmacro
+
+DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7
+
+%ifdef ARCH_X86_64
+ %define gprsize 8
+%else
+ %define gprsize 4
+%endif
+
+%macro PUSH 1
+ push %1
+ %assign stack_offset stack_offset+gprsize
+%endmacro
+
+%macro POP 1
+ pop %1
+ %assign stack_offset stack_offset-gprsize
+%endmacro
+
+%macro SUB 2
+ sub %1, %2
+ %ifidn %1, rsp
+ %assign stack_offset stack_offset+(%2)
+ %endif
+%endmacro
+
+%macro ADD 2
+ add %1, %2
+ %ifidn %1, rsp
+ %assign stack_offset stack_offset-(%2)
+ %endif
+%endmacro
+
+%macro movifnidn 2
+ %ifnidn %1, %2
+ mov %1, %2
+ %endif
+%endmacro
+
+%macro movsxdifnidn 2
+ %ifnidn %1, %2
+ movsxd %1, %2
+ %endif
+%endmacro
+
+%macro ASSERT 1
+ %if (%1) == 0
+ %error assert failed
+ %endif
+%endmacro
+
+%macro DEFINE_ARGS 0-*
+ %ifdef n_arg_names
+ %assign %%i 0
+ %rep n_arg_names
+ CAT_UNDEF arg_name %+ %%i, q
+ CAT_UNDEF arg_name %+ %%i, d
+ CAT_UNDEF arg_name %+ %%i, w
+ CAT_UNDEF arg_name %+ %%i, b
+ CAT_UNDEF arg_name %+ %%i, m
+ CAT_UNDEF arg_name, %%i
+ %assign %%i %%i+1
+ %endrep
+ %endif
+
+ %assign %%i 0
+ %rep %0
+ %xdefine %1q r %+ %%i %+ q
+ %xdefine %1d r %+ %%i %+ d
+ %xdefine %1w r %+ %%i %+ w
+ %xdefine %1b r %+ %%i %+ b
+ %xdefine %1m r %+ %%i %+ m
+ CAT_XDEFINE arg_name, %%i, %1
+ %assign %%i %%i+1
+ %rotate 1
+ %endrep
+ %assign n_arg_names %%i
+%endmacro
+
+%ifdef WIN64 ; Windows x64 ;=================================================
+
+DECLARE_REG 0, rcx, ecx, cx, cl, ecx
+DECLARE_REG 1, rdx, edx, dx, dl, edx
+DECLARE_REG 2, r8, r8d, r8w, r8b, r8d
+DECLARE_REG 3, r9, r9d, r9w, r9b, r9d
+DECLARE_REG 4, rdi, edi, di, dil, [rsp + stack_offset + 40]
+DECLARE_REG 5, rsi, esi, si, sil, [rsp + stack_offset + 48]
+DECLARE_REG 6, rax, eax, ax, al, [rsp + stack_offset + 56]
+%define r7m [rsp + stack_offset + 64]
+%define r8m [rsp + stack_offset + 72]
+
+%macro LOAD_IF_USED 2 ; reg_id, number_of_args
+ %if %1 < %2
+ mov r%1, [rsp + stack_offset + 8 + %1*8]
+ %endif
+%endmacro
+
+%macro PROLOGUE 2-4+ ; #args, #regs, #xmm_regs, arg_names...
+ ASSERT %2 >= %1
+ %assign regs_used %2
+ ASSERT regs_used <= 7
+ %if %0 > 2
+ %assign xmm_regs_used %3
+ %else
+ %assign xmm_regs_used 0
+ %endif
+ ASSERT xmm_regs_used <= 16
+ %if regs_used > 4
+ push r4
+ push r5
+ %assign stack_offset stack_offset+16
+ %endif
+ %if xmm_regs_used > 6
+ sub rsp, (xmm_regs_used-6)*16+16
+ %assign stack_offset stack_offset+(xmm_regs_used-6)*16+16
+ %assign %%i xmm_regs_used
+ %rep (xmm_regs_used-6)
+ %assign %%i %%i-1
+ movdqa [rsp + (%%i-6)*16+8], xmm %+ %%i
+ %endrep
+ %endif
+ LOAD_IF_USED 4, %1
+ LOAD_IF_USED 5, %1
+ LOAD_IF_USED 6, %1
+ DEFINE_ARGS %4
+%endmacro
+
+%macro RESTORE_XMM_INTERNAL 1
+ %if xmm_regs_used > 6
+ %assign %%i xmm_regs_used
+ %rep (xmm_regs_used-6)
+ %assign %%i %%i-1
+ movdqa xmm %+ %%i, [%1 + (%%i-6)*16+8]
+ %endrep
+ add %1, (xmm_regs_used-6)*16+16
+ %endif
+%endmacro
+
+%macro RESTORE_XMM 1
+ RESTORE_XMM_INTERNAL %1
+ %assign stack_offset stack_offset-(xmm_regs_used-6)*16+16
+ %assign xmm_regs_used 0
+%endmacro
+
+%macro RET 0
+ RESTORE_XMM_INTERNAL rsp
+ %if regs_used > 4
+ pop r5
+ pop r4
+ %endif
+ ret
+%endmacro
+
+%macro REP_RET 0
+ %if regs_used > 4 || xmm_regs_used > 6
+ RET
+ %else
+ rep ret
+ %endif
+%endmacro
+
+%elifdef ARCH_X86_64 ; *nix x64 ;=============================================
+
+DECLARE_REG 0, rdi, edi, di, dil, edi
+DECLARE_REG 1, rsi, esi, si, sil, esi
+DECLARE_REG 2, rdx, edx, dx, dl, edx
+DECLARE_REG 3, rcx, ecx, cx, cl, ecx
+DECLARE_REG 4, r8, r8d, r8w, r8b, r8d
+DECLARE_REG 5, r9, r9d, r9w, r9b, r9d
+DECLARE_REG 6, rax, eax, ax, al, [rsp + stack_offset + 8]
+%define r7m [rsp + stack_offset + 16]
+%define r8m [rsp + stack_offset + 24]
+
+%macro LOAD_IF_USED 2 ; reg_id, number_of_args
+ %if %1 < %2
+ mov r%1, [rsp - 40 + %1*8]
+ %endif
+%endmacro
+
+%macro PROLOGUE 2-4+ ; #args, #regs, #xmm_regs, arg_names...
+ ASSERT %2 >= %1
+ ASSERT %2 <= 7
+ LOAD_IF_USED 6, %1
+ DEFINE_ARGS %4
+%endmacro
+
+%macro RET 0
+ ret
+%endmacro
+
+%macro REP_RET 0
+ rep ret
+%endmacro
+
+%else ; X86_32 ;==============================================================
+
+DECLARE_REG 0, eax, eax, ax, al, [esp + stack_offset + 4]
+DECLARE_REG 1, ecx, ecx, cx, cl, [esp + stack_offset + 8]
+DECLARE_REG 2, edx, edx, dx, dl, [esp + stack_offset + 12]
+DECLARE_REG 3, ebx, ebx, bx, bl, [esp + stack_offset + 16]
+DECLARE_REG 4, esi, esi, si, null, [esp + stack_offset + 20]
+DECLARE_REG 5, edi, edi, di, null, [esp + stack_offset + 24]
+DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]
+%define r7m [esp + stack_offset + 32]
+%define r8m [esp + stack_offset + 36]
+%define rsp esp
+
+%macro PUSH_IF_USED 1 ; reg_id
+ %if %1 < regs_used
+ push r%1
+ %assign stack_offset stack_offset+4
+ %endif
+%endmacro
+
+%macro POP_IF_USED 1 ; reg_id
+ %if %1 < regs_used
+ pop r%1
+ %endif
+%endmacro
+
+%macro LOAD_IF_USED 2 ; reg_id, number_of_args
+ %if %1 < %2
+ mov r%1, [esp + stack_offset + 4 + %1*4]
+ %endif
+%endmacro
+
+%macro PROLOGUE 2-4+ ; #args, #regs, arg_names...
+ ASSERT %2 >= %1
+ %assign regs_used %2
+ ASSERT regs_used <= 7
+ PUSH_IF_USED 3
+ PUSH_IF_USED 4
+ PUSH_IF_USED 5
+ PUSH_IF_USED 6
+ LOAD_IF_USED 0, %1
+ LOAD_IF_USED 1, %1
+ LOAD_IF_USED 2, %1
+ LOAD_IF_USED 3, %1
+ LOAD_IF_USED 4, %1
+ LOAD_IF_USED 5, %1
+ LOAD_IF_USED 6, %1
+ DEFINE_ARGS %4
+%endmacro
+
+%macro RET 0
+ POP_IF_USED 6
+ POP_IF_USED 5
+ POP_IF_USED 4
+ POP_IF_USED 3
+ ret
+%endmacro
+
+%macro REP_RET 0
+ %if regs_used > 3
+ RET
+ %else
+ rep ret
+ %endif
+%endmacro
+
+%endif ;======================================================================
+
+
+
+;=============================================================================
+; arch-independent part
+;=============================================================================
+
+%assign function_align 16
+
+; Symbol prefix for C linkage
+%macro cglobal 1-2+
+ %xdefine %1 ff_%1
+ %ifdef PREFIX
+ %xdefine %1 _ %+ %1
+ %endif
+ %xdefine %1.skip_prologue %1 %+ .skip_prologue
+ %ifidn __OUTPUT_FORMAT__,elf
+ global %1:function hidden
+ %else
+ global %1
+ %endif
+ align function_align
+ %1:
+ RESET_MM_PERMUTATION ; not really needed, but makes disassembly somewhat nicer
+ %assign stack_offset 0
+ %if %0 > 1
+ PROLOGUE %2
+ %endif
+%endmacro
+
+%macro cextern 1
+ %ifdef PREFIX
+ %xdefine %1 _%1
+ %endif
+ extern %1
+%endmacro
+
+; This is needed for ELF, otherwise the GNU linker assumes the stack is
+; executable by default.
+%ifidn __OUTPUT_FORMAT__,elf
+SECTION .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
+%assign FENC_STRIDE 16
+%assign FDEC_STRIDE 32
+
+; merge mmx and sse*
+
+%macro CAT_XDEFINE 3
+ %xdefine %1%2 %3
+%endmacro
+
+%macro CAT_UNDEF 2
+ %undef %1%2
+%endmacro
+
+%macro INIT_MMX 0
+ %define RESET_MM_PERMUTATION INIT_MMX
+ %define mmsize 8
+ %define num_mmregs 8
+ %define mova movq
+ %define movu movq
+ %define movh movd
+ %define movnt movntq
+ %assign %%i 0
+ %rep 8
+ CAT_XDEFINE m, %%i, mm %+ %%i
+ CAT_XDEFINE nmm, %%i, %%i
+ %assign %%i %%i+1
+ %endrep
+ %rep 8
+ CAT_UNDEF m, %%i
+ CAT_UNDEF nmm, %%i
+ %assign %%i %%i+1
+ %endrep
+%endmacro
+
+%macro INIT_XMM 0
+ %define RESET_MM_PERMUTATION INIT_XMM
+ %define mmsize 16
+ %define num_mmregs 8
+ %ifdef ARCH_X86_64
+ %define num_mmregs 16
+ %endif
+ %define mova movdqa
+ %define movu movdqu
+ %define movh movq
+ %define movnt movntdq
+ %assign %%i 0
+ %rep num_mmregs
+ CAT_XDEFINE m, %%i, xmm %+ %%i
+ CAT_XDEFINE nxmm, %%i, %%i
+ %assign %%i %%i+1
+ %endrep
+%endmacro
+
+INIT_MMX
+
+; I often want to use macros that permute their arguments. e.g. there's no
+; efficient way to implement butterfly or transpose or dct without swapping some
+; arguments.
+;
+; I would like to not have to manually keep track of the permutations:
+; If I insert a permutation in the middle of a function, it should automatically
+; change everything that follows. For more complex macros I may also have multiple
+; implementations, e.g. the SSE2 and SSSE3 versions may have different permutations.
+;
+; Hence these macros. Insert a PERMUTE or some SWAPs at the end of a macro that
+; permutes its arguments. It's equivalent to exchanging the contents of the
+; registers, except that this way you exchange the register names instead, so it
+; doesn't cost any cycles.
+
+%macro PERMUTE 2-* ; takes a list of pairs to swap
+%rep %0/2
+ %xdefine tmp%2 m%2
+ %xdefine ntmp%2 nm%2
+ %rotate 2
+%endrep
+%rep %0/2
+ %xdefine m%1 tmp%2
+ %xdefine nm%1 ntmp%2
+ %undef tmp%2
+ %undef ntmp%2
+ %rotate 2
+%endrep
+%endmacro
+
+%macro SWAP 2-* ; swaps a single chain (sometimes more concise than pairs)
+%rep %0-1
+%ifdef m%1
+ %xdefine tmp m%1
+ %xdefine m%1 m%2
+ %xdefine m%2 tmp
+ CAT_XDEFINE n, m%1, %1
+ CAT_XDEFINE n, m%2, %2
+%else
+ ; If we were called as "SWAP m0,m1" rather than "SWAP 0,1" infer the original numbers here.
+ ; Be careful using this mode in nested macros though, as in some cases there may be
+ ; other copies of m# that have already been dereferenced and don't get updated correctly.
+ %xdefine %%n1 n %+ %1
+ %xdefine %%n2 n %+ %2
+ %xdefine tmp m %+ %%n1
+ CAT_XDEFINE m, %%n1, m %+ %%n2
+ CAT_XDEFINE m, %%n2, tmp
+ CAT_XDEFINE n, m %+ %%n1, %%n1
+ CAT_XDEFINE n, m %+ %%n2, %%n2
+%endif
+ %undef tmp
+ %rotate 1
+%endrep
+%endmacro
+
+%macro SAVE_MM_PERMUTATION 1
+ %assign %%i 0
+ %rep num_mmregs
+ CAT_XDEFINE %1_m, %%i, m %+ %%i
+ %assign %%i %%i+1
+ %endrep
+%endmacro
+
+%macro LOAD_MM_PERMUTATION 1
+ %assign %%i 0
+ %rep num_mmregs
+ CAT_XDEFINE m, %%i, %1_m %+ %%i
+ CAT_XDEFINE n, m %+ %%i, %%i
+ %assign %%i %%i+1
+ %endrep
+%endmacro
+
+%macro call 1
+ call %1
+ %ifdef %1_m0
+ LOAD_MM_PERMUTATION %1
+ %endif
+%endmacro
+
+;Substitutions that reduce instruction size but are functionally equivalent
+%macro add 2
+ %ifnum %2
+ %if %2==128
+ sub %1, -128
+ %else
+ add %1, %2
+ %endif
+ %else
+ add %1, %2
+ %endif
+%endmacro
+
+%macro sub 2
+ %ifnum %2
+ %if %2==128
+ add %1, -128
+ %else
+ sub %1, %2
+ %endif
+ %else
+ sub %1, %2
+ %endif
+%endmacro

deadbeef-0.5.1.tar.bz2/plugins/ffmpeg/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/ffmpeg/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__ffmpeg_la_SOURCES_DIST = ffmpeg.c
 @HAVE_FFMPEG_TRUE@am_ffmpeg_la_OBJECTS = ffmpeg.lo
 ffmpeg_la_OBJECTS = $(am_ffmpeg_la_OBJECTS)
-ffmpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ffmpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(ffmpeg_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FFMPEG_TRUE@am_ffmpeg_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(ffmpeg_la_SOURCES)
 DIST_SOURCES = $(am__ffmpeg_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 ffmpeg.la: $(ffmpeg_la_OBJECTS) $(ffmpeg_la_DEPENDENCIES) 
-	$(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ffmpeg_la_LINK) $(am_ffmpeg_la_rpath) $(ffmpeg_la_OBJECTS) $(ffmpeg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ffmpeg.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/ffmpeg/ffmpeg.c -> deadbeef-0.5.2.tar.bz2/plugins/ffmpeg/ffmpeg.c Changed

deadbeef-0.5.1.tar.bz2/plugins/flac/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/flac/Makefile.in Changed

@@ -73,9 +73,12 @@
 am__flac_la_SOURCES_DIST = flac.c
 @HAVE_FLAC_TRUE@am_flac_la_OBJECTS = flac.lo
 flac_la_OBJECTS = $(am_flac_la_OBJECTS)
-flac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(flac_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+flac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(flac_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_FLAC_TRUE@am_flac_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(flac_la_SOURCES)
 DIST_SOURCES = $(am__flac_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 flac.la: $(flac_la_OBJECTS) $(flac_la_DEPENDENCIES) 
-	$(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(flac_la_LINK) $(am_flac_la_rpath) $(flac_la_OBJECTS) $(flac_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/flac/flac.c -> deadbeef-0.5.2.tar.bz2/plugins/flac/flac.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gme/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/gme/Makefile.am Changed

@@ -1,7 +1,8 @@
 if HAVE_GME
 
-#gmedir=Game_Music_Emu-0.5.2
-gmeversion=game-music-emu-0.5.5
+#gmeversion=Game_Music_Emu-0.5.2
+#gmeversion=game-music-emu-0.5.5
+gmeversion=game-music-emu-svn
 gmepath=@top_srcdir@/plugins/gme/$(gmeversion)
 
 EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt 
@@ -11,106 +12,108 @@
 pkglib_LTLIBRARIES = gme.la
 
 gme_la_SOURCES = cgme.c\
-game-music-emu-0.5.5/gme/Ay_Apu.cpp\
-game-music-emu-0.5.5/gme/Gb_Apu.cpp\
-game-music-emu-0.5.5/gme/Hes_Emu.cpp\
-game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp\
-game-music-emu-0.5.5/gme/Sms_Apu.cpp\
-game-music-emu-0.5.5/gme/Ay_Cpu.cpp\
-game-music-emu-0.5.5/gme/Gb_Cpu.cpp\
-game-music-emu-0.5.5/gme/Kss_Cpu.cpp\
-game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp\
-game-music-emu-0.5.5/gme/Snes_Spc.cpp\
-game-music-emu-0.5.5/gme/Ay_Emu.cpp\
-game-music-emu-0.5.5/gme/Gb_Oscs.cpp\
-game-music-emu-0.5.5/gme/Kss_Emu.cpp\
-game-music-emu-0.5.5/gme/Nes_Oscs.cpp\
-game-music-emu-0.5.5/gme/Spc_Cpu.cpp\
-game-music-emu-0.5.5/gme/Blip_Buffer.cpp\
-game-music-emu-0.5.5/gme/Gbs_Emu.cpp\
-game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp\
-game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp\
-game-music-emu-0.5.5/gme/Spc_Dsp.cpp\
-game-music-emu-0.5.5/gme/Classic_Emu.cpp\
-game-music-emu-0.5.5/gme/gme.cpp\
-game-music-emu-0.5.5/gme/M3u_Playlist.cpp\
-game-music-emu-0.5.5/gme/Nsfe_Emu.cpp\
-game-music-emu-0.5.5/gme/Spc_Emu.cpp\
-game-music-emu-0.5.5/gme/Data_Reader.cpp\
-game-music-emu-0.5.5/gme/Gme_File.cpp\
-game-music-emu-0.5.5/gme/Multi_Buffer.cpp\
-game-music-emu-0.5.5/gme/Nsf_Emu.cpp\
-game-music-emu-0.5.5/gme/Vgm_Emu.cpp\
-game-music-emu-0.5.5/gme/Dual_Resampler.cpp\
-game-music-emu-0.5.5/gme/Gym_Emu.cpp\
-game-music-emu-0.5.5/gme/Music_Emu.cpp\
-game-music-emu-0.5.5/gme/Sap_Apu.cpp\
-game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp\
-game-music-emu-0.5.5/gme/Effects_Buffer.cpp\
-game-music-emu-0.5.5/gme/Hes_Apu.cpp\
-game-music-emu-0.5.5/gme/Nes_Apu.cpp\
-game-music-emu-0.5.5/gme/Sap_Cpu.cpp\
-game-music-emu-0.5.5/gme/Ym2413_Emu.cpp\
-game-music-emu-0.5.5/gme/Fir_Resampler.cpp\
-game-music-emu-0.5.5/gme/Hes_Cpu.cpp\
-game-music-emu-0.5.5/gme/Nes_Cpu.cpp\
-game-music-emu-0.5.5/gme/Sap_Emu.cpp\
-game-music-emu-0.5.5/gme/Ym2612_Emu.cpp\
-game-music-emu-0.5.5/gme/Ay_Apu.h\
-game-music-emu-0.5.5/gme/Ay_Cpu.h\
-game-music-emu-0.5.5/gme/Ay_Emu.h\
-game-music-emu-0.5.5/gme/blargg_common.h\
-game-music-emu-0.5.5/gme/blargg_config.h\
-game-music-emu-0.5.5/gme/blargg_endian.h\
-game-music-emu-0.5.5/gme/blargg_source.h\
-game-music-emu-0.5.5/gme/Blip_Buffer.h\
-game-music-emu-0.5.5/gme/Classic_Emu.h\
-game-music-emu-0.5.5/gme/Data_Reader.h\
-game-music-emu-0.5.5/gme/Dual_Resampler.h\
-game-music-emu-0.5.5/gme/Effects_Buffer.h\
-game-music-emu-0.5.5/gme/Fir_Resampler.h\
-game-music-emu-0.5.5/gme/Gb_Apu.h\
-game-music-emu-0.5.5/gme/Gb_Cpu.h\
-game-music-emu-0.5.5/gme/gb_cpu_io.h\
-game-music-emu-0.5.5/gme/Gb_Oscs.h\
-game-music-emu-0.5.5/gme/Gbs_Emu.h\
-game-music-emu-0.5.5/gme/Gme_File.h\
-game-music-emu-0.5.5/gme/gme.h\
-game-music-emu-0.5.5/gme/Gym_Emu.h\
-game-music-emu-0.5.5/gme/Hes_Apu.h\
-game-music-emu-0.5.5/gme/Hes_Cpu.h\
-game-music-emu-0.5.5/gme/hes_cpu_io.h\
-game-music-emu-0.5.5/gme/Hes_Emu.h\
-game-music-emu-0.5.5/gme/Kss_Cpu.h\
-game-music-emu-0.5.5/gme/Kss_Emu.h\
-game-music-emu-0.5.5/gme/Kss_Scc_Apu.h\
-game-music-emu-0.5.5/gme/M3u_Playlist.h\
-game-music-emu-0.5.5/gme/Multi_Buffer.h\
-game-music-emu-0.5.5/gme/Music_Emu.h\
-game-music-emu-0.5.5/gme/Nes_Apu.h\
-game-music-emu-0.5.5/gme/Nes_Cpu.h\
-game-music-emu-0.5.5/gme/nes_cpu_io.h\
-game-music-emu-0.5.5/gme/Nes_Fme7_Apu.h\
-game-music-emu-0.5.5/gme/Nes_Namco_Apu.h\
-game-music-emu-0.5.5/gme/Nes_Oscs.h\
-game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.h\
-game-music-emu-0.5.5/gme/Nsfe_Emu.h\
-game-music-emu-0.5.5/gme/Nsf_Emu.h\
-game-music-emu-0.5.5/gme/Sap_Apu.h\
-game-music-emu-0.5.5/gme/Sap_Cpu.h\
-game-music-emu-0.5.5/gme/sap_cpu_io.h\
-game-music-emu-0.5.5/gme/Sap_Emu.h\
-game-music-emu-0.5.5/gme/Sms_Apu.h\
-game-music-emu-0.5.5/gme/Sms_Oscs.h\
-game-music-emu-0.5.5/gme/Snes_Spc.h\
-game-music-emu-0.5.5/gme/Spc_Cpu.h\
-game-music-emu-0.5.5/gme/Spc_Dsp.h\
-game-music-emu-0.5.5/gme/Spc_Emu.h\
-game-music-emu-0.5.5/gme/Vgm_Emu.h\
-game-music-emu-0.5.5/gme/Vgm_Emu_Impl.h\
-game-music-emu-0.5.5/gme/Ym2413_Emu.h\
-game-music-emu-0.5.5/gme/Ym2612_Emu.h\
-game-music-emu-0.5.5/gme/gme_types.h
+	$(gmeversion)/gme/Ay_Apu.cpp\
+	$(gmeversion)/gme/Gb_Apu.cpp\
+	$(gmeversion)/gme/Hes_Emu.cpp\
+	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
+	$(gmeversion)/gme/Sms_Apu.cpp\
+	$(gmeversion)/gme/Ay_Cpu.cpp\
+	$(gmeversion)/gme/Gb_Cpu.cpp\
+	$(gmeversion)/gme/Kss_Cpu.cpp\
+	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
+	$(gmeversion)/gme/Snes_Spc.cpp\
+	$(gmeversion)/gme/Ay_Emu.cpp\
+	$(gmeversion)/gme/Gb_Oscs.cpp\
+	$(gmeversion)/gme/Kss_Emu.cpp\
+	$(gmeversion)/gme/Nes_Oscs.cpp\
+	$(gmeversion)/gme/Spc_Cpu.cpp\
+	$(gmeversion)/gme/Blip_Buffer.cpp\
+	$(gmeversion)/gme/Gbs_Emu.cpp\
+	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
+	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
+	$(gmeversion)/gme/Spc_Dsp.cpp\
+	$(gmeversion)/gme/Classic_Emu.cpp\
+	$(gmeversion)/gme/gme.cpp\
+	$(gmeversion)/gme/M3u_Playlist.cpp\
+	$(gmeversion)/gme/Nsfe_Emu.cpp\
+	$(gmeversion)/gme/Spc_Emu.cpp\
+	$(gmeversion)/gme/Data_Reader.cpp\
+	$(gmeversion)/gme/Gme_File.cpp\
+	$(gmeversion)/gme/Multi_Buffer.cpp\
+	$(gmeversion)/gme/Nsf_Emu.cpp\
+	$(gmeversion)/gme/Vgm_Emu.cpp\
+	$(gmeversion)/gme/Dual_Resampler.cpp\
+	$(gmeversion)/gme/Gym_Emu.cpp\
+	$(gmeversion)/gme/Music_Emu.cpp\
+	$(gmeversion)/gme/Sap_Apu.cpp\
+	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
+	$(gmeversion)/gme/Effects_Buffer.cpp\
+	$(gmeversion)/gme/Hes_Apu.cpp\
+	$(gmeversion)/gme/Nes_Apu.cpp\
+	$(gmeversion)/gme/Sap_Cpu.cpp\
+	$(gmeversion)/gme/Ym2413_Emu.cpp\
+	$(gmeversion)/gme/Fir_Resampler.cpp\
+	$(gmeversion)/gme/Hes_Cpu.cpp\
+	$(gmeversion)/gme/Nes_Cpu.cpp\
+	$(gmeversion)/gme/Sap_Emu.cpp\
+	$(gmeversion)/gme/Ym2612_Emu.cpp\
+	$(gmeversion)/gme/Ay_Apu.h\
+	$(gmeversion)/gme/Ay_Cpu.h\
+	$(gmeversion)/gme/Ay_Emu.h\
+	$(gmeversion)/gme/blargg_common.h\
+	$(gmeversion)/gme/blargg_config.h\
+	$(gmeversion)/gme/blargg_endian.h\
+	$(gmeversion)/gme/blargg_source.h\
+	$(gmeversion)/gme/Blip_Buffer.h\
+	$(gmeversion)/gme/Classic_Emu.h\
+	$(gmeversion)/gme/Data_Reader.h\
+	$(gmeversion)/gme/Dual_Resampler.h\
+	$(gmeversion)/gme/Effects_Buffer.h\
+	$(gmeversion)/gme/Fir_Resampler.h\
+	$(gmeversion)/gme/Gb_Apu.h\
+	$(gmeversion)/gme/Gb_Cpu.h\
+	$(gmeversion)/gme/gb_cpu_io.h\
+	$(gmeversion)/gme/Gb_Oscs.h\
+	$(gmeversion)/gme/Gbs_Emu.h\
+	$(gmeversion)/gme/Gme_File.h\
+	$(gmeversion)/gme/gme.h\
+	$(gmeversion)/gme/Gym_Emu.h\
+	$(gmeversion)/gme/Hes_Apu.h\
+	$(gmeversion)/gme/Hes_Cpu.h\
+	$(gmeversion)/gme/hes_cpu_io.h\
+	$(gmeversion)/gme/Hes_Emu.h\
+	$(gmeversion)/gme/Kss_Cpu.h\
+	$(gmeversion)/gme/Kss_Emu.h\
+	$(gmeversion)/gme/Kss_Scc_Apu.h\
+	$(gmeversion)/gme/M3u_Playlist.h\
+	$(gmeversion)/gme/Multi_Buffer.h\
+	$(gmeversion)/gme/Music_Emu.h\
+	$(gmeversion)/gme/Nes_Apu.h\
+	$(gmeversion)/gme/Nes_Cpu.h\
+	$(gmeversion)/gme/nes_cpu_io.h\
+	$(gmeversion)/gme/Nes_Fme7_Apu.h\
+	$(gmeversion)/gme/Nes_Namco_Apu.h\
+	$(gmeversion)/gme/Nes_Oscs.h\
+	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
+	$(gmeversion)/gme/Nsfe_Emu.h\
+	$(gmeversion)/gme/Nsf_Emu.h\
+	$(gmeversion)/gme/Sap_Apu.h\
+	$(gmeversion)/gme/Sap_Cpu.h\
+	$(gmeversion)/gme/sap_cpu_io.h\
+	$(gmeversion)/gme/Sap_Emu.h\
+	$(gmeversion)/gme/Sms_Apu.h\
+	$(gmeversion)/gme/Sms_Oscs.h\
+	$(gmeversion)/gme/Snes_Spc.h\
+	$(gmeversion)/gme/Spc_Cpu.h\
+	$(gmeversion)/gme/Spc_Dsp.h\
+	$(gmeversion)/gme/Spc_Emu.h\
+	$(gmeversion)/gme/Vgm_Emu.h\
+	$(gmeversion)/gme/Vgm_Emu_Impl.h\
+	$(gmeversion)/gme/Ym2413_Emu.h\
+	$(gmeversion)/gme/Ym2612_Emu.h\
+	$(gmeversion)/gme/gme_types.h\
+	$(gmeversion)/gme/Spc_Filter.cpp\
+	$(gmeversion)/gme/Spc_Filter.h
 
 gme_la_LDFLAGS = -module -nostdlib -lsupc++
 gme_la_LIBADD = $(ZLIB_LIBS)

deadbeef-0.5.1.tar.bz2/plugins/gme/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/gme/Makefile.in Changed

@@ -70,106 +70,72 @@
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @HAVE_GME_TRUE@gme_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__gme_la_SOURCES_DIST = cgme.c game-music-emu-0.5.5/gme/Ay_Apu.cpp \
-	game-music-emu-0.5.5/gme/Gb_Apu.cpp \
-	game-music-emu-0.5.5/gme/Hes_Emu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp \
-	game-music-emu-0.5.5/gme/Sms_Apu.cpp \
-	game-music-emu-0.5.5/gme/Ay_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Gb_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Kss_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp \
-	game-music-emu-0.5.5/gme/Snes_Spc.cpp \
-	game-music-emu-0.5.5/gme/Ay_Emu.cpp \
-	game-music-emu-0.5.5/gme/Gb_Oscs.cpp \
-	game-music-emu-0.5.5/gme/Kss_Emu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Oscs.cpp \
-	game-music-emu-0.5.5/gme/Spc_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Blip_Buffer.cpp \
-	game-music-emu-0.5.5/gme/Gbs_Emu.cpp \
-	game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp \
-	game-music-emu-0.5.5/gme/Spc_Dsp.cpp \
-	game-music-emu-0.5.5/gme/Classic_Emu.cpp \
-	game-music-emu-0.5.5/gme/gme.cpp \
-	game-music-emu-0.5.5/gme/M3u_Playlist.cpp \
-	game-music-emu-0.5.5/gme/Nsfe_Emu.cpp \
-	game-music-emu-0.5.5/gme/Spc_Emu.cpp \
-	game-music-emu-0.5.5/gme/Data_Reader.cpp \
-	game-music-emu-0.5.5/gme/Gme_File.cpp \
-	game-music-emu-0.5.5/gme/Multi_Buffer.cpp \
-	game-music-emu-0.5.5/gme/Nsf_Emu.cpp \
-	game-music-emu-0.5.5/gme/Vgm_Emu.cpp \
-	game-music-emu-0.5.5/gme/Dual_Resampler.cpp \
-	game-music-emu-0.5.5/gme/Gym_Emu.cpp \
-	game-music-emu-0.5.5/gme/Music_Emu.cpp \
-	game-music-emu-0.5.5/gme/Sap_Apu.cpp \
-	game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp \
-	game-music-emu-0.5.5/gme/Effects_Buffer.cpp \
-	game-music-emu-0.5.5/gme/Hes_Apu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Apu.cpp \
-	game-music-emu-0.5.5/gme/Sap_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Ym2413_Emu.cpp \
-	game-music-emu-0.5.5/gme/Fir_Resampler.cpp \
-	game-music-emu-0.5.5/gme/Hes_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Nes_Cpu.cpp \
-	game-music-emu-0.5.5/gme/Sap_Emu.cpp \
-	game-music-emu-0.5.5/gme/Ym2612_Emu.cpp \
-	game-music-emu-0.5.5/gme/Ay_Apu.h \
-	game-music-emu-0.5.5/gme/Ay_Cpu.h \
-	game-music-emu-0.5.5/gme/Ay_Emu.h \
-	game-music-emu-0.5.5/gme/blargg_common.h \
-	game-music-emu-0.5.5/gme/blargg_config.h \
-	game-music-emu-0.5.5/gme/blargg_endian.h \
-	game-music-emu-0.5.5/gme/blargg_source.h \
-	game-music-emu-0.5.5/gme/Blip_Buffer.h \
-	game-music-emu-0.5.5/gme/Classic_Emu.h \
-	game-music-emu-0.5.5/gme/Data_Reader.h \
-	game-music-emu-0.5.5/gme/Dual_Resampler.h \
-	game-music-emu-0.5.5/gme/Effects_Buffer.h \
-	game-music-emu-0.5.5/gme/Fir_Resampler.h \
-	game-music-emu-0.5.5/gme/Gb_Apu.h \
-	game-music-emu-0.5.5/gme/Gb_Cpu.h \
-	game-music-emu-0.5.5/gme/gb_cpu_io.h \
-	game-music-emu-0.5.5/gme/Gb_Oscs.h \
-	game-music-emu-0.5.5/gme/Gbs_Emu.h \
-	game-music-emu-0.5.5/gme/Gme_File.h \
-	game-music-emu-0.5.5/gme/gme.h \
-	game-music-emu-0.5.5/gme/Gym_Emu.h \
-	game-music-emu-0.5.5/gme/Hes_Apu.h \
-	game-music-emu-0.5.5/gme/Hes_Cpu.h \
-	game-music-emu-0.5.5/gme/hes_cpu_io.h \
-	game-music-emu-0.5.5/gme/Hes_Emu.h \
-	game-music-emu-0.5.5/gme/Kss_Cpu.h \
-	game-music-emu-0.5.5/gme/Kss_Emu.h \
-	game-music-emu-0.5.5/gme/Kss_Scc_Apu.h \
-	game-music-emu-0.5.5/gme/M3u_Playlist.h \
-	game-music-emu-0.5.5/gme/Multi_Buffer.h \
-	game-music-emu-0.5.5/gme/Music_Emu.h \
-	game-music-emu-0.5.5/gme/Nes_Apu.h \
-	game-music-emu-0.5.5/gme/Nes_Cpu.h \
-	game-music-emu-0.5.5/gme/nes_cpu_io.h \
-	game-music-emu-0.5.5/gme/Nes_Fme7_Apu.h \
-	game-music-emu-0.5.5/gme/Nes_Namco_Apu.h \
-	game-music-emu-0.5.5/gme/Nes_Oscs.h \
-	game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.h \
-	game-music-emu-0.5.5/gme/Nsfe_Emu.h \
-	game-music-emu-0.5.5/gme/Nsf_Emu.h \
-	game-music-emu-0.5.5/gme/Sap_Apu.h \
-	game-music-emu-0.5.5/gme/Sap_Cpu.h \
-	game-music-emu-0.5.5/gme/sap_cpu_io.h \
-	game-music-emu-0.5.5/gme/Sap_Emu.h \
-	game-music-emu-0.5.5/gme/Sms_Apu.h \
-	game-music-emu-0.5.5/gme/Sms_Oscs.h \
-	game-music-emu-0.5.5/gme/Snes_Spc.h \
-	game-music-emu-0.5.5/gme/Spc_Cpu.h \
-	game-music-emu-0.5.5/gme/Spc_Dsp.h \
-	game-music-emu-0.5.5/gme/Spc_Emu.h \
-	game-music-emu-0.5.5/gme/Vgm_Emu.h \
-	game-music-emu-0.5.5/gme/Vgm_Emu_Impl.h \
-	game-music-emu-0.5.5/gme/Ym2413_Emu.h \
-	game-music-emu-0.5.5/gme/Ym2612_Emu.h \
-	game-music-emu-0.5.5/gme/gme_types.h
+am__gme_la_SOURCES_DIST = cgme.c $(gmeversion)/gme/Ay_Apu.cpp \
+	$(gmeversion)/gme/Gb_Apu.cpp $(gmeversion)/gme/Hes_Emu.cpp \
+	$(gmeversion)/gme/Nes_Fme7_Apu.cpp \
+	$(gmeversion)/gme/Sms_Apu.cpp $(gmeversion)/gme/Ay_Cpu.cpp \
+	$(gmeversion)/gme/Gb_Cpu.cpp $(gmeversion)/gme/Kss_Cpu.cpp \
+	$(gmeversion)/gme/Nes_Namco_Apu.cpp \
+	$(gmeversion)/gme/Snes_Spc.cpp $(gmeversion)/gme/Ay_Emu.cpp \
+	$(gmeversion)/gme/Gb_Oscs.cpp $(gmeversion)/gme/Kss_Emu.cpp \
+	$(gmeversion)/gme/Nes_Oscs.cpp $(gmeversion)/gme/Spc_Cpu.cpp \
+	$(gmeversion)/gme/Blip_Buffer.cpp \
+	$(gmeversion)/gme/Gbs_Emu.cpp \
+	$(gmeversion)/gme/Kss_Scc_Apu.cpp \
+	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp \
+	$(gmeversion)/gme/Spc_Dsp.cpp \
+	$(gmeversion)/gme/Classic_Emu.cpp $(gmeversion)/gme/gme.cpp \
+	$(gmeversion)/gme/M3u_Playlist.cpp \
+	$(gmeversion)/gme/Nsfe_Emu.cpp $(gmeversion)/gme/Spc_Emu.cpp \
+	$(gmeversion)/gme/Data_Reader.cpp \
+	$(gmeversion)/gme/Gme_File.cpp \
+	$(gmeversion)/gme/Multi_Buffer.cpp \
+	$(gmeversion)/gme/Nsf_Emu.cpp $(gmeversion)/gme/Vgm_Emu.cpp \
+	$(gmeversion)/gme/Dual_Resampler.cpp \
+	$(gmeversion)/gme/Gym_Emu.cpp $(gmeversion)/gme/Music_Emu.cpp \
+	$(gmeversion)/gme/Sap_Apu.cpp \
+	$(gmeversion)/gme/Vgm_Emu_Impl.cpp \
+	$(gmeversion)/gme/Effects_Buffer.cpp \
+	$(gmeversion)/gme/Hes_Apu.cpp $(gmeversion)/gme/Nes_Apu.cpp \
+	$(gmeversion)/gme/Sap_Cpu.cpp $(gmeversion)/gme/Ym2413_Emu.cpp \
+	$(gmeversion)/gme/Fir_Resampler.cpp \
+	$(gmeversion)/gme/Hes_Cpu.cpp $(gmeversion)/gme/Nes_Cpu.cpp \
+	$(gmeversion)/gme/Sap_Emu.cpp $(gmeversion)/gme/Ym2612_Emu.cpp \
+	$(gmeversion)/gme/Ay_Apu.h $(gmeversion)/gme/Ay_Cpu.h \
+	$(gmeversion)/gme/Ay_Emu.h $(gmeversion)/gme/blargg_common.h \
+	$(gmeversion)/gme/blargg_config.h \
+	$(gmeversion)/gme/blargg_endian.h \
+	$(gmeversion)/gme/blargg_source.h \
+	$(gmeversion)/gme/Blip_Buffer.h \
+	$(gmeversion)/gme/Classic_Emu.h \
+	$(gmeversion)/gme/Data_Reader.h \
+	$(gmeversion)/gme/Dual_Resampler.h \
+	$(gmeversion)/gme/Effects_Buffer.h \
+	$(gmeversion)/gme/Fir_Resampler.h $(gmeversion)/gme/Gb_Apu.h \
+	$(gmeversion)/gme/Gb_Cpu.h $(gmeversion)/gme/gb_cpu_io.h \
+	$(gmeversion)/gme/Gb_Oscs.h $(gmeversion)/gme/Gbs_Emu.h \
+	$(gmeversion)/gme/Gme_File.h $(gmeversion)/gme/gme.h \
+	$(gmeversion)/gme/Gym_Emu.h $(gmeversion)/gme/Hes_Apu.h \
+	$(gmeversion)/gme/Hes_Cpu.h $(gmeversion)/gme/hes_cpu_io.h \
+	$(gmeversion)/gme/Hes_Emu.h $(gmeversion)/gme/Kss_Cpu.h \
+	$(gmeversion)/gme/Kss_Emu.h $(gmeversion)/gme/Kss_Scc_Apu.h \
+	$(gmeversion)/gme/M3u_Playlist.h \
+	$(gmeversion)/gme/Multi_Buffer.h $(gmeversion)/gme/Music_Emu.h \
+	$(gmeversion)/gme/Nes_Apu.h $(gmeversion)/gme/Nes_Cpu.h \
+	$(gmeversion)/gme/nes_cpu_io.h \
+	$(gmeversion)/gme/Nes_Fme7_Apu.h \
+	$(gmeversion)/gme/Nes_Namco_Apu.h $(gmeversion)/gme/Nes_Oscs.h \
+	$(gmeversion)/gme/Nes_Vrc6_Apu.h $(gmeversion)/gme/Nsfe_Emu.h \
+	$(gmeversion)/gme/Nsf_Emu.h $(gmeversion)/gme/Sap_Apu.h \
+	$(gmeversion)/gme/Sap_Cpu.h $(gmeversion)/gme/sap_cpu_io.h \
+	$(gmeversion)/gme/Sap_Emu.h $(gmeversion)/gme/Sms_Apu.h \
+	$(gmeversion)/gme/Sms_Oscs.h $(gmeversion)/gme/Snes_Spc.h \
+	$(gmeversion)/gme/Spc_Cpu.h $(gmeversion)/gme/Spc_Dsp.h \
+	$(gmeversion)/gme/Spc_Emu.h $(gmeversion)/gme/Vgm_Emu.h \
+	$(gmeversion)/gme/Vgm_Emu_Impl.h \
+	$(gmeversion)/gme/Ym2413_Emu.h $(gmeversion)/gme/Ym2612_Emu.h \
+	$(gmeversion)/gme/gme_types.h $(gmeversion)/gme/Spc_Filter.cpp \
+	$(gmeversion)/gme/Spc_Filter.h
 @HAVE_GME_TRUE@am_gme_la_OBJECTS = cgme.lo Ay_Apu.lo Gb_Apu.lo \
 @HAVE_GME_TRUE@	Hes_Emu.lo Nes_Fme7_Apu.lo Sms_Apu.lo Ay_Cpu.lo \
 @HAVE_GME_TRUE@	Gb_Cpu.lo Kss_Cpu.lo Nes_Namco_Apu.lo \
@@ -184,11 +150,14 @@
 @HAVE_GME_TRUE@	Vgm_Emu_Impl.lo Effects_Buffer.lo Hes_Apu.lo \
 @HAVE_GME_TRUE@	Nes_Apu.lo Sap_Cpu.lo Ym2413_Emu.lo \
 @HAVE_GME_TRUE@	Fir_Resampler.lo Hes_Cpu.lo Nes_Cpu.lo \
-@HAVE_GME_TRUE@	Sap_Emu.lo Ym2612_Emu.lo
+@HAVE_GME_TRUE@	Sap_Emu.lo Ym2612_Emu.lo Spc_Filter.lo
 gme_la_OBJECTS = $(am_gme_la_OBJECTS)
-gme_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(gme_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+gme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(gme_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GME_TRUE@am_gme_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -196,22 +165,42 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo " CXX " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(gme_la_SOURCES)
 DIST_SOURCES = $(am__gme_la_SOURCES_DIST)
 ETAGS = etags
@@ -223,6 +212,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -270,14 +260,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -367,7 +360,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -378,6 +370,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -434,113 +427,116 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-#gmedir=Game_Music_Emu-0.5.2
-@HAVE_GME_TRUE@gmeversion = game-music-emu-0.5.5
+#gmeversion=Game_Music_Emu-0.5.2
+#gmeversion=game-music-emu-0.5.5
+@HAVE_GME_TRUE@gmeversion = game-music-emu-svn
 @HAVE_GME_TRUE@gmepath = @top_srcdir@/plugins/gme/$(gmeversion)
 @HAVE_GME_TRUE@EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt 
 @HAVE_GME_TRUE@gmedir = $(libdir)/$(PACKAGE)
 @HAVE_GME_TRUE@pkglib_LTLIBRARIES = gme.la
 @HAVE_GME_TRUE@gme_la_SOURCES = cgme.c\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sms_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Snes_Spc.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Oscs.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Oscs.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Blip_Buffer.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gbs_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Dsp.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Classic_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/gme.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/M3u_Playlist.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nsfe_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Data_Reader.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gme_File.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Multi_Buffer.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nsf_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Vgm_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Dual_Resampler.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gym_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Music_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Effects_Buffer.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Apu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ym2413_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Fir_Resampler.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Cpu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ym2612_Emu.cpp\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ay_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/blargg_common.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/blargg_config.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/blargg_endian.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/blargg_source.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Blip_Buffer.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Classic_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Data_Reader.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Dual_Resampler.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Effects_Buffer.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Fir_Resampler.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/gb_cpu_io.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gb_Oscs.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gbs_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gme_File.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/gme.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Gym_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/hes_cpu_io.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Hes_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Kss_Scc_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/M3u_Playlist.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Multi_Buffer.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Music_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/nes_cpu_io.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Fme7_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Namco_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Oscs.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nsfe_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Nsf_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/sap_cpu_io.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sap_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sms_Apu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Sms_Oscs.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Snes_Spc.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Cpu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Dsp.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Spc_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Vgm_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Vgm_Emu_Impl.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ym2413_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/Ym2612_Emu.h\
-@HAVE_GME_TRUE@game-music-emu-0.5.5/gme/gme_types.h
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Snes_Spc.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Oscs.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Oscs.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Dsp.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Classic_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/gme.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/M3u_Playlist.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsfe_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Data_Reader.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gme_File.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Multi_Buffer.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Dual_Resampler.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gym_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Music_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu_Impl.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Effects_Buffer.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Apu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2413_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Fir_Resampler.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Cpu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2612_Emu.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_common.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_config.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_endian.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_source.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Classic_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Data_Reader.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Dual_Resampler.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Effects_Buffer.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Fir_Resampler.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/gb_cpu_io.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Oscs.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gme_File.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/gme.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Gym_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/hes_cpu_io.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Scc_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/M3u_Playlist.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Multi_Buffer.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Music_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/nes_cpu_io.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fme7_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Namco_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Oscs.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsfe_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/sap_cpu_io.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Apu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Oscs.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Snes_Spc.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Cpu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Dsp.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu_Impl.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2413_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2612_Emu.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/gme_types.h\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Filter.cpp\
+@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Filter.h
 
 @HAVE_GME_TRUE@gme_la_LDFLAGS = -module -nostdlib -lsupc++
 @HAVE_GME_TRUE@gme_la_LIBADD = $(ZLIB_LIBS)
@@ -612,7 +608,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 gme.la: $(gme_la_OBJECTS) $(gme_la_DEPENDENCIES) 
-	$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -660,6 +656,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spc_Cpu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spc_Dsp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spc_Emu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spc_Filter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vgm_Emu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vgm_Emu_Impl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ym2413_Emu.Plo@am__quote@
@@ -668,361 +665,420 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gme.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
-Ay_Apu.lo: game-music-emu-0.5.5/gme/Ay_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Ay_Apu.lo: $(gmeversion)/gme/Ay_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Apu.lo -MD -MP -MF $(DEPDIR)/Ay_Apu.Tpo -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Apu.Tpo $(DEPDIR)/Ay_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Apu.cpp' object='Ay_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f '$(gmeversion)/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Apu.cpp
+
+Gb_Apu.lo: $(gmeversion)/gme/Gb_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f '$(gmeversion)/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Apu.cpp
 
-Gb_Apu.lo: game-music-emu-0.5.5/gme/Gb_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Apu.lo -MD -MP -MF $(DEPDIR)/Gb_Apu.Tpo -c -o Gb_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Apu.Tpo $(DEPDIR)/Gb_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gb_Apu.cpp' object='Gb_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Hes_Emu.lo: $(gmeversion)/gme/Hes_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f '$(gmeversion)/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Emu.cpp
 
-Hes_Emu.lo: game-music-emu-0.5.5/gme/Hes_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Emu.lo -MD -MP -MF $(DEPDIR)/Hes_Emu.Tpo -c -o Hes_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Emu.Tpo $(DEPDIR)/Hes_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Hes_Emu.cpp' object='Hes_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Fme7_Apu.lo: $(gmeversion)/gme/Nes_Fme7_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fme7_Apu.cpp
 
-Nes_Fme7_Apu.lo: game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Fme7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fme7_Apu.Tpo -c -o Nes_Fme7_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Fme7_Apu.Tpo $(DEPDIR)/Nes_Fme7_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp' object='Nes_Fme7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Sms_Apu.lo: $(gmeversion)/gme/Sms_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Fme7_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Fme7_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f '$(gmeversion)/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Apu.cpp
 
-Sms_Apu.lo: game-music-emu-0.5.5/gme/Sms_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sms_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Apu.Tpo -c -o Sms_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sms_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sms_Apu.Tpo $(DEPDIR)/Sms_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Sms_Apu.cpp' object='Sms_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Ay_Cpu.lo: $(gmeversion)/gme/Ay_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sms_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sms_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f '$(gmeversion)/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Cpu.cpp
 
-Ay_Cpu.lo: game-music-emu-0.5.5/gme/Ay_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Cpu.lo -MD -MP -MF $(DEPDIR)/Ay_Cpu.Tpo -c -o Ay_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Cpu.Tpo $(DEPDIR)/Ay_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Ay_Cpu.cpp' object='Ay_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Gb_Cpu.lo: $(gmeversion)/gme/Gb_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f '$(gmeversion)/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Cpu.cpp
 
-Gb_Cpu.lo: game-music-emu-0.5.5/gme/Gb_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Cpu.lo -MD -MP -MF $(DEPDIR)/Gb_Cpu.Tpo -c -o Gb_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Cpu.Tpo $(DEPDIR)/Gb_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gb_Cpu.cpp' object='Gb_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Kss_Cpu.lo: $(gmeversion)/gme/Kss_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f '$(gmeversion)/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Cpu.cpp
 
-Kss_Cpu.lo: game-music-emu-0.5.5/gme/Kss_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Cpu.lo -MD -MP -MF $(DEPDIR)/Kss_Cpu.Tpo -c -o Kss_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Cpu.Tpo $(DEPDIR)/Kss_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Kss_Cpu.cpp' object='Kss_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Namco_Apu.lo: $(gmeversion)/gme/Nes_Namco_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f '$(gmeversion)/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Namco_Apu.cpp
 
-Nes_Namco_Apu.lo: game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Namco_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Namco_Apu.Tpo -c -o Nes_Namco_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Namco_Apu.Tpo $(DEPDIR)/Nes_Namco_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp' object='Nes_Namco_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Snes_Spc.lo: $(gmeversion)/gme/Snes_Spc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Namco_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Namco_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f '$(gmeversion)/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Snes_Spc.cpp
 
-Snes_Spc.lo: game-music-emu-0.5.5/gme/Snes_Spc.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Snes_Spc.lo -MD -MP -MF $(DEPDIR)/Snes_Spc.Tpo -c -o Snes_Spc.lo `test -f 'game-music-emu-0.5.5/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Snes_Spc.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Snes_Spc.Tpo $(DEPDIR)/Snes_Spc.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Snes_Spc.cpp' object='Snes_Spc.lo' libtool=yes @AMDEPBACKSLASH@
+Ay_Emu.lo: $(gmeversion)/gme/Ay_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Snes_Spc.lo `test -f 'game-music-emu-0.5.5/gme/Snes_Spc.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Snes_Spc.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f '$(gmeversion)/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Emu.cpp
 
-Ay_Emu.lo: game-music-emu-0.5.5/gme/Ay_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ay_Emu.lo -MD -MP -MF $(DEPDIR)/Ay_Emu.Tpo -c -o Ay_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ay_Emu.Tpo $(DEPDIR)/Ay_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Ay_Emu.cpp' object='Ay_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Gb_Oscs.lo: $(gmeversion)/gme/Gb_Oscs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ay_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ay_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f '$(gmeversion)/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gb_Oscs.cpp
 
-Gb_Oscs.lo: game-music-emu-0.5.5/gme/Gb_Oscs.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gb_Oscs.lo -MD -MP -MF $(DEPDIR)/Gb_Oscs.Tpo -c -o Gb_Oscs.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Oscs.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gb_Oscs.Tpo $(DEPDIR)/Gb_Oscs.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gb_Oscs.cpp' object='Gb_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+Kss_Emu.lo: $(gmeversion)/gme/Kss_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gb_Oscs.lo `test -f 'game-music-emu-0.5.5/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gb_Oscs.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f '$(gmeversion)/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Emu.cpp
 
-Kss_Emu.lo: game-music-emu-0.5.5/gme/Kss_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Emu.lo -MD -MP -MF $(DEPDIR)/Kss_Emu.Tpo -c -o Kss_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Emu.Tpo $(DEPDIR)/Kss_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Kss_Emu.cpp' object='Kss_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Oscs.lo: $(gmeversion)/gme/Nes_Oscs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f '$(gmeversion)/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Oscs.cpp
 
-Nes_Oscs.lo: game-music-emu-0.5.5/gme/Nes_Oscs.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Oscs.lo -MD -MP -MF $(DEPDIR)/Nes_Oscs.Tpo -c -o Nes_Oscs.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Oscs.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Oscs.Tpo $(DEPDIR)/Nes_Oscs.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Oscs.cpp' object='Nes_Oscs.lo' libtool=yes @AMDEPBACKSLASH@
+Spc_Cpu.lo: $(gmeversion)/gme/Spc_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Oscs.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Oscs.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f '$(gmeversion)/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Cpu.cpp
 
-Spc_Cpu.lo: game-music-emu-0.5.5/gme/Spc_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Cpu.lo -MD -MP -MF $(DEPDIR)/Spc_Cpu.Tpo -c -o Spc_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Cpu.Tpo $(DEPDIR)/Spc_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Spc_Cpu.cpp' object='Spc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Blip_Buffer.lo: $(gmeversion)/gme/Blip_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f '$(gmeversion)/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Blip_Buffer.cpp
 
-Blip_Buffer.lo: game-music-emu-0.5.5/gme/Blip_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Blip_Buffer.lo -MD -MP -MF $(DEPDIR)/Blip_Buffer.Tpo -c -o Blip_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Blip_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Blip_Buffer.Tpo $(DEPDIR)/Blip_Buffer.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Blip_Buffer.cpp' object='Blip_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+Gbs_Emu.lo: $(gmeversion)/gme/Gbs_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Blip_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Blip_Buffer.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f '$(gmeversion)/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Emu.cpp
 
-Gbs_Emu.lo: game-music-emu-0.5.5/gme/Gbs_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gbs_Emu.lo -MD -MP -MF $(DEPDIR)/Gbs_Emu.Tpo -c -o Gbs_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gbs_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gbs_Emu.Tpo $(DEPDIR)/Gbs_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gbs_Emu.cpp' object='Gbs_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Kss_Scc_Apu.lo: $(gmeversion)/gme/Kss_Scc_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gbs_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gbs_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f '$(gmeversion)/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Scc_Apu.cpp
 
-Kss_Scc_Apu.lo: game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Kss_Scc_Apu.lo -MD -MP -MF $(DEPDIR)/Kss_Scc_Apu.Tpo -c -o Kss_Scc_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Kss_Scc_Apu.Tpo $(DEPDIR)/Kss_Scc_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp' object='Kss_Scc_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Vrc6_Apu.lo: $(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Kss_Scc_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Kss_Scc_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc6_Apu.cpp
 
-Nes_Vrc6_Apu.lo: game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Vrc6_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc6_Apu.Tpo -c -o Nes_Vrc6_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Vrc6_Apu.Tpo $(DEPDIR)/Nes_Vrc6_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp' object='Nes_Vrc6_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Spc_Dsp.lo: $(gmeversion)/gme/Spc_Dsp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Vrc6_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Vrc6_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f '$(gmeversion)/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Dsp.cpp
 
-Spc_Dsp.lo: game-music-emu-0.5.5/gme/Spc_Dsp.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Dsp.lo -MD -MP -MF $(DEPDIR)/Spc_Dsp.Tpo -c -o Spc_Dsp.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Dsp.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Dsp.Tpo $(DEPDIR)/Spc_Dsp.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Spc_Dsp.cpp' object='Spc_Dsp.lo' libtool=yes @AMDEPBACKSLASH@
+Classic_Emu.lo: $(gmeversion)/gme/Classic_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Dsp.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Dsp.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Dsp.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f '$(gmeversion)/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Classic_Emu.cpp
 
-Classic_Emu.lo: game-music-emu-0.5.5/gme/Classic_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Classic_Emu.lo -MD -MP -MF $(DEPDIR)/Classic_Emu.Tpo -c -o Classic_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Classic_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Classic_Emu.Tpo $(DEPDIR)/Classic_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Classic_Emu.cpp' object='Classic_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+gme.lo: $(gmeversion)/gme/gme.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Classic_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Classic_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f '$(gmeversion)/gme/gme.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/gme.cpp
 
-gme.lo: game-music-emu-0.5.5/gme/gme.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gme.lo -MD -MP -MF $(DEPDIR)/gme.Tpo -c -o gme.lo `test -f 'game-music-emu-0.5.5/gme/gme.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/gme.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gme.Tpo $(DEPDIR)/gme.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
+M3u_Playlist.lo: $(gmeversion)/gme/M3u_Playlist.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gme.lo `test -f 'game-music-emu-0.5.5/gme/gme.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/gme.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f '$(gmeversion)/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/M3u_Playlist.cpp
 
-M3u_Playlist.lo: game-music-emu-0.5.5/gme/M3u_Playlist.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT M3u_Playlist.lo -MD -MP -MF $(DEPDIR)/M3u_Playlist.Tpo -c -o M3u_Playlist.lo `test -f 'game-music-emu-0.5.5/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/M3u_Playlist.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/M3u_Playlist.Tpo $(DEPDIR)/M3u_Playlist.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/M3u_Playlist.cpp' object='M3u_Playlist.lo' libtool=yes @AMDEPBACKSLASH@
+Nsfe_Emu.lo: $(gmeversion)/gme/Nsfe_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o M3u_Playlist.lo `test -f 'game-music-emu-0.5.5/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/M3u_Playlist.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f '$(gmeversion)/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsfe_Emu.cpp
 
-Nsfe_Emu.lo: game-music-emu-0.5.5/gme/Nsfe_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsfe_Emu.lo -MD -MP -MF $(DEPDIR)/Nsfe_Emu.Tpo -c -o Nsfe_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nsfe_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsfe_Emu.Tpo $(DEPDIR)/Nsfe_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nsfe_Emu.cpp' object='Nsfe_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Spc_Emu.lo: $(gmeversion)/gme/Spc_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsfe_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nsfe_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f '$(gmeversion)/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Emu.cpp
 
-Spc_Emu.lo: game-music-emu-0.5.5/gme/Spc_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Emu.lo -MD -MP -MF $(DEPDIR)/Spc_Emu.Tpo -c -o Spc_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Spc_Emu.Tpo $(DEPDIR)/Spc_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Spc_Emu.cpp' object='Spc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Data_Reader.lo: $(gmeversion)/gme/Data_Reader.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Spc_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f '$(gmeversion)/gme/Data_Reader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Data_Reader.cpp
 
-Data_Reader.lo: game-music-emu-0.5.5/gme/Data_Reader.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Data_Reader.lo -MD -MP -MF $(DEPDIR)/Data_Reader.Tpo -c -o Data_Reader.lo `test -f 'game-music-emu-0.5.5/gme/Data_Reader.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Data_Reader.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Data_Reader.Tpo $(DEPDIR)/Data_Reader.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Data_Reader.cpp' object='Data_Reader.lo' libtool=yes @AMDEPBACKSLASH@
+Gme_File.lo: $(gmeversion)/gme/Gme_File.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Data_Reader.lo `test -f 'game-music-emu-0.5.5/gme/Data_Reader.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Data_Reader.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f '$(gmeversion)/gme/Gme_File.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_File.cpp
 
-Gme_File.lo: game-music-emu-0.5.5/gme/Gme_File.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gme_File.lo -MD -MP -MF $(DEPDIR)/Gme_File.Tpo -c -o Gme_File.lo `test -f 'game-music-emu-0.5.5/gme/Gme_File.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gme_File.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gme_File.Tpo $(DEPDIR)/Gme_File.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gme_File.cpp' object='Gme_File.lo' libtool=yes @AMDEPBACKSLASH@
+Multi_Buffer.lo: $(gmeversion)/gme/Multi_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gme_File.lo `test -f 'game-music-emu-0.5.5/gme/Gme_File.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gme_File.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f '$(gmeversion)/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Multi_Buffer.cpp
 
-Multi_Buffer.lo: game-music-emu-0.5.5/gme/Multi_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Multi_Buffer.lo -MD -MP -MF $(DEPDIR)/Multi_Buffer.Tpo -c -o Multi_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Multi_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Multi_Buffer.Tpo $(DEPDIR)/Multi_Buffer.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Multi_Buffer.cpp' object='Multi_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+Nsf_Emu.lo: $(gmeversion)/gme/Nsf_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Multi_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Multi_Buffer.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f '$(gmeversion)/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Emu.cpp
 
-Nsf_Emu.lo: game-music-emu-0.5.5/gme/Nsf_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nsf_Emu.lo -MD -MP -MF $(DEPDIR)/Nsf_Emu.Tpo -c -o Nsf_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nsf_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nsf_Emu.Tpo $(DEPDIR)/Nsf_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nsf_Emu.cpp' object='Nsf_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Vgm_Emu.lo: $(gmeversion)/gme/Vgm_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nsf_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nsf_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f '$(gmeversion)/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu.cpp
 
-Vgm_Emu.lo: game-music-emu-0.5.5/gme/Vgm_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu.Tpo -c -o Vgm_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Vgm_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Vgm_Emu.Tpo $(DEPDIR)/Vgm_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Vgm_Emu.cpp' object='Vgm_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Dual_Resampler.lo: $(gmeversion)/gme/Dual_Resampler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Vgm_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f '$(gmeversion)/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Dual_Resampler.cpp
 
-Dual_Resampler.lo: game-music-emu-0.5.5/gme/Dual_Resampler.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Dual_Resampler.lo -MD -MP -MF $(DEPDIR)/Dual_Resampler.Tpo -c -o Dual_Resampler.lo `test -f 'game-music-emu-0.5.5/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Dual_Resampler.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Dual_Resampler.Tpo $(DEPDIR)/Dual_Resampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Dual_Resampler.cpp' object='Dual_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+Gym_Emu.lo: $(gmeversion)/gme/Gym_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Dual_Resampler.lo `test -f 'game-music-emu-0.5.5/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Dual_Resampler.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f '$(gmeversion)/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gym_Emu.cpp
 
-Gym_Emu.lo: game-music-emu-0.5.5/gme/Gym_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Gym_Emu.lo -MD -MP -MF $(DEPDIR)/Gym_Emu.Tpo -c -o Gym_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gym_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Gym_Emu.Tpo $(DEPDIR)/Gym_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Gym_Emu.cpp' object='Gym_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Music_Emu.lo: $(gmeversion)/gme/Music_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Gym_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Gym_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f '$(gmeversion)/gme/Music_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Music_Emu.cpp
 
-Music_Emu.lo: game-music-emu-0.5.5/gme/Music_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Music_Emu.lo -MD -MP -MF $(DEPDIR)/Music_Emu.Tpo -c -o Music_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Music_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Music_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Music_Emu.Tpo $(DEPDIR)/Music_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Music_Emu.cpp' object='Music_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Sap_Apu.lo: $(gmeversion)/gme/Sap_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Music_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Music_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Music_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f '$(gmeversion)/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Apu.cpp
 
-Sap_Apu.lo: game-music-emu-0.5.5/gme/Sap_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Apu.lo -MD -MP -MF $(DEPDIR)/Sap_Apu.Tpo -c -o Sap_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Apu.Tpo $(DEPDIR)/Sap_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Sap_Apu.cpp' object='Sap_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Vgm_Emu_Impl.lo: $(gmeversion)/gme/Vgm_Emu_Impl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu_Impl.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu_Impl.Tpo -c -o Vgm_Emu_Impl.lo `test -f '$(gmeversion)/gme/Vgm_Emu_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu_Impl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Emu_Impl.Tpo $(DEPDIR)/Vgm_Emu_Impl.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Vgm_Emu_Impl.cpp' object='Vgm_Emu_Impl.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu_Impl.lo `test -f '$(gmeversion)/gme/Vgm_Emu_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Emu_Impl.cpp
 
-Vgm_Emu_Impl.lo: game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Vgm_Emu_Impl.lo -MD -MP -MF $(DEPDIR)/Vgm_Emu_Impl.Tpo -c -o Vgm_Emu_Impl.lo `test -f 'game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Vgm_Emu_Impl.Tpo $(DEPDIR)/Vgm_Emu_Impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp' object='Vgm_Emu_Impl.lo' libtool=yes @AMDEPBACKSLASH@
+Effects_Buffer.lo: $(gmeversion)/gme/Effects_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Vgm_Emu_Impl.lo `test -f 'game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Vgm_Emu_Impl.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f '$(gmeversion)/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Effects_Buffer.cpp
 
-Effects_Buffer.lo: game-music-emu-0.5.5/gme/Effects_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Effects_Buffer.lo -MD -MP -MF $(DEPDIR)/Effects_Buffer.Tpo -c -o Effects_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Effects_Buffer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Effects_Buffer.Tpo $(DEPDIR)/Effects_Buffer.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Effects_Buffer.cpp' object='Effects_Buffer.lo' libtool=yes @AMDEPBACKSLASH@
+Hes_Apu.lo: $(gmeversion)/gme/Hes_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Effects_Buffer.lo `test -f 'game-music-emu-0.5.5/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Effects_Buffer.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f '$(gmeversion)/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu.cpp
 
-Hes_Apu.lo: game-music-emu-0.5.5/gme/Hes_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Apu.lo -MD -MP -MF $(DEPDIR)/Hes_Apu.Tpo -c -o Hes_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Apu.Tpo $(DEPDIR)/Hes_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Hes_Apu.cpp' object='Hes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Apu.lo: $(gmeversion)/gme/Nes_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f '$(gmeversion)/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Apu.cpp
 
-Nes_Apu.lo: game-music-emu-0.5.5/gme/Nes_Apu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Apu.Tpo -c -o Nes_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Apu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Apu.Tpo $(DEPDIR)/Nes_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Apu.cpp' object='Nes_Apu.lo' libtool=yes @AMDEPBACKSLASH@
+Sap_Cpu.lo: $(gmeversion)/gme/Sap_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Apu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Apu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f '$(gmeversion)/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Cpu.cpp
 
-Sap_Cpu.lo: game-music-emu-0.5.5/gme/Sap_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Cpu.lo -MD -MP -MF $(DEPDIR)/Sap_Cpu.Tpo -c -o Sap_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Cpu.Tpo $(DEPDIR)/Sap_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Sap_Cpu.cpp' object='Sap_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Ym2413_Emu.lo: $(gmeversion)/gme/Ym2413_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f '$(gmeversion)/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2413_Emu.cpp
 
-Ym2413_Emu.lo: game-music-emu-0.5.5/gme/Ym2413_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2413_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2413_Emu.Tpo -c -o Ym2413_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ym2413_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ym2413_Emu.Tpo $(DEPDIR)/Ym2413_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Ym2413_Emu.cpp' object='Ym2413_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Fir_Resampler.lo: $(gmeversion)/gme/Fir_Resampler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2413_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ym2413_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f '$(gmeversion)/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Fir_Resampler.cpp
 
-Fir_Resampler.lo: game-music-emu-0.5.5/gme/Fir_Resampler.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Fir_Resampler.lo -MD -MP -MF $(DEPDIR)/Fir_Resampler.Tpo -c -o Fir_Resampler.lo `test -f 'game-music-emu-0.5.5/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Fir_Resampler.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Fir_Resampler.Tpo $(DEPDIR)/Fir_Resampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Fir_Resampler.cpp' object='Fir_Resampler.lo' libtool=yes @AMDEPBACKSLASH@
+Hes_Cpu.lo: $(gmeversion)/gme/Hes_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Fir_Resampler.lo `test -f 'game-music-emu-0.5.5/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Fir_Resampler.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f '$(gmeversion)/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Cpu.cpp
 
-Hes_Cpu.lo: game-music-emu-0.5.5/gme/Hes_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hes_Cpu.lo -MD -MP -MF $(DEPDIR)/Hes_Cpu.Tpo -c -o Hes_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Hes_Cpu.Tpo $(DEPDIR)/Hes_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Hes_Cpu.cpp' object='Hes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Nes_Cpu.lo: $(gmeversion)/gme/Nes_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hes_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Hes_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f '$(gmeversion)/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Cpu.cpp
 
-Nes_Cpu.lo: game-music-emu-0.5.5/gme/Nes_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Nes_Cpu.lo -MD -MP -MF $(DEPDIR)/Nes_Cpu.Tpo -c -o Nes_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Nes_Cpu.Tpo $(DEPDIR)/Nes_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Nes_Cpu.cpp' object='Nes_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
+Sap_Emu.lo: $(gmeversion)/gme/Sap_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Nes_Cpu.lo `test -f 'game-music-emu-0.5.5/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Nes_Cpu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f '$(gmeversion)/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Emu.cpp
 
-Sap_Emu.lo: game-music-emu-0.5.5/gme/Sap_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sap_Emu.lo -MD -MP -MF $(DEPDIR)/Sap_Emu.Tpo -c -o Sap_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Sap_Emu.Tpo $(DEPDIR)/Sap_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Sap_Emu.cpp' object='Sap_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Ym2612_Emu.lo: $(gmeversion)/gme/Ym2612_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sap_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Sap_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f '$(gmeversion)/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ym2612_Emu.cpp
 
-Ym2612_Emu.lo: game-music-emu-0.5.5/gme/Ym2612_Emu.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Ym2612_Emu.lo -MD -MP -MF $(DEPDIR)/Ym2612_Emu.Tpo -c -o Ym2612_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ym2612_Emu.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/Ym2612_Emu.Tpo $(DEPDIR)/Ym2612_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='game-music-emu-0.5.5/gme/Ym2612_Emu.cpp' object='Ym2612_Emu.lo' libtool=yes @AMDEPBACKSLASH@
+Spc_Filter.lo: $(gmeversion)/gme/Spc_Filter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Spc_Filter.lo -MD -MP -MF $(DEPDIR)/Spc_Filter.Tpo -c -o Spc_Filter.lo `test -f '$(gmeversion)/gme/Spc_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Filter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Spc_Filter.Tpo $(DEPDIR)/Spc_Filter.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(gmeversion)/gme/Spc_Filter.cpp' object='Spc_Filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Ym2612_Emu.lo `test -f 'game-music-emu-0.5.5/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.5.5/gme/Ym2612_Emu.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Spc_Filter.lo `test -f '$(gmeversion)/gme/Spc_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Spc_Filter.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/gme/cgme.c -> deadbeef-0.5.2.tar.bz2/plugins/gme/cgme.c Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn Added

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/changes.txt Added

@@ -0,0 +1,239 @@
+Game_Music_Emu Change Log
+-------------------------
+
+Game_Music_Emu 0.5.6
+--------------------
+- Switched to newer snes_spc 0.9.0 for SPC emulation. Uses fast DSP.
+
+- Fixed a couple of GBS bugs, one involving access of memory after realloc.
+
+- Removed documentation of C++ interface, as the C interface in gme.h is
+the only supported one.
+
+- Added gme_enable_accuracy() for enabling more accurate sound emulation
+options (currently affects SPC only).
+
+
+Game_Music_Emu 0.5.5
+--------------------
+- CMake build support has been added.  You can build Game_Music_Emu as
+a shared library and install it so that you do not have to include your
+own copy if you know libgme will be present on your target system.
+Requires CMake 2.6 or higher.
+
+
+Game_Music_Emu 0.5.2
+--------------------
+- *TONS* of changes and improvements. You should re-read the new header
+files and documentation as the changes will allow you to simplify your
+code a lot (it might even be simpler to just rewrite it). Existing code
+should continue to work without changes in most cases (see Deprecated
+features in gme.txt).
+
+- New file formats: AY, HES, KSS, SAP, NSFE
+
+- All-new comprehensive C interface (also usable from C++). Simplifies
+many things, especially file loading, and brings everything together in
+one header file (gme.h).
+
+- Information tags and track names and times can be accessed for all
+game music formats
+
+- New features supported by all emulators: end of track fading,
+automatic silence detection, adjustable song tempo, seek to new time in
+track
+
+- Updated mini player example to support track names and times, echo,
+tempo, and channel muting, and added visual waveform display
+
+- Improved configuration to use blargg_config.h, which you can modify
+and keep when you update to a newer libary version. Includes flag for
+library to automatically handle gzipped files using zlib (so you don't
+need to use Gzip_File_Reader anymore).
+
+- GBS: Fixed wave channel to not reset waveform when APU is powered off
+(affected Garfield). Also improved invalid bank selection (affected Game
+& Watch and others).
+
+- VGM: Added support for alternate noise shifter register
+configurations, used by other systems like the BBC Micro.
+
+- SPC: Removed IPL ROM dump from emulator, as none of the SPC files I
+scanned needed it, and an SPC file can include a copy if necessary. Also
+re-enabled supposed clamping in gaussian interpolation between the third
+and fourth lookups, though I don't know whether it matters
+
+- Added Music_Emu::load_mem() to use music data already in memory
+(without copying it)
+
+- Added Music_Emu::warning(), which reports minor problems when loading
+and playing a music file
+
+- Added Music_Emu::set_gain() for uniform adjustment of gain. Can only
+be set during initialization, so not useful as a general volume control.
+
+- Added custom operator new to ensure that no exceptions are thrown in
+the library (I'd use std::nothrow if it were part of pre-ISO (ARM) C++)
+
+- Added BLIP_BUFFER_FAST flag to blargg_config.h to use a lower quality
+bandlimited synthesis in "classic" emulators, which might help
+performance on ancient processors (measure first!). Don't use this
+unless absolutely necessary, as quality suffers.
+
+- Improved performance a bit for x86 platforms
+
+- Text files now in DOS newline format so they will open in Notepad
+properly
+
+- Removed requirement that file header structures not have any padding
+added to the end
+
+- Fixed common bug in all CPU emulators where negative program counter
+could crash emulator (occurred during a negative branch from the
+beginning of memory). Also fixed related bug in Z80 emulator for
+IX/IY+displacement mode.
+
+- Eliminated all warnings when compiling on gcc 4.0. The following
+generates no diagnostics:
+
+	gcc -S gme/*.cpp -o /dev/null -ansi -fno-gnu-keywords
+	-fno-nonansi-builtins -pedantic -W -Wabi -Wall -Wcast-align
+	-Wcast-qual -Wchar-subscripts -Wdisabled-optimization -Werror
+	-Winline -Wlong-long -Wmultichar -Winvalid-offsetof
+	-Wnon-virtual-dtor -Woverloaded-virtual -Wparentheses
+	-Wpointer-arith -Wredundant-decls -Wreorder -Wsign-compare
+	-Wsign-promo -Wunknown-pragmas -Wwrite-strings
+
+
+Game_Music_Emu 0.3.0
+--------------------
+- Added more demos, including music player using the SDL multimedia
+library for sound, and improved documentation
+
+- All: Improved interface to emulators to allow simpler setup and
+loading. Instead of various init() functions, all now support
+set_sample_rate( long rate ) and load( const char* file_path ).
+
+- All: Removed error return from start_track() and play(), and added
+error_count() to get the total number of emulation errors since the
+track was last started. See demos for examples of new usage.
+
+- All: Fixed mute_voices() muting to be preserved after loading files
+and starting tracks, instead of being cleared as it was whenever a track
+was started
+
+- VGM: Rewrote Vgm_Emu to support Sega Genesis/Mega Drive FM sound at
+any sample rate with optional FM oversampling, support for alternate
+YM2612 sound cores, and support for optional YM2413
+
+- VGM: Added tempo control, useful for slowing 60Hz NTSC Sega Genesis
+music to 50Hz PAL
+
+- VGM: Removed Vgm_Emu::track_data(), since I realized that this
+information is already present in the VGM header (oops!)
+
+- GYM: Changed Gym_Emu::track_length() operation (see Gym_Emu.h)
+
+- NSF: Added support for Sunsoft FME-7 sound chip used by Gimmick
+soundtrack
+
+- NSF: Fixed Namco 106 problems with Final Lap and others
+
+- Moved library sources to gme/ directory to reduce clutter, and merged
+boost/ functionality into blargg_common.h
+
+- Added Gzip_File_Reader for transparently using gzipped files
+
+
+Game_Music_Emu 0.2.4
+--------------------
+- Created a discussion forum for problems and feedback:
+http://groups-beta.google.com/group/blargg-sound-libs
+
+- Changed error return value of Blip_Buffer::sample_rate() (also for
+Stereo_Buffer, Effects_Buffer, etc.) to blargg_err_t (defined in
+blargg_common.h), to make error reporting consistent with other
+functions. This means the "no error" return value is the opposite of
+what it was before, which will break current code which checks the error
+return value:
+
+	// current code (broken)
+	if ( !buf.sample_rate( samples_per_sec ) )
+		out_of_memory();
+	
+	// quick-and-dirty fix (just remove the ! operation)
+	if ( buf.sample_rate( samples_per_sec ) )
+		out_of_memory();
+	
+	// proper fix
+	blargg_err_t error = buf.sample_rate( samples_per_sec );
+	if ( error )
+		report_error( error );
+
+- Implemented workaround for MSVC++ 6 compiler limitations, allowing it
+to work on that compiler again
+
+- Added sample clamping to avoid wrap-around at high volumes, allowing
+higher volume with little distortion
+
+- Added to-do list and design notes
+
+- Added Music_Emu::skip( long sample_count ) to skip ahead in current
+track
+
+- Added Gym_Emu::track_length() and Vgm_Emu::track_length() for
+determining the length of non-looped GYM and VGM files
+
+- Partially implemented DMC non-linearity when its value is directly set
+using $4011, which reduces previously over-emphasized "popping" of
+percussion on some games (TMNT II in particular)
+
+- Fixed Fir_Resampler, used for SPC and GYM playback (was incorrectly
+using abs() instead of fabs()...argh)
+
+- Fixed SPC emulation bugs: eliminated clicks in Plok! soundtrack and
+now stops sample slightly earlier than the end, as the SNES does. Fixed
+a totally broken CPU addressing mode.
+
+- Fixed Konami VRC6 saw wave (was very broken before). Now VRC6 music
+sounds decent
+
+- Fixed a minor GBS emulation bug
+
+- Fixed GYM loop point bug when track was restarted before loop point
+had been reached
+
+- Made default GBS frequency equalization less muffled
+
+- Added pseudo-surround effect removal for SPC files
+
+- Added Music_Emu::voice_names() which returns names for each voice.
+
+- Added BLARGG_SOURCE_BEGIN which allows custom compiler options to be
+easily set for library sources
+
+- Changed assignment of expansion sound chips in Nsf_Emu to be spread
+more evenly when using Effects_Buffer
+
+- Changed 'size_t' values in Blip_Buffer interface to 'long'
+
+- Changed demo to generate a WAVE sound file rather than an AIFF file
+
+
+Game_Music_Emu 0.2.0
+--------------------
+- Redid framework and rewrote/cleaned up emulators
+
+- Changed licensing to GNU Lesser General Public License (LGPL)
+
+- Added Sega Genesis GYM and Super Nintendo SPC emulators
+
+- Added Namco-106 and Konami VRC6 sound chip support to NSF emulator
+
+- Eliminated use of static mutable data in emulators, allowing
+multi-instance safety
+
+
+Game_Music_Emu 0.1.0
+--------------------
+- First release

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/design.txt Added

@@ -0,0 +1,194 @@
+Game_Music_Emu 0.5.6 Design
+---------------------------
+This might be slightly out-of-date at times, but will be a big help in
+understanding the library implementation.
+
+
+Architecture
+------------
+The library is essentially a bunch of independent game music file
+emulators unified with a common interface.
+
+Gme_File and Music_Emu provide a common interface to the emulators. The
+virtual functions are protected rather than public to allow pre- and
+post-processing of arguments and data in one place. This allows the
+emulator classes to assume that everything is set up properly when
+starting a track and playing samples.
+
+All file input is done with the Data_Reader interface. Many derived
+classes are present, for the usual disk-based file and block of memory,
+to specialized adaptors for things like reading a subset of data or
+combining a block of memory with a Data_Reader to the remaining data.
+This makes the library much more flexible with regard to the source of
+game music file data. I still added a specialized load_mem() function to
+have the emulator keep a pointer to data already read in memory, for
+those formats whose files can be absolutely huge (GYM, some VGMs). This
+is important if for some reason the caller must load the data ahead of
+time, but doesn't want the emulator needlessly making a copy.
+
+Since silence checking and fading are relatively complex, they are kept
+separate from basic file loading and track information, which are
+handled in the base class Gme_File. My original intent was to use
+Gme_File as the common base class for full emulators and track
+information-only readers, but implementing the C interface was much
+simpler if both derived from Music_Emu. User C++ code can still benefit
+from static checking by using Gme_File where only track information will
+be accessed.
+
+Each emulator generally has three components: main emulator, CPU
+emulator, and sound chip emulator(s). Each component has minimal
+coupling, so use in a full emulator or stand alone is fairly easy. This
+modularity really helps reduce complexity. Blip_Buffer helps a lot with
+simplifying the APU interfaces and implementation.
+
+The "classic" emulators derive from Classic_Emu, which handles
+Blip_Buffer filling and multiple channels. It uses Multi_Buffer for
+output, allowing you to derive a custom buffer that could output each
+voice to a separate sound channel and do different processing on each.
+At some point I'm going to implement a better Effects_Buffer that allows
+individual control of every channel.
+
+In implementing the C interface, I wanted a way to specify an emulator
+type that didn't require linking in all the emulators. For each emulator
+type there is a global object with pointers to functions to create the
+emulator or a track information reader. The emulator type is thus a
+pointer to this, which conveniently allows for a NULL value. The user
+referencing this emulator type object is what ultimately links the
+emulator in (unless new Foo_Emu is used in C++, of course). This type
+also serves as a useful substitute for RTTI on older C++ compilers.
+
+Addendum: I have since added gme_type_list(), which causes all listed
+emulators to be linked in. To avoid this, I make the list itself
+editable in blargg_config.h. Having a built-in list allows
+gme_load_file() to take a path and give back an emulator with the file
+loaded, which is extremely useful for new users.
+
+
+Interface conventions
+----------------------
+If a function retains a pointer to or replaces the value of an object
+passed, it takes a pointer so that it will be clear in the caller's
+source code that care is required.
+
+Multi-word names have an underscore '_' separator between individual
+words.
+
+Functions are named with lowercase words. Functions which perform an
+action with side-effects are named with a verb phrase (i.e. load, move,
+run). Functions which return the value of a piece of state are named
+using a noun phrase (i.e. loaded, moved, running).
+
+Classes are named with capitalized words. Only the first letter of an
+acronym is capitalized. Class names are nouns, sometimes suggestive of
+what they do (i.e. File_Scanner).
+
+Structure, enumeration, and typedefs to these and built-in types are
+named using lowercase words with a _t suffix.
+
+Macros are named with all-uppercase words.
+
+Internal names which can't be hidden due to technical reasons have an
+underscore '_' suffix.
+
+
+Managing Complexity
+-------------------
+Complexity has been a factor in most library decisions. Many features
+have been passed by due to the complexity they would add. Once
+complexity goes past a certain level, it mentally grasping the library
+in its entirety, at which point more defects will occur and be hard to
+find.
+
+I chose 16-bit signed samples because it seems to be the most common
+format. Supporting multiple formats would add too much complexity to be
+worth it. Other formats can be obtained via conversion.
+
+I've kept interfaces fairly lean, leaving many possible features
+untapped but easy to add if necessary. For example the classic emulators
+could have volume and frequency equalization adjusted separately for
+each channel, since they each have an associated Blip_Synth.
+
+Source files of 400 lines or less seem to be the best size to limit
+complexity. In a few cases there is no reasonable way to split longer
+files, or there is benefit from having the source together in one file.
+
+
+Preventing Bugs
+---------------
+I've done many things to reduce the opportunity for defects. A general
+principle is to write code so that defects will be as visible as
+possible. I've used several techniques to achieve this.
+
+I put assertions at key points where defects seem likely or where
+corruption due to a defect is likely to be visible. I've also put
+assertions where violations of the interface are likely. In emulators
+where I am unsure of exact hardware operation in a particular case, I
+output a debug-only message noting that this has occurred; many times I
+haven't implemented a hardware feature because nothing uses it. I've
+made code brittle where there is no clear reason flexibility; code
+written to handle every possibility sacrifices quality and reliability
+to handle vaguely defined situations.
+
+
+Flexibility through indirection
+-------------------------------
+I've tried to allow the most flexibility of modules by using indirection
+to allow extension by the user. This keeps each module simpler and more
+focused on its unique task.
+
+The classic emulators use Multi_Buffer, which potentially allows a
+separate Blip_Buffer for each channel. This keeps emulators free of
+typical code to allow output in mono, stereo, panning, etc.
+
+All emulators use a reader object to access file data, allowing it to be
+stored in a regular file, compressed archive, memory, or generated
+on-the-fly. Again, the library can be kept free of the particulars of
+file access and changes required to support new formats.
+
+
+Emulators in general
+--------------------
+When I wrote the first NES sound emulator, I stored most of the state in
+an emulator-specific format, with significant redundancy. In the
+register write function I decoded everything into named variables. I
+became tired of the verbosity and wanted to more closely model the
+hardware, so I moved to a style of storing the last written value to
+each register, along with as little other state as possible, mostly the
+internal hardware registers. While this involves slightly more
+recalculation, in most cases the emulation code is of comparable size.
+It also makes state save/restore (for use in a full emulator) much
+simpler. Finally, it makes debugging easier since the hardware registers
+used in emulation are obvious.
+
+
+CPU Cores
+---------
+I've spent lots of time coming up with techniques to optimize the CPU
+cores. Some of the most important: execute multiple instructions during
+an emulation call, keep state in local variables to allow register
+assignment, optimize state representation for most common instructions,
+defer status flag calculation until actually needed, read program code
+directly without a call to the memory read function, always pre-fetch
+the operand byte before decoding instruction, and emulate instructions
+using common blocks of code.
+
+I've successfully used Nes_Cpu in a fairly complete NES emulator, and
+I'd like to make all the CPU emulators suitable for use in emulators. It
+seems a waste for them to be used only for the small amount of emulation
+necessary for game music files.
+
+I debugged the CPU cores by writing a test shell that ran them in
+parallel with other CPU cores and compared all memory accesses and
+processor states at each step. This provided good value at little cost.
+
+The CPU mapping page size is adjustable to allow the best tradeoff
+between memory/cache usage and handler granularity. The interface allows
+code to be somewhat independent of the page size.
+
+I optimize program memory accesses to direct reads rather than calls to
+the memory read function. My assumption is that it would be difficult to
+get useful code out of hardware I/O addresses, so no software will
+intentionally execute out of I/O space. Since the page size can be
+changed easily, most program memory mapping schemes can be accommodated.
+This greatly reduces memory access function calls.
+

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme Added

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme.txt Added

@@ -0,0 +1,375 @@
+Game_Music_Emu 0.5.5
+--------------------
+Author : Shay Green <gblargg@gmail.com>
+Website: http://www.slack.net/~ant/libs/
+Forum : http://groups.google.com/group/blargg-sound-libs
+License: GNU Lesser General Public License (LGPL)
+
+Contents
+--------
+* Overview
+* Error handling
+* Emulator types
+* M3U playlist support
+* Information fields
+* Track length
+* Loading file data
+* Sound parameters
+* VGM/GYM YM2413 & YM2612 FM sound
+* Modular construction
+* Obscure features
+* Solving problems
+* Thanks
+
+
+Overview
+--------
+This library can open game music files, play tracks, and read game and
+track information tags. To play a game music file, do the following:
+
+* Open the file with gme_open_file()
+* Start a track with gme_start_track();
+* Generate samples as needed with gme_play()
+* Play samples through speaker using your operating system
+* Delete emulator when done with gme_delete()
+
+Your code must arrange for the generated samples to be played through
+the computer's speaker using whatever method your operating system
+requires.
+
+There are many additional features available; you can:
+
+* Determine of the type of a music file without opening it with
+gme_identify_*()
+* Load just the file's information tags with gme_info_only
+* Load from a block of memory rather than a file with gme_load_data()
+* Arrange for a fade-out at a particular time with gme_set_fade
+* Find when a track has ended with gme_track_ended()
+* Seek to a new time in the track with gme_seek()
+* Load an extended m3u playlist with gme_load_m3u()
+* Get a list of the voices (channels) and mute them individually with
+gme_voice_names() and gme_mute_voice()
+* Change the playback tempo without affecting pitch with gme_set_tempo()
+* Adjust treble/bass equalization with gme_set_equalizer()
+* Associate your own data with an emulator and later get it back with
+gme_set_user_data()
+* Register a function of yours to be called back when the emulator is
+deleted with gme_set_user_cleanup()
+
+Refer to gme.h for a comprehensive summary of features.
+
+
+Error handling
+--------------
+Functions which can fail have a return type of gme_err_t, which is a
+pointer to an error string (const char*). If a function is successful it
+returns NULL. Errors that you can easily avoid are checked with debug
+assertions; gme_err_t return values are only used for genuine run-time
+errors that can't be easily predicted in advance (out of memory, I/O
+errors, incompatible file data). Your code should check all error
+values.
+
+When loading a music file in the wrong emulator or trying to load a
+non-music file, gme_wrong_file_type is returned. You can check for this
+error in C++ like this:
+
+	gme_err_t err = gme_open_file( path, &emu );
+	if ( err == gme_wrong_file_type )
+		...
+
+To check for minor problems, call gme_warning() to get a string
+describing the last warning. Your player should allow the user some way
+of knowing when this is the case, since these minor errors could affect
+playback. Without this information the user can't solve problems as
+well. When playing a track, gme_warning() returns minor playback-related
+problems (major playback problems end the track immediately and set the
+warning string).
+
+
+Emulator types
+--------------
+The library includes several game music emulators that each support a
+different file type. Each is identified by a gme_type_t constant defined
+in gme.h, for example gme_nsf_emu is for the NSF emulator. If you use
+gme_open_file() or gme_open_data(), the library does the work of
+determining the file type and creating an appropriate emulator. If you
+want more control over this process, read on.
+
+There are two basic ways to identify a game music file's type: look at
+its file extension, or read the header data. The library includes
+functions to help with both methods. The first is preferable because it
+is fast and the most common way to identify files. Sometimes the
+extension is lost or wrong, so the header must be read.
+
+Use gme_identify_extension() to find the correct game music type based
+on a filename. To identify a file based on its extension and header
+contents, use gme_identify_file(). If you read the header data yourself,
+use gme_identify_header().
+
+If you want to remove support for some music types to reduce your
+executable size, edit GME_TYPE_LIST in blargg_config.h. For example, to
+support just NSF and GBS, use this:
+
+	#define GME_TYPE_LIST \
+		gme_nsf_type,\
+		gme_gbs_type
+
+
+M3U playlist support
+--------------------
+The library supports playlists in an extended m3u format with
+gme_load_m3u() to give track names and times to multi-song formats: AY,
+GBS, HES, KSS, NSF, NSFE, and SAP. Some aspects of the file format
+itself is not well-defined so some m3u files won't work properly
+(particularly those provided with KSS files). Only m3u files referencing
+a single file are supported; your code must handle m3u files covering
+more than one game music file, though it can use the built-in m3u
+parsing provided by the library.
+
+
+Information fields
+------------------
+Support is provided for the various text fields and length information
+in a file with gme_track_info(). If you just need track information for
+a file (for example, building a playlist), use gme_new_info() in place
+of gme_new_emu(), load the file normally, then you can access the track
+count and info, but nothing else.
+
+ M3U VGM GYM SPC SAP NSFE NSF AY GBS HES KSS
+ -------------------------------------------------------
+Track Count | * * * * * * * * *
+ |
+System | * * * * * * * * * *
+ |
+Game | * * * * * * *
+ |
+Song | * * * * * * *
+ |
+Author | * * * * * * * *
+ |
+Copyright | * * * * * * * *
+ |
+Comment | * * * *
+ |
+Dumper | * * * *
+ |
+Length | * * * * * *
+ |
+Intro Length| * * *
+ |
+Loop Length | * * *
+
+As listed above, the HES and KSS file formats don't include a track
+count, and tracks are often scattered over the 0-255 range, so an m3u
+playlist for these is a must.
+
+Unavailable text fields are set to an empty string and times to -1. Your
+code should be prepared for any combination of available and unavailable
+fields, as a particular music file might not use all of the supported
+fields listed above.
+
+Currently text fields are truncated to 255 characters. Obscure fields of
+some formats are not currently decoded; contact me if you want one
+added.
+
+
+Track length
+------------
+The library leaves it up to you as to when to stop playing a track. You
+can ask for available length information and then tell the library what
+time it should start fading the track with gme_set_fade(). By default it
+also continually checks for 6 or more seconds of silence to mark the end
+of a track. Here is a reasonable algorithm you can use to decide how
+long to play a track:
+
+* If the track length is > 0, use it
+* If the loop length > 0, play for intro + loop * 2
+* Otherwise, default to 2.5 minutes (150000 msec)
+
+If you want to play a track longer than normal, be sure the loop length
+isn't zero. See Music_Player.cpp around line 145 for example code.
+
+By default, the library skips silence at the beginning of a track. It
+also continually checks for the end of a non-looping track by watching
+for 6 seconds of unbroken silence. When doing this is scans *ahead* by
+several seconds so it can report the end of the track after only one
+second of silence has actually played. This feature can be disabled with
+gme_ignore_silence().
+
+
+Loading file data
+-----------------
+The library allows file data to be loaded in many different ways. All
+load functions return an error which you should check. The following
+examples assume these variables:
+
+	Music_Emu* emu;
+	gme_err_t error;
+
+If you're letting the library determine a file's type, you can use
+either gme_open_file() or gme_open_data():
+	
+	error = gme_open_file( pathname, &emu );
+	error = gme_open_data( pointer, size, &emu );
+
+If you're manually determining file type and using used gme_new_emu() to
+create an emulator, you can use the following methods of loading:
+
+* From a block of memory:
+
+	error = gme_load_data( emu, pointer, size );
+
+* Have library call your function to read data:
+
+	gme_err_t my_read( void* my_data, void* out, long count )
+	{
+		// code that reads 'count' bytes into 'out' buffer
+		// and return 0 if no error
+	}
+	
+	error = gme_load_custom( emu, my_read, file_size, my_data );
+
+
+Sound parameters
+----------------
+All emulators support an arbitrary output sampling rate. A rate of 44100
+Hz should work well on most systems. Since band-limited synthesis is
+used, a sampling rate above 48000 Hz is not necessary and will actually
+reduce sound quality and performance.
+
+All emulators also support adjustable gain, mainly for the purpose of
+getting consistent volume between different music formats and avoiding
+excessive modulation. The gain can only be set *before* setting the
+emulator's sampling rate, so it's not useful as a general volume
+control. The default gains of emulators are set so that they give
+generally similar volumes, though some soundtracks are significantly
+louder or quieter than normal.
+
+Some emulators support adjustable treble and bass frequency equalization
+(AY, GBS, HES, KSS, NSF, NSFE, SAP, VGM) using set_equalizer().
+Parameters are specified using gme_equalizer_t eq = { treble_dB,
+bass_freq }. Treble_dB sets the treble level (in dB), where 0.0 dB gives
+normal treble; -200.0 dB is quite muffled, and 5.0 dB emphasizes treble
+for an extra crisp sound. Bass_freq sets the frequency where bass
+response starts to diminish; 15 Hz is normal, 0 Hz gives maximum bass,
+and 15000 Hz removes all bass. For example, the following makes the
+sound extra-crisp but lacking bass:
+
+	gme_equalizer_t eq = { 5.0, 1000 };
+	gme_set_equalizer( music_emu, &eq );
+
+Each emulator's equalization defaults to approximate the particular
+console's sound quality; this default can be determined by calling
+equalizer() just after creating the emulator. The Music_Emu::tv_eq
+profile gives sound as if coming from a TV speaker, and some emulators
+include other profiles for different versions of the system. For
+example, to use Famicom sound equalization with the NSF emulator, do the
+following:
+
+	music_emu->set_equalizer( Nsf_Emu::famicom_eq );
+
+
+VGM/GYM YM2413 & YM2612 FM sound
+--------------------------------
+The library plays Sega Genesis/Mega Drive music using a YM2612 FM sound
+chip emulator based on the Gens project. Because this has some
+inaccuracies, other YM2612 emulators can be used in its place by
+re-implementing the interface in YM2612_Emu.h. Available on my website
+is a modified version of MAME's YM2612 emulator, which sounds better in
+some ways and whose author is still making improvements.
+
+VGM music files using the YM2413 FM sound chip are also supported, but a
+YM2413 emulator isn't included with the library due to technical
+reasons. I have put one of the available YM2413 emulators on my website
+that can be used directly.
+
+
+Modular construction
+--------------------
+The library is made of many fairly independent modules. If you're using
+only one music file emulator, you can eliminate many of the library
+sources from your program. Refer to the files list in readme.txt to get
+a general idea of what can be removed, and be sure to edit GME_TYPE_LIST
+(see "Emulator types" above). Post to the forum if you'd like me to put
+together a smaller version for a particular use, as this only takes me a
+few minutes to do.
+
+If you want to use one of the individual sound chip emulators (or CPU
+cores) in your own console emulator, first check the libraries page on
+my website since I have released several of them as stand alone
+libraries with included documentation and examples on their use. If you
+don't find it as a standalone library, contact me and I'll consider
+separating it.
+
+The "classic" sound chips use my Blip_Buffer library, which greatly
+simplifies their implementation and efficiently handles band-limited
+synthesis. It is also available as a stand alone library with
+documentation and many examples.
+
+
+Obscure features
+----------------
+The library's flexibility allows many possibilities. Contact me if you
+want help implementing ideas or removing limitations.
+
+* Uses no global/static variables, allowing multiple instances of any
+emulator. This is useful in a music player if you want to allow
+simultaneous recording or scanning of other tracks while one is already
+playing. This will also be useful if your platform disallows global
+data.
+
+* Emulators that support a custom sound buffer can have *every* voice
+routed to a different Blip_Buffer, allowing custom processing on each
+voice. For example you could record a Game Boy track as a 4-channel
+sound file.
+
+* Defining BLIP_BUFFER_FAST uses lower quality, less-multiply-intensive
+synthesis on "classic" emulators, which might help on some really old
+processors. This significantly lowers sound quality and prevents treble
+equalization. Try this if your platform's processor isn't fast enough
+for normal quality. Even on my ten-year-old 400 MHz Mac, this reduces
+processor usage at most by about 0.6% (from 4% to 3.4%), hardly worth
+the quality loss.
+
+
+Solving problems
+----------------
+If you're having problems, try the following:
+
+* If you're getting garbled sound, try this simple siren generator in
+place of your call to play(). This will quickly tell whether the problem
+is in the library or in your code.
+
+	static void play_siren( long count, short* out )
+	{
+		static double a, a2;
+		while ( count-- )
+			*out++ = 0x2000 * sin( a += .1 + .05*sin( a2+=.00005 ) );
+	}
+
+* Enable debugging support in your environment. This enables assertions
+and other run-time checks.
+
+* Turn the compiler's optimizer is off. Sometimes an optimizer generates
+bad code.
+
+* If multiple threads are being used, ensure that only one at a time is
+accessing a given set of objects from the library. This library is not
+in general thread-safe, though independent objects can be used in
+separate threads.
+
+* If all else fails, see if the demos work.
+
+
+Thanks
+------
+Big thanks to Chris Moeller (kode54) for help with library testing and
+feedback, for maintaining the Foobar2000 plugin foo_gep based on it, and
+for original work on openspc++ that was used when developing Spc_Emu.
+Brad Martin's excellent OpenSPC SNES DSP emulator worked well from the
+start. Also thanks to Richard Bannister, Mahendra Tallur, Shazz,
+nenolod, theHobbit, Johan Samuelsson, and nes6502 for testing, using,
+and giving feedback for the library in their respective game music
+players. More recently, Lucas Paul and Michael Pyne have helped nudge the
+library into a public repository and get its interface more stable for use
+in shared libraries.

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Emu.cpp Added

@@ -0,0 +1,405 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Ay_Emu.h"
+
+#include "blargg_endian.h"
+#include <string.h>
+
+/* Copyright (C) 2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+long const spectrum_clock = 3546900;
+long const cpc_clock = 2000000;
+
+unsigned const ram_start = 0x4000;
+int const osc_count = Ay_Apu::osc_count + 1;
+
+Ay_Emu::Ay_Emu()
+{
+	beeper_output = 0;
+	set_type( gme_ay_type );
+	
+	static const char* const names [osc_count] = {
+		"Wave 1", "Wave 2", "Wave 3", "Beeper"
+	};
+	set_voice_names( names );
+	
+	static int const types [osc_count] = {
+		wave_type | 0, wave_type | 1, wave_type | 2, mixed_type | 0
+	};
+	set_voice_types( types );
+	set_silence_lookahead( 6 );
+}
+
+Ay_Emu::~Ay_Emu() { }
+
+// Track info
+
+static byte const* get_data( Ay_Emu::file_t const& file, byte const* ptr, int min_size )
+{
+	long pos = ptr - (byte const*) file.header;
+	long file_size = file.end - (byte const*) file.header;
+	assert( (unsigned long) pos <= (unsigned long) file_size - 2 );
+	int offset = (BOOST::int16_t) get_be16( ptr );
+	if ( !offset || blargg_ulong (pos + offset) > blargg_ulong (file_size - min_size) )
+		return 0;
+	return ptr + offset;
+}
+
+static blargg_err_t parse_header( byte const* in, long size, Ay_Emu::file_t* out )
+{
+	typedef Ay_Emu::header_t header_t;
+	out->header = (header_t const*) in;
+	out->end = in + size;
+	
+	if ( size < Ay_Emu::header_size )
+		return gme_wrong_file_type;
+	
+	header_t const& h = *(header_t const*) in;
+	if ( memcmp( h.tag, "ZXAYEMUL", 8 ) )
+		return gme_wrong_file_type;
+	
+	out->tracks = get_data( *out, h.track_info, (h.max_track + 1) * 4 );
+	if ( !out->tracks )
+		return "Missing track data";
+	
+	return 0;
+}
+
+static void copy_ay_fields( Ay_Emu::file_t const& file, track_info_t* out, int track )
+{
+	Gme_File::copy_field_( out->song, (char const*) get_data( file, file.tracks + track * 4, 1 ) );
+	byte const* track_info = get_data( file, file.tracks + track * 4 + 2, 6 );
+	if ( track_info )
+		out->length = get_be16( track_info + 4 ) * (1000L / 50); // frames to msec
+	
+	Gme_File::copy_field_( out->author, (char const*) get_data( file, file.header->author, 1 ) );
+	Gme_File::copy_field_( out->comment, (char const*) get_data( file, file.header->comment, 1 ) );
+}
+
+blargg_err_t Ay_Emu::track_info_( track_info_t* out, int track ) const
+{
+	copy_ay_fields( file, out, track );
+	return 0;
+}
+
+struct Ay_File : Gme_Info_
+{
+	Ay_Emu::file_t file;
+	
+	Ay_File() { set_type( gme_ay_type ); }
+	
+	blargg_err_t load_mem_( byte const* begin, long size )
+	{
+		RETURN_ERR( parse_header( begin, size, &file ) );
+		set_track_count( file.header->max_track + 1 );
+		return 0;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int track ) const
+	{
+		copy_ay_fields( file, out, track );
+		return 0;
+	}
+};
+
+static Music_Emu* new_ay_emu () { return BLARGG_NEW Ay_Emu ; }
+static Music_Emu* new_ay_file() { return BLARGG_NEW Ay_File; }
+
+static gme_type_t_ const gme_ay_type_ = { "ZX Spectrum", 0, &new_ay_emu, &new_ay_file, "AY", 1 };
+gme_type_t const gme_ay_type = &gme_ay_type_;
+
+// Setup
+
+blargg_err_t Ay_Emu::load_mem_( byte const* in, long size )
+{
+	assert( offsetof (header_t,track_info [2]) == header_size );
+	
+	RETURN_ERR( parse_header( in, size, &file ) );
+	set_track_count( file.header->max_track + 1 );
+	
+	if ( file.header->vers > 2 )
+		set_warning( "Unknown file version" );
+	
+	set_voice_count( osc_count );
+	apu.volume( gain() );
+	
+	return setup_buffer( spectrum_clock );
+}
+	
+void Ay_Emu::update_eq( blip_eq_t const& eq )
+{
+	apu.treble_eq( eq );
+}
+
+void Ay_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer*, Blip_Buffer* )
+{
+	if ( i >= Ay_Apu::osc_count )
+		beeper_output = center;
+	else
+		apu.osc_output( i, center );
+}
+
+// Emulation
+
+void Ay_Emu::set_tempo_( double t )
+{
+	play_period = blip_time_t (clock_rate() / 50 / t);
+}
+
+blargg_err_t Ay_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	
+	memset( mem.ram + 0x0000, 0xC9, 0x100 ); // fill RST vectors with RET
+	memset( mem.ram + 0x0100, 0xFF, 0x4000 - 0x100 );
+	memset( mem.ram + ram_start, 0x00, sizeof mem.ram - ram_start );
+	memset( mem.padding1, 0xFF, sizeof mem.padding1 );
+	memset( mem.ram + 0x10000, 0xFF, sizeof mem.ram - 0x10000 );
+	
+	// locate data blocks
+	byte const* const data = get_data( file, file.tracks + track * 4 + 2, 14 );
+	if ( !data ) return "File data missing";
+	
+	byte const* const more_data = get_data( file, data + 10, 6 );
+	if ( !more_data ) return "File data missing";
+	
+	byte const* blocks = get_data( file, data + 12, 8 );
+	if ( !blocks ) return "File data missing";
+	
+	// initial addresses
+	cpu::reset( mem.ram );
+	r.sp = get_be16( more_data );
+	r.b.a = r.b.b = r.b.d = r.b.h = data [8];
+	r.b.flags = r.b.c = r.b.e = r.b.l = data [9];
+	r.alt.w = r.w;
+	r.ix = r.iy = r.w.hl;
+	
+	unsigned addr = get_be16( blocks );
+	if ( !addr ) return "File data missing";
+	
+	unsigned init = get_be16( more_data + 2 );
+	if ( !init )
+		init = addr;
+	
+	// copy blocks into memory
+	do
+	{
+		blocks += 2;
+		unsigned len = get_be16( blocks ); blocks += 2;
+		if ( addr + len > 0x10000 )
+		{
+			set_warning( "Bad data block size" );
+			len = 0x10000 - addr;
+		}
+		check( len );
+		byte const* in = get_data( file, blocks, 0 ); blocks += 2;
+		if ( len > blargg_ulong (file.end - in) )
+		{
+			set_warning( "Missing file data" );
+			len = file.end - in;
+		}
+		//debug_printf( "addr: $%04X, len: $%04X\n", addr, len );
+		if ( addr < ram_start && addr >= 0x400 ) // several tracks use low data
+			debug_printf( "Block addr in ROM\n" );
+		memcpy( mem.ram + addr, in, len );
+		
+		if ( file.end - blocks < 8 )
+		{
+			set_warning( "Missing file data" );
+			break;
+		}
+	}
+	while ( (addr = get_be16( blocks )) != 0 );
+	
+	// copy and configure driver
+	static byte const passive [] = {
+		0xF3, // DI
+		0xCD, 0, 0, // CALL init
+		0xED, 0x5E, // LOOP: IM 2
+		0xFB, // EI
+		0x76, // HALT
+		0x18, 0xFA // JR LOOP
+	};
+	static byte const active [] = {
+		0xF3, // DI
+		0xCD, 0, 0, // CALL init
+		0xED, 0x56, // LOOP: IM 1
+		0xFB, // EI
+		0x76, // HALT
+		0xCD, 0, 0, // CALL play
+		0x18, 0xF7 // JR LOOP
+	};
+	memcpy( mem.ram, passive, sizeof passive );
+	unsigned play_addr = get_be16( more_data + 4 );
+	//debug_printf( "Play: $%04X\n", play_addr );
+	if ( play_addr )
+	{
+		memcpy( mem.ram, active, sizeof active );
+		mem.ram [ 9] = play_addr;
+		mem.ram [10] = play_addr >> 8;
+	}
+	mem.ram [2] = init;
+	mem.ram [3] = init >> 8;
+	
+	mem.ram [0x38] = 0xFB; // Put EI at interrupt vector (followed by RET)
+	
+	memcpy( mem.ram + 0x10000, mem.ram, 0x80 ); // some code wraps around (ugh)
+	
+	beeper_delta = int (apu.amp_range * 0.65);
+	last_beeper = 0;
+	apu.reset();
+	next_play = play_period;
+	
+	// start at spectrum speed
+	change_clock_rate( spectrum_clock );
+	set_tempo( tempo() );
+	
+	spectrum_mode = false;
+	cpc_mode = false;
+	cpc_latch = 0;
+	
+	return 0;
+}
+
+// Emulation
+
+void Ay_Emu::cpu_out_misc( cpu_time_t time, unsigned addr, int data )
+{
+	if ( !cpc_mode )
+	{
+		switch ( addr & 0xFEFF )
+		{
+		case 0xFEFD:
+			spectrum_mode = true;
+			apu_addr = data & 0x0F;
+			return;
+		
+		case 0xBEFD:
+			spectrum_mode = true;
+			apu.write( time, apu_addr, data );
+			return;
+		}
+	}
+	
+	if ( !spectrum_mode )
+	{
+		switch ( addr >> 8 )
+		{
+		case 0xF6:
+			switch ( data & 0xC0 )
+			{
+			case 0xC0:
+				apu_addr = cpc_latch & 0x0F;
+				goto enable_cpc;
+			
+			case 0x80:
+				apu.write( time, apu_addr, cpc_latch );
+				goto enable_cpc;
+			}
+			break;
+		
+		case 0xF4:
+			cpc_latch = data;
+			goto enable_cpc;
+		}
+	}
+	
+	debug_printf( "Unmapped OUT: $%04X <- $%02X\n", addr, data );
+	return;
+	
+enable_cpc:
+	if ( !cpc_mode )
+	{
+		cpc_mode = true;
+		change_clock_rate( cpc_clock );
+		set_tempo( tempo() );
+	}
+}
+
+void ay_cpu_out( Ay_Cpu* cpu, cpu_time_t time, unsigned addr, int data )
+{
+	Ay_Emu& emu = STATIC_CAST(Ay_Emu&,*cpu);
+	
+	if ( (addr & 0xFF) == 0xFE && !emu.cpc_mode )
+	{
+		int delta = emu.beeper_delta;
+		data &= 0x10;
+		if ( emu.last_beeper != data )
+		{
+			emu.last_beeper = data;
+			emu.beeper_delta = -delta;
+			emu.spectrum_mode = true;
+			if ( emu.beeper_output )
+				emu.apu.synth_.offset( time, delta, emu.beeper_output );
+		}
+	}
+	else
+	{
+		emu.cpu_out_misc( time, addr, data );
+	}
+}
+
+int ay_cpu_in( Ay_Cpu*, unsigned addr )
+{
+	// keyboard read and other things
+	if ( (addr & 0xFF) == 0xFE )
+		return 0xFF; // other values break some beeper tunes
+	
+	debug_printf( "Unmapped IN : $%04X\n", addr );
+	return 0xFF;
+}
+
+blargg_err_t Ay_Emu::run_clocks( blip_time_t& duration, int )
+{
+	set_time( 0 );
+	if ( !(spectrum_mode | cpc_mode) )
+		duration /= 2; // until mode is set, leave room for halved clock rate
+	
+	while ( time() < duration )
+	{
+		cpu::run( min( duration, (blip_time_t) next_play ) );
+		
+		if ( time() >= next_play )
+		{
+			next_play += play_period;
+			
+			if ( r.iff1 )
+			{
+				if ( mem.ram [r.pc] == 0x76 )
+					r.pc++;
+				
+				r.iff1 = r.iff2 = 0;
+				
+				mem.ram [--r.sp] = uint8_t (r.pc >> 8);
+				mem.ram [--r.sp] = uint8_t (r.pc);
+				r.pc = 0x38;
+				cpu::adjust_time( 12 );
+				if ( r.im == 2 )
+				{
+					cpu::adjust_time( 6 );
+					unsigned addr = r.i * 0x100u + 0xFF;
+					r.pc = mem.ram [(addr + 1) & 0xFFFF] * 0x100u + mem.ram [addr];
+				}
+			}
+		}
+	}
+	duration = time();
+	next_play -= duration;
+	check( next_play >= 0 );
+	adjust_time( -duration );
+	
+	apu.end_frame( duration );
+	
+	return 0;
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ay_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Blip_Buffer.cpp Added

@@ -0,0 +1,460 @@
+// Blip_Buffer 0.4.1. http://www.slack.net/~ant/
+
+#include "Blip_Buffer.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+/* Copyright (C) 2003-2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#ifdef BLARGG_ENABLE_OPTIMIZER
+	#include BLARGG_ENABLE_OPTIMIZER
+#endif
+
+int const silent_buf_size = 1; // size used for Silent_Blip_Buffer
+
+Blip_Buffer::Blip_Buffer()
+{
+	factor_ = (blip_ulong)-1 / 2;
+	offset_ = 0;
+	buffer_ = 0;
+	buffer_size_ = 0;
+	sample_rate_ = 0;
+	reader_accum_ = 0;
+	bass_shift_ = 0;
+	clock_rate_ = 0;
+	bass_freq_ = 16;
+	length_ = 0;
+	
+	// assumptions code makes about implementation-defined features
+	#ifndef NDEBUG
+		// right shift of negative value preserves sign
+		buf_t_ i = -0x7FFFFFFE;
+		assert( (i >> 1) == -0x3FFFFFFF );
+		
+		// casting to short truncates to 16 bits and sign-extends
+		i = 0x18000;
+		assert( (short) i == -0x8000 );
+	#endif
+}
+
+Blip_Buffer::~Blip_Buffer()
+{
+	if ( buffer_size_ != silent_buf_size )
+		free( buffer_ );
+}
+
+Silent_Blip_Buffer::Silent_Blip_Buffer()
+{
+	factor_ = 0;
+	buffer_ = buf;
+	buffer_size_ = silent_buf_size;
+	memset( buf, 0, sizeof buf ); // in case machine takes exception for signed overflow
+}
+
+void Blip_Buffer::clear( int entire_buffer )
+{
+	offset_ = 0;
+	reader_accum_ = 0;
+	modified_ = 0;
+	if ( buffer_ )
+	{
+		long count = (entire_buffer ? buffer_size_ : samples_avail());
+		memset( buffer_, 0, (count + blip_buffer_extra_) * sizeof (buf_t_) );
+	}
+}
+
+Blip_Buffer::blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, int msec )
+{
+	if ( buffer_size_ == silent_buf_size )
+	{
+		assert( 0 );
+		return "Internal (tried to resize Silent_Blip_Buffer)";
+	}
+	
+	// start with maximum length that resampled time can represent
+	long new_size = (UINT_MAX >> BLIP_BUFFER_ACCURACY) - blip_buffer_extra_ - 64;
+	if ( msec != blip_max_length )
+	{
+		long s = (new_rate * (msec + 1) + 999) / 1000;
+		if ( s < new_size )
+			new_size = s;
+		else
+			assert( 0 ); // fails if requested buffer length exceeds limit
+	}
+	
+	if ( buffer_size_ != new_size )
+	{
+		void* p = realloc( buffer_, (new_size + blip_buffer_extra_) * sizeof *buffer_ );
+		if ( !p )
+			return "Out of memory";
+		buffer_ = (buf_t_*) p;
+	}
+	
+	buffer_size_ = new_size;
+	assert( buffer_size_ != silent_buf_size );
+	
+	// update things based on the sample rate
+	sample_rate_ = new_rate;
+	length_ = new_size * 1000 / new_rate - 1;
+	if ( msec )
+		assert( length_ == msec ); // ensure length is same as that passed in
+	if ( clock_rate_ )
+		clock_rate( clock_rate_ );
+	bass_freq( bass_freq_ );
+	
+	clear();
+	
+	return 0; // success
+}
+
+blip_resampled_time_t Blip_Buffer::clock_rate_factor( long rate ) const
+{
+	double ratio = (double) sample_rate_ / rate;
+	blip_long factor = (blip_long) floor( ratio * (1L << BLIP_BUFFER_ACCURACY) + 0.5 );
+	assert( factor > 0 || !sample_rate_ ); // fails if clock/output ratio is too large
+	return (blip_resampled_time_t) factor;
+}
+
+void Blip_Buffer::bass_freq( int freq )
+{
+	bass_freq_ = freq;
+	int shift = 31;
+	if ( freq > 0 )
+	{
+		shift = 13;
+		long f = (freq << 16) / sample_rate_;
+		while ( (f >>= 1) && --shift ) { }
+	}
+	bass_shift_ = shift;
+}
+
+void Blip_Buffer::end_frame( blip_time_t t )
+{
+	offset_ += t * factor_;
+	assert( samples_avail() <= (long) buffer_size_ ); // time outside buffer length
+}
+
+void Blip_Buffer::remove_silence( long count )
+{
+	assert( count <= samples_avail() ); // tried to remove more samples than available
+	offset_ -= (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
+}
+
+long Blip_Buffer::count_samples( blip_time_t t ) const
+{
+	unsigned long last_sample = resampled_time( t ) >> BLIP_BUFFER_ACCURACY;
+	unsigned long first_sample = offset_ >> BLIP_BUFFER_ACCURACY;
+	return (long) (last_sample - first_sample);
+}
+
+blip_time_t Blip_Buffer::count_clocks( long count ) const
+{
+	if ( !factor_ )
+	{
+		assert( 0 ); // sample rate and clock rates must be set first
+		return 0;
+	}
+	
+	if ( count > buffer_size_ )
+		count = buffer_size_;
+	blip_resampled_time_t time = (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
+	return (blip_time_t) ((time - offset_ + factor_ - 1) / factor_);
+}
+
+void Blip_Buffer::remove_samples( long count )
+{
+	if ( count )
+	{
+		remove_silence( count );
+		
+		// copy remaining samples to beginning and clear old samples
+		long remain = samples_avail() + blip_buffer_extra_;
+		memmove( buffer_, buffer_ + count, remain * sizeof *buffer_ );
+		memset( buffer_ + remain, 0, count * sizeof *buffer_ );
+	}
+}
+
+// Blip_Synth_
+
+Blip_Synth_Fast_::Blip_Synth_Fast_()
+{
+	buf = 0;
+	last_amp = 0;
+	delta_factor = 0;
+}
+
+void Blip_Synth_Fast_::volume_unit( double new_unit )
+{
+	delta_factor = int (new_unit * (1L << blip_sample_bits) + 0.5);
+}
+
+#if !BLIP_BUFFER_FAST
+
+Blip_Synth_::Blip_Synth_( short* p, int w ) :
+	impulses( p ),
+	width( w )
+{
+	volume_unit_ = 0.0;
+	kernel_unit = 0;
+	buf = 0;
+	last_amp = 0;
+	delta_factor = 0;
+}
+
+#undef PI
+#define PI 3.1415926535897932384626433832795029
+
+static void gen_sinc( float* out, int count, double oversample, double treble, double cutoff )
+{
+	if ( cutoff >= 0.999 )
+		cutoff = 0.999;
+	
+	if ( treble < -300.0 )
+		treble = -300.0;
+	if ( treble > 5.0 )
+		treble = 5.0;
+	
+	double const maxh = 4096.0;
+	double const rolloff = pow( 10.0, 1.0 / (maxh * 20.0) * treble / (1.0 - cutoff) );
+	double const pow_a_n = pow( rolloff, maxh - maxh * cutoff );
+	double const to_angle = PI / 2 / maxh / oversample;
+	for ( int i = 0; i < count; i++ )
+	{
+		double angle = ((i - count) * 2 + 1) * to_angle;
+		double angle_maxh = angle * maxh;
+		double angle_maxh_mid = angle_maxh * cutoff;
+		
+		double y = maxh;
+		
+		// 0 to Fs/2*cutoff, flat
+		if ( angle_maxh_mid ) // unstable at t=0
+			y *= sin( angle_maxh_mid ) / angle_maxh_mid;
+		
+		// Fs/2*cutoff to Fs/2, logarithmic rolloff
+		double cosa = cos( angle );
+		double den = 1 + rolloff * (rolloff - cosa - cosa);
+		
+		// Becomes unstable when rolloff is near 1.0 and t is near 0,
+		// which is the only time den becomes small
+		if ( den > 1e-13 )
+		{
+			double num =
+				(cos( angle_maxh - angle ) * rolloff - cos( angle_maxh )) * pow_a_n -
+				 cos( angle_maxh_mid - angle ) * rolloff + cos( angle_maxh_mid );
+			
+			y = y * cutoff + num / den;
+		}
+		
+		out [i] = (float) y;
+	}
+}
+
+void blip_eq_t::generate( float* out, int count ) const
+{
+	// lower cutoff freq for narrow kernels with their wider transition band
+	// (8 points->1.49, 16 points->1.15)
+	double oversample = blip_res * 2.25 / count + 0.85;
+	double half_rate = sample_rate * 0.5;
+	if ( cutoff_freq )
+		oversample = half_rate / cutoff_freq;
+	double cutoff = rolloff_freq * oversample / half_rate;
+	
+	gen_sinc( out, count, blip_res * oversample, treble, cutoff );
+	
+	// apply (half of) hamming window
+	double to_fraction = PI / (count - 1);
+	for ( int i = count; i--; )
+		out [i] *= 0.54f - 0.46f * (float) cos( i * to_fraction );
+}
+
+void Blip_Synth_::adjust_impulse()
+{
+	// sum pairs for each phase and add error correction to end of first half
+	int const size = impulses_size();
+	for ( int p = blip_res; p-- >= blip_res / 2; )
+	{
+		int p2 = blip_res - 2 - p;
+		long error = kernel_unit;
+		for ( int i = 1; i < size; i += blip_res )
+		{
+			error -= impulses [i + p ];
+			error -= impulses [i + p2];
+		}
+		if ( p == p2 )
+			error /= 2; // phase = 0.5 impulse uses same half for both sides
+		impulses [size - blip_res + p] += (short) error;
+		//printf( "error: %ld\n", error );
+	}
+	
+	//for ( int i = blip_res; i--; printf( "\n" ) )
+	// for ( int j = 0; j < width / 2; j++ )
+	// printf( "%5ld,", impulses [j * blip_res + i + 1] );
+}
+
+void Blip_Synth_::treble_eq( blip_eq_t const& eq )
+{
+	float fimpulse [blip_res / 2 * (blip_widest_impulse_ - 1) + blip_res * 2];
+	
+	int const half_size = blip_res / 2 * (width - 1);
+	eq.generate( &fimpulse [blip_res], half_size );
+	
+	int i;
+	
+	// need mirror slightly past center for calculation
+	for ( i = blip_res; i--; )
+		fimpulse [blip_res + half_size + i] = fimpulse [blip_res + half_size - 1 - i];
+	
+	// starts at 0
+	for ( i = 0; i < blip_res; i++ )
+		fimpulse [i] = 0.0f;
+	
+	// find rescale factor
+	double total = 0.0;
+	for ( i = 0; i < half_size; i++ )
+		total += fimpulse [blip_res + i];
+	
+	//double const base_unit = 44800.0 - 128 * 18; // allows treble up to +0 dB
+	//double const base_unit = 37888.0; // allows treble to +5 dB
+	double const base_unit = 32768.0; // necessary for blip_unscaled to work
+	double rescale = base_unit / 2 / total;
+	kernel_unit = (long) base_unit;
+	
+	// integrate, first difference, rescale, convert to int
+	double sum = 0.0;
+	double next = 0.0;
+	int const impulses_size = this->impulses_size();
+	for ( i = 0; i < impulses_size; i++ )
+	{
+		impulses [i] = (short) floor( (next - sum) * rescale + 0.5 );
+		sum += fimpulse [i];
+		next += fimpulse [i + blip_res];
+	}
+	adjust_impulse();
+	
+	// volume might require rescaling
+	double vol = volume_unit_;
+	if ( vol )
+	{
+		volume_unit_ = 0.0;
+		volume_unit( vol );
+	}
+}
+
+void Blip_Synth_::volume_unit( double new_unit )
+{
+	if ( new_unit != volume_unit_ )
+	{
+		// use default eq if it hasn't been set yet
+		if ( !kernel_unit )
+			treble_eq( -8.0 );
+		
+		volume_unit_ = new_unit;
+		double factor = new_unit * (1L << blip_sample_bits) / kernel_unit;
+		
+		if ( factor > 0.0 )
+		{
+			int shift = 0;
+			
+			// if unit is really small, might need to attenuate kernel
+			while ( factor < 2.0 )
+			{
+				shift++;
+				factor *= 2.0;
+			}
+			
+			if ( shift )
+			{
+				kernel_unit >>= shift;
+				assert( kernel_unit > 0 ); // fails if volume unit is too low
+				
+				// keep values positive to avoid round-towards-zero of sign-preserving
+				// right shift for negative values
+				long offset = 0x8000 + (1 << (shift - 1));
+				long offset2 = 0x8000 >> shift;
+				for ( int i = impulses_size(); i--; )
+					impulses [i] = (short) (((impulses [i] + offset) >> shift) - offset2);
+				adjust_impulse();
+			}
+		}
+		delta_factor = (int) floor( factor + 0.5 );
+		//printf( "delta_factor: %d, kernel_unit: %d\n", delta_factor, kernel_unit );
+	}
+}
+#endif
+
+long Blip_Buffer::read_samples( blip_sample_t* BLIP_RESTRICT out, long max_samples, int stereo )
+{
+	long count = samples_avail();
+	if ( count > max_samples )
+		count = max_samples;
+	
+	if ( count )
+	{
+		int const bass = BLIP_READER_BASS( *this );
+		BLIP_READER_BEGIN( reader, *this );
+		
+		if ( !stereo )
+		{
+			for ( blip_long n = count; n; --n )
+			{
+				blip_long s = BLIP_READER_READ( reader );
+				if ( (blip_sample_t) s != s )
+					s = 0x7FFF - (s >> 24);
+				*out++ = (blip_sample_t) s;
+				BLIP_READER_NEXT( reader, bass );
+			}
+		}
+		else
+		{
+			for ( blip_long n = count; n; --n )
+			{
+				blip_long s = BLIP_READER_READ( reader );
+				if ( (blip_sample_t) s != s )
+					s = 0x7FFF - (s >> 24);
+				*out = (blip_sample_t) s;
+				out += 2;
+				BLIP_READER_NEXT( reader, bass );
+			}
+		}
+		BLIP_READER_END( reader, *this );
+		
+		remove_samples( count );
+	}
+	return count;
+}
+
+void Blip_Buffer::mix_samples( blip_sample_t const* in, long count )
+{
+	if ( buffer_size_ == silent_buf_size )
+	{
+		assert( 0 );
+		return;
+	}
+	
+	buf_t_* out = buffer_ + (offset_ >> BLIP_BUFFER_ACCURACY) + blip_widest_impulse_ / 2;
+	
+	int const sample_shift = blip_sample_bits - 16;
+	int prev = 0;
+	while ( count-- )
+	{
+		blip_long s = (blip_long) *in++ << sample_shift;
+		*out += s - prev;
+		prev = s;
+		++out;
+	}
+	*out -= prev;
+}
+

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Blip_Buffer.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Classic_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Classic_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Data_Reader.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Data_Reader.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Dual_Resampler.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Dual_Resampler.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Effects_Buffer.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Effects_Buffer.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Fir_Resampler.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Fir_Resampler.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Oscs.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gb_Oscs.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gbs_Emu.cpp Added

@@ -0,0 +1,289 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Gbs_Emu.h"
+
+#include "blargg_endian.h"
+#include <string.h>
+
+/* Copyright (C) 2003-2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+Gbs_Emu::equalizer_t const Gbs_Emu::handheld_eq = { -47.0, 2000 };
+Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = { 0.0, 300 };
+
+Gbs_Emu::Gbs_Emu()
+{
+	set_type( gme_gbs_type );
+	
+	static const char* const names [Gb_Apu::osc_count] = {
+		"Square 1", "Square 2", "Wave", "Noise"
+	};
+	set_voice_names( names );
+	
+	static int const types [Gb_Apu::osc_count] = {
+		wave_type | 1, wave_type | 2, wave_type | 0, mixed_type | 0
+	};
+	set_voice_types( types );
+	
+	set_silence_lookahead( 6 );
+	set_max_initial_silence( 21 );
+	set_gain( 1.2 );
+	
+	static equalizer_t const eq = { -1.0, 120 };
+	set_equalizer( eq );
+}
+
+Gbs_Emu::~Gbs_Emu() { }
+
+void Gbs_Emu::unload()
+{
+	rom.clear();
+	Music_Emu::unload();
+}
+
+// Track info
+
+static void copy_gbs_fields( Gbs_Emu::header_t const& h, track_info_t* out )
+{
+	GME_COPY_FIELD( h, out, game );
+	GME_COPY_FIELD( h, out, author );
+	GME_COPY_FIELD( h, out, copyright );
+}
+
+blargg_err_t Gbs_Emu::track_info_( track_info_t* out, int ) const
+{
+	copy_gbs_fields( header_, out );
+	return 0;
+}
+
+static blargg_err_t check_gbs_header( void const* header )
+{
+	if ( memcmp( header, "GBS", 3 ) )
+		return gme_wrong_file_type;
+	return 0;
+}
+
+struct Gbs_File : Gme_Info_
+{
+	Gbs_Emu::header_t h;
+	
+	Gbs_File() { set_type( gme_gbs_type ); }
+	
+	blargg_err_t load_( Data_Reader& in )
+	{
+		blargg_err_t err = in.read( &h, Gbs_Emu::header_size );
+		if ( err )
+			return (err == in.eof_error ? gme_wrong_file_type : err);
+		
+		set_track_count( h.track_count );
+		return check_gbs_header( &h );
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		copy_gbs_fields( h, out );
+		return 0;
+	}
+};
+
+static Music_Emu* new_gbs_emu () { return BLARGG_NEW Gbs_Emu ; }
+static Music_Emu* new_gbs_file() { return BLARGG_NEW Gbs_File; }
+
+static gme_type_t_ const gme_gbs_type_ = { "Game Boy", 0, &new_gbs_emu, &new_gbs_file, "GBS", 1 };
+gme_type_t const gme_gbs_type = &gme_gbs_type_;
+
+// Setup
+
+blargg_err_t Gbs_Emu::load_( Data_Reader& in )
+{
+	assert( offsetof (header_t,copyright [32]) == header_size );
+	RETURN_ERR( rom.load( in, header_size, &header_, 0 ) );
+	
+	set_track_count( header_.track_count );
+	RETURN_ERR( check_gbs_header( &header_ ) );
+	
+	if ( header_.vers != 1 )
+		set_warning( "Unknown file version" );
+	
+	if ( header_.timer_mode & 0x78 )
+		set_warning( "Invalid timer mode" );
+	
+	unsigned load_addr = get_le16( header_.load_addr );
+	if ( (header_.load_addr [1] | header_.init_addr [1] | header_.play_addr [1]) > 0x7F ||
+			load_addr < 0x400 )
+		set_warning( "Invalid load/init/play address" );
+	
+	set_voice_count( Gb_Apu::osc_count );
+	
+	apu.volume( gain() );
+	
+	return setup_buffer( 4194304 );
+}
+
+void Gbs_Emu::update_eq( blip_eq_t const& eq )
+{
+	apu.treble_eq( eq );
+}
+
+void Gbs_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
+{
+	apu.osc_output( i, c, l, r );
+}
+
+// Emulation
+
+// see gb_cpu_io.h for read/write functions
+
+void Gbs_Emu::set_bank( int n )
+{
+	blargg_long addr = rom.mask_addr( n * (blargg_long) bank_size );
+	if ( addr == 0 && rom.size() > bank_size )
+	{
+		// TODO: what is the correct behavior? Current Game & Watch Gallery
+		// rip requires that this have no effect or set to bank 1.
+		//debug_printf( "Selected ROM bank 0\n" );
+		return;
+		//n = 1;
+	}
+	cpu::map_code( bank_size, bank_size, rom.at_addr( addr ) );
+}
+
+void Gbs_Emu::update_timer()
+{
+	if ( header_.timer_mode & 0x04 )
+	{
+		static byte const rates [4] = { 10, 4, 6, 8 };
+		int shift = rates [ram [hi_page + 7] & 3] - (header_.timer_mode >> 7);
+		play_period = (256L - ram [hi_page + 6]) << shift;
+	}
+	else
+	{
+		play_period = 70224; // 59.73 Hz
+	}
+	if ( tempo() != 1.0 )
+		play_period = blip_time_t (play_period / tempo());
+}
+
+static BOOST::uint8_t const sound_data [Gb_Apu::register_count] = {
+	0x80, 0xBF, 0x00, 0x00, 0xBF, // square 1
+	0x00, 0x3F, 0x00, 0x00, 0xBF, // square 2
+	0x7F, 0xFF, 0x9F, 0x00, 0xBF, // wave
+	0x00, 0xFF, 0x00, 0x00, 0xBF, // noise
+	0x77, 0xF3, 0xF1, // vin/volume, status, power mode
+	0, 0, 0, 0, 0, 0, 0, 0, 0, // unused
+	0xAC, 0xDD, 0xDA, 0x48, 0x36, 0x02, 0xCF, 0x16, // waveform data
+	0x2C, 0x04, 0xE5, 0x2C, 0xAC, 0xDD, 0xDA, 0x48
+};
+
+void Gbs_Emu::cpu_jsr( gb_addr_t addr )
+{
+	check( cpu::r.sp == get_le16( header_.stack_ptr ) );
+	cpu::r.pc = addr;
+	cpu_write( --cpu::r.sp, idle_addr >> 8 );
+	cpu_write( --cpu::r.sp, idle_addr&0xFF );
+}
+
+void Gbs_Emu::set_tempo_( double t )
+{
+	apu.set_tempo( t );
+	update_timer();
+}
+
+blargg_err_t Gbs_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	
+	memset( ram, 0, 0x4000 );
+	memset( ram + 0x4000, 0xFF, 0x1F80 );
+	memset( ram + 0x5F80, 0, sizeof ram - 0x5F80 );
+	ram [hi_page] = 0; // joypad reads back as 0
+	
+	apu.reset();
+	for ( int i = 0; i < (int) sizeof sound_data; i++ )
+		apu.write_register( 0, i + apu.start_addr, sound_data [i] );
+	
+	unsigned load_addr = get_le16( header_.load_addr );
+	rom.set_addr( load_addr );
+	cpu::rst_base = load_addr;
+	
+	cpu::reset( rom.unmapped() );
+	
+	cpu::map_code( ram_addr, 0x10000 - ram_addr, ram );
+	cpu::map_code( 0, bank_size, rom.at_addr( 0 ) );
+	set_bank( rom.size() > bank_size );
+	
+	ram [hi_page + 6] = header_.timer_modulo;
+	ram [hi_page + 7] = header_.timer_mode;
+	update_timer();
+	next_play = play_period;
+	
+	cpu::r.a = track;
+	cpu::r.pc = idle_addr;
+	cpu::r.sp = get_le16( header_.stack_ptr );
+	cpu_time = 0;
+	cpu_jsr( get_le16( header_.init_addr ) );
+	
+	return 0;
+}
+
+blargg_err_t Gbs_Emu::run_clocks( blip_time_t& duration, int )
+{
+	cpu_time = 0;
+	while ( cpu_time < duration )
+	{
+		long count = duration - cpu_time;
+		cpu_time = duration;
+		bool result = cpu::run( count );
+		cpu_time -= cpu::remain();
+		
+		if ( result )
+		{
+			if ( cpu::r.pc == idle_addr )
+			{
+				if ( next_play > duration )
+				{
+					cpu_time = duration;
+					break;
+				}
+				
+				if ( cpu_time < next_play )
+					cpu_time = next_play;
+				next_play += play_period;
+				cpu_jsr( get_le16( header_.play_addr ) );
+				GME_FRAME_HOOK( this );
+				// TODO: handle timer rates different than 60 Hz
+			}
+			else if ( cpu::r.pc > 0xFFFF )
+			{
+				debug_printf( "PC wrapped around\n" );
+				cpu::r.pc &= 0xFFFF;
+			}
+			else
+			{
+				set_warning( "Emulation error (illegal/unsupported instruction)" );
+				debug_printf( "Bad opcode $%.2x at $%.4x\n",
+						(int) *cpu::get_code( cpu::r.pc ), (int) cpu::r.pc );
+				cpu::r.pc = (cpu::r.pc + 1) & 0xFFFF;
+				cpu_time += 6;
+			}
+		}
+	}
+	
+	duration = cpu_time;
+	next_play -= cpu_time;
+	if ( next_play < 0 ) // could go negative if routine is taking too long to return
+		next_play = 0;
+	apu.end_frame( cpu_time );
+	
+	return 0;
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gbs_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gme_File.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gme_File.h Added

@@ -0,0 +1,177 @@
+// Common interface to game music file loading and information
+
+// Game_Music_Emu 0.5.5
+#ifndef GME_FILE_H
+#define GME_FILE_H
+
+#include "gme.h"
+#include "blargg_common.h"
+#include "Data_Reader.h"
+#include "M3u_Playlist.h"
+
+// Error returned if file is wrong type
+//extern const char gme_wrong_file_type []; // declared in gme.h
+
+struct gme_type_t_
+{
+	const char* system; /* name of system this music file type is generally for */
+	int track_count; /* non-zero for formats with a fixed number of tracks */
+	Music_Emu* (*new_emu)(); /* Create new emulator for this type (useful in C++ only) */
+	Music_Emu* (*new_info)(); /* Create new info reader for this type */
+	
+	/* internal */
+	const char* extension_;
+	int flags_;
+};
+
+struct track_info_t
+{
+	long track_count;
+	
+	/* times in milliseconds; -1 if unknown */
+	long length;
+	long intro_length;
+	long loop_length;
+	
+	/* empty string if not available */
+	char system [256];
+	char game [256];
+	char song [256];
+	char author [256];
+	char copyright [256];
+	char comment [256];
+	char dumper [256];
+};
+enum { gme_max_field = 255 };
+
+struct Gme_File {
+public:
+// File loading
+	
+	// Each loads game music data from a file and returns an error if
+	// file is wrong type or is seriously corrupt. They also set warning
+	// string for minor problems.
+	
+	// Load from file on disk
+	blargg_err_t load_file( const char* path );
+	
+	// Load from custom data source (see Data_Reader.h)
+	blargg_err_t load( Data_Reader& );
+	
+	// Load from file already read into memory. Keeps pointer to data, so you
+	// must not free it until you're done with the file.
+	blargg_err_t load_mem( void const* data, long size );
+	
+	// Load an m3u playlist. Must be done after loading main music file.
+	blargg_err_t load_m3u( const char* path );
+	blargg_err_t load_m3u( Data_Reader& in );
+	
+	// Clears any loaded m3u playlist and any internal playlist that the music
+	// format supports (NSFE for example).
+	void clear_playlist();
+	
+// Informational
+	
+	// Type of emulator. For example if this returns gme_nsfe_type, this object
+	// is an NSFE emulator, and you can cast to an Nsfe_Emu* if necessary.
+	gme_type_t type() const;
+	
+	// Most recent warning string, or NULL if none. Clears current warning after
+	// returning.
+	const char* warning();
+	
+	// Number of tracks or 0 if no file has been loaded
+	int track_count() const;
+	
+	// Get information for a track (length, name, author, etc.)
+	// See gme.h for definition of struct track_info_t.
+	blargg_err_t track_info( track_info_t* out, int track ) const;
+	
+// User data/cleanup
+	
+	// Set/get pointer to data you want to associate with this emulator.
+	// You can use this for whatever you want.
+	void set_user_data( void* p ) { user_data_ = p; }
+	void* user_data() const { return user_data_; }
+	
+	// Register cleanup function to be called when deleting emulator, or NULL to
+	// clear it. Passes user_data to cleanup function.
+	void set_user_cleanup( gme_user_cleanup_t func ) { user_cleanup_ = func; }
+	
+public:
+	// deprecated
+	int error_count() const; // use warning()
+public:
+	Gme_File();
+	virtual ~Gme_File();
+	BLARGG_DISABLE_NOTHROW
+	typedef BOOST::uint8_t byte;
+protected:
+	// Services
+	void set_track_count( int n ) { track_count_ = raw_track_count_ = n; }
+	void set_warning( const char* s ) { warning_ = s; }
+	void set_type( gme_type_t t ) { type_ = t; }
+	blargg_err_t load_remaining_( void const* header, long header_size, Data_Reader& remaining );
+	
+	// Overridable
+	virtual void unload(); // called before loading file and if loading fails
+	virtual blargg_err_t load_( Data_Reader& ); // default loads then calls load_mem_()
+	virtual blargg_err_t load_mem_( byte const* data, long size ); // use data in memory
+	virtual blargg_err_t track_info_( track_info_t* out, int track ) const = 0;
+	virtual void pre_load();
+	virtual void post_load_();
+	virtual void clear_playlist_() { }
+	
+public:
+	blargg_err_t remap_track_( int* track_io ) const; // need by Music_Emu
+private:
+	// noncopyable
+	Gme_File( const Gme_File& );
+	Gme_File& operator = ( const Gme_File& );
+	
+	gme_type_t type_;
+	int track_count_;
+	int raw_track_count_;
+	const char* warning_;
+	void* user_data_;
+	gme_user_cleanup_t user_cleanup_;
+	M3u_Playlist playlist;
+	char playlist_warning [64];
+	blargg_vector<byte> file_data; // only if loaded into memory using default load
+	
+	blargg_err_t load_m3u_( blargg_err_t );
+	blargg_err_t post_load( blargg_err_t err );
+public:
+	// track_info field copying
+	enum { max_field_ = 255 };
+	static void copy_field_( char* out, const char* in );
+	static void copy_field_( char* out, const char* in, int len );
+};
+	
+Music_Emu* gme_new_( Music_Emu*, long sample_rate );
+
+#define GME_COPY_FIELD( in, out, name ) \
+	{ Gme_File::copy_field_( out->name, in.name, sizeof in.name ); }
+
+#ifndef GME_FILE_READER
+	#ifdef HAVE_ZLIB_H
+		#define GME_FILE_READER Gzip_File_Reader
+	#else
+		#define GME_FILE_READER Std_File_Reader
+	#endif
+#elif defined (GME_FILE_READER_INCLUDE)
+	#include GME_FILE_READER_INCLUDE
+#endif
+
+inline gme_type_t Gme_File::type() const { return type_; }
+inline int Gme_File::error_count() const { return warning_ != 0; }
+inline int Gme_File::track_count() const { return track_count_; }
+
+inline const char* Gme_File::warning()
+{
+	const char* s = warning_;
+	warning_ = 0;
+	return s;
+}
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gym_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Gym_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Hes_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Scc_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Kss_Scc_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/M3u_Playlist.cpp Added

@@ -0,0 +1,426 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "M3u_Playlist.h"
+#include "Music_Emu.h"
+
+#include <string.h>
+
+/* Copyright (C) 2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+// gme functions defined here to avoid linking in m3u code unless it's used
+
+blargg_err_t Gme_File::load_m3u_( blargg_err_t err )
+{
+	require( raw_track_count_ ); // file must be loaded first
+	
+	if ( !err )
+	{
+		if ( playlist.size() )
+			track_count_ = playlist.size();
+		
+		int line = playlist.first_error();
+		if ( line )
+		{
+			// avoid using bloated printf()
+			char* out = &playlist_warning [sizeof playlist_warning];
+			*--out = 0;
+			do {
+				*--out = line % 10 + '0';
+			} while ( (line /= 10) > 0 );
+			
+			static const char str [] = "Problem in m3u at line ";
+			out -= sizeof str - 1;
+			memcpy( out, str, sizeof str - 1 );
+			set_warning( out );
+		}
+	}
+	return err;
+}
+
+blargg_err_t Gme_File::load_m3u( const char* path ) { return load_m3u_( playlist.load( path ) ); }
+
+blargg_err_t Gme_File::load_m3u( Data_Reader& in ) { return load_m3u_( playlist.load( in ) ); }
+
+BLARGG_EXPORT gme_err_t gme_load_m3u( Music_Emu* me, const char* path ) { return me->load_m3u( path ); }
+
+BLARGG_EXPORT gme_err_t gme_load_m3u_data( Music_Emu* me, const void* data, long size )
+{
+	Mem_File_Reader in( data, size );
+	return me->load_m3u( in );
+}
+
+
+
+static char* skip_white( char* in )
+{
+	while ( *in == ' ' )
+		in++;
+	return in;
+}
+
+inline unsigned from_dec( unsigned n ) { return n - '0'; }
+
+static char* parse_filename( char* in, M3u_Playlist::entry_t& entry )
+{
+	entry.file = in;
+	entry.type = "";
+	char* out = in;
+	while ( 1 )
+	{
+		int c = *in;
+		if ( !c ) break;
+		in++;
+		
+		if ( c == ',' ) // commas in filename
+		{
+			char* p = skip_white( in );
+			if ( *p == '$' || from_dec( *p ) <= 9 )
+			{
+				in = p;
+				break;
+			}
+		}
+		
+		if ( c == ':' && in [0] == ':' && in [1] && in [2] != ',' ) // ::type suffix
+		{
+			entry.type = ++in;
+			while ( (c = *in) != 0 && c != ',' )
+				in++;
+			if ( c == ',' )
+			{
+				*in++ = 0; // terminate type
+				in = skip_white( in );
+			}
+			break;
+		}
+		
+		if ( c == '\\' ) // \ prefix for special characters
+		{
+			c = *in;
+			if ( !c ) break;
+			in++;
+		}
+		*out++ = (char) c;
+	}
+	*out = 0; // terminate string
+	return in;
+}
+
+static char* next_field( char* in, int* result )
+{
+	while ( 1 )
+	{
+		in = skip_white( in );
+		
+		if ( !*in )
+			break;
+		
+		if ( *in == ',' )
+		{
+			in++;
+			break;
+		}
+		
+		*result = 1;
+		in++;
+	}
+	return skip_white( in );
+}
+
+static char* parse_int_( char* in, int* out )
+{
+	int n = 0;
+	while ( 1 )
+	{
+		unsigned d = from_dec( *in );
+		if ( d > 9 )
+			break;
+		in++;
+		n = n * 10 + d;
+		*out = n;
+	}
+	return in;
+}
+
+static char* parse_int( char* in, int* out, int* result )
+{
+	return next_field( parse_int_( in, out ), result );
+}
+
+// Returns 16 or greater if not hex
+inline int from_hex_char( int h )
+{
+	h -= 0x30;
+	if ( (unsigned) h > 9 )
+		h = ((h - 0x11) & 0xDF) + 10;
+	return h;
+}
+
+static char* parse_track( char* in, M3u_Playlist::entry_t& entry, int* result )
+{
+	if ( *in == '$' )
+	{
+		in++;
+		int n = 0;
+		while ( 1 )
+		{
+			int h = from_hex_char( *in );
+			if ( h > 15 )
+				break;
+			in++;
+			n = n * 16 + h;
+			entry.track = n;
+		}
+	}
+	else
+	{
+		in = parse_int_( in, &entry.track );
+		if ( entry.track >= 0 )
+			entry.decimal_track = 1;
+	}
+	return next_field( in, result );
+}
+
+static char* parse_time_( char* in, int* out )
+{
+	*out = -1;
+	int n = -1;
+	in = parse_int_( in, &n );
+	if ( n >= 0 )
+	{
+		*out = n;
+		if ( *in == ':' )
+		{
+			n = -1;
+			in = parse_int_( in + 1, &n );
+			if ( n >= 0 )
+				*out = *out * 60 + n;
+		}
+	}
+	return in;
+}
+
+static char* parse_time( char* in, int* out, int* result )
+{
+	return next_field( parse_time_( in, out ), result );
+}
+
+static char* parse_name( char* in )
+{
+	char* out = in;
+	while ( 1 )
+	{
+		int c = *in;
+		if ( !c ) break;
+		in++;
+		
+		if ( c == ',' ) // commas in string
+		{
+			char* p = skip_white( in );
+			if ( *p == ',' || *p == '-' || from_dec( *p ) <= 9 )
+			{
+				in = p;
+				break;
+			}
+		}
+		
+		if ( c == '\\' ) // \ prefix for special characters
+		{
+			c = *in;
+			if ( !c ) break;
+			in++;
+		}
+		*out++ = (char) c;
+	}
+	*out = 0; // terminate string
+	return in;
+}
+
+static int parse_line( char* in, M3u_Playlist::entry_t& entry )
+{
+	int result = 0;
+	
+	// file
+	entry.file = in;
+	entry.type = "";
+	in = parse_filename( in, entry );
+	
+	// track
+	entry.track = -1;
+	entry.decimal_track = 0;
+	in = parse_track( in, entry, &result );
+	
+	// name
+	entry.name = in;
+	in = parse_name( in );
+	
+	// time
+	entry.length = -1;
+	in = parse_time( in, &entry.length, &result );
+	
+	// loop
+	entry.intro = -1;
+	entry.loop = -1;
+	if ( *in == '-' )
+	{
+		entry.loop = entry.length;
+		in++;
+	}
+	else
+	{
+		in = parse_time_( in, &entry.loop );
+		if ( entry.loop >= 0 )
+		{
+			entry.intro = 0;
+			if ( *in == '-' ) // trailing '-' means that intro length was specified 
+			{
+				in++;
+				entry.intro = entry.loop;
+				entry.loop = entry.length - entry.intro;
+			}
+		}
+	}
+	in = next_field( in, &result );
+	
+	// fade
+	entry.fade = -1;
+	in = parse_time( in, &entry.fade, &result );
+	
+	// repeat
+	entry.repeat = -1;
+	in = parse_int( in, &entry.repeat, &result );
+	
+	return result;
+}
+
+static void parse_comment( char* in, M3u_Playlist::info_t& info, bool first )
+{
+	in = skip_white( in + 1 );
+	const char* field = in;
+	while ( *in && *in != ':' )
+		in++;
+	
+	if ( *in == ':' )
+	{
+		const char* text = skip_white( in + 1 );
+		if ( *text )
+		{
+			*in = 0;
+			 if ( !strcmp( "Composer", field ) ) info.composer = text;
+			else if ( !strcmp( "Engineer", field ) ) info.engineer = text;
+			else if ( !strcmp( "Ripping" , field ) ) info.ripping = text;
+			else if ( !strcmp( "Tagging" , field ) ) info.tagging = text;
+			else
+				text = 0;
+			if ( text )
+				return;
+			*in = ':';
+		}
+	}
+	
+	if ( first )
+		info.title = field;
+}
+
+blargg_err_t M3u_Playlist::parse_()
+{
+	info_.title = "";
+	info_.composer = "";
+	info_.engineer = "";
+	info_.ripping = "";
+	info_.tagging = "";
+	
+	int const CR = 13;
+	int const LF = 10;
+	
+	data.end() [-1] = LF; // terminate input
+	
+	first_error_ = 0;
+	bool first_comment = true;
+	int line = 0;
+	int count = 0;
+	char* in = data.begin();
+	while ( in < data.end() )
+	{
+		// find end of line and terminate it
+		line++;
+		char* begin = in;
+		while ( *in != CR && *in != LF )
+		{
+			if ( !*in )
+				return "Not an m3u playlist";
+			in++;
+		}
+		if ( in [0] == CR && in [1] == LF ) // treat CR,LF as a single line
+			*in++ = 0;
+		*in++ = 0;
+		
+		// parse line
+		if ( *begin == '#' )
+		{
+			parse_comment( begin, info_, first_comment );
+			first_comment = false;
+		}
+		else if ( *begin )
+		{
+			if ( (int) entries.size() <= count )
+				RETURN_ERR( entries.resize( count * 2 + 64 ) );
+			
+			if ( !parse_line( begin, entries [count] ) )
+				count++;
+			else if ( !first_error_ )
+				first_error_ = line;
+			first_comment = false;
+		}
+	}
+	if ( count <= 0 )
+		return "Not an m3u playlist";
+	
+	if ( !(info_.composer [0] | info_.engineer [0] | info_.ripping [0] | info_.tagging [0]) )
+		info_.title = "";
+	
+	return entries.resize( count );
+}
+
+blargg_err_t M3u_Playlist::parse()
+{
+	blargg_err_t err = parse_();
+	if ( err )
+	{
+		entries.clear();
+		data.clear();
+	}
+	return err;
+}
+
+blargg_err_t M3u_Playlist::load( Data_Reader& in )
+{
+	RETURN_ERR( data.resize( in.remain() + 1 ) );
+	RETURN_ERR( in.read( data.begin(), data.size() - 1 ) );
+	return parse();
+}
+
+blargg_err_t M3u_Playlist::load( const char* path )
+{
+	GME_FILE_READER in;
+	RETURN_ERR( in.open( path ) );
+	return load( in );
+}
+
+blargg_err_t M3u_Playlist::load( void const* in, long size )
+{
+	RETURN_ERR( data.resize( size + 1 ) );
+	memcpy( data.begin(), in, size );
+	return parse();
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/M3u_Playlist.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Multi_Buffer.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Multi_Buffer.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Music_Emu.cpp Added

@@ -0,0 +1,411 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Music_Emu.h"
+
+#include "Multi_Buffer.h"
+#include <string.h>
+
+/* Copyright (C) 2003-2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+int const stereo = 2; // number of channels for stereo
+int const silence_max = 6; // seconds
+int const silence_threshold = 0x10;
+long const fade_block_size = 512;
+int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
+
+Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 };
+
+void Music_Emu::clear_track_vars()
+{
+	current_track_ = -1;
+	out_time = 0;
+	emu_time = 0;
+	emu_track_ended_ = true;
+	track_ended_ = true;
+	fade_start = INT_MAX / 2 + 1;
+	fade_step = 1;
+	silence_time = 0;
+	silence_count = 0;
+	buf_remain = 0;
+	warning(); // clear warning
+}
+
+void Music_Emu::unload()
+{
+	voice_count_ = 0;
+	clear_track_vars();
+	Gme_File::unload();
+}
+
+Music_Emu::Music_Emu()
+{
+	effects_buffer = 0;
+	
+	sample_rate_ = 0;
+	mute_mask_ = 0;
+	tempo_ = 1.0;
+	gain_ = 1.0;
+	
+	// defaults
+	max_initial_silence = 2;
+	silence_lookahead = 3;
+	ignore_silence_ = false;
+	equalizer_.treble = -1.0;
+	equalizer_.bass = 60;
+	
+	static const char* const names [] = {
+		"Voice 1", "Voice 2", "Voice 3", "Voice 4",
+		"Voice 5", "Voice 6", "Voice 7", "Voice 8"
+	};
+	set_voice_names( names );
+	Music_Emu::unload(); // non-virtual
+}
+
+Music_Emu::~Music_Emu() { delete effects_buffer; }
+
+blargg_err_t Music_Emu::set_sample_rate( long rate )
+{
+	require( !sample_rate() ); // sample rate can't be changed once set
+	RETURN_ERR( set_sample_rate_( rate ) );
+	RETURN_ERR( buf.resize( buf_size ) );
+	sample_rate_ = rate;
+	return 0;
+}
+
+void Music_Emu::pre_load()
+{
+	require( sample_rate() ); // set_sample_rate() must be called before loading a file
+	Gme_File::pre_load();
+}
+
+void Music_Emu::set_equalizer( equalizer_t const& eq )
+{
+	equalizer_ = eq;
+	set_equalizer_( eq );
+}
+
+void Music_Emu::mute_voice( int index, bool mute )
+{
+	require( (unsigned) index < (unsigned) voice_count() );
+	int bit = 1 << index;
+	int mask = mute_mask_ | bit;
+	if ( !mute )
+		mask ^= bit;
+	mute_voices( mask );
+}
+
+void Music_Emu::mute_voices( int mask )
+{
+	require( sample_rate() ); // sample rate must be set first
+	mute_mask_ = mask;
+	mute_voices_( mask );
+}
+
+void Music_Emu::set_tempo( double t )
+{
+	require( sample_rate() ); // sample rate must be set first
+	double const min = 0.02;
+	double const max = 4.00;
+	if ( t < min ) t = min;
+	if ( t > max ) t = max;
+	tempo_ = t;
+	set_tempo_( t );
+}
+
+void Music_Emu::post_load_()
+{
+	set_tempo( tempo_ );
+	remute_voices();
+}
+
+blargg_err_t Music_Emu::start_track( int track )
+{
+	clear_track_vars();
+	
+	int remapped = track;
+	RETURN_ERR( remap_track_( &remapped ) );
+	current_track_ = track;
+	RETURN_ERR( start_track_( remapped ) );
+	
+	emu_track_ended_ = false;
+	track_ended_ = false;
+	
+	if ( !ignore_silence_ )
+	{
+		// play until non-silence or end of track
+		for ( long end = max_initial_silence * stereo * sample_rate(); emu_time < end; )
+		{
+			fill_buf();
+			if ( buf_remain | (int) emu_track_ended_ )
+				break;
+		}
+		
+		emu_time = buf_remain;
+		out_time = 0;
+		silence_time = 0;
+		silence_count = 0;
+	}
+	return track_ended() ? warning() : 0;
+}
+
+void Music_Emu::end_track_if_error( blargg_err_t err )
+{
+	if ( err )
+	{
+		emu_track_ended_ = true;
+		set_warning( err );
+	}
+}
+
+// Tell/Seek
+
+blargg_long Music_Emu::msec_to_samples( blargg_long msec ) const
+{
+	blargg_long sec = msec / 1000;
+	msec -= sec * 1000;
+	return (sec * sample_rate() + msec * sample_rate() / 1000) * stereo;
+}
+
+long Music_Emu::tell() const
+{
+	blargg_long rate = sample_rate() * stereo;
+	blargg_long sec = out_time / rate;
+	return sec * 1000 + (out_time - sec * rate) * 1000 / rate;
+}
+
+blargg_err_t Music_Emu::seek( long msec )
+{
+	blargg_long time = msec_to_samples( msec );
+	if ( time < out_time )
+		RETURN_ERR( start_track( current_track_ ) );
+	return skip( time - out_time );
+}
+
+blargg_err_t Music_Emu::skip( long count )
+{
+	require( current_track() >= 0 ); // start_track() must have been called already
+	out_time += count;
+	
+	// remove from silence and buf first
+	{
+		long n = min( count, silence_count );
+		silence_count -= n;
+		count -= n;
+		
+		n = min( count, buf_remain );
+		buf_remain -= n;
+		count -= n;
+	}
+		
+	if ( count && !emu_track_ended_ )
+	{
+		emu_time += count;
+		end_track_if_error( skip_( count ) );
+	}
+	
+	if ( !(silence_count | buf_remain) ) // caught up to emulator, so update track ended
+		track_ended_ |= emu_track_ended_;
+	
+	return 0;
+}
+
+blargg_err_t Music_Emu::skip_( long count )
+{
+	// for long skip, mute sound
+	const long threshold = 30000;
+	if ( count > threshold )
+	{
+		int saved_mute = mute_mask_;
+		mute_voices( ~0 );
+		
+		while ( count > threshold / 2 && !emu_track_ended_ )
+		{
+			RETURN_ERR( play_( buf_size, buf.begin() ) );
+			count -= buf_size;
+		}
+		
+		mute_voices( saved_mute );
+	}
+	
+	while ( count && !emu_track_ended_ )
+	{
+		long n = buf_size;
+		if ( n > count )
+			n = count;
+		count -= n;
+		RETURN_ERR( play_( n, buf.begin() ) );
+	}
+	return 0;
+}
+
+// Fading
+
+void Music_Emu::set_fade( long start_msec, long length_msec )
+{
+	fade_step = sample_rate() * length_msec / (fade_block_size * fade_shift * 1000 / stereo);
+	fade_start = msec_to_samples( start_msec );
+}
+
+// unit / pow( 2.0, (double) x / step )
+static int int_log( blargg_long x, int step, int unit )
+{
+	int shift = x / step;
+	int fraction = (x - shift * step) * unit / step;
+	return ((unit - fraction) + (fraction >> 1)) >> shift;
+}
+
+void Music_Emu::handle_fade( long out_count, sample_t* out )
+{
+	for ( int i = 0; i < out_count; i += fade_block_size )
+	{
+		int const shift = 14;
+		int const unit = 1 << shift;
+		int gain = int_log( (out_time + i - fade_start) / fade_block_size,
+				fade_step, unit );
+		if ( gain < (unit >> fade_shift) )
+			track_ended_ = emu_track_ended_ = true;
+		
+		sample_t* io = &out [i];
+		for ( int count = min( fade_block_size, out_count - i ); count; --count )
+		{
+			*io = sample_t ((*io * gain) >> shift);
+			++io;
+		}
+	}
+}
+
+// Silence detection
+
+void Music_Emu::emu_play( long count, sample_t* out )
+{
+	check( current_track_ >= 0 );
+	emu_time += count;
+	if ( current_track_ >= 0 && !emu_track_ended_ )
+		end_track_if_error( play_( count, out ) );
+	else
+		memset( out, 0, count * sizeof *out );
+}
+
+// number of consecutive silent samples at end
+static long count_silence( Music_Emu::sample_t* begin, long size )
+{
+	Music_Emu::sample_t first = *begin;
+	*begin = silence_threshold; // sentinel
+	Music_Emu::sample_t* p = begin + size;
+	while ( (unsigned) (*--p + silence_threshold / 2) <= (unsigned) silence_threshold ) { }
+	*begin = first;
+	return size - (p - begin);
+}
+
+// fill internal buffer and check it for silence
+void Music_Emu::fill_buf()
+{
+	assert( !buf_remain );
+	if ( !emu_track_ended_ )
+	{
+		emu_play( buf_size, buf.begin() );
+		long silence = count_silence( buf.begin(), buf_size );
+		if ( silence < buf_size )
+		{
+			silence_time = emu_time - silence;
+			buf_remain = buf_size;
+			return;
+		}
+	}
+	silence_count += buf_size;
+}
+
+blargg_err_t Music_Emu::play( long out_count, sample_t* out )
+{
+	if ( track_ended_ )
+	{
+		memset( out, 0, out_count * sizeof *out );
+	}
+	else
+	{
+		require( current_track() >= 0 );
+		require( out_count % stereo == 0 );
+		
+		assert( emu_time >= out_time );
+		
+		// prints nifty graph of how far ahead we are when searching for silence
+		//debug_printf( "%*s \n", int ((emu_time - out_time) * 7 / sample_rate()), "*" );
+		
+		long pos = 0;
+		if ( silence_count )
+		{
+			// during a run of silence, run emulator at >=2x speed so it gets ahead
+			long ahead_time = silence_lookahead * (out_time + out_count - silence_time) + silence_time;
+			while ( emu_time < ahead_time && !(buf_remain | emu_track_ended_) )
+				fill_buf();
+			
+			// fill with silence
+			pos = min( silence_count, out_count );
+			memset( out, 0, pos * sizeof *out );
+			silence_count -= pos;
+			
+			if ( emu_time - silence_time > silence_max * stereo * sample_rate() )
+			{
+				track_ended_ = emu_track_ended_ = true;
+				silence_count = 0;
+				buf_remain = 0;
+			}
+		}
+		
+		if ( buf_remain )
+		{
+			// empty silence buf
+			long n = min( buf_remain, out_count - pos );
+			memcpy( &out [pos], buf.begin() + (buf_size - buf_remain), n * sizeof *out );
+			buf_remain -= n;
+			pos += n;
+		}
+		
+		// generate remaining samples normally
+		long remain = out_count - pos;
+		if ( remain )
+		{
+			emu_play( remain, out + pos );
+			track_ended_ |= emu_track_ended_;
+			
+			if ( !ignore_silence_ || out_time > fade_start )
+			{
+				// check end for a new run of silence
+				long silence = count_silence( out + pos, remain );
+				if ( silence < remain )
+					silence_time = emu_time - silence;
+				
+				if ( emu_time - silence_time >= buf_size )
+					fill_buf(); // cause silence detection on next play()
+			}
+		}
+		
+		if ( out_time > fade_start )
+			handle_fade( out_count, out );
+	}
+	out_time += out_count;
+	return 0;
+}
+
+// Gme_Info_
+
+blargg_err_t Gme_Info_::set_sample_rate_( long ) { return 0; }
+void Gme_Info_::pre_load() { Gme_File::pre_load(); } // skip Music_Emu
+void Gme_Info_::post_load_() { Gme_File::post_load_(); } // skip Music_Emu
+void Gme_Info_::set_equalizer_( equalizer_t const& ){ check( false ); }
+void Gme_Info_::enable_accuracy_( bool ) { check( false ); }
+void Gme_Info_::mute_voices_( int ) { check( false ); }
+void Gme_Info_::set_tempo_( double ) { }
+blargg_err_t Gme_Info_::start_track_( int ) { return "Use full emulator for playback"; }
+blargg_err_t Gme_Info_::play_( long, sample_t* ) { return "Use full emulator for playback"; }

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Music_Emu.h Added

@@ -0,0 +1,218 @@
+// Common interface to game music file emulators
+
+// Game_Music_Emu 0.5.5
+#ifndef MUSIC_EMU_H
+#define MUSIC_EMU_H
+
+#include "Gme_File.h"
+class Multi_Buffer;
+
+struct Music_Emu : public Gme_File {
+public:
+// Basic functionality (see Gme_File.h for file loading/track info functions)
+
+	// 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;
+	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();
+protected:
+	void set_max_initial_silence( int n ) { max_initial_silence = n; }
+	void set_silence_lookahead( int n ) { silence_lookahead = n; }
+	void set_voice_count( int n ) { voice_count_ = n; }
+	void set_voice_names( const char* const* names );
+	void set_track_ended() { emu_track_ended_ = true; }
+	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 ) { }
+	virtual void mute_voices_( int mask ) = 0;
+	virtual void set_tempo_( double ) = 0;
+	virtual blargg_err_t start_track_( int ) = 0; // tempo is set before this
+	virtual blargg_err_t play_( long count, sample_t* out ) = 0;
+	virtual blargg_err_t skip_( long count );
+protected:
+	virtual void unload();
+	virtual void pre_load();
+	virtual void post_load_();
+private:
+	// general
+	equalizer_t equalizer_;
+	int max_initial_silence;
+	const char** voice_names_;
+	int voice_count_;
+	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
+	blargg_long emu_time; // number of samples emulator has generated since start of track
+	bool emu_track_ended_; // emulator has reached end of track
+	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_;
+	long silence_time; // number of samples where most recent silence began
+	long silence_count; // number of samples of silence to play before using buf
+	long buf_remain; // number of samples left in silence buffer
+	enum { buf_size = 2048 };
+	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 );
+};
+
+// base class for info-only derivations
+struct Gme_Info_ : Music_Emu
+{
+	virtual blargg_err_t set_sample_rate_( long sample_rate );
+	virtual void set_equalizer_( equalizer_t const& );
+	virtual void enable_accuracy_( bool );
+	virtual void mute_voices_( int mask );
+	virtual void set_tempo_( double );
+	virtual blargg_err_t start_track_( int );
+	virtual blargg_err_t play_( long count, sample_t* out );
+	virtual void pre_load();
+	virtual void post_load_();
+};
+
+inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const
+{
+	return track_info( out, current_track_ );
+}
+
+inline long Music_Emu::sample_rate() const { return sample_rate_; }
+inline const char** Music_Emu::voice_names() const { return voice_names_; }
+inline int Music_Emu::voice_count() const { return voice_count_; }
+inline int Music_Emu::current_track() const { return current_track_; }
+inline bool Music_Emu::track_ended() const { return track_ended_; }
+inline const Music_Emu::equalizer_t& Music_Emu::equalizer() const { return equalizer_; }
+
+inline void Music_Emu::enable_accuracy( bool b ) { enable_accuracy_( b ); }
+inline void Music_Emu::set_tempo_( double t ) { tempo_ = t; }
+inline void Music_Emu::remute_voices() { mute_voices( mute_mask_ ); }
+inline void Music_Emu::ignore_silence( bool b ) { ignore_silence_ = b; }
+inline blargg_err_t Music_Emu::start_track_( int ) { return 0; }
+
+inline void Music_Emu::set_voice_names( const char* const* names )
+{
+	// Intentional removal of const, so users don't have to remember obscure const in middle
+	voice_names_ = const_cast<const char**> (names);
+}
+
+inline void Music_Emu::mute_voices_( int ) { }
+
+inline void Music_Emu::set_gain( double g )
+{
+	assert( !sample_rate() ); // you must set gain before setting sample rate
+	gain_ = g;
+}
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Fme7_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Fme7_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Namco_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Namco_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Oscs.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Oscs.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Vrc6_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nes_Vrc6_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nsf_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nsf_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nsfe_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Nsfe_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Apu.cpp Added

@@ -0,0 +1,334 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Sap_Apu.h"
+
+#include <string.h>
+
+/* Copyright (C) 2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+int const max_frequency = 12000; // pure waves above this frequency are silenced
+
+static void gen_poly( blargg_ulong mask, int count, byte* out )
+{
+	blargg_ulong n = 1;
+	do
+	{
+		int bits = 0;
+		int b = 0;
+		do
+		{
+			// implemented using "Galios configuration"
+			bits |= (n & 1) << b;
+			n = (n >> 1) ^ (mask & -(n & 1));
+		}
+		while ( b++ < 7 );
+		*out++ = bits;
+	}
+	while ( --count );
+}
+
+// poly5
+int const poly5_len = (1 << 5) - 1;
+blargg_ulong const poly5_mask = (1UL << poly5_len) - 1;
+blargg_ulong const poly5 = 0x167C6EA1;
+
+inline blargg_ulong run_poly5( blargg_ulong in, int shift )
+{
+	return (in << shift & poly5_mask) | (in >> (poly5_len - shift));
+}
+
+#define POLY_MASK( width, tap1, tap2 ) \
+	((1UL << (width - 1 - tap1)) | (1UL << (width - 1 - tap2)))
+
+Sap_Apu_Impl::Sap_Apu_Impl()
+{
+	gen_poly( POLY_MASK( 4, 1, 0 ), sizeof poly4, poly4 );
+	gen_poly( POLY_MASK( 9, 5, 0 ), sizeof poly9, poly9 );
+	gen_poly( POLY_MASK( 17, 5, 0 ), sizeof poly17, poly17 );
+	
+	if ( 0 ) // comment out to recauculate poly5 constant
+	{
+		byte poly5 [4];
+		gen_poly( POLY_MASK( 5, 2, 0 ), sizeof poly5, poly5 );
+		blargg_ulong n = poly5 [3] * 0x1000000L + poly5 [2] * 0x10000L + 
+				poly5 [1] * 0x100L + poly5 [0];
+		blargg_ulong rev = n & 1;
+		for ( int i = 1; i < poly5_len; i++ )
+			rev |= (n >> i & 1) << (poly5_len - i);
+		debug_printf( "poly5: 0x%08lX\n", rev );
+	}
+}
+
+Sap_Apu::Sap_Apu()
+{
+	impl = 0;
+	for ( int i = 0; i < osc_count; i++ )
+		osc_output( i, 0 );
+}
+
+void Sap_Apu::reset( Sap_Apu_Impl* new_impl )
+{
+	impl = new_impl;
+	last_time = 0;
+	poly5_pos = 0;
+	poly4_pos = 0;
+	polym_pos = 0;
+	control = 0;
+	
+	for ( int i = 0; i < osc_count; i++ )
+		memset( &oscs [i], 0, offsetof (osc_t,output) );
+}
+
+inline void Sap_Apu::calc_periods()
+{
+	 // 15/64 kHz clock
+	int divider = 28;
+	if ( this->control & 1 )
+		divider = 114;
+	
+	for ( int i = 0; i < osc_count; i++ )
+	{
+		osc_t* const osc = &oscs [i];
+		
+		int const osc_reload = osc->regs [0]; // cache
+		blargg_long period = (osc_reload + 1) * divider;
+		static byte const fast_bits [osc_count] = { 1 << 6, 1 << 4, 1 << 5, 1 << 3 };
+		if ( this->control & fast_bits [i] )
+		{
+			period = osc_reload + 4;
+			if ( i & 1 )
+			{
+				period = osc_reload * 0x100L + osc [-1].regs [0] + 7;
+				if ( !(this->control & fast_bits [i - 1]) )
+					period = (period - 6) * divider;
+				
+				if ( (osc [-1].regs [1] & 0x1F) > 0x10 )
+					debug_printf( "Use of slave channel in 16-bit mode not supported\n" );
+			}
+		}
+		osc->period = period;
+	}
+}
+
+void Sap_Apu::run_until( blip_time_t end_time )
+{
+	calc_periods();
+	Sap_Apu_Impl* const impl = this->impl; // cache
+	
+	// 17/9-bit poly selection
+	byte const* polym = impl->poly17;
+	int polym_len = poly17_len;
+	if ( this->control & 0x80 )
+	{
+		polym_len = poly9_len;
+		polym = impl->poly9;
+	}
+	polym_pos %= polym_len;
+	
+	for ( int i = 0; i < osc_count; i++ )
+	{
+		osc_t* const osc = &oscs [i];
+		blip_time_t time = last_time + osc->delay;
+		blip_time_t const period = osc->period;
+		
+		// output
+		Blip_Buffer* output = osc->output;
+		if ( output )
+		{
+			output->set_modified();
+			
+			int const osc_control = osc->regs [1]; // cache
+			int volume = (osc_control & 0x0F) * 2;
+			if ( !volume || osc_control & 0x10 || // silent, DAC mode, or inaudible frequency
+					((osc_control & 0xA0) == 0xA0 && period < 1789773 / 2 / max_frequency) )
+			{
+				if ( !(osc_control & 0x10) )
+					volume >>= 1; // inaudible frequency = half volume
+				
+				int delta = volume - osc->last_amp;
+				if ( delta )
+				{
+					osc->last_amp = volume;
+					impl->synth.offset( last_time, delta, output );
+				}
+				
+				// TODO: doesn't maintain high pass flip-flop (very minor issue)
+			}
+			else
+			{
+				// high pass
+				static byte const hipass_bits [osc_count] = { 1 << 2, 1 << 1, 0, 0 };
+				blip_time_t period2 = 0; // unused if no high pass
+				blip_time_t time2 = end_time;
+				if ( this->control & hipass_bits [i] )
+				{
+					period2 = osc [2].period;
+					time2 = last_time + osc [2].delay;
+					if ( osc->invert )
+					{
+						// trick inner wave loop into inverting output
+						osc->last_amp -= volume;
+						volume = -volume;
+					}
+				}
+				
+				if ( time < end_time || time2 < end_time )
+				{
+					// poly source
+					static byte const poly1 [] = { 0x55, 0x55 }; // square wave
+					byte const* poly = poly1;
+					int poly_len = 8 * sizeof poly1; // can be just 2 bits, but this is faster
+					int poly_pos = osc->phase & 1;
+					int poly_inc = 1;
+					if ( !(osc_control & 0x20) )
+					{
+						poly = polym;
+						poly_len = polym_len;
+						poly_pos = polym_pos;
+						if ( osc_control & 0x40 )
+						{
+							poly = impl->poly4;
+							poly_len = poly4_len;
+							poly_pos = poly4_pos;
+						}
+						poly_inc = period % poly_len;
+						poly_pos = (poly_pos + osc->delay) % poly_len;
+					}
+					poly_inc -= poly_len; // allows more optimized inner loop below
+					
+					// square/poly5 wave
+					blargg_ulong wave = poly5;
+					check( poly5 & 1 ); // low bit is set for pure wave
+					int poly5_inc = 0;
+					if ( !(osc_control & 0x80) )
+					{
+						wave = run_poly5( wave, (osc->delay + poly5_pos) % poly5_len );
+						poly5_inc = period % poly5_len;
+					}
+					
+					// Run wave and high pass interleved with each catching up to the other.
+					// Disabled high pass has no performance effect since inner wave loop
+					// makes no compromise for high pass, and only runs once in that case.
+					int osc_last_amp = osc->last_amp;
+					do
+					{
+						// run high pass
+						if ( time2 < time )
+						{
+							int delta = -osc_last_amp;
+							if ( volume < 0 )
+								delta += volume;
+							if ( delta )
+							{
+								osc_last_amp += delta - volume;
+								volume = -volume;
+								impl->synth.offset( time2, delta, output );
+							}
+						}
+						while ( time2 <= time ) // must advance *past* time to avoid hang
+							time2 += period2;
+						
+						// run wave
+						blip_time_t end = end_time;
+						if ( end > time2 )
+							end = time2;
+						while ( time < end )
+						{
+							if ( wave & 1 )
+							{
+								int amp = volume & -(poly [poly_pos >> 3] >> (poly_pos & 7) & 1);
+								if ( (poly_pos += poly_inc) < 0 )
+									poly_pos += poly_len;
+								int delta = amp - osc_last_amp;
+								if ( delta )
+								{
+									osc_last_amp = amp;
+									impl->synth.offset( time, delta, output );
+								}
+							}
+							wave = run_poly5( wave, poly5_inc );
+							time += period;
+						}
+					}
+					while ( time < end_time || time2 < end_time );
+					
+					osc->phase = poly_pos;
+					osc->last_amp = osc_last_amp;
+				}
+				
+				osc->invert = 0;
+				if ( volume < 0 )
+				{
+					// undo inversion trickery
+					osc->last_amp -= volume;
+					osc->invert = 1;
+				}
+			}
+		}
+		
+		// maintain divider
+		blip_time_t remain = end_time - time;
+		if ( remain > 0 )
+		{
+			blargg_long count = (remain + period - 1) / period;
+			osc->phase ^= count;
+			time += count * period;
+		}
+		osc->delay = time - end_time;
+	}
+	
+	// advance polies
+	blip_time_t duration = end_time - last_time;
+	last_time = end_time;
+	poly4_pos = (poly4_pos + duration) % poly4_len;
+	poly5_pos = (poly5_pos + duration) % poly5_len;
+	polym_pos += duration; // will get %'d on next call
+}
+
+void Sap_Apu::write_data( blip_time_t time, unsigned addr, int data )
+{
+	run_until( time );
+	int i = (addr ^ 0xD200) >> 1;
+	if ( i < osc_count )
+	{
+		oscs [i].regs [addr & 1] = data;
+	}
+	else if ( addr == 0xD208 )
+	{
+		control = data;
+	}
+	else if ( addr == 0xD209 )
+	{
+		oscs [0].delay = 0;
+		oscs [1].delay = 0;
+		oscs [2].delay = 0;
+		oscs [3].delay = 0;
+	}
+	/*
+	// TODO: are polynomials reset in this case?
+	else if ( addr == 0xD20F )
+	{
+		if ( (data & 3) == 0 )
+			polym_pos = 0;
+	}
+	*/
+}
+
+void Sap_Apu::end_frame( blip_time_t end_time )
+{
+	if ( end_time > last_time )
+		run_until( end_time );
+	
+	last_time -= end_time;
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Cpu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Cpu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sap_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sms_Apu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sms_Apu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Sms_Oscs.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Snes_Spc.cpp Added

@@ -0,0 +1,380 @@
+// SPC emulation support: init, sample buffering, reset, SPC loading
+
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Snes_Spc.h"
+
+#include <string.h>
+
+/* Copyright (C) 2004-2007 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+#define RAM (m.ram.ram)
+#define REGS (m.smp_regs [0])
+#define REGS_IN (m.smp_regs [1])
+
+// (n ? n : 256)
+#define IF_0_THEN_256( n ) ((uint8_t) ((n) - 1) + 1)
+
+
+//// Init
+
+blargg_err_t Snes_Spc::init()
+{
+	memset( &m, 0, sizeof m );
+	dsp.init( RAM );
+	
+	m.tempo = tempo_unit;
+	
+	// Most SPC music doesn't need ROM, and almost all the rest only rely
+	// on these two bytes
+	m.rom [0x3E] = 0xFF;
+	m.rom [0x3F] = 0xC0;
+	
+	static unsigned char const cycle_table [128] =
+	{// 01 23 45 67 89 AB CD EF
+	 0x28,0x47,0x34,0x36,0x26,0x54,0x54,0x68, // 0
+	 0x48,0x47,0x45,0x56,0x55,0x65,0x22,0x46, // 1
+	 0x28,0x47,0x34,0x36,0x26,0x54,0x54,0x74, // 2
+	 0x48,0x47,0x45,0x56,0x55,0x65,0x22,0x38, // 3
+	 0x28,0x47,0x34,0x36,0x26,0x44,0x54,0x66, // 4
+	 0x48,0x47,0x45,0x56,0x55,0x45,0x22,0x43, // 5
+	 0x28,0x47,0x34,0x36,0x26,0x44,0x54,0x75, // 6
+	 0x48,0x47,0x45,0x56,0x55,0x55,0x22,0x36, // 7
+	 0x28,0x47,0x34,0x36,0x26,0x54,0x52,0x45, // 8
+	 0x48,0x47,0x45,0x56,0x55,0x55,0x22,0xC5, // 9
+	 0x38,0x47,0x34,0x36,0x26,0x44,0x52,0x44, // A
+	 0x48,0x47,0x45,0x56,0x55,0x55,0x22,0x34, // B
+	 0x38,0x47,0x45,0x47,0x25,0x64,0x52,0x49, // C
+	 0x48,0x47,0x56,0x67,0x45,0x55,0x22,0x83, // D
+	 0x28,0x47,0x34,0x36,0x24,0x53,0x43,0x40, // E
+	 0x48,0x47,0x45,0x56,0x34,0x54,0x22,0x60, // F
+	};
+	
+	// unpack cycle table
+	for ( int i = 0; i < 128; i++ )
+	{
+		int n = cycle_table [i];
+		m.cycle_table [i * 2 + 0] = n >> 4;
+		m.cycle_table [i * 2 + 1] = n & 0x0F;
+	}
+	
+	#if SPC_LESS_ACCURATE
+		memcpy( reg_times, reg_times_, sizeof reg_times );
+	#endif
+	
+	reset();
+	return 0;
+}
+
+void Snes_Spc::init_rom( uint8_t const in [rom_size] )
+{
+	memcpy( m.rom, in, sizeof m.rom );
+}
+
+void Snes_Spc::set_tempo( int t )
+{
+	m.tempo = t;
+	int const timer2_shift = 4; // 64 kHz
+	int const other_shift = 3; // 8 kHz
+	
+	#if SPC_DISABLE_TEMPO
+		m.timers [2].prescaler = timer2_shift;
+		m.timers [1].prescaler = timer2_shift + other_shift;
+		m.timers [0].prescaler = timer2_shift + other_shift;
+	#else
+		if ( !t )
+			t = 1;
+		int const timer2_rate = 1 << timer2_shift;
+		int rate = (timer2_rate * tempo_unit + (t >> 1)) / t;
+		if ( rate < timer2_rate / 4 )
+			rate = timer2_rate / 4; // max 4x tempo
+		m.timers [2].prescaler = rate;
+		m.timers [1].prescaler = rate << other_shift;
+		m.timers [0].prescaler = rate << other_shift;
+	#endif
+}
+
+// Timer registers have been loaded. Applies these to the timers. Does not
+// reset timer prescalers or dividers.
+void Snes_Spc::timers_loaded()
+{
+	int i;
+	for ( i = 0; i < timer_count; i++ )
+	{
+		Timer* t = &m.timers [i];
+		t->period = IF_0_THEN_256( REGS [r_t0target + i] );
+		t->enabled = REGS [r_control] >> i & 1;
+		t->counter = REGS_IN [r_t0out + i] & 0x0F;
+	}
+	
+	set_tempo( m.tempo );
+}
+
+// Loads registers from unified 16-byte format
+void Snes_Spc::load_regs( uint8_t const in [reg_count] )
+{
+	memcpy( REGS, in, reg_count );
+	memcpy( REGS_IN, REGS, reg_count );
+	
+	// These always read back as 0
+	REGS_IN [r_test ] = 0;
+	REGS_IN [r_control ] = 0;
+	REGS_IN [r_t0target] = 0;
+	REGS_IN [r_t1target] = 0;
+	REGS_IN [r_t2target] = 0;
+}
+
+// RAM was just loaded from SPC, with $F0-$FF containing SMP registers
+// and timer counts. Copies these to proper registers.
+void Snes_Spc::ram_loaded()
+{
+	m.rom_enabled = 0;
+	load_regs( &RAM [0xF0] );
+	
+	// Put STOP instruction around memory to catch PC underflow/overflow
+	memset( m.ram.padding1, cpu_pad_fill, sizeof m.ram.padding1 );
+	memset( m.ram.padding2, cpu_pad_fill, sizeof m.ram.padding2 );
+}
+
+// Registers were just loaded. Applies these new values.
+void Snes_Spc::regs_loaded()
+{
+	enable_rom( REGS [r_control] & 0x80 );
+	timers_loaded();
+}
+
+void Snes_Spc::reset_time_regs()
+{
+	m.cpu_error = 0;
+	m.echo_accessed = 0;
+	m.spc_time = 0;
+	m.dsp_time = 0;
+	#if SPC_LESS_ACCURATE
+		m.dsp_time = clocks_per_sample + 1;
+	#endif
+	
+	for ( int i = 0; i < timer_count; i++ )
+	{
+		Timer* t = &m.timers [i];
+		t->next_time = 1;
+		t->divider = 0;
+	}
+	
+	regs_loaded();
+	
+	m.extra_clocks = 0;
+	reset_buf();
+}
+
+void Snes_Spc::reset_common( int timer_counter_init )
+{
+	int i;
+	for ( i = 0; i < timer_count; i++ )
+		REGS_IN [r_t0out + i] = timer_counter_init;
+	
+	// Run IPL ROM
+	memset( &m.cpu_regs, 0, sizeof m.cpu_regs );
+	m.cpu_regs.pc = rom_addr;
+	
+	REGS [r_test ] = 0x0A;
+	REGS [r_control] = 0xB0; // ROM enabled, clear ports
+	for ( i = 0; i < port_count; i++ )
+		REGS_IN [r_cpuio0 + i] = 0;
+	
+	reset_time_regs();
+}
+
+void Snes_Spc::soft_reset()
+{
+	reset_common( 0 );
+	dsp.soft_reset();
+}
+
+void Snes_Spc::reset()
+{
+	memset( RAM, 0xFF, 0x10000 );
+	ram_loaded();
+	reset_common( 0x0F );
+	dsp.reset();
+}
+
+char const Snes_Spc::signature [signature_size + 1] =
+		"SNES-SPC700 Sound File Data v0.30\x1A\x1A";
+
+blargg_err_t Snes_Spc::load_spc( void const* data, long size )
+{
+	spc_file_t const* const spc = (spc_file_t const*) data;
+	
+	// be sure compiler didn't insert any padding into fle_t
+	assert( sizeof (spc_file_t) == spc_min_file_size + 0x80 );
+	
+	// Check signature and file size
+	if ( size < signature_size || memcmp( spc, signature, 27 ) )
+		return "Not an SPC file";
+	
+	if ( size < spc_min_file_size )
+		return "Corrupt SPC file";
+	
+	// CPU registers
+	m.cpu_regs.pc = spc->pch * 0x100 + spc->pcl;
+	m.cpu_regs.a = spc->a;
+	m.cpu_regs.x = spc->x;
+	m.cpu_regs.y = spc->y;
+	m.cpu_regs.psw = spc->psw;
+	m.cpu_regs.sp = spc->sp;
+	
+	// RAM and registers
+	memcpy( RAM, spc->ram, 0x10000 );
+	ram_loaded();
+	
+	// DSP registers
+	dsp.load( spc->dsp );
+	
+	reset_time_regs();
+	
+	return 0;
+}
+
+void Snes_Spc::clear_echo()
+{
+	if ( !(dsp.read( Spc_Dsp::r_flg ) & 0x20) )
+	{
+		int addr = 0x100 * dsp.read( Spc_Dsp::r_esa );
+		int end = addr + 0x800 * (dsp.read( Spc_Dsp::r_edl ) & 0x0F);
+		if ( end > 0x10000 )
+			end = 0x10000;
+		memset( &RAM [addr], 0xFF, end - addr );
+	}
+}
+
+
+//// Sample output
+
+void Snes_Spc::reset_buf()
+{
+	// Start with half extra buffer of silence
+	sample_t* out = m.extra_buf;
+	while ( out < &m.extra_buf [extra_size / 2] )
+		*out++ = 0;
+	
+	m.extra_pos = out;
+	m.buf_begin = 0;
+	
+	dsp.set_output( 0, 0 );
+}
+
+void Snes_Spc::set_output( sample_t* out, int size )
+{
+	require( (size & 1) == 0 ); // size must be even
+	
+	m.extra_clocks &= clocks_per_sample - 1;
+	if ( out )
+	{
+		sample_t const* out_end = out + size;
+		m.buf_begin = out;
+		m.buf_end = out_end;
+		
+		// Copy extra to output
+		sample_t const* in = m.extra_buf;
+		while ( in < m.extra_pos && out < out_end )
+			*out++ = *in++;
+		
+		// Handle output being full already
+		if ( out >= out_end )
+		{
+			// Have DSP write to remaining extra space
+			out = dsp.extra();
+			out_end = &dsp.extra() [extra_size];
+			
+			// Copy any remaining extra samples as if DSP wrote them
+			while ( in < m.extra_pos )
+				*out++ = *in++;
+			assert( out <= out_end );
+		}
+		
+		dsp.set_output( out, out_end - out );
+	}
+	else
+	{
+		reset_buf();
+	}
+}
+
+void Snes_Spc::save_extra()
+{
+	// Get end pointers
+	sample_t const* main_end = m.buf_end; // end of data written to buf
+	sample_t const* dsp_end = dsp.out_pos(); // end of data written to dsp.extra()
+	if ( m.buf_begin <= dsp_end && dsp_end <= main_end )
+	{
+		main_end = dsp_end;
+		dsp_end = dsp.extra(); // nothing in DSP's extra
+	}
+	
+	// Copy any extra samples at these ends into extra_buf
+	sample_t* out = m.extra_buf;
+	sample_t const* in;
+	for ( in = m.buf_begin + sample_count(); in < main_end; in++ )
+		*out++ = *in;
+	for ( in = dsp.extra(); in < dsp_end ; in++ )
+		*out++ = *in;
+	
+	m.extra_pos = out;
+	assert( out <= &m.extra_buf [extra_size] );
+}
+
+blargg_err_t Snes_Spc::play( int count, sample_t* out )
+{
+	require( (count & 1) == 0 ); // must be even
+	if ( count )
+	{
+		set_output( out, count );
+		end_frame( count * (clocks_per_sample / 2) );
+	}
+	
+	const char* err = m.cpu_error;
+	m.cpu_error = 0;
+	return err;
+}
+
+blargg_err_t Snes_Spc::skip( int count )
+{
+	#if SPC_LESS_ACCURATE
+	if ( count > 2 * sample_rate * 2 )
+	{
+		set_output( 0, 0 );
+		
+		// Skip a multiple of 4 samples
+		time_t end = count;
+		count = (count & 3) + 1 * sample_rate * 2;
+		end = (end - count) * (clocks_per_sample / 2);
+		
+		m.skipped_kon = 0;
+		m.skipped_koff = 0;
+		
+		// Preserve DSP and timer synchronization
+		// TODO: verify that this really preserves it
+		int old_dsp_time = m.dsp_time + m.spc_time;
+		m.dsp_time = end - m.spc_time + skipping_time;
+		end_frame( end );
+		m.dsp_time = m.dsp_time - skipping_time + old_dsp_time;
+		
+		dsp.write( Spc_Dsp::r_koff, m.skipped_koff & ~m.skipped_kon );
+		dsp.write( Spc_Dsp::r_kon , m.skipped_kon );
+		clear_echo();
+	}
+	#endif
+	
+	return play( count, 0 );
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Snes_Spc.h Added

@@ -0,0 +1,287 @@
+// SNES SPC-700 APU emulator
+
+// Game_Music_Emu 0.5.5
+#ifndef SNES_SPC_H
+#define SNES_SPC_H
+
+#include "Spc_Dsp.h"
+#include "blargg_endian.h"
+
+struct Snes_Spc {
+public:
+	typedef BOOST::uint8_t uint8_t;
+	
+	// Must be called once before using
+	blargg_err_t init();
+	
+	// Sample pairs generated per second
+	enum { sample_rate = 32000 };
+	
+// Emulator use
+	
+	// Sets IPL ROM data. Library does not include ROM data. Most SPC music files
+	// don't need ROM, but a full emulator must provide this.
+	enum { rom_size = 0x40 };
+	void init_rom( uint8_t const rom [rom_size] );
+
+	// Sets destination for output samples
+	typedef short sample_t;
+	void set_output( sample_t* out, int out_size );
+
+	// Number of samples written to output since last set
+	int sample_count() const;
+
+	// Resets SPC to power-on state. This resets your output buffer, so you must
+	// call set_output() after this.
+	void reset();
+
+	// Emulates pressing reset switch on SNES. This resets your output buffer, so
+	// you must call set_output() after this.
+	void soft_reset();
+
+	// 1024000 SPC clocks per second, sample pair every 32 clocks
+	typedef int time_t;
+	enum { clock_rate = 1024000 };
+	enum { clocks_per_sample = 32 };
+	
+	// Emulated port read/write at specified time
+	enum { port_count = 4 };
+	int read_port ( time_t, int port );
+	void write_port( time_t, int port, int data );
+
+	// Runs SPC to end_time and starts a new time frame at 0
+	void end_frame( time_t end_time );
+	
+// Sound control
+	
+	// Mutes voices corresponding to non-zero bits in mask (issues repeated KOFF events).
+	// Reduces emulation accuracy.
+	enum { voice_count = 8 };
+	void mute_voices( int mask );
+	
+	// If true, prevents channels and global volumes from being phase-negated.
+	// Only supported by fast DSP.
+	void disable_surround( bool disable = true );
+	
+	// Sets tempo, where tempo_unit = normal, tempo_unit / 2 = half speed, etc.
+	enum { tempo_unit = 0x100 };
+	void set_tempo( int );
+
+// SPC music files
+
+	// Loads SPC data into emulator
+	enum { spc_min_file_size = 0x10180 };
+	enum { spc_file_size = 0x10200 };
+	blargg_err_t load_spc( void const* in, long size );
+	
+	// Clears echo region. Useful after loading an SPC as many have garbage in echo.
+	void clear_echo();
+
+	// Plays for count samples and write samples to out. Discards samples if out
+	// is NULL. Count must be a multiple of 2 since output is stereo.
+	blargg_err_t play( int count, sample_t* out );
+	
+	// Skips count samples. Several times faster than play() when using fast DSP.
+	blargg_err_t skip( int count );
+	
+// State save/load (only available with accurate DSP)
+
+#if !SPC_NO_COPY_STATE_FUNCS
+	// Saves/loads state
+	enum { state_size = 67 * 1024L }; // maximum space needed when saving
+	typedef Spc_Dsp::copy_func_t copy_func_t;
+	void copy_state( unsigned char** io, copy_func_t );
+	
+	// Writes minimal header to spc_out
+	static void init_header( void* spc_out );
+
+	// Saves emulator state as SPC file data. Writes spc_file_size bytes to spc_out.
+	// Does not set up SPC header; use init_header() for that.
+	void save_spc( void* spc_out );
+
+	// Returns true if new key-on events occurred since last check. Useful for
+	// trimming silence while saving an SPC.
+	bool check_kon();
+#endif
+
+public:
+	// TODO: document
+	struct regs_t
+	{
+		int pc;
+		int a;
+		int x;
+		int y;
+		int psw;
+		int sp;
+	};
+	regs_t& smp_regs() { return m.cpu_regs; }
+	
+	uint8_t* smp_ram() { return m.ram.ram; }
+	
+	void run_until( time_t t ) { run_until_( t ); }
+public:
+	BLARGG_DISABLE_NOTHROW
+	
+	typedef BOOST::uint16_t uint16_t;
+	
+	// Time relative to m_spc_time. Speeds up code a bit by eliminating need to
+	// constantly add m_spc_time to time from CPU. CPU uses time that ends at
+	// 0 to eliminate reloading end time every instruction. It pays off.
+	typedef int rel_time_t;
+	
+	struct Timer
+	{
+		rel_time_t next_time; // time of next event
+		int prescaler;
+		int period;
+		int divider;
+		int enabled;
+		int counter;
+	};
+	enum { reg_count = 0x10 };
+	enum { timer_count = 3 };
+	enum { extra_size = Spc_Dsp::extra_size };
+	
+	enum { signature_size = 35 };
+	
+private:
+	Spc_Dsp dsp;
+	
+	#if SPC_LESS_ACCURATE
+		static signed char const reg_times_ [256];
+		signed char reg_times [256];
+	#endif
+	
+	struct state_t
+	{
+		Timer timers [timer_count];
+		
+		uint8_t smp_regs [2] [reg_count];
+		
+		regs_t cpu_regs;
+		
+		rel_time_t dsp_time;
+		time_t spc_time;
+		bool echo_accessed;
+		
+		int tempo;
+		int skipped_kon;
+		int skipped_koff;
+		const char* cpu_error;
+		
+		int extra_clocks;
+		sample_t* buf_begin;
+		sample_t const* buf_end;
+		sample_t* extra_pos;
+		sample_t extra_buf [extra_size];
+		
+		int rom_enabled;
+		uint8_t rom [rom_size];
+		uint8_t hi_ram [rom_size];
+		
+		unsigned char cycle_table [256];
+		
+		struct
+		{
+			// padding to neutralize address overflow
+			union {
+				uint8_t padding1 [0x100];
+				uint16_t align; // makes compiler align data for 16-bit access
+			} padding1 [1];
+			uint8_t ram [0x10000];
+			uint8_t padding2 [0x100];
+		} ram;
+	};
+	state_t m;
+	
+	enum { rom_addr = 0xFFC0 };
+	
+	enum { skipping_time = 127 };
+	
+	// Value that padding should be filled with
+	enum { cpu_pad_fill = 0xFF };
+	
+	enum {
+ r_test = 0x0, r_control = 0x1,
+ r_dspaddr = 0x2, r_dspdata = 0x3,
+ r_cpuio0 = 0x4, r_cpuio1 = 0x5,
+ r_cpuio2 = 0x6, r_cpuio3 = 0x7,
+ r_f8 = 0x8, r_f9 = 0x9,
+ r_t0target = 0xA, r_t1target = 0xB, r_t2target = 0xC,
+ r_t0out = 0xD, r_t1out = 0xE, r_t2out = 0xF
+	};
+	
+	void timers_loaded();
+	void enable_rom( int enable );
+	void reset_buf();
+	void save_extra();
+	void load_regs( uint8_t const in [reg_count] );
+	void ram_loaded();
+	void regs_loaded();
+	void reset_time_regs();
+	void reset_common( int timer_counter_init );
+	
+	Timer* run_timer_ ( Timer* t, rel_time_t );
+	Timer* run_timer ( Timer* t, rel_time_t );
+	int dsp_read ( rel_time_t );
+	void dsp_write ( int data, rel_time_t );
+	void cpu_write_smp_reg_( int data, rel_time_t, int addr );
+	void cpu_write_smp_reg ( int data, rel_time_t, int addr );
+	void cpu_write_high ( int data, int i, rel_time_t );
+	void cpu_write ( int data, int addr, rel_time_t );
+	int cpu_read_smp_reg ( int i, rel_time_t );
+	int cpu_read ( int addr, rel_time_t );
+	unsigned CPU_mem_bit ( uint8_t const* pc, rel_time_t );
+	
+	bool check_echo_access ( int addr );
+	uint8_t* run_until_( time_t end_time );
+	
+	struct spc_file_t
+	{
+		char signature [signature_size];
+		uint8_t has_id666;
+		uint8_t version;
+		uint8_t pcl, pch;
+		uint8_t a;
+		uint8_t x;
+		uint8_t y;
+		uint8_t psw;
+		uint8_t sp;
+		char text [212];
+		uint8_t ram [0x10000];
+		uint8_t dsp [128];
+		uint8_t unused [0x40];
+		uint8_t ipl_rom [0x40];
+	};
+
+	static char const signature [signature_size + 1];
+	
+	void save_regs( uint8_t out [reg_count] );
+};
+
+#include <assert.h>
+
+inline int Snes_Spc::sample_count() const { return (m.extra_clocks >> 5) * 2; }
+
+inline int Snes_Spc::read_port( time_t t, int port )
+{
+	assert( (unsigned) port < port_count );
+	return run_until_( t ) [port];
+}
+
+inline void Snes_Spc::write_port( time_t t, int port, int data )
+{
+	assert( (unsigned) port < port_count );
+	run_until_( t ) [0x10 + port] = data;
+}
+
+inline void Snes_Spc::mute_voices( int mask ) { dsp.mute_voices( mask ); }
+	
+inline void Snes_Spc::disable_surround( bool disable ) { dsp.disable_surround( disable ); }
+
+#if !SPC_NO_COPY_STATE_FUNCS
+inline bool Snes_Spc::check_kon() { return dsp.check_kon(); }
+#endif
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Cpu.cpp Added

@@ -0,0 +1,565 @@
+// Core SPC emulation: CPU, timers, SMP registers, memory
+
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Snes_Spc.h"
+
+#include <string.h>
+
+/* Copyright (C) 2004-2007 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+#define RAM (m.ram.ram)
+#define REGS (m.smp_regs [0])
+#define REGS_IN (m.smp_regs [1])
+
+// (n ? n : 256)
+#define IF_0_THEN_256( n ) ((uint8_t) ((n) - 1) + 1)
+
+// Note: SPC_MORE_ACCURACY exists mainly so I can run my validation tests, which
+// do crazy echo buffer accesses.
+#ifndef SPC_MORE_ACCURACY
+	#define SPC_MORE_ACCURACY 0
+#endif
+
+#ifdef BLARGG_ENABLE_OPTIMIZER
+	#include BLARGG_ENABLE_OPTIMIZER
+#endif
+
+
+//// Timers
+
+#if SPC_DISABLE_TEMPO
+	#define TIMER_DIV( t, n ) ((n) >> t->prescaler)
+	#define TIMER_MUL( t, n ) ((n) << t->prescaler)
+#else
+	#define TIMER_DIV( t, n ) ((n) / t->prescaler)
+	#define TIMER_MUL( t, n ) ((n) * t->prescaler)
+#endif
+
+Snes_Spc::Timer* Snes_Spc::run_timer_( Timer* t, rel_time_t time )
+{
+	int elapsed = TIMER_DIV( t, time - t->next_time ) + 1;
+	t->next_time += TIMER_MUL( t, elapsed );
+	
+	if ( t->enabled )
+	{
+		int remain = IF_0_THEN_256( t->period - t->divider );
+		int divider = t->divider + elapsed;
+		int over = elapsed - remain;
+		if ( over >= 0 )
+		{
+			int n = over / t->period;
+			t->counter = (t->counter + 1 + n) & 0x0F;
+			divider = over - n * t->period;
+		}
+		t->divider = (uint8_t) divider;
+	}
+	return t;
+}
+
+inline Snes_Spc::Timer* Snes_Spc::run_timer( Timer* t, rel_time_t time )
+{
+	if ( time >= t->next_time )
+		t = run_timer_( t, time );
+	return t;
+}
+
+
+//// ROM
+
+void Snes_Spc::enable_rom( int enable )
+{
+	if ( m.rom_enabled != enable )
+	{
+		m.rom_enabled = enable;
+		if ( enable )
+			memcpy( m.hi_ram, &RAM [rom_addr], sizeof m.hi_ram );
+		memcpy( &RAM [rom_addr], (enable ? m.rom : m.hi_ram), rom_size );
+		// TODO: ROM can still get overwritten when DSP writes to echo buffer
+	}
+}
+
+
+//// DSP
+
+#if SPC_LESS_ACCURATE
+	int const max_reg_time = 29;
+	
+	signed char const Snes_Spc::reg_times_ [256] =
+	{
+		 -1, 0,-11,-10,-15,-11, -2, -2, 4, 3, 14, 14, 26, 26, 14, 22,
+		 2, 3, 0, 1,-12, 0, 1, 1, 7, 6, 14, 14, 27, 14, 14, 23,
+		 5, 6, 3, 4, -1, 3, 4, 4, 10, 9, 14, 14, 26, -5, 14, 23,
+		 8, 9, 6, 7, 2, 6, 7, 7, 13, 12, 14, 14, 27, -4, 14, 24,
+		 11, 12, 9, 10, 5, 9, 10, 10, 16, 15, 14, 14, -2, -4, 14, 24,
+		 14, 15, 12, 13, 8, 12, 13, 13, 19, 18, 14, 14, -2,-36, 14, 24,
+		 17, 18, 15, 16, 11, 15, 16, 16, 22, 21, 14, 14, 28, -3, 14, 25,
+		 20, 21, 18, 19, 14, 18, 19, 19, 25, 24, 14, 14, 14, 29, 14, 25,
+		 
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+	};
+	
+	#define RUN_DSP( time, offset ) \
+		int count = (time) - (offset) - m.dsp_time;\
+		if ( count >= 0 )\
+		{\
+			int clock_count = (count & ~(clocks_per_sample - 1)) + clocks_per_sample;\
+			m.dsp_time += clock_count;\
+			dsp.run( clock_count );\
+		}
+#else
+	#define RUN_DSP( time, offset ) \
+		{\
+			int count = (time) - m.dsp_time;\
+			if ( !SPC_MORE_ACCURACY || count )\
+			{\
+				assert( count > 0 );\
+				m.dsp_time = (time);\
+				dsp.run( count );\
+			}\
+		}
+#endif
+
+int Snes_Spc::dsp_read( rel_time_t time )
+{
+	RUN_DSP( time, reg_times [REGS [r_dspaddr] & 0x7F] );
+	
+	int result = dsp.read( REGS [r_dspaddr] & 0x7F );
+	
+	#ifdef SPC_DSP_READ_HOOK
+		SPC_DSP_READ_HOOK( spc_time + time, (REGS [r_dspaddr] & 0x7F), result );
+	#endif
+	
+	return result;
+}
+
+inline void Snes_Spc::dsp_write( int data, rel_time_t time )
+{
+	RUN_DSP( time, reg_times [REGS [r_dspaddr]] )
+	#if SPC_LESS_ACCURATE
+		else if ( m.dsp_time == skipping_time )
+		{
+			int r = REGS [r_dspaddr];
+			if ( r == Spc_Dsp::r_kon )
+				m.skipped_kon |= data & ~dsp.read( Spc_Dsp::r_koff );
+			
+			if ( r == Spc_Dsp::r_koff )
+			{
+				m.skipped_koff |= data;
+				m.skipped_kon &= ~data;
+			}
+		}
+	#endif
+	
+	#ifdef SPC_DSP_WRITE_HOOK
+		SPC_DSP_WRITE_HOOK( m.spc_time + time, REGS [r_dspaddr], (uint8_t) data );
+	#endif
+	
+	if ( REGS [r_dspaddr] <= 0x7F )
+		dsp.write( REGS [r_dspaddr], data );
+	else if ( !SPC_MORE_ACCURACY )
+		debug_printf( "SPC wrote to DSP register > $7F\n" );
+}
+
+
+//// Memory access extras
+
+#if SPC_MORE_ACCURACY
+	#define MEM_ACCESS( time, addr ) \
+	{\
+		if ( time >= m.dsp_time )\
+		{\
+			RUN_DSP( time, max_reg_time );\
+		}\
+	}
+#elif !defined (NDEBUG)
+	// Debug-only check for read/write within echo buffer, since this might result in
+	// inaccurate emulation due to the DSP not being caught up to the present.
+	
+	bool Snes_Spc::check_echo_access( int addr )
+	{
+		if ( !(dsp.read( Spc_Dsp::r_flg ) & 0x20) )
+		{
+			int start = 0x100 * dsp.read( Spc_Dsp::r_esa );
+			int size = 0x800 * (dsp.read( Spc_Dsp::r_edl ) & 0x0F);
+			int end = start + (size ? size : 4);
+			if ( start <= addr && addr < end )
+			{
+				if ( !m.echo_accessed )
+				{
+					m.echo_accessed = 1;
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	#define MEM_ACCESS( time, addr ) check( !check_echo_access( (uint16_t) addr ) );
+#else
+	#define MEM_ACCESS( time, addr )
+#endif
+
+
+//// CPU write
+
+#if SPC_MORE_ACCURACY
+static unsigned char const glitch_probs [3] [256] =
+{
+	0xC3,0x92,0x5B,0x1C,0xD1,0x92,0x5B,0x1C,0xDB,0x9C,0x72,0x18,0xCD,0x5C,0x38,0x0B,
+	0xE1,0x9C,0x74,0x17,0xCF,0x75,0x45,0x0C,0xCF,0x6E,0x4A,0x0D,0xA3,0x3A,0x1D,0x08,
+	0xDB,0xA0,0x82,0x19,0xD9,0x73,0x3C,0x0E,0xCB,0x76,0x52,0x0B,0xA5,0x46,0x1D,0x09,
+	0xDA,0x74,0x55,0x0F,0xA2,0x3F,0x21,0x05,0x9A,0x40,0x20,0x07,0x63,0x1E,0x10,0x01,
+	0xDF,0xA9,0x85,0x1D,0xD3,0x84,0x4B,0x0E,0xCF,0x6F,0x49,0x0F,0xB3,0x48,0x1E,0x05,
+	0xD8,0x77,0x52,0x12,0xB7,0x49,0x23,0x06,0xAA,0x45,0x28,0x07,0x7D,0x28,0x0F,0x07,
+	0xCC,0x7B,0x4A,0x0E,0xB2,0x4F,0x24,0x07,0xAD,0x43,0x2C,0x06,0x86,0x29,0x11,0x07,
+	0xAE,0x48,0x1F,0x0A,0x76,0x21,0x19,0x05,0x76,0x21,0x14,0x05,0x44,0x11,0x0B,0x01,
+	0xE7,0xAD,0x96,0x23,0xDC,0x86,0x59,0x0E,0xDC,0x7C,0x5F,0x15,0xBB,0x53,0x2E,0x09,
+	0xD6,0x7C,0x4A,0x16,0xBB,0x4A,0x25,0x08,0xB3,0x4F,0x28,0x0B,0x8E,0x23,0x15,0x08,
+	0xCF,0x7F,0x57,0x11,0xB5,0x4A,0x23,0x0A,0xAA,0x42,0x28,0x05,0x7D,0x22,0x12,0x03,
+	0xA6,0x49,0x28,0x09,0x82,0x2B,0x0D,0x04,0x7A,0x20,0x0F,0x04,0x3D,0x0F,0x09,0x03,
+	0xD1,0x7C,0x4C,0x0F,0xAF,0x4E,0x21,0x09,0xA8,0x46,0x2A,0x07,0x85,0x1F,0x0E,0x07,
+	0xA6,0x3F,0x26,0x07,0x7C,0x24,0x14,0x07,0x78,0x22,0x16,0x04,0x46,0x12,0x0A,0x02,
+	0xA6,0x41,0x2C,0x0A,0x7E,0x28,0x11,0x05,0x73,0x1B,0x14,0x05,0x3D,0x11,0x0A,0x02,
+	0x70,0x22,0x17,0x05,0x48,0x13,0x08,0x03,0x3C,0x07,0x0D,0x07,0x26,0x07,0x06,0x01,
+	
+	0xE0,0x9F,0xDA,0x7C,0x4F,0x18,0x28,0x0D,0xE9,0x9F,0xDA,0x7C,0x4F,0x18,0x1F,0x07,
+	0xE6,0x97,0xD8,0x72,0x64,0x13,0x26,0x09,0xDC,0x67,0xA9,0x38,0x21,0x07,0x15,0x06,
+	0xE9,0x91,0xD2,0x6B,0x63,0x14,0x2B,0x0E,0xD6,0x61,0xB7,0x41,0x2B,0x0E,0x10,0x09,
+	0xCF,0x59,0xB0,0x2F,0x35,0x08,0x0F,0x07,0xB6,0x30,0x7A,0x21,0x17,0x07,0x09,0x03,
+	0xE7,0xA3,0xE5,0x6B,0x65,0x1F,0x34,0x09,0xD8,0x6B,0xBE,0x45,0x27,0x07,0x10,0x07,
+	0xDA,0x54,0xB1,0x39,0x2E,0x0E,0x17,0x08,0xA9,0x3C,0x86,0x22,0x16,0x06,0x07,0x03,
+	0xD4,0x51,0xBC,0x3D,0x38,0x0A,0x13,0x06,0xB2,0x37,0x79,0x1C,0x17,0x05,0x0E,0x06,
+	0xA7,0x31,0x74,0x1C,0x11,0x06,0x0C,0x02,0x6D,0x1A,0x38,0x10,0x0B,0x05,0x06,0x03,
+	0xEB,0x9A,0xE1,0x7A,0x6F,0x13,0x34,0x0E,0xE6,0x75,0xC5,0x45,0x3E,0x0B,0x1A,0x05,
+	0xD8,0x63,0xC1,0x40,0x3C,0x1B,0x19,0x06,0xB3,0x42,0x83,0x29,0x18,0x0A,0x08,0x04,
+	0xD4,0x58,0xBA,0x43,0x3F,0x0A,0x1F,0x09,0xB1,0x33,0x8A,0x1F,0x1F,0x06,0x0D,0x05,
+	0xAF,0x3C,0x7A,0x1F,0x16,0x08,0x0A,0x01,0x72,0x1B,0x52,0x0D,0x0B,0x09,0x06,0x01,
+	0xCF,0x63,0xB7,0x47,0x40,0x10,0x14,0x06,0xC0,0x41,0x96,0x20,0x1C,0x09,0x10,0x05,
+	0xA6,0x35,0x82,0x1A,0x20,0x0C,0x0E,0x04,0x80,0x1F,0x53,0x0F,0x0B,0x02,0x06,0x01,
+	0xA6,0x31,0x81,0x1B,0x1D,0x01,0x08,0x08,0x7B,0x20,0x4D,0x19,0x0E,0x05,0x07,0x03,
+	0x6B,0x17,0x49,0x07,0x0E,0x03,0x0A,0x05,0x37,0x0B,0x1F,0x06,0x04,0x02,0x07,0x01,
+	
+	0xF0,0xD6,0xED,0xAD,0xEC,0xB1,0xEB,0x79,0xAC,0x22,0x47,0x1E,0x6E,0x1B,0x32,0x0A,
+	0xF0,0xD6,0xEA,0xA4,0xED,0xC4,0xDE,0x82,0x98,0x1F,0x50,0x13,0x52,0x15,0x2A,0x0A,
+	0xF1,0xD1,0xEB,0xA2,0xEB,0xB7,0xD8,0x69,0xA2,0x1F,0x5B,0x18,0x55,0x18,0x2C,0x0A,
+	0xED,0xB5,0xDE,0x7E,0xE6,0x85,0xD3,0x59,0x59,0x0F,0x2C,0x09,0x24,0x07,0x15,0x09,
+	0xF1,0xD6,0xEA,0xA0,0xEC,0xBB,0xDA,0x77,0xA9,0x23,0x58,0x14,0x5D,0x12,0x2F,0x09,
+	0xF1,0xC1,0xE3,0x86,0xE4,0x87,0xD2,0x4E,0x68,0x15,0x26,0x0B,0x27,0x09,0x15,0x02,
+	0xEE,0xA6,0xE0,0x5C,0xE0,0x77,0xC3,0x41,0x67,0x1B,0x3C,0x07,0x2A,0x06,0x19,0x07,
+	0xE4,0x75,0xC6,0x43,0xCC,0x50,0x95,0x23,0x35,0x09,0x14,0x04,0x15,0x05,0x0B,0x04,
+	0xEE,0xD6,0xED,0xAD,0xEC,0xB1,0xEB,0x79,0xAC,0x22,0x56,0x14,0x5A,0x12,0x26,0x0A,
+	0xEE,0xBB,0xE7,0x7E,0xE9,0x8D,0xCB,0x49,0x67,0x11,0x34,0x07,0x2B,0x0B,0x14,0x07,
+	0xED,0xA7,0xE5,0x76,0xE3,0x7E,0xC4,0x4B,0x77,0x14,0x34,0x08,0x27,0x07,0x14,0x04,
+	0xE7,0x8B,0xD2,0x4C,0xCA,0x56,0x9E,0x31,0x36,0x0C,0x11,0x07,0x14,0x04,0x0A,0x02,
+	0xF0,0x9B,0xEA,0x6F,0xE5,0x81,0xC4,0x43,0x74,0x10,0x30,0x0B,0x2D,0x08,0x1B,0x06,
+	0xE6,0x83,0xCA,0x48,0xD9,0x56,0xA7,0x23,0x3B,0x09,0x12,0x09,0x15,0x07,0x0A,0x03,
+	0xE5,0x5F,0xCB,0x3C,0xCF,0x48,0x91,0x22,0x31,0x0A,0x17,0x08,0x15,0x04,0x0D,0x02,
+	0xD1,0x43,0x91,0x20,0xA9,0x2D,0x54,0x12,0x17,0x07,0x09,0x02,0x0C,0x04,0x05,0x03,
+};
+#endif
+
+// Read/write handlers are divided into multiple functions to keep rarely-used
+// functionality separate so often-used functionality can be optimized better
+// by compiler.
+
+// If write isn't preceded by read, data has this added to it
+int const no_read_before_write = 0x2000;
+
+void Snes_Spc::cpu_write_smp_reg_( int data, rel_time_t time, int addr )
+{
+	switch ( addr )
+	{
+	case r_t0target:
+	case r_t1target:
+	case r_t2target: {
+		Timer* t = &m.timers [addr - r_t0target];
+		int period = IF_0_THEN_256( data );
+		if ( t->period != period )
+		{
+			t = run_timer( t, time );
+			#if SPC_MORE_ACCURACY
+				// Insane behavior when target is written just after counter is
+				// clocked and counter matches new period and new period isn't 1, 2, 4, or 8
+				if ( t->divider == (period & 0xFF) &&
+						t->next_time == time + TIMER_MUL( t, 1 ) &&
+						((period - 1) | ~0x0F) & period )
+				{
+					//debug_printf( "SPC pathological timer target write\n" );
+					
+					// If the period is 3, 5, or 9, there's a probability this behavior won't occur,
+					// based on the previous period
+					int prob = 0xFF;
+					int old_period = t->period & 0xFF;
+					if ( period == 3 ) prob = glitch_probs [0] [old_period];
+					if ( period == 5 ) prob = glitch_probs [1] [old_period];
+					if ( period == 9 ) prob = glitch_probs [2] [old_period];
+					
+					// The glitch suppresses incrementing of one of the counter bits, based on
+					// the lowest set bit in the new period
+					int b = 1;
+					while ( !(period & b) )
+						b <<= 1;
+					
+					if ( (rand() >> 4 & 0xFF) <= prob )
+						t->divider = (t->divider - b) & 0xFF;
+				}
+			#endif
+			t->period = period;
+		}
+		break;
+	}
+	
+	case r_t0out:
+	case r_t1out:
+	case r_t2out:
+		if ( !SPC_MORE_ACCURACY )
+			debug_printf( "SPC wrote to counter %d\n", (int) addr - r_t0out );
+		
+		if ( data < no_read_before_write / 2 )
+			run_timer( &m.timers [addr - r_t0out], time - 1 )->counter = 0;
+		break;
+	
+	// Registers that act like RAM
+	case 0x8:
+	case 0x9:
+		REGS_IN [addr] = (uint8_t) data;
+		break;
+	
+	case r_test:
+		if ( (uint8_t) data != 0x0A )
+			debug_printf( "SPC wrote to test register\n" );
+		break;
+	
+	case r_control:
+		// port clears
+		if ( data & 0x10 )
+		{
+			REGS_IN [r_cpuio0] = 0;
+			REGS_IN [r_cpuio1] = 0;
+		}
+		if ( data & 0x20 )
+		{
+			REGS_IN [r_cpuio2] = 0;
+			REGS_IN [r_cpuio3] = 0;
+		}
+		
+		// timers
+		{
+			for ( int i = 0; i < timer_count; i++ )
+			{
+				Timer* t = &m.timers [i];
+				int enabled = data >> i & 1;
+				if ( t->enabled != enabled )
+				{
+					t = run_timer( t, time );
+					t->enabled = enabled;
+					if ( enabled )
+					{
+						t->divider = 0;
+						t->counter = 0;
+					}
+				}
+			}
+		}
+		enable_rom( data & 0x80 );
+		break;
+	}
+}
+
+void Snes_Spc::cpu_write_smp_reg( int data, rel_time_t time, int addr )
+{
+	if ( addr == r_dspdata ) // 99%
+		dsp_write( data, time );
+	else
+		cpu_write_smp_reg_( data, time, addr );
+}
+
+void Snes_Spc::cpu_write_high( int data, int i, rel_time_t time )
+{
+	if ( i < rom_size )
+	{
+		m.hi_ram [i] = (uint8_t) data;
+		if ( m.rom_enabled )
+			RAM [i + rom_addr] = m.rom [i]; // restore overwritten ROM
+	}
+	else
+	{
+		assert( RAM [i + rom_addr] == (uint8_t) data );
+		RAM [i + rom_addr] = cpu_pad_fill; // restore overwritten padding
+		cpu_write( data, i + rom_addr - 0x10000, time );
+	}
+}
+
+int const bits_in_int = CHAR_BIT * sizeof (int);
+
+void Snes_Spc::cpu_write( int data, int addr, rel_time_t time )
+{
+	MEM_ACCESS( time, addr )
+	
+	// RAM
+	RAM [addr] = (uint8_t) data;
+	int reg = addr - 0xF0;
+	if ( reg >= 0 ) // 64%
+	{
+		// $F0-$FF
+		if ( reg < reg_count ) // 87%
+		{
+			REGS [reg] = (uint8_t) data;
+			
+			// Ports
+			#ifdef SPC_PORT_WRITE_HOOK
+				if ( (unsigned) (reg - r_cpuio0) < port_count )
+					SPC_PORT_WRITE_HOOK( m.spc_time + time, (reg - r_cpuio0),
+							(uint8_t) data, &REGS [r_cpuio0] );
+			#endif
+			
+			// Registers other than $F2 and $F4-$F7
+			//if ( reg != 2 && reg != 4 && reg != 5 && reg != 6 && reg != 7 )
+			// TODO: this is a bit on the fragile side
+			if ( ((~0x2F00 << (bits_in_int - 16)) << reg) < 0 ) // 36%
+				cpu_write_smp_reg( data, time, reg );
+		}
+		// High mem/address wrap-around
+		else
+		{
+			reg -= rom_addr - 0xF0;
+			if ( reg >= 0 ) // 1% in IPL ROM area or address wrapped around
+				cpu_write_high( data, reg, time );
+		}
+	}
+}
+
+
+//// CPU read
+
+inline int Snes_Spc::cpu_read_smp_reg( int reg, rel_time_t time )
+{
+	int result = REGS_IN [reg];
+	reg -= r_dspaddr;
+	// DSP addr and data
+	if ( (unsigned) reg <= 1 ) // 4% 0xF2 and 0xF3
+	{
+		result = REGS [r_dspaddr];
+		if ( (unsigned) reg == 1 )
+			result = dsp_read( time ); // 0xF3
+	}
+	return result;
+}
+
+int Snes_Spc::cpu_read( int addr, rel_time_t time )
+{
+	MEM_ACCESS( time, addr )
+	
+	// RAM
+	int result = RAM [addr];
+	int reg = addr - 0xF0;
+	if ( reg >= 0 ) // 40%
+	{
+		reg -= 0x10;
+		if ( (unsigned) reg >= 0xFF00 ) // 21%
+		{
+			reg += 0x10 - r_t0out;
+			
+			// Timers
+			if ( (unsigned) reg < timer_count ) // 90%
+			{
+				Timer* t = &m.timers [reg];
+				if ( time >= t->next_time )
+					t = run_timer_( t, time );
+				result = t->counter;
+				t->counter = 0;
+			}
+			// Other registers
+			else if ( reg < 0 ) // 10%
+			{
+				result = cpu_read_smp_reg( reg + r_t0out, time );
+			}
+			else // 1%
+			{
+				assert( reg + (r_t0out + 0xF0 - 0x10000) < 0x100 );
+				result = cpu_read( reg + (r_t0out + 0xF0 - 0x10000), time );
+			}
+		}
+	}
+	
+	return result;
+}
+
+
+//// Run
+
+// Prefix and suffix for CPU emulator function
+#define SPC_CPU_RUN_FUNC \
+BOOST::uint8_t* Snes_Spc::run_until_( time_t end_time )\
+{\
+	rel_time_t rel_time = m.spc_time - end_time;\
+	assert( rel_time <= 0 );\
+	m.spc_time = end_time;\
+	m.dsp_time += rel_time;\
+	m.timers [0].next_time += rel_time;\
+	m.timers [1].next_time += rel_time;\
+	m.timers [2].next_time += rel_time;
+
+#define SPC_CPU_RUN_FUNC_END \
+	m.spc_time += rel_time;\
+	m.dsp_time -= rel_time;\
+	m.timers [0].next_time -= rel_time;\
+	m.timers [1].next_time -= rel_time;\
+	m.timers [2].next_time -= rel_time;\
+	assert( m.spc_time <= end_time );\
+	return &REGS [r_cpuio0];\
+}
+
+int const cpu_lag_max = 12 - 1; // DIV YA,X takes 12 clocks
+
+void Snes_Spc::end_frame( time_t end_time )
+{
+	// Catch CPU up to as close to end as possible. If final instruction
+	// would exceed end, does NOT execute it and leaves m.spc_time < end.
+	if ( end_time > m.spc_time )
+		run_until_( end_time );
+	
+	m.spc_time -= end_time;
+	m.extra_clocks += end_time;
+	
+	// Greatest number of clocks early that emulation can stop early due to
+	// not being able to execute current instruction without going over
+	// allowed time.
+	assert( -cpu_lag_max <= m.spc_time && m.spc_time <= 0 );
+	
+	// Catch timers up to CPU
+	for ( int i = 0; i < timer_count; i++ )
+		run_timer( &m.timers [i], 0 );
+	
+	// Catch DSP up to CPU
+	if ( m.dsp_time < 0 )
+	{
+		RUN_DSP( 0, max_reg_time );
+	}
+	
+	// Save any extra samples beyond what should be generated
+	if ( m.buf_begin )
+		save_extra();
+}
+
+// Inclusion here allows static memory access functions and better optimization
+#include "Spc_Cpu.h"

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Cpu.h Added

@@ -0,0 +1,1220 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+/* Copyright (C) 2004-2007 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+//// Memory access
+
+#if SPC_MORE_ACCURACY
+	#define SUSPICIOUS_OPCODE( name ) ((void) 0)
+#else
+	#define SUSPICIOUS_OPCODE( name ) debug_printf( "SPC: suspicious opcode: " name "\n" )
+#endif
+
+#define CPU_READ( time, offset, addr )\
+	cpu_read( addr, time + offset )
+
+#define CPU_WRITE( time, offset, addr, data )\
+	cpu_write( data, addr, time + offset )
+
+#if SPC_MORE_ACCURACY
+	#define CPU_READ_TIMER( time, offset, addr, out )\
+		{ out = CPU_READ( time, offset, addr ); }
+
+#else
+	// timers are by far the most common thing read from dp
+	#define CPU_READ_TIMER( time, offset, addr_, out )\
+	{\
+		rel_time_t adj_time = time + offset;\
+		int dp_addr = addr_;\
+		int ti = dp_addr - (r_t0out + 0xF0);\
+		if ( (unsigned) ti < timer_count )\
+		{\
+			Timer* t = &m.timers [ti];\
+			if ( adj_time >= t->next_time )\
+				t = run_timer_( t, adj_time );\
+			out = t->counter;\
+			t->counter = 0;\
+		}\
+		else\
+		{\
+			out = ram [dp_addr];\
+			int i = dp_addr - 0xF0;\
+			if ( (unsigned) i < 0x10 )\
+				out = cpu_read_smp_reg( i, adj_time );\
+		}\
+	}
+#endif
+
+#define TIME_ADJ( n ) (n)
+
+#define READ_TIMER( time, addr, out ) CPU_READ_TIMER( rel_time, TIME_ADJ(time), (addr), out )
+#define READ( time, addr ) CPU_READ ( rel_time, TIME_ADJ(time), (addr) )
+#define WRITE( time, addr, data ) CPU_WRITE( rel_time, TIME_ADJ(time), (addr), (data) )
+
+#define DP_ADDR( addr ) (dp + (addr))
+
+#define READ_DP_TIMER( time, addr, out ) CPU_READ_TIMER( rel_time, TIME_ADJ(time), DP_ADDR( addr ), out )
+#define READ_DP( time, addr ) READ ( time, DP_ADDR( addr ) )
+#define WRITE_DP( time, addr, data ) WRITE( time, DP_ADDR( addr ), data )
+
+#define READ_PROG16( addr ) GET_LE16( ram + (addr) )
+
+#define SET_PC( n ) (pc = ram + (n))
+#define GET_PC() (pc - ram)
+#define READ_PC( pc ) (*(pc))
+#define READ_PC16( pc ) GET_LE16( pc )
+
+// TODO: remove non-wrapping versions?
+#define SPC_NO_SP_WRAPAROUND 0
+
+#define SET_SP( v ) (sp = ram + 0x101 + (v))
+#define GET_SP() (sp - 0x101 - ram)
+
+#if SPC_NO_SP_WRAPAROUND
+#define PUSH16( v ) (sp -= 2, SET_LE16( sp, v ))
+#define PUSH( v ) (void) (*--sp = (uint8_t) (v))
+#define POP( out ) (void) ((out) = *sp++)
+
+#else
+#define PUSH16( data )\
+{\
+	int addr = (sp -= 2) - ram;\
+	if ( addr > 0x100 )\
+	{\
+		SET_LE16( sp, data );\
+	}\
+	else\
+	{\
+		ram [(uint8_t) addr + 0x100] = (uint8_t) data;\
+		sp [1] = (uint8_t) (data >> 8);\
+		sp += 0x100;\
+	}\
+}
+
+#define PUSH( data )\
+{\
+	*--sp = (uint8_t) (data);\
+	if ( sp - ram == 0x100 )\
+		sp += 0x100;\
+}
+
+#define POP( out )\
+{\
+	out = *sp++;\
+	if ( sp - ram == 0x201 )\
+	{\
+		out = sp [-0x101];\
+		sp -= 0x100;\
+	}\
+}
+
+#endif
+
+#define MEM_BIT( rel ) CPU_mem_bit( pc, rel_time + rel )
+
+unsigned Snes_Spc::CPU_mem_bit( uint8_t const* pc, rel_time_t rel_time )
+{
+	unsigned addr = READ_PC16( pc );
+	unsigned t = READ( 0, addr & 0x1FFF ) >> (addr >> 13);
+	return t << 8 & 0x100;
+}
+
+//// Status flag handling
+
+// Hex value in name to clarify code and bit shifting.
+// Flag stored in indicated variable during emulation
+int const n80 = 0x80; // nz
+int const v40 = 0x40; // psw
+int const p20 = 0x20; // dp
+int const b10 = 0x10; // psw
+int const h08 = 0x08; // psw
+int const i04 = 0x04; // psw
+int const z02 = 0x02; // nz
+int const c01 = 0x01; // c
+
+int const nz_neg_mask = 0x880; // either bit set indicates N flag set
+
+#define GET_PSW( out )\
+{\
+	out = psw & ~(n80 | p20 | z02 | c01);\
+	out |= c >> 8 & c01;\
+	out |= dp >> 3 & p20;\
+	out |= ((nz >> 4) | nz) & n80;\
+	if ( !(uint8_t) nz ) out |= z02;\
+}
+
+#define SET_PSW( in )\
+{\
+	psw = in;\
+	c = in << 8;\
+	dp = in << 3 & 0x100;\
+	nz = (in << 4 & 0x800) | (~in & z02);\
+}
+
+SPC_CPU_RUN_FUNC
+{
+	uint8_t* const ram = RAM;
+	int a = m.cpu_regs.a;
+	int x = m.cpu_regs.x;
+	int y = m.cpu_regs.y;
+	uint8_t const* pc;
+	uint8_t* sp;
+	int psw;
+	int c;
+	int nz;
+	int dp;
+	
+	SET_PC( m.cpu_regs.pc );
+	SET_SP( m.cpu_regs.sp );
+	SET_PSW( m.cpu_regs.psw );
+	
+	goto loop;
+	
+	
+	// Main loop
+	
+cbranch_taken_loop:
+	pc += *(BOOST::int8_t const*) pc;
+inc_pc_loop:
+	pc++;
+loop:
+{
+	unsigned opcode;
+	unsigned data;
+	
+	check( (unsigned) a < 0x100 );
+	check( (unsigned) x < 0x100 );
+	check( (unsigned) y < 0x100 );
+	
+	opcode = *pc;
+	if ( (rel_time += m.cycle_table [opcode]) > 0 )
+		goto out_of_time;
+	
+	#ifdef SPC_CPU_OPCODE_HOOK
+		SPC_CPU_OPCODE_HOOK( GET_PC(), opcode );
+	#endif
+	/*
+	//SUB_CASE_COUNTER( 1 );
+	#define PROFILE_TIMER_LOOP( op, addr, len )\
+	if ( opcode == op )\
+	{\
+		int cond = (unsigned) ((addr) - 0xFD) < 3 &&\
+				pc [len] == 0xF0 && pc [len+1] == 0xFE - len;\
+		SUB_CASE_COUNTER( op && cond );\
+	}
+	
+	PROFILE_TIMER_LOOP( 0xEC, GET_LE16( pc + 1 ), 3 );
+	PROFILE_TIMER_LOOP( 0xEB, pc [1], 2 );
+	PROFILE_TIMER_LOOP( 0xE4, pc [1], 2 );
+	*/
+	
+	// TODO: if PC is at end of memory, this will get wrong operand (very obscure)
+	data = *++pc;
+	switch ( opcode )
+	{
+	
+// Common instructions
+
+#define BRANCH( cond )\
+{\
+	pc++;\
+	pc += (BOOST::int8_t) data;\
+	if ( cond )\
+		goto loop;\
+	pc -= (BOOST::int8_t) data;\
+	rel_time -= 2;\
+	goto loop;\
+}
+
+	case 0xF0: // BEQ
+		BRANCH( !(uint8_t) nz ) // 89% taken
+	
+	case 0xD0: // BNE
+		BRANCH( (uint8_t) nz )
+	
+	case 0x3F:{// CALL
+		int old_addr = GET_PC() + 2;
+		SET_PC( READ_PC16( pc ) );
+		PUSH16( old_addr );
+		goto loop;
+	}
+	
+	case 0x6F:// RET
+		#if SPC_NO_SP_WRAPAROUND
+		{
+			SET_PC( GET_LE16( sp ) );
+			sp += 2;
+		}
+		#else
+		{
+			int addr = sp - ram;
+			SET_PC( GET_LE16( sp ) );
+			sp += 2;
+			if ( addr < 0x1FF )
+				goto loop;
+			
+			SET_PC( sp [-0x101] * 0x100 + ram [(uint8_t) addr + 0x100] );
+			sp -= 0x100;
+		}
+		#endif
+		goto loop;
+	
+	case 0xE4: // MOV a,dp
+		++pc;
+		// 80% from timer
+		READ_DP_TIMER( 0, data, a = nz );
+		goto loop;
+	
+	case 0xFA:{// MOV dp,dp
+		int temp;
+		READ_DP_TIMER( -2, data, temp );
+		data = temp + no_read_before_write ;
+	}
+	// fall through
+	case 0x8F:{// MOV dp,#imm
+		int temp = READ_PC( pc + 1 );
+		pc += 2;
+		
+		#if !SPC_MORE_ACCURACY
+		{
+			int i = dp + temp;
+			ram [i] = (uint8_t) data;
+			i -= 0xF0;
+			if ( (unsigned) i < 0x10 ) // 76%
+			{
+				REGS [i] = (uint8_t) data;
+				
+				// Registers other than $F2 and $F4-$F7
+				//if ( i != 2 && i != 4 && i != 5 && i != 6 && i != 7 )
+				if ( ((~0x2F00 << (bits_in_int - 16)) << i) < 0 ) // 12%
+					cpu_write_smp_reg( data, rel_time, i );
+			}
+		}
+		#else
+			WRITE_DP( 0, temp, data );
+		#endif
+		goto loop;
+	}
+	
+	case 0xC4: // MOV dp,a
+		++pc;
+		#if !SPC_MORE_ACCURACY
+		{
+			int i = dp + data;
+			ram [i] = (uint8_t) a;
+			i -= 0xF0;
+			if ( (unsigned) i < 0x10 ) // 39%
+			{
+				unsigned sel = i - 2;
+				REGS [i] = (uint8_t) a;
+				
+				if ( sel == 1 ) // 51% $F3
+					dsp_write( a, rel_time );
+				else if ( sel > 1 ) // 1% not $F2 or $F3
+					cpu_write_smp_reg_( a, rel_time, i );
+			}
+		}
+		#else
+			WRITE_DP( 0, data, a );
+		#endif
+		goto loop;
+	
+#define CASE( n ) case n:
+
+// Define common address modes based on opcode for immediate mode. Execution
+// ends with data set to the address of the operand.
+#define ADDR_MODES_( op )\
+	CASE( op - 0x02 ) /* (X) */\
+		data = x + dp;\
+		pc--;\
+		goto end_##op;\
+	CASE( op + 0x0F ) /* (dp)+Y */\
+		data = READ_PROG16( data + dp ) + y;\
+		goto end_##op;\
+	CASE( op - 0x01 ) /* (dp+X) */\
+		data = READ_PROG16( ((uint8_t) (data + x)) + dp );\
+		goto end_##op;\
+	CASE( op + 0x0E ) /* abs+Y */\
+		data += y;\
+		goto abs_##op;\
+	CASE( op + 0x0D ) /* abs+X */\
+		data += x;\
+	CASE( op - 0x03 ) /* abs */\
+	abs_##op:\
+		data += 0x100 * READ_PC( ++pc );\
+		goto end_##op;\
+	CASE( op + 0x0C ) /* dp+X */\
+		data = (uint8_t) (data + x);
+
+#define ADDR_MODES_NO_DP( op )\
+	ADDR_MODES_( op )\
+		data += dp;\
+	end_##op:
+
+#define ADDR_MODES( op )\
+	ADDR_MODES_( op )\
+	CASE( op - 0x04 ) /* dp */\
+		data += dp;\
+	end_##op:
+
+// 1. 8-bit Data Transmission Commands. Group I
+
+	ADDR_MODES_NO_DP( 0xE8 ) // MOV A,addr
+		a = nz = READ( 0, data );
+		goto inc_pc_loop;
+	
+	case 0xBF:{// MOV A,(X)+
+		int temp = x + dp;
+		x = (uint8_t) (x + 1);
+		a = nz = READ( -1, temp );
+		goto loop;
+	}
+	
+	case 0xE8: // MOV A,imm
+		a = data;
+		nz = data;
+		goto inc_pc_loop;
+	
+	case 0xF9: // MOV X,dp+Y
+		data = (uint8_t) (data + y);
+	case 0xF8: // MOV X,dp
+		READ_DP_TIMER( 0, data, x = nz );
+		goto inc_pc_loop;
+	
+	case 0xE9: // MOV X,abs
+		data = READ_PC16( pc );
+		++pc;
+		data = READ( 0, data );
+	case 0xCD: // MOV X,imm
+		x = data;
+		nz = data;
+		goto inc_pc_loop;
+	
+	case 0xFB: // MOV Y,dp+X
+		data = (uint8_t) (data + x);
+	case 0xEB: // MOV Y,dp
+		// 70% from timer
+		pc++;
+		READ_DP_TIMER( 0, data, y = nz );
+		goto loop;
+	
+	case 0xEC:{// MOV Y,abs
+		int temp = READ_PC16( pc );
+		pc += 2;
+		READ_TIMER( 0, temp, y = nz );
+		//y = nz = READ( 0, temp );
+		goto loop;
+	}
+	
+	case 0x8D: // MOV Y,imm
+		y = data;
+		nz = data;
+		goto inc_pc_loop;
+	
+// 2. 8-BIT DATA TRANSMISSION COMMANDS, GROUP 2
+
+	ADDR_MODES_NO_DP( 0xC8 ) // MOV addr,A
+		WRITE( 0, data, a );
+		goto inc_pc_loop;
+	
+	{
+		int temp;
+	case 0xCC: // MOV abs,Y
+		temp = y;
+		goto mov_abs_temp;
+	case 0xC9: // MOV abs,X
+		temp = x;
+	mov_abs_temp:
+		WRITE( 0, READ_PC16( pc ), temp );
+		pc += 2;
+		goto loop;
+	}
+	
+	case 0xD9: // MOV dp+Y,X
+		data = (uint8_t) (data + y);
+	case 0xD8: // MOV dp,X
+		WRITE( 0, data + dp, x );
+		goto inc_pc_loop;
+	
+	case 0xDB: // MOV dp+X,Y
+		data = (uint8_t) (data + x);
+	case 0xCB: // MOV dp,Y
+		WRITE( 0, data + dp, y );
+		goto inc_pc_loop;
+
+// 3. 8-BIT DATA TRANSMISSIN COMMANDS, GROUP 3.
+	
+	case 0x7D: // MOV A,X
+		a = x;
+		nz = x;
+		goto loop;
+	
+	case 0xDD: // MOV A,Y
+		a = y;
+		nz = y;
+		goto loop;
+	
+	case 0x5D: // MOV X,A
+		x = a;
+		nz = a;
+		goto loop;
+	
+	case 0xFD: // MOV Y,A
+		y = a;
+		nz = a;
+		goto loop;
+	
+	case 0x9D: // MOV X,SP
+		x = nz = GET_SP();
+		goto loop;
+	
+	case 0xBD: // MOV SP,X
+		SET_SP( x );
+		goto loop;
+	
+	//case 0xC6: // MOV (X),A (handled by MOV addr,A in group 2)
+	
+	case 0xAF: // MOV (X)+,A
+		WRITE_DP( 0, x, a + no_read_before_write );
+		x++;
+		goto loop;
+	
+// 5. 8-BIT LOGIC OPERATION COMMANDS
+	
+#define LOGICAL_OP( op, func )\
+	ADDR_MODES( op ) /* addr */\
+		data = READ( 0, data );\
+	case op: /* imm */\
+		nz = a func##= data;\
+		goto inc_pc_loop;\
+	{ unsigned addr;\
+	case op + 0x11: /* X,Y */\
+		data = READ_DP( -2, y );\
+		addr = x + dp;\
+		goto addr_##op;\
+	case op + 0x01: /* dp,dp */\
+		data = READ_DP( -3, data );\
+	case op + 0x10:{/*dp,imm*/\
+		uint8_t const* addr2 = pc + 1;\
+		pc += 2;\
+		addr = READ_PC( addr2 ) + dp;\
+	}\
+	addr_##op:\
+		nz = data func READ( -1, addr );\
+		WRITE( 0, addr, nz );\
+		goto loop;\
+	}
+	
+	LOGICAL_OP( 0x28, & ); // AND
+	
+	LOGICAL_OP( 0x08, | ); // OR
+	
+	LOGICAL_OP( 0x48, ^ ); // EOR
+	
+// 4. 8-BIT ARITHMETIC OPERATION COMMANDS
+
+	ADDR_MODES( 0x68 ) // CMP addr
+		data = READ( 0, data );
+	case 0x68: // CMP imm
+		nz = a - data;
+		c = ~nz;
+		nz &= 0xFF;
+		goto inc_pc_loop;
+	
+	case 0x79: // CMP (X),(Y)
+		data = READ_DP( -2, y );
+		nz = READ_DP( -1, x ) - data;
+		c = ~nz;
+		nz &= 0xFF;
+		goto loop;
+	
+	case 0x69: // CMP dp,dp
+		data = READ_DP( -3, data );
+	case 0x78: // CMP dp,imm
+		nz = READ_DP( -1, READ_PC( ++pc ) ) - data;
+		c = ~nz;
+		nz &= 0xFF;
+		goto inc_pc_loop;
+	
+	case 0x3E: // CMP X,dp
+		data += dp;
+		goto cmp_x_addr;
+	case 0x1E: // CMP X,abs
+		data = READ_PC16( pc );
+		pc++;
+	cmp_x_addr:
+		data = READ( 0, data );
+	case 0xC8: // CMP X,imm
+		nz = x - data;
+		c = ~nz;
+		nz &= 0xFF;
+		goto inc_pc_loop;
+	
+	case 0x7E: // CMP Y,dp
+		data += dp;
+		goto cmp_y_addr;
+	case 0x5E: // CMP Y,abs
+		data = READ_PC16( pc );
+		pc++;
+	cmp_y_addr:
+		data = READ( 0, data );
+	case 0xAD: // CMP Y,imm
+		nz = y - data;
+		c = ~nz;
+		nz &= 0xFF;
+		goto inc_pc_loop;
+	
+	{
+		int addr;
+	case 0xB9: // SBC (x),(y)
+	case 0x99: // ADC (x),(y)
+		pc--; // compensate for inc later
+		data = READ_DP( -2, y );
+		addr = x + dp;
+		goto adc_addr;
+	case 0xA9: // SBC dp,dp
+	case 0x89: // ADC dp,dp
+		data = READ_DP( -3, data );
+	case 0xB8: // SBC dp,imm
+	case 0x98: // ADC dp,imm
+		addr = READ_PC( ++pc ) + dp;
+	adc_addr:
+		nz = READ( -1, addr );
+		goto adc_data;
+		
+// catch ADC and SBC together, then decode later based on operand
+#undef CASE
+#define CASE( n ) case n: case (n) + 0x20:
+	ADDR_MODES( 0x88 ) // ADC/SBC addr
+		data = READ( 0, data );
+	case 0xA8: // SBC imm
+	case 0x88: // ADC imm
+		addr = -1; // A
+		nz = a;
+	adc_data: {
+		int flags;
+		if ( opcode >= 0xA0 ) // SBC
+			data ^= 0xFF;
+		
+		flags = data ^ nz;
+		nz += data + (c >> 8 & 1);
+		flags ^= nz;
+		
+		psw = (psw & ~(v40 | h08)) |
+				(flags >> 1 & h08) |
+				((flags + 0x80) >> 2 & v40);
+		c = nz;
+		if ( addr < 0 )
+		{
+			a = (uint8_t) nz;
+			goto inc_pc_loop;
+		}
+		WRITE( 0, addr, /*(uint8_t)*/ nz );
+		goto inc_pc_loop;
+	}
+	
+	}
+	
+// 6. ADDITION & SUBTRACTION COMMANDS
+
+#define INC_DEC_REG( reg, op )\
+		nz = reg op;\
+		reg = (uint8_t) nz;\
+		goto loop;
+
+	case 0xBC: INC_DEC_REG( a, + 1 ) // INC A
+	case 0x3D: INC_DEC_REG( x, + 1 ) // INC X
+	case 0xFC: INC_DEC_REG( y, + 1 ) // INC Y
+	
+	case 0x9C: INC_DEC_REG( a, - 1 ) // DEC A
+	case 0x1D: INC_DEC_REG( x, - 1 ) // DEC X
+	case 0xDC: INC_DEC_REG( y, - 1 ) // DEC Y
+
+	case 0x9B: // DEC dp+X
+	case 0xBB: // INC dp+X
+		data = (uint8_t) (data + x);
+	case 0x8B: // DEC dp
+	case 0xAB: // INC dp
+		data += dp;
+		goto inc_abs;
+	case 0x8C: // DEC abs
+	case 0xAC: // INC abs
+		data = READ_PC16( pc );
+		pc++;
+	inc_abs:
+		nz = (opcode >> 4 & 2) - 1;
+		nz += READ( -1, data );
+		WRITE( 0, data, /*(uint8_t)*/ nz );
+		goto inc_pc_loop;
+	
+// 7. SHIFT, ROTATION COMMANDS
+
+	case 0x5C: // LSR A
+		c = 0;
+	case 0x7C:{// ROR A
+		nz = (c >> 1 & 0x80) | (a >> 1);
+		c = a << 8;
+		a = nz;
+		goto loop;
+	}
+	
+	case 0x1C: // ASL A
+		c = 0;
+	case 0x3C:{// ROL A
+		int temp = c >> 8 & 1;
+		c = a << 1;
+		nz = c | temp;
+		a = (uint8_t) nz;
+		goto loop;
+	}
+	
+	case 0x0B: // ASL dp
+		c = 0;
+		data += dp;
+		goto rol_mem;
+	case 0x1B: // ASL dp+X
+		c = 0;
+	case 0x3B: // ROL dp+X
+		data = (uint8_t) (data + x);
+	case 0x2B: // ROL dp
+		data += dp;
+		goto rol_mem;
+	case 0x0C: // ASL abs
+		c = 0;
+	case 0x2C: // ROL abs
+		data = READ_PC16( pc );
+		pc++;
+	rol_mem:
+		nz = c >> 8 & 1;
+		nz |= (c = READ( -1, data ) << 1);
+		WRITE( 0, data, /*(uint8_t)*/ nz );
+		goto inc_pc_loop;
+	
+	case 0x4B: // LSR dp
+		c = 0;
+		data += dp;
+		goto ror_mem;
+	case 0x5B: // LSR dp+X
+		c = 0;
+	case 0x7B: // ROR dp+X
+		data = (uint8_t) (data + x);
+	case 0x6B: // ROR dp
+		data += dp;
+		goto ror_mem;
+	case 0x4C: // LSR abs
+		c = 0;
+	case 0x6C: // ROR abs
+		data = READ_PC16( pc );
+		pc++;
+	ror_mem: {
+		int temp = READ( -1, data );
+		nz = (c >> 1 & 0x80) | (temp >> 1);
+		c = temp << 8;
+		WRITE( 0, data, nz );
+		goto inc_pc_loop;
+	}
+
+	case 0x9F: // XCN
+		nz = a = (a >> 4) | (uint8_t) (a << 4);
+		goto loop;
+
+// 8. 16-BIT TRANSMISION COMMANDS
+
+	case 0xBA: // MOVW YA,dp
+		a = READ_DP( -2, data );
+		nz = (a & 0x7F) | (a >> 1);
+		y = READ_DP( 0, (uint8_t) (data + 1) );
+		nz |= y;
+		goto inc_pc_loop;
+	
+	case 0xDA: // MOVW dp,YA
+		WRITE_DP( -1, data, a );
+		WRITE_DP( 0, (uint8_t) (data + 1), y + no_read_before_write );
+		goto inc_pc_loop;
+	
+// 9. 16-BIT OPERATION COMMANDS
+
+	case 0x3A: // INCW dp
+	case 0x1A:{// DECW dp
+		int temp;
+		// low byte
+		data += dp;
+		temp = READ( -3, data );
+		temp += (opcode >> 4 & 2) - 1; // +1 for INCW, -1 for DECW
+		nz = ((temp >> 1) | temp) & 0x7F;
+		WRITE( -2, data, /*(uint8_t)*/ temp );
+		
+		// high byte
+		data = (uint8_t) (data + 1) + dp;
+		temp = (uint8_t) ((temp >> 8) + READ( -1, data ));
+		nz |= temp;
+		WRITE( 0, data, temp );
+		
+		goto inc_pc_loop;
+	}
+		
+	case 0x7A: // ADDW YA,dp
+	case 0x9A:{// SUBW YA,dp
+		int lo = READ_DP( -2, data );
+		int hi = READ_DP( 0, (uint8_t) (data + 1) );
+		int result;
+		int flags;
+		
+		if ( opcode == 0x9A ) // SUBW
+		{
+			lo = (lo ^ 0xFF) + 1;
+			hi ^= 0xFF;
+		}
+		
+		lo += a;
+		result = y + hi + (lo >> 8);
+		flags = hi ^ y ^ result;
+		
+		psw = (psw & ~(v40 | h08)) |
+				(flags >> 1 & h08) |
+				((flags + 0x80) >> 2 & v40);
+		c = result;
+		a = (uint8_t) lo;
+		result = (uint8_t) result;
+		y = result;
+		nz = (((lo >> 1) | lo) & 0x7F) | result;
+		
+		goto inc_pc_loop;
+	}
+	
+	case 0x5A: { // CMPW YA,dp
+		int temp = a - READ_DP( -1, data );
+		nz = ((temp >> 1) | temp) & 0x7F;
+		temp = y + (temp >> 8);
+		temp -= READ_DP( 0, (uint8_t) (data + 1) );
+		nz |= temp;
+		c = ~temp;
+		nz &= 0xFF;
+		goto inc_pc_loop;
+	}
+	
+// 10. MULTIPLICATION & DIVISON COMMANDS
+
+	case 0xCF: { // MUL YA
+		unsigned temp = y * a;
+		a = (uint8_t) temp;
+		nz = ((temp >> 1) | temp) & 0x7F;
+		y = temp >> 8;
+		nz |= y;
+		goto loop;
+	}
+	
+	case 0x9E: // DIV YA,X
+	{
+		unsigned ya = y * 0x100 + a;
+		
+		psw &= ~(h08 | v40);
+		
+		if ( y >= x )
+			psw |= v40;
+		
+		if ( (y & 15) >= (x & 15) )
+			psw |= h08;
+		
+		if ( y < x * 2 )
+		{
+			a = ya / x;
+			y = ya - a * x;
+		}
+		else
+		{
+			a = 255 - (ya - x * 0x200) / (256 - x);
+			y = x + (ya - x * 0x200) % (256 - x);
+		}
+		
+		nz = (uint8_t) a;
+		a = (uint8_t) a;
+		
+		goto loop;
+	}
+	
+// 11. DECIMAL COMPENSATION COMMANDS
+	
+	case 0xDF: // DAA
+		SUSPICIOUS_OPCODE( "DAA" );
+		if ( a > 0x99 || c & 0x100 )
+		{
+			a += 0x60;
+			c = 0x100;
+		}
+		
+		if ( (a & 0x0F) > 9 || psw & h08 )
+			a += 0x06;
+		
+		nz = a;
+		a = (uint8_t) a;
+		goto loop;
+	
+	case 0xBE: // DAS
+		SUSPICIOUS_OPCODE( "DAS" );
+		if ( a > 0x99 || !(c & 0x100) )
+		{
+			a -= 0x60;
+			c = 0;
+		}
+		
+		if ( (a & 0x0F) > 9 || !(psw & h08) )
+			a -= 0x06;
+		
+		nz = a;
+		a = (uint8_t) a;
+		goto loop;
+	
+// 12. BRANCHING COMMANDS
+
+	case 0x2F: // BRA rel
+		pc += (BOOST::int8_t) data;
+		goto inc_pc_loop;
+	
+	case 0x30: // BMI
+		BRANCH( (nz & nz_neg_mask) )
+	
+	case 0x10: // BPL
+		BRANCH( !(nz & nz_neg_mask) )
+	
+	case 0xB0: // BCS
+		BRANCH( c & 0x100 )
+	
+	case 0x90: // BCC
+		BRANCH( !(c & 0x100) )
+	
+	case 0x70: // BVS
+		BRANCH( psw & v40 )
+	
+	case 0x50: // BVC
+		BRANCH( !(psw & v40) )
+	
+	#define CBRANCH( cond )\
+	{\
+		pc++;\
+		if ( cond )\
+			goto cbranch_taken_loop;\
+		rel_time -= 2;\
+		goto inc_pc_loop;\
+	}
+	
+	case 0x03: // BBS dp.bit,rel
+	case 0x23:
+	case 0x43:
+	case 0x63:
+	case 0x83:
+	case 0xA3:
+	case 0xC3:
+	case 0xE3:
+		CBRANCH( READ_DP( -4, data ) >> (opcode >> 5) & 1 )
+	
+	case 0x13: // BBC dp.bit,rel
+	case 0x33:
+	case 0x53:
+	case 0x73:
+	case 0x93:
+	case 0xB3:
+	case 0xD3:
+	case 0xF3:
+		CBRANCH( !(READ_DP( -4, data ) >> (opcode >> 5) & 1) )
+	
+	case 0xDE: // CBNE dp+X,rel
+		data = (uint8_t) (data + x);
+		// fall through
+	case 0x2E:{// CBNE dp,rel
+		int temp;
+		// 61% from timer
+		READ_DP_TIMER( -4, data, temp );
+		CBRANCH( temp != a )
+	}
+	
+	case 0x6E: { // DBNZ dp,rel
+		unsigned temp = READ_DP( -4, data ) - 1;
+		WRITE_DP( -3, (uint8_t) data, /*(uint8_t)*/ temp + no_read_before_write );
+		CBRANCH( temp )
+	}
+	
+	case 0xFE: // DBNZ Y,rel
+		y = (uint8_t) (y - 1);
+		BRANCH( y )
+	
+	case 0x1F: // JMP [abs+X]
+		SET_PC( READ_PC16( pc ) + x );
+		// fall through
+	case 0x5F: // JMP abs
+		SET_PC( READ_PC16( pc ) );
+		goto loop;
+	
+// 13. SUB-ROUTINE CALL RETURN COMMANDS
+	
+	case 0x0F:{// BRK
+		int temp;
+		int ret_addr = GET_PC();
+		SUSPICIOUS_OPCODE( "BRK" );
+		SET_PC( READ_PROG16( 0xFFDE ) ); // vector address verified
+		PUSH16( ret_addr );
+		GET_PSW( temp );
+		psw = (psw | b10) & ~i04;
+		PUSH( temp );
+		goto loop;
+	}
+	
+	case 0x4F:{// PCALL offset
+		int ret_addr = GET_PC() + 1;
+		SET_PC( 0xFF00 | data );
+		PUSH16( ret_addr );
+		goto loop;
+	}
+	
+	case 0x01: // TCALL n
+	case 0x11:
+	case 0x21:
+	case 0x31:
+	case 0x41:
+	case 0x51:
+	case 0x61:
+	case 0x71:
+	case 0x81:
+	case 0x91:
+	case 0xA1:
+	case 0xB1:
+	case 0xC1:
+	case 0xD1:
+	case 0xE1:
+	case 0xF1: {
+		int ret_addr = GET_PC();
+		SET_PC( READ_PROG16( 0xFFDE - (opcode >> 3) ) );
+		PUSH16( ret_addr );
+		goto loop;
+	}
+	
+// 14. STACK OPERATION COMMANDS
+
+	{
+		int temp;
+	case 0x7F: // RET1
+		temp = *sp;
+		SET_PC( GET_LE16( sp + 1 ) );
+		sp += 3;
+		goto set_psw;
+	case 0x8E: // POP PSW
+		POP( temp );
+	set_psw:
+		SET_PSW( temp );
+		goto loop;
+	}
+	
+	case 0x0D: { // PUSH PSW
+		int temp;
+		GET_PSW( temp );
+		PUSH( temp );
+		goto loop;
+	}
+
+	case 0x2D: // PUSH A
+		PUSH( a );
+		goto loop;
+	
+	case 0x4D: // PUSH X
+		PUSH( x );
+		goto loop;
+	
+	case 0x6D: // PUSH Y
+		PUSH( y );
+		goto loop;
+	
+	case 0xAE: // POP A
+		POP( a );
+		goto loop;
+	
+	case 0xCE: // POP X
+		POP( x );
+		goto loop;
+	
+	case 0xEE: // POP Y
+		POP( y );
+		goto loop;
+	
+// 15. BIT OPERATION COMMANDS
+
+	case 0x02: // SET1
+	case 0x22:
+	case 0x42:
+	case 0x62:
+	case 0x82:
+	case 0xA2:
+	case 0xC2:
+	case 0xE2:
+	case 0x12: // CLR1
+	case 0x32:
+	case 0x52:
+	case 0x72:
+	case 0x92:
+	case 0xB2:
+	case 0xD2:
+	case 0xF2: {
+		int bit = 1 << (opcode >> 5);
+		int mask = ~bit;
+		if ( opcode & 0x10 )
+			bit = 0;
+		data += dp;
+		WRITE( 0, data, (READ( -1, data ) & mask) | bit );
+		goto inc_pc_loop;
+	}
+		
+	case 0x0E: // TSET1 abs
+	case 0x4E: // TCLR1 abs
+		data = READ_PC16( pc );
+		pc += 2;
+		{
+			unsigned temp = READ( -2, data );
+			nz = (uint8_t) (a - temp);
+			temp &= ~a;
+			if ( opcode == 0x0E )
+				temp |= a;
+			WRITE( 0, data, temp );
+		}
+		goto loop;
+	
+	case 0x4A: // AND1 C,mem.bit
+		c &= MEM_BIT( 0 );
+		pc += 2;
+		goto loop;
+	
+	case 0x6A: // AND1 C,/mem.bit
+		c &= ~MEM_BIT( 0 );
+		pc += 2;
+		goto loop;
+	
+	case 0x0A: // OR1 C,mem.bit
+		c |= MEM_BIT( -1 );
+		pc += 2;
+		goto loop;
+	
+	case 0x2A: // OR1 C,/mem.bit
+		c |= ~MEM_BIT( -1 );
+		pc += 2;
+		goto loop;
+	
+	case 0x8A: // EOR1 C,mem.bit
+		c ^= MEM_BIT( -1 );
+		pc += 2;
+		goto loop;
+	
+	case 0xEA: // NOT1 mem.bit
+		data = READ_PC16( pc );
+		pc += 2;
+		{
+			unsigned temp = READ( -1, data & 0x1FFF );
+			temp ^= 1 << (data >> 13);
+			WRITE( 0, data & 0x1FFF, temp );
+		}
+		goto loop;
+	
+	case 0xCA: // MOV1 mem.bit,C
+		data = READ_PC16( pc );
+		pc += 2;
+		{
+			unsigned temp = READ( -2, data & 0x1FFF );
+			unsigned bit = data >> 13;
+			temp = (temp & ~(1 << bit)) | ((c >> 8 & 1) << bit);
+			WRITE( 0, data & 0x1FFF, temp + no_read_before_write );
+		}
+		goto loop;
+	
+	case 0xAA: // MOV1 C,mem.bit
+		c = MEM_BIT( 0 );
+		pc += 2;
+		goto loop;
+	
+// 16. PROGRAM PSW FLAG OPERATION COMMANDS
+
+	case 0x60: // CLRC
+		c = 0;
+		goto loop;
+		
+	case 0x80: // SETC
+		c = ~0;
+		goto loop;
+	
+	case 0xED: // NOTC
+		c ^= 0x100;
+		goto loop;
+		
+	case 0xE0: // CLRV
+		psw &= ~(v40 | h08);
+		goto loop;
+	
+	case 0x20: // CLRP
+		dp = 0;
+		goto loop;
+	
+	case 0x40: // SETP
+		dp = 0x100;
+		goto loop;
+	
+	case 0xA0: // EI
+		SUSPICIOUS_OPCODE( "EI" );
+		psw |= i04;
+		goto loop;
+	
+	case 0xC0: // DI
+		SUSPICIOUS_OPCODE( "DI" );
+		psw &= ~i04;
+		goto loop;
+	
+// 17. OTHER COMMANDS
+
+	case 0x00: // NOP
+		goto loop;
+	
+	case 0xFF:{// STOP
+		// handle PC wrap-around
+		unsigned addr = GET_PC() - 1;
+		if ( addr >= 0x10000 )
+		{
+			addr &= 0xFFFF;
+			SET_PC( addr );
+			debug_printf( "SPC: PC wrapped around\n" );
+			goto loop;
+		}
+	}
+	// fall through
+	case 0xEF: // SLEEP
+		SUSPICIOUS_OPCODE( "STOP/SLEEP" );
+		--pc;
+		rel_time = 0;
+		m.cpu_error = "SPC emulation error";
+		goto stop;
+	} // switch
+	
+	assert( 0 ); // catch any unhandled instructions
+} 
+out_of_time:
+	rel_time -= m.cycle_table [*pc]; // undo partial execution of opcode
+stop:
+	
+	// Uncache registers
+	if ( GET_PC() >= 0x10000 )
+		debug_printf( "SPC: PC wrapped around\n" );
+	m.cpu_regs.pc = (uint16_t) GET_PC();
+	m.cpu_regs.sp = ( uint8_t) GET_SP();
+	m.cpu_regs.a = ( uint8_t) a;
+	m.cpu_regs.x = ( uint8_t) x;
+	m.cpu_regs.y = ( uint8_t) y;
+	{
+		int temp;
+		GET_PSW( temp );
+		m.cpu_regs.psw = (uint8_t) temp;
+	}
+}
+SPC_CPU_RUN_FUNC_END

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Dsp.cpp Added

@@ -0,0 +1,703 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Spc_Dsp.h"
+
+#include "blargg_endian.h"
+#include <string.h>
+
+/* Copyright (C) 2007 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+#ifdef BLARGG_ENABLE_OPTIMIZER
+	#include BLARGG_ENABLE_OPTIMIZER
+#endif
+
+#if INT_MAX < 0x7FFFFFFF
+	#error "Requires that int type have at least 32 bits"
+#endif
+
+
+// TODO: add to blargg_endian.h
+#define GET_LE16SA( addr ) ((BOOST::int16_t) GET_LE16( addr ))
+#define GET_LE16A( addr ) GET_LE16( addr )
+#define SET_LE16A( addr, data ) SET_LE16( addr, data )
+
+static BOOST::uint8_t const initial_regs [Spc_Dsp::register_count] =
+{
+	0x45,0x8B,0x5A,0x9A,0xE4,0x82,0x1B,0x78,0x00,0x00,0xAA,0x96,0x89,0x0E,0xE0,0x80,
+	0x2A,0x49,0x3D,0xBA,0x14,0xA0,0xAC,0xC5,0x00,0x00,0x51,0xBB,0x9C,0x4E,0x7B,0xFF,
+	0xF4,0xFD,0x57,0x32,0x37,0xD9,0x42,0x22,0x00,0x00,0x5B,0x3C,0x9F,0x1B,0x87,0x9A,
+	0x6F,0x27,0xAF,0x7B,0xE5,0x68,0x0A,0xD9,0x00,0x00,0x9A,0xC5,0x9C,0x4E,0x7B,0xFF,
+	0xEA,0x21,0x78,0x4F,0xDD,0xED,0x24,0x14,0x00,0x00,0x77,0xB1,0xD1,0x36,0xC1,0x67,
+	0x52,0x57,0x46,0x3D,0x59,0xF4,0x87,0xA4,0x00,0x00,0x7E,0x44,0x9C,0x4E,0x7B,0xFF,
+	0x75,0xF5,0x06,0x97,0x10,0xC3,0x24,0xBB,0x00,0x00,0x7B,0x7A,0xE0,0x60,0x12,0x0F,
+	0xF7,0x74,0x1C,0xE5,0x39,0x3D,0x73,0xC1,0x00,0x00,0x7A,0xB3,0xFF,0x4E,0x7B,0xFF
+};
+
+// if ( io < -32768 ) io = -32768;
+// if ( io > 32767 ) io = 32767;
+#define CLAMP16( io )\
+{\
+	if ( (int16_t) io != io )\
+		io = (io >> 31) ^ 0x7FFF;\
+}
+
+// Access global DSP register
+#define REG(n) m.regs [r_##n]
+
+// Access voice DSP register
+#define VREG(r,n) r [v_##n]
+
+#define WRITE_SAMPLES( l, r, out ) \
+{\
+	out [0] = l;\
+	out [1] = r;\
+	out += 2;\
+	if ( out >= m.out_end )\
+	{\
+		check( out == m.out_end );\
+		check( m.out_end != &m.extra [extra_size] || \
+			(m.extra <= m.out_begin && m.extra < &m.extra [extra_size]) );\
+		out = m.extra;\
+		m.out_end = &m.extra [extra_size];\
+	}\
+}\
+
+void Spc_Dsp::set_output( sample_t* out, int size )
+{
+	require( (size & 1) == 0 ); // must be even
+	if ( !out )
+	{
+		out = m.extra;
+		size = extra_size;
+	}
+	m.out_begin = out;
+	m.out = out;
+	m.out_end = out + size;
+}
+
+// Volume registers and efb are signed! Easy to forget int8_t cast.
+// Prefixes are to avoid accidental use of locals with same names.
+
+// Interleved gauss table (to improve cache coherency)
+// interleved_gauss [i] = gauss [(i & 1) * 256 + 255 - (i >> 1 & 0xFF)]
+static short const interleved_gauss [512] =
+{
+ 370,1305, 366,1305, 362,1304, 358,1304, 354,1304, 351,1304, 347,1304, 343,1303,
+ 339,1303, 336,1303, 332,1302, 328,1302, 325,1301, 321,1300, 318,1300, 314,1299,
+ 311,1298, 307,1297, 304,1297, 300,1296, 297,1295, 293,1294, 290,1293, 286,1292,
+ 283,1291, 280,1290, 276,1288, 273,1287, 270,1286, 267,1284, 263,1283, 260,1282,
+ 257,1280, 254,1279, 251,1277, 248,1275, 245,1274, 242,1272, 239,1270, 236,1269,
+ 233,1267, 230,1265, 227,1263, 224,1261, 221,1259, 218,1257, 215,1255, 212,1253,
+ 210,1251, 207,1248, 204,1246, 201,1244, 199,1241, 196,1239, 193,1237, 191,1234,
+ 188,1232, 186,1229, 183,1227, 180,1224, 178,1221, 175,1219, 173,1216, 171,1213,
+ 168,1210, 166,1207, 163,1205, 161,1202, 159,1199, 156,1196, 154,1193, 152,1190,
+ 150,1186, 147,1183, 145,1180, 143,1177, 141,1174, 139,1170, 137,1167, 134,1164,
+ 132,1160, 130,1157, 128,1153, 126,1150, 124,1146, 122,1143, 120,1139, 118,1136,
+ 117,1132, 115,1128, 113,1125, 111,1121, 109,1117, 107,1113, 106,1109, 104,1106,
+ 102,1102, 100,1098, 99,1094, 97,1090, 95,1086, 94,1082, 92,1078, 90,1074,
+ 89,1070, 87,1066, 86,1061, 84,1057, 83,1053, 81,1049, 80,1045, 78,1040,
+ 77,1036, 76,1032, 74,1027, 73,1023, 71,1019, 70,1014, 69,1010, 67,1005,
+ 66,1001, 65, 997, 64, 992, 62, 988, 61, 983, 60, 978, 59, 974, 58, 969,
+ 56, 965, 55, 960, 54, 955, 53, 951, 52, 946, 51, 941, 50, 937, 49, 932,
+ 48, 927, 47, 923, 46, 918, 45, 913, 44, 908, 43, 904, 42, 899, 41, 894,
+ 40, 889, 39, 884, 38, 880, 37, 875, 36, 870, 36, 865, 35, 860, 34, 855,
+ 33, 851, 32, 846, 32, 841, 31, 836, 30, 831, 29, 826, 29, 821, 28, 816,
+ 27, 811, 27, 806, 26, 802, 25, 797, 24, 792, 24, 787, 23, 782, 23, 777,
+ 22, 772, 21, 767, 21, 762, 20, 757, 20, 752, 19, 747, 19, 742, 18, 737,
+ 17, 732, 17, 728, 16, 723, 16, 718, 15, 713, 15, 708, 15, 703, 14, 698,
+ 14, 693, 13, 688, 13, 683, 12, 678, 12, 674, 11, 669, 11, 664, 11, 659,
+ 10, 654, 10, 649, 10, 644, 9, 640, 9, 635, 9, 630, 8, 625, 8, 620,
+ 8, 615, 7, 611, 7, 606, 7, 601, 6, 596, 6, 592, 6, 587, 6, 582,
+ 5, 577, 5, 573, 5, 568, 5, 563, 4, 559, 4, 554, 4, 550, 4, 545,
+ 4, 540, 3, 536, 3, 531, 3, 527, 3, 522, 3, 517, 2, 513, 2, 508,
+ 2, 504, 2, 499, 2, 495, 2, 491, 2, 486, 1, 482, 1, 477, 1, 473,
+ 1, 469, 1, 464, 1, 460, 1, 456, 1, 451, 1, 447, 1, 443, 1, 439,
+ 0, 434, 0, 430, 0, 426, 0, 422, 0, 418, 0, 414, 0, 410, 0, 405,
+ 0, 401, 0, 397, 0, 393, 0, 389, 0, 385, 0, 381, 0, 378, 0, 374,
+};
+
+
+//// Counters
+
+#define RATE( rate, div )\
+	(rate >= div ? rate / div * 8 - 1 : rate - 1)
+
+static unsigned const counter_mask [32] =
+{
+	RATE( 2,2), RATE(2048,4), RATE(1536,3),
+	RATE(1280,5), RATE(1024,4), RATE( 768,3),
+	RATE( 640,5), RATE( 512,4), RATE( 384,3),
+	RATE( 320,5), RATE( 256,4), RATE( 192,3),
+	RATE( 160,5), RATE( 128,4), RATE( 96,3),
+	RATE( 80,5), RATE( 64,4), RATE( 48,3),
+	RATE( 40,5), RATE( 32,4), RATE( 24,3),
+	RATE( 20,5), RATE( 16,4), RATE( 12,3),
+	RATE( 10,5), RATE( 8,4), RATE( 6,3),
+	RATE( 5,5), RATE( 4,4), RATE( 3,3),
+	 RATE( 2,4),
+	 RATE( 1,4)
+};
+#undef RATE
+
+inline void Spc_Dsp::init_counter()
+{
+	// counters start out with this synchronization
+	m.counters [0] = 1;
+	m.counters [1] = 0;
+	m.counters [2] = -0x20u;
+	m.counters [3] = 0x0B;
+	
+	int n = 2;
+	for ( int i = 1; i < 32; i++ )
+	{
+		m.counter_select [i] = &m.counters [n];
+		if ( !--n )
+			n = 3;
+	}
+	m.counter_select [ 0] = &m.counters [0];
+	m.counter_select [30] = &m.counters [2];
+}
+
+inline void Spc_Dsp::run_counter( int i )
+{
+	int n = m.counters [i];
+	if ( !(n-- & 7) )
+		n -= 6 - i;
+	m.counters [i] = n;
+}
+
+#define READ_COUNTER( rate )\
+	(*m.counter_select [rate] & counter_mask [rate])
+
+
+//// Emulation
+
+void Spc_Dsp::run( int clock_count )
+{
+	int new_phase = m.phase + clock_count;
+	int count = new_phase >> 5;
+	m.phase = new_phase & 31;
+	if ( !count )
+		return;
+	
+	uint8_t* const ram = m.ram;
+	uint8_t const* const dir = &ram [REG(dir) * 0x100];
+	int const slow_gaussian = (REG(pmon) >> 1) | REG(non);
+	int const noise_rate = REG(flg) & 0x1F;
+	
+	// Global volume
+	int mvoll = (int8_t) REG(mvoll);
+	int mvolr = (int8_t) REG(mvolr);
+	if ( mvoll * mvolr < m.surround_threshold )
+		mvoll = -mvoll; // eliminate surround
+	
+	do
+	{
+		// KON/KOFF reading
+		if ( (m.every_other_sample ^= 1) != 0 )
+		{
+			m.new_kon &= ~m.kon;
+			m.kon = m.new_kon;
+			m.t_koff = REG(koff); 
+		}
+		
+		run_counter( 1 );
+		run_counter( 2 );
+		run_counter( 3 );
+		
+		// Noise
+		if ( !READ_COUNTER( noise_rate ) )
+		{
+			int feedback = (m.noise << 13) ^ (m.noise << 14);
+			m.noise = (feedback & 0x4000) ^ (m.noise >> 1);
+		}
+		
+		// Voices
+		int pmon_input = 0;
+		int main_out_l = 0;
+		int main_out_r = 0;
+		int echo_out_l = 0;
+		int echo_out_r = 0;
+		voice_t* v = m.voices;
+		uint8_t* v_regs = m.regs;
+		int vbit = 1;
+		do
+		{
+			#define SAMPLE_PTR(i) GET_LE16A( &dir [VREG(v_regs,srcn) * 4 + i * 2] )
+			
+			int brr_header = ram [v->brr_addr];
+			int kon_delay = v->kon_delay;
+			
+			// Pitch
+			int pitch = GET_LE16A( &VREG(v_regs,pitchl) ) & 0x3FFF;
+			if ( REG(pmon) & vbit )
+				pitch += ((pmon_input >> 5) * pitch) >> 10;
+			
+			// KON phases
+			if ( --kon_delay >= 0 )
+			{
+				v->kon_delay = kon_delay;
+				
+				// Get ready to start BRR decoding on next sample
+				if ( kon_delay == 4 )
+				{
+					v->brr_addr = SAMPLE_PTR( 0 );
+					v->brr_offset = 1;
+					v->buf_pos = v->buf;
+					brr_header = 0; // header is ignored on this sample
+				}
+				
+				// Envelope is never run during KON
+				v->env = 0;
+				v->hidden_env = 0;
+				
+				// Disable BRR decoding until last three samples
+				v->interp_pos = (kon_delay & 3 ? 0x4000 : 0);
+				
+				// Pitch is never added during KON
+				pitch = 0;
+			}
+			
+			int env = v->env;
+			
+			// Gaussian interpolation
+			{
+				int output = 0;
+				VREG(v_regs,envx) = (uint8_t) (env >> 4);
+				if ( env )
+				{
+					// Make pointers into gaussian based on fractional position between samples
+					int offset = (unsigned) v->interp_pos >> 3 & 0x1FE;
+					short const* fwd = interleved_gauss + offset;
+					short const* rev = interleved_gauss + 510 - offset; // mirror left half of gaussian
+					
+					int const* in = &v->buf_pos [(unsigned) v->interp_pos >> 12];
+					
+					if ( !(slow_gaussian & vbit) ) // 99%
+					{
+						// Faster approximation when exact sample value isn't necessary for pitch mod
+						output = (fwd [0] * in [0] +
+						 fwd [1] * in [1] +
+						 rev [1] * in [2] +
+						 rev [0] * in [3]) >> 11;
+						output = (output * env) >> 11;
+					}
+					else
+					{
+						output = (int16_t) (m.noise * 2);
+						if ( !(REG(non) & vbit) )
+						{
+							output = (fwd [0] * in [0]) >> 11;
+							output += (fwd [1] * in [1]) >> 11;
+							output += (rev [1] * in [2]) >> 11;
+							output = (int16_t) output;
+							output += (rev [0] * in [3]) >> 11;
+							
+							CLAMP16( output );
+							output &= ~1;
+						}
+						output = (output * env) >> 11 & ~1;
+					}
+					
+					// Output
+					int l = output * v->volume [0];
+					int r = output * v->volume [1];
+					
+					main_out_l += l;
+					main_out_r += r;
+					
+					if ( REG(eon) & vbit )
+					{
+						echo_out_l += l;
+						echo_out_r += r;
+					}
+				}
+				
+				pmon_input = output;
+				VREG(v_regs,outx) = (uint8_t) (output >> 8);
+			}
+			
+			// Soft reset or end of sample
+			if ( REG(flg) & 0x80 || (brr_header & 3) == 1 )
+			{
+				v->env_mode = env_release;
+				env = 0;
+			}
+			
+			if ( m.every_other_sample )
+			{
+				// KOFF
+				if ( m.t_koff & vbit )
+					v->env_mode = env_release;
+				
+				// KON
+				if ( m.kon & vbit )
+				{
+					v->kon_delay = 5;
+					v->env_mode = env_attack;
+					REG(endx) &= ~vbit;
+				}
+			}
+			
+			// Envelope
+			if ( !v->kon_delay )
+			{
+				if ( v->env_mode == env_release ) // 97%
+				{
+					env -= 0x8;
+					v->env = env;
+					if ( env <= 0 )
+					{
+						v->env = 0;
+						goto skip_brr; // no BRR decoding for you!
+					}
+				}
+				else // 3%
+				{
+					int rate;
+					int const adsr0 = VREG(v_regs,adsr0);
+					int env_data = VREG(v_regs,adsr1);
+					if ( adsr0 >= 0x80 ) // 97% ADSR
+					{
+						if ( v->env_mode > env_decay ) // 89%
+						{
+							env--;
+							env -= env >> 8;
+							rate = env_data & 0x1F;
+							
+							// optimized handling
+							v->hidden_env = env;
+							if ( READ_COUNTER( rate ) )
+								goto exit_env;
+							v->env = env;
+							goto exit_env;
+						}
+						else if ( v->env_mode == env_decay )
+						{
+							env--;
+							env -= env >> 8;
+							rate = (adsr0 >> 3 & 0x0E) + 0x10;
+						}
+						else // env_attack
+						{
+							rate = (adsr0 & 0x0F) * 2 + 1;
+							env += rate < 31 ? 0x20 : 0x400;
+						}
+					}
+					else // GAIN
+					{
+						int mode;
+						env_data = VREG(v_regs,gain);
+						mode = env_data >> 5;
+						if ( mode < 4 ) // direct
+						{
+							env = env_data * 0x10;
+							rate = 31;
+						}
+						else
+						{
+							rate = env_data & 0x1F;
+							if ( mode == 4 ) // 4: linear decrease
+							{
+								env -= 0x20;
+							}
+							else if ( mode < 6 ) // 5: exponential decrease
+							{
+								env--;
+								env -= env >> 8;
+							}
+							else // 6,7: linear increase
+							{
+								env += 0x20;
+								if ( mode > 6 && (unsigned) v->hidden_env >= 0x600 )
+									env += 0x8 - 0x20; // 7: two-slope linear increase
+							}
+						}
+					}
+					
+					// Sustain level
+					if ( (env >> 8) == (env_data >> 5) && v->env_mode == env_decay )
+						v->env_mode = env_sustain;
+					
+					v->hidden_env = env;
+					
+					// unsigned cast because linear decrease going negative also triggers this
+					if ( (unsigned) env > 0x7FF )
+					{
+						env = (env < 0 ? 0 : 0x7FF);
+						if ( v->env_mode == env_attack )
+							v->env_mode = env_decay;
+					}
+					
+					if ( !READ_COUNTER( rate ) )
+						v->env = env; // nothing else is controlled by the counter
+				}
+			}
+		exit_env:
+			
+			{
+				// Apply pitch
+				int old_pos = v->interp_pos;
+				int interp_pos = (old_pos & 0x3FFF) + pitch;
+				if ( interp_pos > 0x7FFF )
+					interp_pos = 0x7FFF;
+				v->interp_pos = interp_pos;
+				
+				// BRR decode if necessary
+				if ( old_pos >= 0x4000 )
+				{
+					// Arrange the four input nybbles in 0xABCD order for easy decoding
+					int nybbles = ram [(v->brr_addr + v->brr_offset) & 0xFFFF] * 0x100 +
+							ram [(v->brr_addr + v->brr_offset + 1) & 0xFFFF];
+					
+					// Advance read position
+					int const brr_block_size = 9;
+					int brr_offset = v->brr_offset;
+					if ( (brr_offset += 2) >= brr_block_size )
+					{
+						// Next BRR block
+						int brr_addr = (v->brr_addr + brr_block_size) & 0xFFFF;
+						assert( brr_offset == brr_block_size );
+						if ( brr_header & 1 )
+						{
+							brr_addr = SAMPLE_PTR( 1 );
+							if ( !v->kon_delay )
+								REG(endx) |= vbit;
+						}
+						v->brr_addr = brr_addr;
+						brr_offset = 1;
+					}
+					v->brr_offset = brr_offset;
+					
+					// Decode
+					
+					// 0: >>1 1: <<0 2: <<1 ... 12: <<11 13-15: >>4 <<11
+					static unsigned char const shifts [16 * 2] = {
+						13,12,12,12,12,12,12,12,12,12,12, 12, 12, 16, 16, 16,
+						 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 11, 11, 11
+					};
+					int const scale = brr_header >> 4;
+					int const right_shift = shifts [scale];
+					int const left_shift = shifts [scale + 16];
+					
+					// Write to next four samples in circular buffer
+					int* pos = v->buf_pos;
+					int* end;
+					
+					// Decode four samples
+					for ( end = pos + 4; pos < end; pos++, nybbles <<= 4 )
+					{
+						// Extract upper nybble and scale appropriately
+						int s = ((int16_t) nybbles >> right_shift) << left_shift;
+						
+						// Apply IIR filter (8 is the most commonly used)
+						int const filter = brr_header & 0x0C;
+						int const p1 = pos [brr_buf_size - 1];
+						int const p2 = pos [brr_buf_size - 2] >> 1;
+						if ( filter >= 8 )
+						{
+							s += p1;
+							s -= p2;
+							if ( filter == 8 ) // s += p1 * 0.953125 - p2 * 0.46875
+							{
+								s += p2 >> 4;
+								s += (p1 * -3) >> 6;
+							}
+							else // s += p1 * 0.8984375 - p2 * 0.40625
+							{
+								s += (p1 * -13) >> 7;
+								s += (p2 * 3) >> 4;
+							}
+						}
+						else if ( filter ) // s += p1 * 0.46875
+						{
+							s += p1 >> 1;
+							s += (-p1) >> 5;
+						}
+						
+						// Adjust and write sample
+						CLAMP16( s );
+						s = (int16_t) (s * 2);
+						pos [brr_buf_size] = pos [0] = s; // second copy simplifies wrap-around
+					}
+					
+					if ( pos >= &v->buf [brr_buf_size] )
+						pos = v->buf;
+					v->buf_pos = pos;
+				}
+			}
+skip_brr:
+			// Next voice
+			vbit <<= 1;
+			v_regs += 0x10;
+			v++;
+		}
+		while ( vbit < 0x100 );
+		
+		// Echo position
+		int echo_offset = m.echo_offset;
+		uint8_t* const echo_ptr = &ram [(REG(esa) * 0x100 + echo_offset) & 0xFFFF];
+		if ( !echo_offset )
+			m.echo_length = (REG(edl) & 0x0F) * 0x800;
+		echo_offset += 4;
+		if ( echo_offset >= m.echo_length )
+			echo_offset = 0;
+		m.echo_offset = echo_offset;
+		
+		// FIR
+		int echo_in_l = GET_LE16SA( echo_ptr + 0 );
+		int echo_in_r = GET_LE16SA( echo_ptr + 2 );
+		
+		int (*echo_hist_pos) [2] = m.echo_hist_pos;
+		if ( ++echo_hist_pos >= &m.echo_hist [echo_hist_size] )
+			echo_hist_pos = m.echo_hist;
+		m.echo_hist_pos = echo_hist_pos;
+		
+		echo_hist_pos [0] [0] = echo_hist_pos [8] [0] = echo_in_l;
+		echo_hist_pos [0] [1] = echo_hist_pos [8] [1] = echo_in_r;
+		
+		#define CALC_FIR_( i, in ) ((in) * (int8_t) REG(fir + i * 0x10))
+		echo_in_l = CALC_FIR_( 7, echo_in_l );
+		echo_in_r = CALC_FIR_( 7, echo_in_r );
+		
+		#define CALC_FIR( i, ch ) CALC_FIR_( i, echo_hist_pos [i + 1] [ch] )
+		#define DO_FIR( i )\
+			echo_in_l += CALC_FIR( i, 0 );\
+			echo_in_r += CALC_FIR( i, 1 );
+		DO_FIR( 0 );
+		DO_FIR( 1 );
+		DO_FIR( 2 );
+		#if defined (__MWERKS__) && __MWERKS__ < 0x3200
+			__eieio(); // keeps compiler from stupidly "caching" things in memory
+		#endif
+		DO_FIR( 3 );
+		DO_FIR( 4 );
+		DO_FIR( 5 );
+		DO_FIR( 6 );
+		
+		// Echo out
+		if ( !(REG(flg) & 0x20) )
+		{
+			int l = (echo_out_l >> 7) + ((echo_in_l * (int8_t) REG(efb)) >> 14);
+			int r = (echo_out_r >> 7) + ((echo_in_r * (int8_t) REG(efb)) >> 14);
+			
+			// just to help pass more validation tests
+			#if SPC_MORE_ACCURACY
+				l &= ~1;
+				r &= ~1;
+			#endif
+			
+			CLAMP16( l );
+			CLAMP16( r );
+			
+			SET_LE16A( echo_ptr + 0, l );
+			SET_LE16A( echo_ptr + 2, r );
+		}
+		
+		// Sound out
+		int l = (main_out_l * mvoll + echo_in_l * (int8_t) REG(evoll)) >> 14;
+		int r = (main_out_r * mvolr + echo_in_r * (int8_t) REG(evolr)) >> 14;
+		
+		CLAMP16( l );
+		CLAMP16( r );
+		
+		if ( (REG(flg) & 0x40) )
+		{
+			l = 0;
+			r = 0;
+		}
+		
+		sample_t* out = m.out;
+		WRITE_SAMPLES( l, r, out );
+		m.out = out;
+	}
+	while ( --count );
+}
+
+
+//// Setup
+
+void Spc_Dsp::mute_voices( int mask )
+{
+	m.mute_mask = mask;
+	for ( int i = 0; i < voice_count; i++ )
+	{
+		m.voices [i].enabled = (mask >> i & 1) - 1;
+		update_voice_vol( i * 0x10 );
+	}
+}
+
+void Spc_Dsp::init( void* ram_64k )
+{
+	m.ram = (uint8_t*) ram_64k;
+	mute_voices( 0 );
+	disable_surround( false );
+	set_output( 0, 0 );
+	reset();
+	
+	#ifndef NDEBUG
+		// be sure this sign-extends
+		assert( (int16_t) 0x8000 == -0x8000 );
+		
+		// be sure right shift preserves sign
+		assert( (-1 >> 1) == -1 );
+		
+		// check clamp macro
+		int i;
+		i = +0x8000; CLAMP16( i ); assert( i == +0x7FFF );
+		i = -0x8001; CLAMP16( i ); assert( i == -0x8000 );
+		
+		blargg_verify_byte_order();
+	#endif
+}
+
+void Spc_Dsp::soft_reset_common()
+{
+	require( m.ram ); // init() must have been called already
+	
+	m.noise = 0x4000;
+	m.echo_hist_pos = m.echo_hist;
+	m.every_other_sample = 1;
+	m.echo_offset = 0;
+	m.phase = 0;
+	
+	init_counter();
+}
+
+void Spc_Dsp::soft_reset()
+{
+	REG(flg) = 0xE0;
+	soft_reset_common();
+}
+
+void Spc_Dsp::load( uint8_t const regs [register_count] )
+{
+	memcpy( m.regs, regs, sizeof m.regs );
+	memset( &m.regs [register_count], 0, offsetof (state_t,ram) - register_count );
+	
+	// Internal state
+	int i;
+	for ( i = voice_count; --i >= 0; )
+	{
+		voice_t& v = m.voices [i];
+		v.brr_offset = 1;
+		v.buf_pos = v.buf;
+	}
+	m.new_kon = REG(kon);
+	
+	mute_voices( m.mute_mask );
+	soft_reset_common();
+}
+
+void Spc_Dsp::reset() { load( initial_regs ); }

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Dsp.h Added

@@ -0,0 +1,212 @@
+// Fast SNES SPC-700 DSP emulator (about 3x speed of accurate one)
+
+// Game_Music_Emu 0.5.5
+#ifndef SPC_DSP_H
+#define SPC_DSP_H
+
+#include "blargg_common.h"
+
+struct Spc_Dsp {
+public:
+	typedef BOOST::uint8_t uint8_t;
+	
+// Setup
+	
+	// Initializes DSP and has it use the 64K RAM provided
+	void init( void* ram_64k );
+
+	// Sets destination for output samples. If out is NULL or out_size is 0,
+	// doesn't generate any.
+	typedef short sample_t;
+	void set_output( sample_t* out, int out_size );
+
+	// Number of samples written to output since it was last set, always
+	// a multiple of 2. Undefined if more samples were generated than
+	// output buffer could hold.
+	int sample_count() const;
+
+// Emulation
+	
+	// Resets DSP to power-on state
+	void reset();
+
+	// Emulates pressing reset switch on SNES
+	void soft_reset();
+	
+	// Reads/writes DSP registers. For accuracy, you must first call spc_run_dsp()
+	// to catch the DSP up to present.
+	int read ( int addr ) const;
+	void write( int addr, int data );
+
+	// Runs DSP for specified number of clocks (~1024000 per second). Every 32 clocks
+	// a pair of samples is be generated.
+	void run( int clock_count );
+
+// Sound control
+
+	// Mutes voices corresponding to non-zero bits in mask (overrides VxVOL with 0).
+	// Reduces emulation accuracy.
+	enum { voice_count = 8 };
+	void mute_voices( int mask );
+
+	// If true, prevents channels and global volumes from being phase-negated
+	void disable_surround( bool disable = true );
+
+// State
+	
+	// Resets DSP and uses supplied values to initialize registers
+	enum { register_count = 128 };
+	void load( uint8_t const regs [register_count] );
+
+// DSP register addresses
+
+	// Global registers
+	enum {
+	 r_mvoll = 0x0C, r_mvolr = 0x1C,
+	 r_evoll = 0x2C, r_evolr = 0x3C,
+	 r_kon = 0x4C, r_koff = 0x5C,
+	 r_flg = 0x6C, r_endx = 0x7C,
+	 r_efb = 0x0D, r_pmon = 0x2D,
+	 r_non = 0x3D, r_eon = 0x4D,
+	 r_dir = 0x5D, r_esa = 0x6D,
+	 r_edl = 0x7D,
+	 r_fir = 0x0F // 8 coefficients at 0x0F, 0x1F ... 0x7F
+	};
+
+	// Voice registers
+	enum {
+		v_voll = 0x00, v_volr = 0x01,
+		v_pitchl = 0x02, v_pitchh = 0x03,
+		v_srcn = 0x04, v_adsr0 = 0x05,
+		v_adsr1 = 0x06, v_gain = 0x07,
+		v_envx = 0x08, v_outx = 0x09
+	};
+
+public:
+	enum { extra_size = 16 };
+	sample_t* extra() { return m.extra; }
+	sample_t const* out_pos() const { return m.out; }
+public:
+	BLARGG_DISABLE_NOTHROW
+	
+	typedef BOOST::int8_t int8_t;
+	typedef BOOST::int16_t int16_t;
+	
+	enum { echo_hist_size = 8 };
+	
+	enum env_mode_t { env_release, env_attack, env_decay, env_sustain };
+	enum { brr_buf_size = 12 };
+	struct voice_t
+	{
+		int buf [brr_buf_size*2];// decoded samples (twice the size to simplify wrap handling)
+		int* buf_pos; // place in buffer where next samples will be decoded
+		int interp_pos; // relative fractional position in sample (0x1000 = 1.0)
+		int brr_addr; // address of current BRR block
+		int brr_offset; // current decoding offset in BRR block
+		int kon_delay; // KON delay/current setup phase
+		env_mode_t env_mode;
+		int env; // current envelope level
+		int hidden_env; // used by GAIN mode 7, very obscure quirk
+		int volume [2]; // copy of volume from DSP registers, with surround disabled
+		int enabled; // -1 if enabled, 0 if muted
+	};
+private:
+	struct state_t
+	{
+		uint8_t regs [register_count];
+		
+		// Echo history keeps most recent 8 samples (twice the size to simplify wrap handling)
+		int echo_hist [echo_hist_size * 2] [2];
+		int (*echo_hist_pos) [2]; // &echo_hist [0 to 7]
+		
+		int every_other_sample; // toggles every sample
+		int kon; // KON value when last checked
+		int noise;
+		int echo_offset; // offset from ESA in echo buffer
+		int echo_length; // number of bytes that echo_offset will stop at
+		int phase; // next clock cycle to run (0-31)
+		unsigned counters [4];
+		
+		int new_kon;
+		int t_koff;
+		
+		voice_t voices [voice_count];
+		
+		unsigned* counter_select [32];
+		
+		// non-emulation state
+		uint8_t* ram; // 64K shared RAM between DSP and SMP
+		int mute_mask;
+		int surround_threshold;
+		sample_t* out;
+		sample_t* out_end;
+		sample_t* out_begin;
+		sample_t extra [extra_size];
+	};
+	state_t m;
+	
+	void init_counter();
+	void run_counter( int );
+	void soft_reset_common();
+	void write_outline( int addr, int data );
+	void update_voice_vol( int addr );
+};
+
+#include <assert.h>
+
+inline int Spc_Dsp::sample_count() const { return m.out - m.out_begin; }
+
+inline int Spc_Dsp::read( int addr ) const
+{
+	assert( (unsigned) addr < register_count );
+	return m.regs [addr];
+}
+
+inline void Spc_Dsp::update_voice_vol( int addr )
+{
+	int l = (int8_t) m.regs [addr + v_voll];
+	int r = (int8_t) m.regs [addr + v_volr];
+	
+	if ( l * r < m.surround_threshold )
+	{
+		// signs differ, so negate those that are negative
+		l ^= l >> 7;
+		r ^= r >> 7;
+	}
+	
+	voice_t& v = m.voices [addr >> 4];
+	int enabled = v.enabled;
+	v.volume [0] = l & enabled;
+	v.volume [1] = r & enabled;
+}
+
+inline void Spc_Dsp::write( int addr, int data )
+{
+	assert( (unsigned) addr < register_count );
+	
+	m.regs [addr] = (uint8_t) data;
+	int low = addr & 0x0F;
+	if ( low < 0x2 ) // voice volumes
+	{
+		update_voice_vol( low ^ addr );
+	}
+	else if ( low == 0xC )
+	{
+		if ( addr == r_kon )
+			m.new_kon = (uint8_t) data;
+		
+		if ( addr == r_endx ) // always cleared, regardless of data written
+			m.regs [r_endx] = 0;
+	}
+}
+
+inline void Spc_Dsp::disable_surround( bool disable )
+{
+	m.surround_threshold = disable ? 0 : -0x4000;
+}
+
+#define SPC_NO_COPY_STATE_FUNCS 1
+
+#define SPC_LESS_ACCURATE 1
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Emu.cpp Added

@@ -0,0 +1,352 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Spc_Emu.h"
+
+#include "blargg_endian.h"
+#include <stdlib.h>
+#include <string.h>
+
+/* Copyright (C) 2004-2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+// TODO: support Spc_Filter's bass
+
+Spc_Emu::Spc_Emu()
+{
+	set_type( gme_spc_type );
+	
+	static const char* const names [Snes_Spc::voice_count] = {
+		"DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
+	};
+	set_voice_names( names );
+	
+	set_gain( 1.4 );
+}
+
+Spc_Emu::~Spc_Emu() { }
+
+// Track info
+
+long const trailer_offset = 0x10200;
+
+byte const* Spc_Emu::trailer() const { return &file_data [min( file_size, trailer_offset )]; }
+
+long Spc_Emu::trailer_size() const { return max( 0L, file_size - trailer_offset ); }
+
+static void get_spc_xid6( byte const* begin, long size, track_info_t* out )
+{
+	// header
+	byte const* end = begin + size;
+	if ( size < 8 || memcmp( begin, "xid6", 4 ) )
+	{
+		check( false );
+		return;
+	}
+	long info_size = get_le32( begin + 4 );
+	byte const* in = begin + 8; 
+	if ( end - in > info_size )
+	{
+		debug_printf( "Extra data after SPC xid6 info\n" );
+		end = in + info_size;
+	}
+	
+	int year = 0;
+	char copyright [256 + 5];
+	int copyright_len = 0;
+	int const year_len = 5;
+	
+	while ( end - in >= 4 )
+	{
+		// header
+		int id = in [0];
+		int data = in [3] * 0x100 + in [2];
+		int type = in [1];
+		int len = type ? data : 0;
+		in += 4;
+		if ( len > end - in )
+		{
+			check( false );
+			break; // block goes past end of data
+		}
+		
+		// handle specific block types
+		char* field = 0;
+		switch ( id )
+		{
+			case 0x01: field = out->song; break;
+			case 0x02: field = out->game; break;
+			case 0x03: field = out->author; break;
+			case 0x04: field = out->dumper; break;
+			case 0x07: field = out->comment; break;
+			case 0x14: year = data; break;
+			
+			//case 0x30: // intro length
+			// Many SPCs have intro length set wrong for looped tracks, making it useless
+			/*
+			case 0x30:
+				check( len == 4 );
+				if ( len >= 4 )
+				{
+					out->intro_length = get_le32( in ) / 64;
+					if ( out->length > 0 )
+					{
+						long loop = out->length - out->intro_length;
+						if ( loop >= 2000 )
+							out->loop_length = loop;
+					}
+				}
+				break;
+			*/
+			
+			case 0x13:
+				copyright_len = min( len, (int) sizeof copyright - year_len );
+				memcpy( &copyright [year_len], in, copyright_len );
+				break;
+			
+			default:
+				if ( id < 0x01 || (id > 0x07 && id < 0x10) ||
+						(id > 0x14 && id < 0x30) || id > 0x36 )
+					debug_printf( "Unknown SPC xid6 block: %X\n", (int) id );
+				break;
+		}
+		if ( field )
+		{
+			check( type == 1 );
+			Gme_File::copy_field_( field, (char const*) in, len );
+		}
+		
+		// skip to next block
+		in += len;
+		
+		// blocks are supposed to be 4-byte aligned with zero-padding...
+		byte const* unaligned = in;
+		while ( (in - begin) & 3 && in < end )
+		{
+			if ( *in++ != 0 )
+			{
+				// ...but some files have no padding
+				in = unaligned;
+				debug_printf( "SPC info tag wasn't properly padded to align\n" );
+				break;
+			}
+		}
+	}
+	
+	char* p = &copyright [year_len];
+	if ( year )
+	{
+		*--p = ' ';
+		for ( int n = 4; n--; )
+		{
+			*--p = char (year % 10 + '0');
+			year /= 10;
+		}
+		copyright_len += year_len;
+	}
+	if ( copyright_len )
+		Gme_File::copy_field_( out->copyright, p, copyright_len );
+	
+	check( in == end );
+}
+
+static void get_spc_info( Spc_Emu::header_t const& h, byte const* xid6, long xid6_size,
+		track_info_t* out )
+{
+	// decode length (can be in text or binary format, sometimes ambiguous ugh)
+	long len_secs = 0;
+	for ( int i = 0; i < 3; i++ )
+	{
+		unsigned n = h.len_secs [i] - '0';
+		if ( n > 9 )
+		{
+			// ignore single-digit text lengths
+			// (except if author field is present and begins at offset 1, ugh)
+			if ( i == 1 && (h.author [0] || !h.author [1]) )
+				len_secs = 0;
+			break;
+		}
+		len_secs *= 10;
+		len_secs += n;
+	}
+	if ( !len_secs || len_secs > 0x1FFF )
+		len_secs = get_le16( h.len_secs );
+	if ( len_secs < 0x1FFF )
+		out->length = len_secs * 1000;
+	
+	int offset = (h.author [0] < ' ' || unsigned (h.author [0] - '0') <= 9);
+	Gme_File::copy_field_( out->author, &h.author [offset], sizeof h.author - offset );
+	
+	GME_COPY_FIELD( h, out, song );
+	GME_COPY_FIELD( h, out, game );
+	GME_COPY_FIELD( h, out, dumper );
+	GME_COPY_FIELD( h, out, comment );
+	
+	if ( xid6_size )
+		get_spc_xid6( xid6, xid6_size, out );
+}
+
+blargg_err_t Spc_Emu::track_info_( track_info_t* out, int ) const
+{
+	get_spc_info( header(), trailer(), trailer_size(), out );
+	return 0;
+}
+
+static blargg_err_t check_spc_header( void const* header )
+{
+	if ( memcmp( header, "SNES-SPC700 Sound File Data", 27 ) )
+		return gme_wrong_file_type;
+	return 0;
+}
+
+struct Spc_File : Gme_Info_
+{
+	Spc_Emu::header_t header;
+	blargg_vector<byte> xid6;
+	
+	Spc_File() { set_type( gme_spc_type ); }
+	
+	blargg_err_t load_( Data_Reader& in )
+	{
+		long file_size = in.remain();
+		if ( file_size < Snes_Spc::spc_min_file_size )
+			return gme_wrong_file_type;
+		RETURN_ERR( in.read( &header, Spc_Emu::header_size ) );
+		RETURN_ERR( check_spc_header( header.tag ) );
+		long const xid6_offset = 0x10200;
+		long xid6_size = file_size - xid6_offset;
+		if ( xid6_size > 0 )
+		{
+			RETURN_ERR( xid6.resize( xid6_size ) );
+			RETURN_ERR( in.skip( xid6_offset - Spc_Emu::header_size ) );
+			RETURN_ERR( in.read( xid6.begin(), xid6.size() ) );
+		}
+		return 0;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		get_spc_info( header, xid6.begin(), xid6.size(), out );
+		return 0;
+	}
+};
+
+static Music_Emu* new_spc_emu () { return BLARGG_NEW Spc_Emu ; }
+static Music_Emu* new_spc_file() { return BLARGG_NEW Spc_File; }
+
+static gme_type_t_ const gme_spc_type_ = { "Super Nintendo", 1, &new_spc_emu, &new_spc_file, "SPC", 0 };
+gme_type_t const gme_spc_type = &gme_spc_type_;
+
+
+// Setup
+
+blargg_err_t Spc_Emu::set_sample_rate_( long sample_rate )
+{
+	RETURN_ERR( apu.init() );
+	enable_accuracy( false );
+	if ( sample_rate != native_sample_rate )
+	{
+		RETURN_ERR( resampler.buffer_size( native_sample_rate / 20 * 2 ) );
+		resampler.time_ratio( (double) native_sample_rate / sample_rate, 0.9965 );
+	}
+	return 0;
+}
+
+void Spc_Emu::enable_accuracy_( bool b )
+{
+	Music_Emu::enable_accuracy_( b );
+	filter.enable( b );
+}
+
+void Spc_Emu::mute_voices_( int m )
+{
+	Music_Emu::mute_voices_( m );
+	apu.mute_voices( m );
+}
+
+blargg_err_t Spc_Emu::load_mem_( byte const* in, long size )
+{
+	assert( offsetof (header_t,unused2 [46]) == header_size );
+	file_data = in;
+	file_size = size;
+	set_voice_count( Snes_Spc::voice_count );
+	if ( size < Snes_Spc::spc_min_file_size )
+		return gme_wrong_file_type;
+	return check_spc_header( in );
+}
+
+// Emulation
+
+void Spc_Emu::set_tempo_( double t )
+{
+	apu.set_tempo( (int) (t * apu.tempo_unit) );
+}
+
+blargg_err_t Spc_Emu::start_track_( int track )
+{
+	RETURN_ERR( Music_Emu::start_track_( track ) );
+	resampler.clear();
+	filter.clear();
+	RETURN_ERR( apu.load_spc( file_data, file_size ) );
+	filter.set_gain( (int) (gain() * SPC_Filter::gain_unit) );
+	apu.clear_echo();
+	return 0;
+}
+
+blargg_err_t Spc_Emu::play_and_filter( long count, sample_t out [] )
+{
+	RETURN_ERR( apu.play( count, out ) );
+	filter.run( out, count );
+	return 0;
+}
+
+blargg_err_t Spc_Emu::skip_( long count )
+{
+	if ( sample_rate() != native_sample_rate )
+	{
+		count = long (count * resampler.ratio()) & ~1;
+		count -= resampler.skip_input( count );
+	}
+	
+	// TODO: shouldn't skip be adjusted for the 64 samples read afterwards?
+	
+	if ( count > 0 )
+	{
+		RETURN_ERR( apu.skip( count ) );
+		filter.clear();
+	}
+	
+	// eliminate pop due to resampler
+	const int resampler_latency = 64;
+	sample_t buf [resampler_latency];
+	return play_( resampler_latency, buf );
+}
+
+blargg_err_t Spc_Emu::play_( long count, sample_t* out )
+{
+	if ( sample_rate() == native_sample_rate )
+		return play_and_filter( count, out );
+	
+	long remain = count;
+	while ( remain > 0 )
+	{
+		remain -= resampler.read( &out [count - remain], remain );
+		if ( remain > 0 )
+		{
+			long n = resampler.max_write();
+			RETURN_ERR( play_and_filter( n, resampler.buffer() ) );
+			resampler.write( n );
+		}
+	}
+	check( remain == 0 );
+	return 0;
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Emu.h Added

@@ -0,0 +1,82 @@
+// Super Nintendo SPC music file emulator
+
+// Game_Music_Emu 0.5.5
+#ifndef SPC_EMU_H
+#define SPC_EMU_H
+
+#include "Fir_Resampler.h"
+#include "Music_Emu.h"
+#include "Snes_Spc.h"
+#include "Spc_Filter.h"
+
+class Spc_Emu : public Music_Emu {
+public:
+	// 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
+	{
+		char tag [35];
+		byte format;
+		byte version;
+		byte pc [2];
+		byte a, x, y, psw, sp;
+		byte unused [2];
+		char song [32];
+		char game [32];
+		char dumper [16];
+		char comment [32];
+		byte date [11];
+		byte len_secs [3];
+		byte fade_msec [4];
+		char author [32]; // sometimes first char should be skipped (see official SPC spec)
+		byte mute_mask;
+		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;
+	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()
+	long trailer_size() const;
+
+public:
+	Spc_Emu();
+	~Spc_Emu();
+protected:
+	blargg_err_t load_mem_( byte const*, long );
+	blargg_err_t track_info_( track_info_t*, int track ) const;
+	blargg_err_t set_sample_rate_( long );
+	blargg_err_t start_track_( int );
+	blargg_err_t play_( long, sample_t* );
+	blargg_err_t skip_( long );
+	void mute_voices_( int );
+	void set_tempo_( double );
+	void enable_accuracy_( bool );
+private:
+	byte const* file_data;
+	long file_size;
+	Fir_Resampler<24> resampler;
+	SPC_Filter filter;
+	Snes_Spc apu;
+	
+	blargg_err_t play_and_filter( long count, sample_t out [] );
+};
+
+inline void Spc_Emu::disable_surround( bool b ) { apu.disable_surround( b ); }
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Filter.cpp Added

@@ -0,0 +1,83 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Spc_Filter.h"
+
+#include <string.h>
+
+/* Copyright (C) 2007 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+void SPC_Filter::clear() { memset( ch, 0, sizeof ch ); }
+
+SPC_Filter::SPC_Filter()
+{
+	enabled = true;
+	gain = gain_unit;
+	bass = bass_norm;
+	clear();
+}
+
+void SPC_Filter::run( short* io, int count )
+{
+	require( (count & 1) == 0 ); // must be even
+	
+	int const gain = this->gain;
+	if ( enabled )
+	{
+		int const bass = this->bass;
+		chan_t* c = &ch [2];
+		do
+		{
+			// cache in registers
+			int sum = (--c)->sum;
+			int pp1 = c->pp1;
+			int p1 = c->p1;
+			
+			for ( int i = 0; i < count; i += 2 )
+			{
+				// Low-pass filter (two point FIR with coeffs 0.25, 0.75)
+				int f = io [i] + p1;
+				p1 = io [i] * 3;
+				
+				// High-pass filter ("leaky integrator")
+				int delta = f - pp1;
+				pp1 = f;
+				int s = sum >> (gain_bits + 2);
+				sum += (delta * gain) - (sum >> bass);
+				
+				// Clamp to 16 bits
+				if ( (short) s != s )
+					s = (s >> 31) ^ 0x7FFF;
+				
+				io [i] = (short) s;
+			}
+			
+			c->p1 = p1;
+			c->pp1 = pp1;
+			c->sum = sum;
+			++io;
+		}
+		while ( c != ch );
+	}
+	else if ( gain != gain_unit )
+	{
+		short* const end = io + count;
+		while ( io < end )
+		{
+			int s = (*io * gain) >> gain_bits;
+			if ( (short) s != s )
+				s = (s >> 31) ^ 0x7FFF;
+			*io++ = (short) s;
+		}
+	}
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Spc_Filter.h Added

@@ -0,0 +1,53 @@
+// Simple low-pass and high-pass filter to better match sound output of a SNES
+
+// Game_Music_Emu 0.5.5
+#ifndef SPC_FILTER_H
+#define SPC_FILTER_H
+
+#include "blargg_common.h"
+
+struct SPC_Filter {
+public:
+	
+	// Filters count samples of stereo sound in place. Count must be a multiple of 2.
+	typedef short sample_t;
+	void run( sample_t* io, int count );
+	
+// Optional features
+
+	// Clears filter to silence
+	void clear();
+	
+	// Sets gain (volume), where gain_unit is normal. Gains greater than gain_unit
+	// are fine, since output is clamped to 16-bit sample range.
+	enum { gain_unit = 0x100 };
+	void set_gain( int gain );
+	
+	// Enables/disables filtering (when disabled, gain is still applied)
+	void enable( bool b );
+	
+	// Sets amount of bass (logarithmic scale)
+	enum { bass_none =  0 };
+	enum { bass_norm =  8 }; // normal amount
+	enum { bass_max  = 31 };
+	void set_bass( int bass );
+	
+public:
+	SPC_Filter();
+	BLARGG_DISABLE_NOTHROW
+private:
+	enum { gain_bits = 8 };
+	int gain;
+	int bass;
+	bool enabled;
+	struct chan_t { int p1, pp1, sum; };
+	chan_t ch [2];
+};
+
+inline void SPC_Filter::enable( bool b )  { enabled = b; }
+
+inline void SPC_Filter::set_gain( int g ) { gain = g; }
+
+inline void SPC_Filter::set_bass( int b ) { bass = b; }
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Vgm_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Vgm_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Vgm_Emu_Impl.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Vgm_Emu_Impl.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ym2413_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ym2413_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ym2612_Emu.cpp Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/Ym2612_Emu.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/blargg_common.h Added

@@ -0,0 +1,196 @@
+// Sets up common environment for Shay Green's libraries.
+// To change configuration options, modify blargg_config.h, not this file.
+
+#ifndef BLARGG_COMMON_H
+#define BLARGG_COMMON_H
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
+
+#undef BLARGG_COMMON_H
+// allow blargg_config.h to #include blargg_common.h
+#include "blargg_config.h"
+#ifndef BLARGG_COMMON_H
+#define BLARGG_COMMON_H
+
+// BLARGG_RESTRICT: equivalent to restrict, where supported
+#if __GNUC__ >= 3 || _MSC_VER >= 1100
+	#define BLARGG_RESTRICT __restrict
+#else
+	#define BLARGG_RESTRICT
+#endif
+
+// STATIC_CAST(T,expr): Used in place of static_cast<T> (expr)
+#ifndef STATIC_CAST
+	#define STATIC_CAST(T,expr) ((T) (expr))
+#endif
+
+// blargg_err_t (0 on success, otherwise error string)
+#ifndef blargg_err_t
+	typedef const char* blargg_err_t;
+#endif
+
+// blargg_vector - very lightweight vector of POD types (no constructor/destructor)
+template<class T>
+class blargg_vector {
+	T* begin_;
+	size_t size_;
+public:
+	blargg_vector() : begin_( 0 ), size_( 0 ) { }
+	~blargg_vector() { free( begin_ ); }
+	size_t size() const { return size_; }
+	T* begin() const { return begin_; }
+	T* end() const { return begin_ + size_; }
+	blargg_err_t resize( size_t n )
+	{
+		void* p = realloc( begin_, n * sizeof (T) );
+		if ( !p && n )
+			return "Out of memory";
+		begin_ = (T*) p;
+		size_ = n;
+		return 0;
+	}
+	void clear() { void* p = begin_; begin_ = 0; size_ = 0; free( p ); }
+	T& operator [] ( size_t n ) const
+	{
+		assert( n <= size_ ); // <= to allow past-the-end value
+		return begin_ [n];
+	}
+};
+
+#ifndef BLARGG_DISABLE_NOTHROW
+	// throw spec mandatory in ISO C++ if operator new can return NULL
+	#if __cplusplus >= 199711 || __GNUC__ >= 3
+		#define BLARGG_THROWS( spec ) throw spec
+	#else
+		#define BLARGG_THROWS( spec )
+	#endif
+	#define BLARGG_DISABLE_NOTHROW \
+		void* operator new ( size_t s ) BLARGG_THROWS(()) { return malloc( s ); }\
+		void operator delete ( void* p ) { free( p ); }
+	#define BLARGG_NEW new
+#else
+	#include <new>
+	#define BLARGG_NEW new (std::nothrow)
+#endif
+
+// BLARGG_4CHAR('a','b','c','d') = 'abcd' (four character integer constant)
+#define BLARGG_4CHAR( a, b, c, d ) \
+	((a&0xFF)*0x1000000L + (b&0xFF)*0x10000L + (c&0xFF)*0x100L + (d&0xFF))
+
+// BOOST_STATIC_ASSERT( expr ): Generates compile error if expr is 0.
+#ifndef BOOST_STATIC_ASSERT
+	#ifdef _MSC_VER
+		// MSVC6 (_MSC_VER < 1300) fails for use of __LINE__ when /Zl is specified
+		#define BOOST_STATIC_ASSERT( expr ) \
+			void blargg_failed_( int (*arg) [2 / (int) !!(expr) - 1] )
+	#else
+		// Some other compilers fail when declaring same function multiple times in class,
+		// so differentiate them by line
+		#define BOOST_STATIC_ASSERT( expr ) \
+			void blargg_failed_( int (*arg) [2 / !!(expr) - 1] [__LINE__] )
+	#endif
+#endif
+
+// BLARGG_COMPILER_HAS_BOOL: If 0, provides bool support for old compiler. If 1,
+// compiler is assumed to support bool. If undefined, availability is determined.
+#ifndef BLARGG_COMPILER_HAS_BOOL
+	#if defined (__MWERKS__)
+		#if !__option(bool)
+			#define BLARGG_COMPILER_HAS_BOOL 0
+		#endif
+	#elif defined (_MSC_VER)
+		#if _MSC_VER < 1100
+			#define BLARGG_COMPILER_HAS_BOOL 0
+		#endif
+	#elif defined (__GNUC__)
+		// supports bool
+	#elif __cplusplus < 199711
+		#define BLARGG_COMPILER_HAS_BOOL 0
+	#endif
+#endif
+#if defined (BLARGG_COMPILER_HAS_BOOL) && !BLARGG_COMPILER_HAS_BOOL
+	// If you get errors here, modify your blargg_config.h file
+	typedef int bool;
+	const bool true = 1;
+	const bool false = 0;
+#endif
+
+// blargg_long/blargg_ulong = at least 32 bits, int if it's big enough
+
+#if INT_MAX < 0x7FFFFFFF || LONG_MAX == 0x7FFFFFFF
+	typedef long blargg_long;
+#else
+	typedef int blargg_long;
+#endif
+
+#if UINT_MAX < 0xFFFFFFFF || ULONG_MAX == 0xFFFFFFFF
+	typedef unsigned long blargg_ulong;
+#else
+	typedef unsigned blargg_ulong;
+#endif
+
+// BOOST::int8_t etc.
+
+// HAVE_STDINT_H: If defined, use <stdint.h> for int8_t etc.
+#if defined (HAVE_STDINT_H)
+	#include <stdint.h>
+	#define BOOST
+
+// HAVE_INTTYPES_H: If defined, use <stdint.h> for int8_t etc.
+#elif defined (HAVE_INTTYPES_H)
+	#include <inttypes.h>
+	#define BOOST
+
+#else
+	struct BOOST
+	{
+		#if UCHAR_MAX == 0xFF && SCHAR_MAX == 0x7F
+			typedef signed char int8_t;
+			typedef unsigned char uint8_t;
+		#else
+			// No suitable 8-bit type available
+			typedef struct see_blargg_common_h int8_t;
+			typedef struct see_blargg_common_h uint8_t;
+		#endif
+		
+		#if USHRT_MAX == 0xFFFF
+			typedef short int16_t;
+			typedef unsigned short uint16_t;
+		#else
+			// No suitable 16-bit type available
+			typedef struct see_blargg_common_h int16_t;
+			typedef struct see_blargg_common_h uint16_t;
+		#endif
+		
+		#if ULONG_MAX == 0xFFFFFFFF
+			typedef long int32_t;
+			typedef unsigned long uint32_t;
+		#elif UINT_MAX == 0xFFFFFFFF
+			typedef int int32_t;
+			typedef unsigned int uint32_t;
+		#else
+			// No suitable 32-bit type available
+			typedef struct see_blargg_common_h int32_t;
+			typedef struct see_blargg_common_h uint32_t;
+		#endif
+	};
+#endif
+
+#if __GNUC__ >= 3
+	#define BLARGG_DEPRECATED __attribute__ ((deprecated))
+#else
+	#define BLARGG_DEPRECATED
+#endif
+
+// Use in place of "= 0;" for a pure virtual, since these cause calls to std C++ lib.
+// During development, BLARGG_PURE( x ) expands to = 0;
+// virtual int func() BLARGG_PURE( { return 0; } )
+#ifndef BLARGG_PURE
+	#define BLARGG_PURE( def ) def
+#endif
+
+#endif
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/blargg_config.h Added

@@ -0,0 +1,43 @@
+// Library configuration. Modify this file as necessary.
+
+#ifndef BLARGG_CONFIG_H
+#define BLARGG_CONFIG_H
+
+// Uncomment to use zlib for transparent decompression of gzipped files
+//#define HAVE_ZLIB_H
+
+// Uncomment and edit list to support only the listed game music types,
+// so that the others don't get linked in at all.
+/*
+#define GME_TYPE_LIST \
+	gme_ay_type,\
+	gme_gbs_type,\
+	gme_gym_type,\
+	gme_hes_type,\
+	gme_kss_type,\
+	gme_nsf_type,\
+	gme_nsfe_type,\
+	gme_sap_type,\
+	gme_spc_type,\
+	gme_vgm_type,\
+	gme_vgz_type
+*/
+
+// Uncomment to enable platform-specific optimizations
+#define BLARGG_NONPORTABLE 1
+
+// Uncomment to use faster, lower quality sound synthesis
+//#define BLIP_BUFFER_FAST 1
+
+// Uncomment if automatic byte-order determination doesn't work
+//#define BLARGG_BIG_ENDIAN 1
+
+// Uncomment if you get errors in the bool section of blargg_common.h
+//#define BLARGG_COMPILER_HAS_BOOL 1
+
+// Use standard config.h if present
+#ifdef HAVE_CONFIG_H
+	#include "config.h"
+#endif
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/blargg_endian.h Added

@@ -0,0 +1,184 @@
+// CPU Byte Order Utilities
+
+#ifndef BLARGG_ENDIAN
+#define BLARGG_ENDIAN
+
+#include "blargg_common.h"
+
+// BLARGG_CPU_CISC: Defined if CPU has very few general-purpose registers (< 16)
+#if defined (__i386__) || defined (__x86_64__) || defined (_M_IX86) || defined (_M_X64)
+	#define BLARGG_CPU_X86 1
+	#define BLARGG_CPU_CISC 1
+#endif
+
+#if defined (__powerpc__) || defined (__ppc__) || defined (__ppc64__) || \
+		defined (__POWERPC__) || defined (__powerc)
+	#define BLARGG_CPU_POWERPC 1
+	#define BLARGG_CPU_RISC 1
+#endif
+
+// BLARGG_BIG_ENDIAN, BLARGG_LITTLE_ENDIAN: Determined automatically, otherwise only
+// one may be #defined to 1. Only needed if something actually depends on byte order.
+#if !defined (BLARGG_BIG_ENDIAN) && !defined (BLARGG_LITTLE_ENDIAN)
+#ifdef __GLIBC__
+	// GCC handles this for us
+	#include <endian.h>
+	#if __BYTE_ORDER == __LITTLE_ENDIAN
+		#define BLARGG_LITTLE_ENDIAN 1
+	#elif __BYTE_ORDER == __BIG_ENDIAN
+		#define BLARGG_BIG_ENDIAN 1
+	#endif
+#else
+
+#if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \
+		(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
+	#define BLARGG_LITTLE_ENDIAN 1
+#endif
+
+#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+	defined (__sparc__) || BLARGG_CPU_POWERPC || \
+	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+	#define BLARGG_BIG_ENDIAN 1
+#elif !defined (__mips__)
+	// No endian specified; assume little-endian, since it's most common
+	#define BLARGG_LITTLE_ENDIAN 1
+#endif
+#endif
+#endif
+
+#if BLARGG_LITTLE_ENDIAN && BLARGG_BIG_ENDIAN
+	#undef BLARGG_LITTLE_ENDIAN
+	#undef BLARGG_BIG_ENDIAN
+#endif
+
+inline void blargg_verify_byte_order()
+{
+	#ifndef NDEBUG
+		#if BLARGG_BIG_ENDIAN
+			volatile int i = 1;
+			assert( *(volatile char*) &i == 0 );
+		#elif BLARGG_LITTLE_ENDIAN
+			volatile int i = 1;
+			assert( *(volatile char*) &i != 0 );
+		#endif
+	#endif
+}
+
+inline unsigned get_le16( void const* p )
+{
+	return (unsigned) ((unsigned char const*) p) [1] << 8 |
+			(unsigned) ((unsigned char const*) p) [0];
+}
+
+inline unsigned get_be16( void const* p )
+{
+	return (unsigned) ((unsigned char const*) p) [0] << 8 |
+			(unsigned) ((unsigned char const*) p) [1];
+}
+
+inline blargg_ulong get_le32( void const* p )
+{
+	return (blargg_ulong) ((unsigned char const*) p) [3] << 24 |
+			(blargg_ulong) ((unsigned char const*) p) [2] << 16 |
+			(blargg_ulong) ((unsigned char const*) p) [1] << 8 |
+			(blargg_ulong) ((unsigned char const*) p) [0];
+}
+
+inline blargg_ulong get_be32( void const* p )
+{
+	return (blargg_ulong) ((unsigned char const*) p) [0] << 24 |
+			(blargg_ulong) ((unsigned char const*) p) [1] << 16 |
+			(blargg_ulong) ((unsigned char const*) p) [2] << 8 |
+			(blargg_ulong) ((unsigned char const*) p) [3];
+}
+
+inline void set_le16( void* p, unsigned n )
+{
+	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
+	((unsigned char*) p) [0] = (unsigned char) n;
+}
+
+inline void set_be16( void* p, unsigned n )
+{
+	((unsigned char*) p) [0] = (unsigned char) (n >> 8);
+	((unsigned char*) p) [1] = (unsigned char) n;
+}
+
+inline void set_le32( void* p, blargg_ulong n )
+{
+	((unsigned char*) p) [0] = (unsigned char) n;
+	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
+	((unsigned char*) p) [2] = (unsigned char) (n >> 16);
+	((unsigned char*) p) [3] = (unsigned char) (n >> 24);
+}
+
+inline void set_be32( void* p, blargg_ulong n )
+{
+	((unsigned char*) p) [3] = (unsigned char) n;
+	((unsigned char*) p) [2] = (unsigned char) (n >> 8);
+	((unsigned char*) p) [1] = (unsigned char) (n >> 16);
+	((unsigned char*) p) [0] = (unsigned char) (n >> 24);
+}
+
+#if BLARGG_NONPORTABLE
+	// Optimized implementation if byte order is known
+	#if BLARGG_LITTLE_ENDIAN
+		#define GET_LE16( addr ) (*(BOOST::uint16_t*) (addr))
+		#define GET_LE32( addr ) (*(BOOST::uint32_t*) (addr))
+		#define SET_LE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
+		#define SET_LE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
+	#elif BLARGG_BIG_ENDIAN
+		#define GET_BE16( addr ) (*(BOOST::uint16_t*) (addr))
+		#define GET_BE32( addr ) (*(BOOST::uint32_t*) (addr))
+		#define SET_BE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
+		#define SET_BE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
+		
+		#if BLARGG_CPU_POWERPC
+			// PowerPC has special byte-reversed instructions
+			#if defined (__MWERKS__)
+				#define GET_LE16( addr ) (__lhbrx( addr, 0 ))
+				#define GET_LE32( addr ) (__lwbrx( addr, 0 ))
+				#define SET_LE16( addr, in ) (__sthbrx( in, addr, 0 ))
+				#define SET_LE32( addr, in ) (__stwbrx( in, addr, 0 ))
+			#elif defined (__GNUC__)
+				#define GET_LE16( addr ) ({unsigned short ppc_lhbrx_; __asm__ volatile( "lhbrx %0,0,%1" : "=r" (ppc_lhbrx_) : "r" (addr) : "memory" ); ppc_lhbrx_;})
+				#define GET_LE32( addr ) ({unsigned short ppc_lwbrx_; __asm__ volatile( "lwbrx %0,0,%1" : "=r" (ppc_lwbrx_) : "r" (addr) : "memory" ); ppc_lwbrx_;})
+				#define SET_LE16( addr, in ) ({__asm__ volatile( "sthbrx %0,0,%1" : : "r" (in), "r" (addr) : "memory" );})
+				#define SET_LE32( addr, in ) ({__asm__ volatile( "stwbrx %0,0,%1" : : "r" (in), "r" (addr) : "memory" );})
+			#endif
+		#endif
+	#endif
+#endif
+
+#ifndef GET_LE16
+	#define GET_LE16( addr ) get_le16( addr )
+	#define SET_LE16( addr, data ) set_le16( addr, data )
+#endif
+
+#ifndef GET_LE32
+	#define GET_LE32( addr ) get_le32( addr )
+	#define SET_LE32( addr, data ) set_le32( addr, data )
+#endif
+
+#ifndef GET_BE16
+	#define GET_BE16( addr ) get_be16( addr )
+	#define SET_BE16( addr, data ) set_be16( addr, data )
+#endif
+
+#ifndef GET_BE32
+	#define GET_BE32( addr ) get_be32( addr )
+	#define SET_BE32( addr, data ) set_be32( addr, data )
+#endif
+
+// auto-selecting versions
+
+inline void set_le( BOOST::uint16_t* p, unsigned n ) { SET_LE16( p, n ); }
+inline void set_le( BOOST::uint32_t* p, blargg_ulong n ) { SET_LE32( p, n ); }
+inline void set_be( BOOST::uint16_t* p, unsigned n ) { SET_BE16( p, n ); }
+inline void set_be( BOOST::uint32_t* p, blargg_ulong n ) { SET_BE32( p, n ); }
+inline unsigned get_le( BOOST::uint16_t* p ) { return GET_LE16( p ); }
+inline blargg_ulong get_le( BOOST::uint32_t* p ) { return GET_LE32( p ); }
+inline unsigned get_be( BOOST::uint16_t* p ) { return GET_BE16( p ); }
+inline blargg_ulong get_be( BOOST::uint32_t* p ) { return GET_BE32( p ); }
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/blargg_source.h Added

@@ -0,0 +1,110 @@
+/* Included at the beginning of library source files, after all other #include lines.
+Sets up helpful macros and services used in my source code. They don't need
+module an annoying module prefix on their names since they are defined after
+all other #include lines. */
+
+#ifndef BLARGG_SOURCE_H
+#define BLARGG_SOURCE_H
+
+// If debugging is enabled, abort program if expr is false. Meant for checking
+// internal state and consistency. A failed assertion indicates a bug in the module.
+// void assert( bool expr );
+#include <assert.h>
+
+// If debugging is enabled and expr is false, abort program. Meant for checking
+// caller-supplied parameters and operations that are outside the control of the
+// module. A failed requirement indicates a bug outside the module.
+// void require( bool expr );
+#undef require
+#define require( expr ) assert( expr )
+
+// Like printf() except output goes to debug log file. Might be defined to do
+// nothing (not even evaluate its arguments).
+// void debug_printf( const char* format, ... );
+static inline void blargg_dprintf_( const char*, ... ) { }
+#undef debug_printf
+#define debug_printf (1) ? (void) 0 : blargg_dprintf_
+
+// If enabled, evaluate expr and if false, make debug log entry with source file
+// and line. Meant for finding situations that should be examined further, but that
+// don't indicate a problem. In all cases, execution continues normally.
+#undef check
+#define check( expr ) ((void) 0)
+
+// If expr yields error string, return it from current function, otherwise continue.
+#undef RETURN_ERR
+#define RETURN_ERR( expr ) do { \
+		blargg_err_t blargg_return_err_ = (expr); \
+		if ( blargg_return_err_ ) return blargg_return_err_; \
+	} while ( 0 )
+
+// If ptr is 0, return out of memory error string.
+#undef CHECK_ALLOC
+#define CHECK_ALLOC( ptr ) do { if ( (ptr) == 0 ) return "Out of memory"; } while ( 0 )
+
+// Avoid any macros which evaluate their arguments multiple times
+#undef min
+#undef max
+
+#define DEF_MIN_MAX( type ) \
+	static inline type min( type x, type y ) { if ( x < y ) return x; return y; }\
+	static inline type max( type x, type y ) { if ( y < x ) return x; return y; }
+
+DEF_MIN_MAX( int )
+DEF_MIN_MAX( unsigned )
+DEF_MIN_MAX( long )
+DEF_MIN_MAX( unsigned long )
+DEF_MIN_MAX( float )
+DEF_MIN_MAX( double )
+
+#undef DEF_MIN_MAX
+
+/*
+// using const references generates crappy code, and I am currenly only using these
+// for built-in types, so they take arguments by value
+
+// TODO: remove
+inline int min( int x, int y ) 
+template<class T>
+inline T min( T x, T y )
+{
+	if ( x < y )
+		return x;
+	return y;
+}
+
+template<class T>
+inline T max( T x, T y )
+{
+	if ( x < y )
+		return y;
+	return x;
+}
+*/
+
+// TODO: good idea? bad idea?
+#undef byte
+#define byte byte_
+typedef unsigned char byte;
+
+// Setup compiler defines useful for exporting required public API symbols in gme.cpp
+#ifndef BLARGG_EXPORT
+ #if defined (_WIN32) && defined(BLARGG_BUILD_DLL)
+ #define BLARGG_EXPORT __declspec(dllexport)
+ #elif defined (LIBGME_VISIBILITY)
+ #define BLARGG_EXPORT __attribute__((visibility ("default")))
+ #else
+ #define BLARGG_EXPORT
+ #endif
+#endif
+
+// deprecated
+#define BLARGG_CHECK_ALLOC CHECK_ALLOC
+#define BLARGG_RETURN_ERR RETURN_ERR
+
+// BLARGG_SOURCE_BEGIN: If defined, #included, allowing redefition of debug_printf and check
+#ifdef BLARGG_SOURCE_BEGIN
+	#include BLARGG_SOURCE_BEGIN
+#endif
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/gb_cpu_io.h Added

@@ -0,0 +1,72 @@
+
+#include "Gbs_Emu.h"
+
+#include "blargg_source.h"
+
+int Gbs_Emu::cpu_read( gb_addr_t addr )
+{
+	int result = *cpu::get_code( addr );
+	if ( unsigned (addr - Gb_Apu::start_addr) < Gb_Apu::register_count )
+		result = apu.read_register( clock(), addr );
+#ifndef NDEBUG
+	else if ( unsigned (addr - 0x8000) < 0x2000 || unsigned (addr - 0xE000) < 0x1F00 )
+		debug_printf( "Read from unmapped memory $%.4x\n", (unsigned) addr );
+	else if ( unsigned (addr - 0xFF01) < 0xFF80 - 0xFF01 )
+		debug_printf( "Unhandled I/O read 0x%4X\n", (unsigned) addr );
+#endif
+	return result;
+}
+
+void Gbs_Emu::cpu_write( gb_addr_t addr, int data )
+{
+	unsigned offset = addr - ram_addr;
+	if ( offset <= 0xFFFF - ram_addr )
+	{
+		ram [offset] = data;
+		if ( (addr ^ 0xE000) <= 0x1F80 - 1 )
+		{
+			if ( unsigned (addr - Gb_Apu::start_addr) < Gb_Apu::register_count )
+			{
+				GME_APU_HOOK( this, addr - Gb_Apu::start_addr, data );
+				apu.write_register( clock(), addr, data );
+			}
+			else if ( (addr ^ 0xFF06) < 2 )
+				update_timer();
+			else if ( addr == joypad_addr )
+				ram [offset] = 0; // keep joypad return value 0
+			else
+				ram [offset] = 0xFF;
+
+			//if ( addr == 0xFFFF )
+			// debug_printf( "Wrote interrupt mask\n" );
+		}
+	}
+	else if ( (addr ^ 0x2000) <= 0x2000 - 1 )
+	{
+		set_bank( data );
+	}
+#ifndef NDEBUG
+	else if ( unsigned (addr - 0x8000) < 0x2000 || unsigned (addr - 0xE000) < 0x1F00 )
+	{
+		debug_printf( "Wrote to unmapped memory $%.4x\n", (unsigned) addr );
+	}
+#endif
+}
+
+#define CPU_READ_FAST( cpu, addr, time, out ) \
+	CPU_READ_FAST_( STATIC_CAST(Gbs_Emu*,cpu), addr, time, out )
+
+#define CPU_READ_FAST_( emu, addr, time, out ) \
+{\
+	out = READ_PROG( addr );\
+	if ( unsigned (addr - Gb_Apu::start_addr) < Gb_Apu::register_count )\
+		out = emu->apu.read_register( emu->cpu_time - time * clocks_per_instr, addr );\
+	else\
+		check( out == emu->cpu_read( addr ) );\
+}
+
+#define CPU_READ( cpu, addr, time ) \
+	STATIC_CAST(Gbs_Emu*,cpu)->cpu_read( addr )
+
+#define CPU_WRITE( cpu, addr, data, time ) \
+	STATIC_CAST(Gbs_Emu*,cpu)->cpu_write( addr, data )

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/gme.cpp Added

@@ -0,0 +1,376 @@
+// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
+
+#include "Music_Emu.h"
+
+#include "gme_types.h"
+#if !GME_DISABLE_STEREO_DEPTH
+#include "Effects_Buffer.h"
+#endif
+#include "blargg_endian.h"
+#include <string.h>
+#include <ctype.h>
+
+/* Copyright (C) 2003-2006 Shay Green. This module 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
+module 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 module; if not, write to the Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
+
+#include "blargg_source.h"
+
+BLARGG_EXPORT gme_type_t const* gme_type_list()
+{
+	static gme_type_t const gme_type_list_ [] = {
+#ifdef GME_TYPE_LIST
+	GME_TYPE_LIST,
+#else
+	#ifdef USE_GME_AY
+	 gme_ay_type,
+	#endif
+	#ifdef USE_GME_GBS
+	 gme_gbs_type,
+	#endif
+	#ifdef USE_GME_GYM
+	 gme_gym_type,
+	#endif
+	#ifdef USE_GME_HES
+	 gme_hes_type,
+	#endif
+	#ifdef USE_GME_KSS
+	 gme_kss_type,
+	#endif
+	#ifdef USE_GME_NSF
+	 gme_nsf_type,
+	#endif
+	#ifdef USE_GME_NSFE
+	 gme_nsfe_type,
+	#endif
+	#ifdef USE_GME_SAP
+	 gme_sap_type,
+	#endif
+	#ifdef USE_GME_SPC
+	 gme_spc_type,
+	#endif
+	#ifdef USE_GME_VGM
+	 gme_vgm_type,
+	 gme_vgz_type,
+	#endif
+#endif
+ 0
+ };
+
+	return gme_type_list_;
+}
+
+BLARGG_EXPORT const char* gme_identify_header( void const* header )
+{
+	switch ( get_be32( header ) )
+	{
+		case BLARGG_4CHAR('Z','X','A','Y'): return "AY";
+		case BLARGG_4CHAR('G','B','S',0x01): return "GBS";
+		case BLARGG_4CHAR('G','Y','M','X'): return "GYM";
+		case BLARGG_4CHAR('H','E','S','M'): return "HES";
+		case BLARGG_4CHAR('K','S','C','C'):
+		case BLARGG_4CHAR('K','S','S','X'): return "KSS";
+		case BLARGG_4CHAR('N','E','S','M'): return "NSF";
+		case BLARGG_4CHAR('N','S','F','E'): return "NSFE";
+		case BLARGG_4CHAR('S','A','P',0x0D): return "SAP";
+		case BLARGG_4CHAR('S','N','E','S'): return "SPC";
+		case BLARGG_4CHAR('V','g','m',' '): return "VGM";
+	}
+	return "";
+}
+
+static void to_uppercase( const char* in, int len, char* out )
+{
+	for ( int i = 0; i < len; i++ )
+	{
+		if ( !(out [i] = toupper( in [i] )) )
+			return;
+	}
+	*out = 0; // extension too long
+}
+
+BLARGG_EXPORT gme_type_t gme_identify_extension( const char* extension_ )
+{
+	char const* end = strrchr( extension_, '.' );
+	if ( end )
+		extension_ = end + 1;
+	
+	char extension [6];
+	to_uppercase( extension_, sizeof extension, extension );
+	
+	for ( gme_type_t const* types = gme_type_list(); *types; types++ )
+		if ( !strcmp( extension, (*types)->extension_ ) )
+			return *types;
+	return 0;
+}
+
+BLARGG_EXPORT gme_err_t gme_identify_file( const char* path, gme_type_t* type_out )
+{
+	*type_out = gme_identify_extension( path );
+	// TODO: don't examine header if file has extension?
+	if ( !*type_out )
+	{
+		char header [4];
+		GME_FILE_READER in;
+		RETURN_ERR( in.open( path ) );
+		RETURN_ERR( in.read( header, sizeof header ) );
+		*type_out = gme_identify_extension( gme_identify_header( header ) );
+	}
+	return 0; 
+}
+
+BLARGG_EXPORT gme_err_t gme_open_data( const char *path, void const* data, long size, Music_Emu** out, int sample_rate )
+{
+	require( (data || !size) && out );
+	*out = 0;
+	
+	gme_type_t file_type = 0;
+	if ( size >= 4 )
+		file_type = gme_identify_extension( path );
+	if ( !file_type )
+		return gme_wrong_file_type;
+	
+	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
+	CHECK_ALLOC( emu );
+	
+	gme_err_t err = gme_load_data( emu, data, size );
+	
+	if ( err )
+		delete emu;
+	else
+		*out = emu;
+	
+	return err;
+}
+
+BLARGG_EXPORT gme_err_t gme_open_file( const char* path, Music_Emu** out, int sample_rate )
+{
+	require( path && out );
+	*out = 0;
+	
+	GME_FILE_READER in;
+	RETURN_ERR( in.open( path ) );
+	
+	char header [4];
+	int header_size = 0;
+	
+	gme_type_t file_type = gme_identify_extension( path );
+	if ( !file_type )
+	{
+		header_size = sizeof header;
+		RETURN_ERR( in.read( header, sizeof header ) );
+		file_type = gme_identify_extension( gme_identify_header( header ) );
+	}
+	if ( !file_type )
+		return gme_wrong_file_type;
+	
+	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
+	CHECK_ALLOC( emu );
+	
+	// optimization: avoids seeking/re-reading header
+	Remaining_Reader rem( header, header_size, &in );
+	gme_err_t err = emu->load( rem );
+	in.close();
+	
+	if ( err )
+		delete emu;
+	else
+		*out = emu;
+	
+	return err;
+}
+
+BLARGG_EXPORT Music_Emu* gme_new_emu( gme_type_t type, int rate )
+{
+	if ( type )
+	{
+		if ( rate == gme_info_only )
+			return type->new_info();
+		
+		Music_Emu* me = type->new_emu();
+		if ( me )
+		{
+		#if !GME_DISABLE_STEREO_DEPTH
+			if ( type->flags_ & 1 )
+			{
+				me->effects_buffer = BLARGG_NEW Effects_Buffer;
+				if ( me->effects_buffer )
+					me->set_buffer( me->effects_buffer );
+			}
+			
+			if ( !(type->flags_ & 1) || me->effects_buffer )
+		#endif
+			{
+				if ( !me->set_sample_rate( rate ) )
+				{
+					check( me->type() == type );
+					return me;
+				}
+			}
+			delete me;
+		}
+	}
+	return 0;
+}
+
+BLARGG_EXPORT gme_err_t gme_load_file( Music_Emu* me, const char* path ) { return me->load_file( path ); }
+
+BLARGG_EXPORT gme_err_t gme_load_data( Music_Emu* me, void const* data, long size )
+{
+	Mem_File_Reader in( data, size );
+	return me->load( in );
+}
+
+BLARGG_EXPORT gme_err_t gme_load_custom( Music_Emu* me, gme_reader_t func, long size, void* data )
+{
+	Callback_Reader in( func, size, data );
+	return me->load( in );
+}
+
+BLARGG_EXPORT void gme_delete( Music_Emu* me ) { delete me; }
+
+BLARGG_EXPORT gme_type_t gme_type( Music_Emu const* me ) { return me->type(); }
+
+BLARGG_EXPORT const char* gme_warning( Music_Emu* me ) { return me->warning(); }
+
+BLARGG_EXPORT int gme_track_count( Music_Emu const* me ) { return me->track_count(); }
+
+struct gme_info_t_ : gme_info_t
+{
+	track_info_t info;
+	
+	BLARGG_DISABLE_NOTHROW
+};
+
+BLARGG_EXPORT gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
+{
+	*out = NULL;
+	
+	gme_info_t_* info = BLARGG_NEW gme_info_t_;
+	CHECK_ALLOC( info );
+	
+	gme_err_t err = me->track_info( &info->info, track );
+	if ( err )
+	{
+		gme_free_info( info );
+		return err;
+	}
+	
+	#define COPY(name) info->name = info->info.name;
+	
+	COPY( length );
+	COPY( intro_length );
+	COPY( loop_length );
+	
+	info->i4 = -1;
+	info->i5 = -1;
+	info->i6 = -1;
+	info->i7 = -1;
+	info->i8 = -1;
+	info->i9 = -1;
+	info->i10 = -1;
+	info->i11 = -1;
+	info->i12 = -1;
+	info->i13 = -1;
+	info->i14 = -1;
+	info->i15 = -1;
+	
+	info->s7 = "";
+	info->s8 = "";
+	info->s9 = "";
+	info->s10 = "";
+	info->s11 = "";
+	info->s12 = "";
+	info->s13 = "";
+	info->s14 = "";
+	info->s15 = "";
+	
+	COPY( system );
+	COPY( game );
+	COPY( song );
+	COPY( author );
+	COPY( copyright );
+	COPY( comment );
+	COPY( dumper );
+	
+	#undef COPY
+	
+	info->play_length = info->length;
+	if ( info->play_length <= 0 )
+	{
+		info->play_length = info->intro_length + 2 * info->loop_length; // intro + 2 loops
+		if ( info->play_length <= 0 )
+			info->play_length = 150 * 1000; // 2.5 minutes
+	}
+	
+	*out = info;
+	
+	return 0;
+}
+
+BLARGG_EXPORT void gme_free_info( gme_info_t* info )
+{
+	delete STATIC_CAST(gme_info_t_*,info);
+}
+
+BLARGG_EXPORT void gme_set_stereo_depth( Music_Emu* me, double depth )
+{
+#if !GME_DISABLE_STEREO_DEPTH
+	if ( me->effects_buffer )
+		STATIC_CAST(Effects_Buffer*,me->effects_buffer)->set_depth( depth );
+#endif
+}
+
+BLARGG_EXPORT void* gme_user_data ( Music_Emu const* me ) { return me->user_data(); }
+BLARGG_EXPORT void gme_set_user_data ( Music_Emu* me, void* new_user_data ) { me->set_user_data( new_user_data ); }
+BLARGG_EXPORT void gme_set_user_cleanup(Music_Emu* me, gme_user_cleanup_t func ) { me->set_user_cleanup( func ); }
+
+BLARGG_EXPORT gme_err_t gme_start_track ( Music_Emu* me, int index ) { return me->start_track( index ); }
+BLARGG_EXPORT gme_err_t gme_play ( Music_Emu* me, int n, short* p ) { return me->play( n, p ); }
+BLARGG_EXPORT void gme_set_fade ( Music_Emu* me, int start_msec ) { me->set_fade( start_msec ); }
+BLARGG_EXPORT int gme_track_ended ( Music_Emu const* me ) { return me->track_ended(); }
+BLARGG_EXPORT int gme_tell ( Music_Emu const* me ) { return me->tell(); }
+BLARGG_EXPORT gme_err_t gme_seek ( Music_Emu* me, int msec ) { return me->seek( msec ); }
+BLARGG_EXPORT int gme_voice_count ( Music_Emu const* me ) { return me->voice_count(); }
+BLARGG_EXPORT void gme_ignore_silence ( Music_Emu* me, int disable ) { me->ignore_silence( disable != 0 ); }
+BLARGG_EXPORT void gme_set_tempo ( Music_Emu* me, double t ) { me->set_tempo( t ); }
+BLARGG_EXPORT void gme_mute_voice ( Music_Emu* me, int index, int mute ) { me->mute_voice( index, mute != 0 ); }
+BLARGG_EXPORT void gme_mute_voices ( Music_Emu* me, int mask ) { me->mute_voices( mask ); }
+BLARGG_EXPORT void gme_enable_accuracy( Music_Emu* me, int enabled ) { me->enable_accuracy( enabled ); }
+BLARGG_EXPORT void gme_clear_playlist ( Music_Emu* me ) { me->clear_playlist(); }
+BLARGG_EXPORT int gme_type_multitrack( gme_type_t t ) { return t->track_count != 1; }
+
+BLARGG_EXPORT void gme_set_equalizer ( Music_Emu* me, gme_equalizer_t const* eq )
+{
+	Music_Emu::equalizer_t e = me->equalizer();
+	e.treble = eq->treble;
+	e.bass = eq->bass;
+	me->set_equalizer( e );
+}
+
+BLARGG_EXPORT void gme_equalizer( Music_Emu const* me, gme_equalizer_t* out )
+{
+	gme_equalizer_t e = { };
+	e.treble = me->equalizer().treble;
+	e.bass = me->equalizer().bass;
+	*out = e;
+}
+
+BLARGG_EXPORT const char* gme_voice_name( Music_Emu const* me, int i )
+{
+	assert( (unsigned) i < (unsigned) me->voice_count() );
+	return me->voice_names() [i];
+}
+
+BLARGG_EXPORT const char* gme_type_system( gme_type_t type )
+{
+	assert( type );
+	return type->system;
+}

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/gme.h Added

@@ -0,0 +1,238 @@
+/* Game music emulator library C interface (also usable from C++) */
+
+/* Game_Music_Emu 0.5.5 */
+#ifndef GME_H
+#define GME_H
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+/* Error string returned by library functions, or NULL if no error (success) */
+typedef const char* gme_err_t;
+
+/* First parameter of most gme_ functions is a pointer to the Music_Emu */
+typedef struct Music_Emu Music_Emu;
+
+
+/******** Basic operations ********/
+
+/* Create emulator and load game music file/data into it. Sets *out to new emulator. */
+gme_err_t gme_open_file( const char path [], Music_Emu** out, int sample_rate );
+
+/* Number of tracks available */
+int gme_track_count( Music_Emu const* );
+
+/* Start a track, where 0 is the first track */
+gme_err_t gme_start_track( Music_Emu*, int index );
+
+/* Generate 'count' 16-bit signed samples info 'out'. Output is in stereo. */
+gme_err_t gme_play( Music_Emu*, int count, short out [] );
+
+/* Finish using emulator and free memory */
+void gme_delete( Music_Emu* );
+
+
+/******** Track position/length ********/
+
+/* Set time to start fading track out. Once fade ends track_ended() returns true.
+Fade time can be changed while track is playing. */
+void gme_set_fade( Music_Emu*, int start_msec );
+
+/* True if a track has reached its end */
+int gme_track_ended( Music_Emu const* );
+
+/* Number of milliseconds (1000 = one second) played since beginning of track */
+int gme_tell( Music_Emu const* );
+
+/* Seek to new time in track. Seeking backwards or far forward can take a while. */
+gme_err_t gme_seek( Music_Emu*, int msec );
+
+
+/******** Informational ********/
+
+/* If you only need track information from a music file, pass gme_info_only for
+sample_rate to open/load. */
+enum { gme_info_only = -1 };
+
+/* Most recent warning string, or NULL if none. Clears current warning after returning.
+Warning is also cleared when loading a file and starting a track. */
+const char* gme_warning( Music_Emu* );
+
+/* Load m3u playlist file (must be done after loading music) */
+gme_err_t gme_load_m3u( Music_Emu*, const char path [] );
+
+/* Clear any loaded m3u playlist and any internal playlist that the music format
+supports (NSFE for example). */
+void gme_clear_playlist( Music_Emu* );
+
+/* Gets information for a particular track (length, name, author, etc.).
+Must be freed after use. */
+typedef struct gme_info_t gme_info_t;
+gme_err_t gme_track_info( Music_Emu const*, gme_info_t** out, int track );
+
+/* Frees track information */
+void gme_free_info( gme_info_t* );
+
+struct gme_info_t
+{
+	/* times in milliseconds; -1 if unknown */
+	int length;			/* total length, if file specifies it */
+	int intro_length;	/* length of song up to looping section */
+	int loop_length;	/* length of looping section */
+	
+	/* Length if available, otherwise intro_length+loop_length*2 if available,
+	otherwise a default of 150000 (2.5 minutes). */
+	int play_length;
+	
+	int i4,i5,i6,i7,i8,i9,i10,i11,i12,i13,i14,i15; /* reserved */
+	
+	/* empty string ("") if not available */
+	const char* system;
+	const char* game;
+	const char* song;
+	const char* author;
+	const char* copyright;
+	const char* comment;
+	const char* dumper;
+	
+	const char *s7,*s8,*s9,*s10,*s11,*s12,*s13,*s14,*s15; /* reserved */
+};
+
+
+/******** Advanced playback ********/
+
+/* Adjust stereo echo depth, where 0.0 = off and 1.0 = maximum. Has no effect for
+GYM, SPC, and Sega Genesis VGM music */
+void gme_set_stereo_depth( Music_Emu*, double depth );
+
+/* Disable automatic end-of-track detection and skipping of silence at beginning
+if ignore is true */
+void gme_ignore_silence( Music_Emu*, int ignore );
+
+/* 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 gme_set_tempo( Music_Emu*, double tempo );
+
+/* Number of voices used by currently loaded file */
+int gme_voice_count( Music_Emu const* );
+
+/* Name of voice i, from 0 to gme_voice_count() - 1 */
+const char* gme_voice_name( Music_Emu const*, int i );
+
+/* Mute/unmute voice i, where voice 0 is first voice */
+void gme_mute_voice( Music_Emu*, int index, int mute );
+
+/* Set muting state of all voices at once using a bit mask, where -1 mutes all
+voices, 0 unmutes them all, 0x01 mutes just the first voice, etc. */
+void gme_mute_voices( Music_Emu*, int muting_mask );
+
+/* Frequency equalizer parameters (see gme.txt) */
+typedef struct gme_equalizer_t
+{
+	double treble; /* -50.0 = muffled, 0 = flat, +5.0 = extra-crisp */
+	double bass;   /* 1 = full bass, 90 = average, 16000 = almost no bass */
+	
+	double d2,d3,d4,d5,d6,d7,d8,d9; /* reserved */
+} gme_equalizer_t;
+
+/* Get current frequency equalizater parameters */
+void gme_equalizer( Music_Emu const*, gme_equalizer_t* out );
+
+/* Change frequency equalizer parameters */
+void gme_set_equalizer( Music_Emu*, gme_equalizer_t const* eq );
+
+/* Enables/disables most accurate sound emulation options */
+void gme_enable_accuracy( Music_Emu*, int enabled );
+
+
+/******** Game music types ********/
+
+/* Music file type identifier. Can also hold NULL. */
+typedef const struct gme_type_t_* gme_type_t;
+
+/* Emulator type constants for each supported file type */
+extern const gme_type_t
+	gme_ay_type,
+	gme_gbs_type,
+	gme_gym_type,
+	gme_hes_type,
+	gme_kss_type,
+	gme_nsf_type,
+	gme_nsfe_type,
+	gme_sap_type,
+	gme_spc_type,
+	gme_vgm_type,
+	gme_vgz_type;
+
+/* Type of this emulator */
+gme_type_t gme_type( Music_Emu const* );
+
+/* Pointer to array of all music types, with NULL entry at end. Allows a player linked
+to this library to support new music types without having to be updated. */
+gme_type_t const* gme_type_list();
+
+/* Name of game system for this music file type */
+const char* gme_type_system( gme_type_t );
+
+/* True if this music file type supports multiple tracks */
+int gme_type_multitrack( gme_type_t );
+
+
+/******** Advanced file loading ********/
+
+/* Error returned if file type is not supported */
+extern const char* const gme_wrong_file_type;
+
+/* Same as gme_open_file(), but uses file data already in memory. Makes copy of data. */
+gme_err_t gme_open_data( const char *path, void const* data, long size, Music_Emu** out, int sample_rate );
+
+/* Determine likely game music type based on first four bytes of file. Returns
+string containing proper file suffix (i.e. "NSF", "SPC", etc.) or "" if
+file header is not recognized. */
+const char* gme_identify_header( void const* header );
+
+/* Get corresponding music type for file path or extension passed in. */
+gme_type_t gme_identify_extension( const char path_or_extension [] );
+
+/* Determine file type based on file's extension or header (if extension isn't recognized).
+Sets *type_out to type, or 0 if unrecognized or error. */
+gme_err_t gme_identify_file( const char path [], gme_type_t* type_out );
+
+/* Create new emulator and set sample rate. Returns NULL if out of memory. If you only need
+track information, pass gme_info_only for sample_rate. */
+Music_Emu* gme_new_emu( gme_type_t, int sample_rate );
+
+/* Load music file into emulator */
+gme_err_t gme_load_file( Music_Emu*, const char path [] );
+
+/* Load music file from memory into emulator. Makes a copy of data passed. */
+gme_err_t gme_load_data( Music_Emu*, void const* data, long size );
+
+/* Load music file using custom data reader function that will be called to
+read file data. Most emulators load the entire file in one read call. */
+typedef gme_err_t (*gme_reader_t)( void* your_data, void* out, int count );
+gme_err_t gme_load_custom( Music_Emu*, gme_reader_t, long file_size, void* your_data );
+
+/* Load m3u playlist file from memory (must be done after loading music) */
+gme_err_t gme_load_m3u_data( Music_Emu*, void const* data, long size );
+
+
+/******** User data ********/
+
+/* Set/get pointer to data you want to associate with this emulator.
+You can use this for whatever you want. */
+void  gme_set_user_data( Music_Emu*, void* new_user_data );
+void* gme_user_data( Music_Emu const* );
+
+/* Register cleanup function to be called when deleting emulator, or NULL to
+clear it. Passes user_data to cleanup function. */
+typedef void (*gme_user_cleanup_t)( void* user_data );
+void gme_set_user_cleanup( Music_Emu*, gme_user_cleanup_t func );
+
+
+#ifdef __cplusplus
+	}
+#endif
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/gme_types.h Added

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/hes_cpu_io.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/nes_cpu_io.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/gme/sap_cpu_io.h Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/license.txt Changed

deadbeef-0.5.2.tar.bz2/plugins/gme/game-music-emu-svn/readme.txt Added

@@ -0,0 +1,216 @@
+Game_Music_Emu 0.5.5: Game Music Emulators
+------------------------------------------
+Game_Music_Emu is a collection of video game music file emulators that
+support the following formats and systems:
+
+AY ZX Spectrum/Amstrad CPC
+GBS Nintendo Game Boy
+GYM Sega Genesis/Mega Drive
+HES NEC TurboGrafx-16/PC Engine
+KSS MSX Home Computer/other Z80 systems (doesn't support FM sound)
+NSF/NSFE Nintendo NES/Famicom (with VRC 6, Namco 106, and FME-7 sound)
+SAP Atari systems using POKEY sound chip
+SPC Super Nintendo/Super Famicom
+VGM/VGZ Sega Master System/Mark III, Sega Genesis/Mega Drive,BBC Micro
+
+Features:
+* C interface for use in C, C++, and other compatible languages
+* High emphasis has been placed on making the library very easy to use
+* One set of common functions work with all emulators the same way
+* Several code examples, including music player using SDL
+* Portable code for use on any system with modern or older C++ compilers
+* Adjustable output sample rate using quality band-limited resampling
+* Uniform access to text information fields and track timing information
+* End-of-track fading and automatic look ahead silence detection
+* Treble/bass and stereo echo for AY/GBS/HES/KSS/NSF/NSFE/SAP/VGM
+* Tempo can be adjusted and individual voices can be muted while playing
+* Can read music data from file, memory, or custom reader function/class
+* Can access track information without having to load into full emulator
+* M3U track listing support for multi-track formats
+* Modular design allows elimination of unneeded emulators/features
+
+This library has been used in game music players for Windows, Linux on
+several architectures, Mac OS, MorphOS, Xbox, PlayStation Portable,
+GP2X, and Nintendo DS.
+
+Author : Shay Green <gblargg@gmail.com>
+Website: http://www.slack.net/~ant/
+Forum : http://groups.google.com/group/blargg-sound-libs
+License: GNU Lesser General Public License (LGPL)
+
+
+Getting Started
+---------------
+Build a program consisting of demo/basics.c, demo/Wave_Writer.cpp, and
+all source files in gme/. If you have CMake 2.6 or later, execute
+
+	run cmake
+	cd demo
+	run make
+
+Be sure "test.nsf" is in the same directory as the program. Running it
+should generate the recording "out.wav".
+
+A slightly more extensive demo application is available in the player/
+directory. It requires SDL to build.
+
+Read gme.txt for more information. Post to the discussion forum for
+assistance.
+
+
+Files
+-----
+gme.txt General notes about the library
+changes.txt Changes made since previous releases
+design.txt Library design notes
+license.txt GNU Lesser General Public License
+CMakeLists.txt CMake build rules
+
+test.nsf Test file for NSF emulator
+test.m3u Test m3u playlist for features.c demo
+
+demo/
+ basics.c Records NSF file to wave sound file
+ features.c Demonstrates many additional features
+ Wave_Writer.h WAVE sound file writer used for demo output
+ Wave_Writer.cpp
+ CMakeLists.txt CMake build rules
+
+player/ Player using the SDL multimedia library
+ player.cpp Simple music player with waveform display
+ Music_Player.cpp Stand alone player for background music
+ Music_Player.h
+ Audio_Scope.cpp Audio waveform scope
+ Audio_Scope.h
+ CMakeLists.txt CMake build rules
+
+gme/
+ blargg_config.h Library configuration (modify this file as needed)
+
+ gme.h Library interface header file
+ gme.cpp
+
+ Ay_Emu.h ZX Spectrum AY emulator
+ Ay_Emu.cpp
+ Ay_Apu.cpp
+ Ay_Apu.h
+ Ay_Cpu.cpp
+ Ay_Cpu.h
+
+ Gbs_Emu.h Nintendo Game Boy GBS emulator
+ Gbs_Emu.cpp
+ Gb_Apu.cpp
+ Gb_Apu.h
+ Gb_Cpu.cpp
+ Gb_Cpu.h
+ gb_cpu_io.h
+ Gb_Oscs.cpp
+ Gb_Oscs.h
+
+ Hes_Emu.h TurboGrafx-16/PC Engine HES emulator
+ Hes_Apu.cpp
+ Hes_Apu.h
+ Hes_Cpu.cpp
+ Hes_Cpu.h
+ hes_cpu_io.h
+ Hes_Emu.cpp
+
+ Kss_Emu.h MSX Home Computer/other Z80 systems KSS emulator
+ Kss_Emu.cpp
+ Kss_Cpu.cpp
+ Kss_Cpu.h
+ Kss_Scc_Apu.cpp
+ Kss_Scc_Apu.h
+ Ay_Apu.h
+ Ay_Apu.cpp
+ Sms_Apu.h
+ Sms_Apu.cpp
+ Sms_Oscs.h
+
+ Nsf_Emu.h Nintendo NES NSF/NSFE emulator
+ Nsf_Emu.cpp
+ Nes_Apu.cpp
+ Nes_Apu.h
+ Nes_Cpu.cpp
+ Nes_Cpu.h
+ nes_cpu_io.h
+ Nes_Oscs.cpp
+ Nes_Oscs.h
+ Nes_Fme7_Apu.cpp
+ Nes_Fme7_Apu.h
+ Nes_Namco_Apu.cpp
+ Nes_Namco_Apu.h
+ Nes_Vrc6_Apu.cpp
+ Nes_Vrc6_Apu.h
+ Nsfe_Emu.h NSFE support
+ Nsfe_Emu.cpp
+
+ Spc_Emu.h Super Nintendo SPC emulator
+ Spc_Emu.cpp
+ Snes_Spc.cpp
+ Snes_Spc.h
+ Spc_Cpu.cpp
+ Spc_Cpu.h
+ Spc_Dsp.cpp
+ Spc_Dsp.h
+ Fir_Resampler.cpp
+ Fir_Resampler.h
+
+ Sap_Emu.h Atari SAP emulator
+ Sap_Emu.cpp
+ Sap_Apu.cpp
+ Sap_Apu.h
+ Sap_Cpu.cpp
+ Sap_Cpu.h
+ sap_cpu_io.h
+
+ Vgm_Emu.h Sega VGM emulator
+ Vgm_Emu_Impl.cpp
+ Vgm_Emu_Impl.h
+ Vgm_Emu.cpp
+ Ym2413_Emu.cpp
+ Ym2413_Emu.h
+ Gym_Emu.h Sega Genesis GYM emulator
+ Gym_Emu.cpp
+ Sms_Apu.cpp Common Sega emulator files
+ Sms_Apu.h
+ Sms_Oscs.h
+ Ym2612_Emu.cpp
+ Ym2612_Emu.h
+ Dual_Resampler.cpp
+ Dual_Resampler.h
+ Fir_Resampler.cpp
+ Fir_Resampler.h
+
+ M3u_Playlist.h M3U playlist support
+ M3u_Playlist.cpp
+
+ Effects_Buffer.h Sound buffer with stereo echo and panning
+ Effects_Buffer.cpp
+
+ blargg_common.h Common files needed by all emulators
+ blargg_endian.h
+ blargg_source.h
+ Blip_Buffer.cpp
+ Blip_Buffer.h
+ Gme_File.h
+ Gme_File.cpp
+ Music_Emu.h
+ Music_Emu.cpp
+ Classic_Emu.h
+ Classic_Emu.cpp
+ Multi_Buffer.h
+ Multi_Buffer.cpp
+ Data_Reader.h
+ Data_Reader.cpp
+ 
+ CMakeLists.txt CMake build rules
+
+
+Legal
+-----
+Game_Music_Emu library copyright (C) 2003-2009 Shay Green.
+Sega Genesis YM2612 emulator copyright (C) 2002 Stephane Dallongeville.
+
+--
+Shay Green <gblargg@gmail.com>

deadbeef-0.5.1.tar.bz2/plugins/gtkui/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/Makefile.am Changed

@@ -1,19 +1,5 @@
 if HAVE_GTKUI
 gtkuidir = $(libdir)/$(PACKAGE)
-gtkui_VALASOURCES = ddbequalizer.vala ddbseekbar.vala ddbcellrenderertextmultiline.vala
-gtkui_VALABUILTSOURCES = $(gtkui_VALASOURCES:.vala=.c) ddbequalizer.h ddbseekbar.h ddbcellrenderertextmultiline.h
-if MAINTAINER_MODE
-BUILT_SOURCES = vala.stamp
-vala.stamp: $(gtkui_VALASOURCES)
-	$(VALAC)  -C -H ddbcellrenderertextmultiline.h --library ddbcellrenderertextmultiline --pkg=gtk+-2.0 gdk-keysyms.vapi ddbcellrenderertextmultiline.vala
-	$(VALAC)  -C -H ddbequalizer.h --library ddbequalizer gtkui.vapi --pkg=gtk+-2.0 ddbequalizer.vala
-	$(VALAC)  -C -H ddbseekbar.h --library ddbseekbar gtkui.vapi --pkg=gtk+-2.0 ddbseekbar.vala
-	touch $@
-
-CLEANFILES =								\
-	$(BUILT_SOURCES)						\
-	$(gtkui_VALABUILTSOURCES)
-endif
 
 GTKUI_SOURCES =    gtkui.c gtkui.h\
 				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
@@ -36,31 +22,50 @@
 				   dspconfig.c dspconfig.h\
 				   tagwritersettings.c tagwritersettings.h\
 				   wingeom.c wingeom.h\
-				   pluginconf.h
+				   pluginconf.h\
+				   ddbseekbar.h ddbequalizer.h ddbcellrenderertextmultiline.h\
+				   ddbseekbar.c ddbequalizer.c ddbcellrenderertextmultiline.c
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = gtkui_api.h
 
-EXTRA_DIST = $(gtkui_VALASOURCES) deadbeef.glade
+EXTRA_DIST = deadbeef.glade
 
 if STATICLINK
 pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
 else
+if HAVE_GTK2
+if HAVE_GTK3
+pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
+else
 pkglib_LTLIBRARIES = ddb_gui_GTK2.la
 endif
+else
+if HAVE_GTK3
+pkglib_LTLIBRARIES = ddb_gui_GTK3.la
+endif
+endif
+endif
 
 # normal lib
-ddb_gui_GTK2_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
+if HAVE_GTK2
+ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES)
 ddb_gui_GTK2_la_LDFLAGS = -module
-ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
+endif
+if HAVE_GTK3
+ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES)
+ddb_gui_GTK3_la_LDFLAGS = -module
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
+endif
 
 # fallback lib
 if STATICLINK
 GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
-#../../../deadbeef-deps/gtk-debian/usr
 
-ddb_gui_GTK2_fallback_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
+ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES)
 ddb_gui_GTK2_fallback_la_LDFLAGS = -module
 
 ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la

deadbeef-0.5.1.tar.bz2/plugins/gtkui/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/Makefile.in Changed

@@ -81,9 +81,7 @@
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgmodule-2.0.la \
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libgthread-2.0.la \
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(GTK_ROOT)/lib/libglib-2.0.la
-am__ddb_gui_GTK2_fallback_la_SOURCES_DIST = ddbequalizer.c \
-	ddbseekbar.c ddbcellrenderertextmultiline.c ddbequalizer.h \
-	ddbseekbar.h ddbcellrenderertextmultiline.h gtkui.c gtkui.h \
+am__ddb_gui_GTK2_fallback_la_SOURCES_DIST = gtkui.c gtkui.h \
 	callbacks.c interface.c support.c callbacks.h interface.h \
 	support.h ddblistview.c ddblistview.h mainplaylist.c \
 	mainplaylist.h drawing.h gdkdrawing.c progress.c progress.h \
@@ -92,13 +90,10 @@
 	trkproperties.c trkproperties.h coverart.c coverart.h \
 	plcommon.c plcommon.h prefwin.c eq.c eq.h actions.c actions.h \
 	dspconfig.c dspconfig.h tagwritersettings.c \
-	tagwritersettings.h wingeom.c wingeom.h pluginconf.h
-@HAVE_GTKUI_TRUE@am__objects_1 = \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbequalizer.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbseekbar.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo
-@HAVE_GTKUI_TRUE@am__objects_2 = $(am__objects_1)
-@HAVE_GTKUI_TRUE@am__objects_3 = ddb_gui_GTK2_fallback_la-gtkui.lo \
+	tagwritersettings.h wingeom.c wingeom.h pluginconf.h \
+	ddbseekbar.h ddbequalizer.h ddbcellrenderertextmultiline.h \
+	ddbseekbar.c ddbequalizer.c ddbcellrenderertextmultiline.c
+@HAVE_GTKUI_TRUE@am__objects_1 = ddb_gui_GTK2_fallback_la-gtkui.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-callbacks.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-interface.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-support.lo \
@@ -120,23 +115,27 @@
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-actions.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-dspconfig.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-tagwritersettings.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-wingeom.lo
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-wingeom.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbseekbar.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbequalizer.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@am_ddb_gui_GTK2_fallback_la_OBJECTS = \
-@HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(am__objects_2) \
-@HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(am__objects_3)
+@HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(am__objects_1)
 ddb_gui_GTK2_fallback_la_OBJECTS = \
 	$(am_ddb_gui_GTK2_fallback_la_OBJECTS)
-ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ddb_gui_GTK2_fallback_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) \
 	$(ddb_gui_GTK2_fallback_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@am_ddb_gui_GTK2_fallback_la_rpath = \
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	-rpath $(pkglibdir)
 am__DEPENDENCIES_1 =
-@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__ddb_gui_GTK2_la_SOURCES_DIST = ddbequalizer.c ddbseekbar.c \
-	ddbcellrenderertextmultiline.c ddbequalizer.h ddbseekbar.h \
-	ddbcellrenderertextmultiline.h gtkui.c gtkui.h callbacks.c \
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_DEPENDENCIES = \
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@	$(am__DEPENDENCIES_1)
+am__ddb_gui_GTK2_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
 	interface.c support.c callbacks.h interface.h support.h \
 	ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
 	drawing.h gdkdrawing.c progress.c progress.h search.c search.h \
@@ -145,12 +144,10 @@
 	trkproperties.h coverart.c coverart.h plcommon.c plcommon.h \
 	prefwin.c eq.c eq.h actions.c actions.h dspconfig.c \
 	dspconfig.h tagwritersettings.c tagwritersettings.h wingeom.c \
-	wingeom.h pluginconf.h
-@HAVE_GTKUI_TRUE@am__objects_4 = ddb_gui_GTK2_la-ddbequalizer.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-ddbseekbar.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo
-@HAVE_GTKUI_TRUE@am__objects_5 = $(am__objects_4)
-@HAVE_GTKUI_TRUE@am__objects_6 = ddb_gui_GTK2_la-gtkui.lo \
+	wingeom.h pluginconf.h ddbseekbar.h ddbequalizer.h \
+	ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
+	ddbcellrenderertextmultiline.c
+@HAVE_GTKUI_TRUE@am__objects_2 = ddb_gui_GTK2_la-gtkui.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-callbacks.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-interface.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-support.lo \
@@ -172,34 +169,105 @@
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-actions.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-dspconfig.lo \
 @HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-tagwritersettings.lo \
-@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-wingeom.lo
-@HAVE_GTKUI_TRUE@am_ddb_gui_GTK2_la_OBJECTS = $(am__objects_5) \
-@HAVE_GTKUI_TRUE@	$(am__objects_6)
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-wingeom.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-ddbseekbar.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-ddbequalizer.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@am_ddb_gui_GTK2_la_OBJECTS = \
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@	$(am__objects_2)
 ddb_gui_GTK2_la_OBJECTS = $(am_ddb_gui_GTK2_la_OBJECTS)
-ddb_gui_GTK2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_gui_GTK2_la_CFLAGS) \
-	$(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@am_ddb_gui_GTK2_la_rpath = -rpath \
-@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
+ddb_gui_GTK2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) $(ddb_gui_GTK2_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@am_ddb_gui_GTK2_la_rpath = -rpath \
+@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@am_ddb_gui_GTK2_la_rpath = -rpath \
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@am_ddb_gui_GTK2_la_rpath = -rpath \
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK3_la_DEPENDENCIES = \
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@	$(am__DEPENDENCIES_1)
+am__ddb_gui_GTK3_la_SOURCES_DIST = gtkui.c gtkui.h callbacks.c \
+	interface.c support.c callbacks.h interface.h support.h \
+	ddblistview.c ddblistview.h mainplaylist.c mainplaylist.h \
+	drawing.h gdkdrawing.c progress.c progress.h search.c search.h \
+	fileman.c pluginconf.c parser.c parser.h ddbtabstrip.c \
+	ddbtabstrip.h ddbvolumebar.c ddbvolumebar.h trkproperties.c \
+	trkproperties.h coverart.c coverart.h plcommon.c plcommon.h \
+	prefwin.c eq.c eq.h actions.c actions.h dspconfig.c \
+	dspconfig.h tagwritersettings.c tagwritersettings.h wingeom.c \
+	wingeom.h pluginconf.h ddbseekbar.h ddbequalizer.h \
+	ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
+	ddbcellrenderertextmultiline.c
+@HAVE_GTKUI_TRUE@am__objects_3 = ddb_gui_GTK3_la-gtkui.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-callbacks.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-interface.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-support.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddblistview.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-mainplaylist.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-gdkdrawing.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-progress.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-search.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-fileman.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-pluginconf.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-parser.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddbtabstrip.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddbvolumebar.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-trkproperties.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-coverart.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-plcommon.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-prefwin.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-eq.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-actions.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-dspconfig.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-tagwritersettings.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-wingeom.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddbseekbar.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddbequalizer.lo \
+@HAVE_GTKUI_TRUE@	ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@am_ddb_gui_GTK3_la_OBJECTS = \
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@	$(am__objects_3)
+ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS)
+ddb_gui_GTK3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) $(ddb_gui_GTK3_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@am_ddb_gui_GTK3_la_rpath = -rpath \
+@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@am_ddb_gui_GTK3_la_rpath = -rpath \
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(ddb_gui_GTK2_fallback_la_SOURCES) \
-	$(ddb_gui_GTK2_la_SOURCES)
+	$(ddb_gui_GTK2_la_SOURCES) $(ddb_gui_GTK3_la_SOURCES)
 DIST_SOURCES = $(am__ddb_gui_GTK2_fallback_la_SOURCES_DIST) \
-	$(am__ddb_gui_GTK2_la_SOURCES_DIST)
+	$(am__ddb_gui_GTK2_la_SOURCES_DIST) \
+	$(am__ddb_gui_GTK3_la_SOURCES_DIST)
 am__sdk_HEADERS_DIST = gtkui_api.h
 HEADERS = $(sdk_HEADERS)
 ETAGS = etags
@@ -211,6 +279,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -258,14 +327,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -355,7 +427,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -366,6 +437,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -422,13 +494,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @HAVE_GTKUI_TRUE@gtkuidir = $(libdir)/$(PACKAGE)
-@HAVE_GTKUI_TRUE@gtkui_VALASOURCES = ddbequalizer.vala ddbseekbar.vala ddbcellrenderertextmultiline.vala
-@HAVE_GTKUI_TRUE@gtkui_VALABUILTSOURCES = $(gtkui_VALASOURCES:.vala=.c) ddbequalizer.h ddbseekbar.h ddbcellrenderertextmultiline.h
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@BUILT_SOURCES = vala.stamp
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@CLEANFILES = \
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	$(BUILT_SOURCES)						\
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	$(gtkui_VALABUILTSOURCES)
-
 @HAVE_GTKUI_TRUE@GTKUI_SOURCES = gtkui.c gtkui.h\
 @HAVE_GTKUI_TRUE@				 callbacks.c interface.c support.c callbacks.h interface.h support.h\
 @HAVE_GTKUI_TRUE@				 ddblistview.c ddblistview.h\
@@ -450,29 +515,35 @@
 @HAVE_GTKUI_TRUE@				 dspconfig.c dspconfig.h\
 @HAVE_GTKUI_TRUE@				 tagwritersettings.c tagwritersettings.h\
 @HAVE_GTKUI_TRUE@				 wingeom.c wingeom.h\
-@HAVE_GTKUI_TRUE@				 pluginconf.h
+@HAVE_GTKUI_TRUE@				 pluginconf.h\
+@HAVE_GTKUI_TRUE@				 ddbseekbar.h ddbequalizer.h ddbcellrenderertextmultiline.h\
+@HAVE_GTKUI_TRUE@				 ddbseekbar.c ddbequalizer.c ddbcellrenderertextmultiline.c
 
 @HAVE_GTKUI_TRUE@sdkdir = $(pkgincludedir)
 @HAVE_GTKUI_TRUE@sdk_HEADERS = gtkui_api.h
-@HAVE_GTKUI_TRUE@EXTRA_DIST = $(gtkui_VALASOURCES) deadbeef.glade
-@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la
+@HAVE_GTKUI_TRUE@EXTRA_DIST = deadbeef.glade
+@HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK3.la
+@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
 
 # normal lib
-@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
-@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module
-@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
-@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES)
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
+@HAVE_GTK2_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES)
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK3_la_LDFLAGS = -module
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
+@HAVE_GTK3_TRUE@@HAVE_GTKUI_TRUE@ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
 
 # fallback lib
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
-#../../../deadbeef-deps/gtk-debian/usr
-@HAVE_GTKUI_TRUE@@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_SOURCES = $(gtkui_VALABUILTSOURCES) $(GTKUI_SOURCES)
+@HAVE_GTKUI_TRUE@@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES)
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LDFLAGS = -module
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
 @HAVE_GTKUI_TRUE@@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -538,9 +609,11 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 ddb_gui_GTK2.fallback.la: $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_DEPENDENCIES) 
-	$(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_gui_GTK2_fallback_la_LINK) $(am_ddb_gui_GTK2_fallback_la_rpath) $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_LIBADD) $(LIBS)
 ddb_gui_GTK2.la: $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_DEPENDENCIES) 
-	$(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ddb_gui_GTK2_la_LINK) $(am_ddb_gui_GTK2_la_rpath) $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_LIBADD) $(LIBS)
+ddb_gui_GTK3.la: $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -600,391 +673,680 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-actions.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-eq.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-progress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-search.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-ddb_gui_GTK2_fallback_la-ddbequalizer.lo: ddbequalizer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
-
-ddb_gui_GTK2_fallback_la-ddbseekbar.lo: ddbseekbar.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
-
-ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
-
 ddb_gui_GTK2_fallback_la-gtkui.lo: gtkui.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK2_fallback_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
 ddb_gui_GTK2_fallback_la-callbacks.lo: callbacks.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK2_fallback_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 ddb_gui_GTK2_fallback_la-interface.lo: interface.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK2_fallback_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 ddb_gui_GTK2_fallback_la-support.lo: support.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK2_fallback_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_GTK2_fallback_la-ddblistview.lo: ddblistview.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK2_fallback_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
 
 ddb_gui_GTK2_fallback_la-mainplaylist.lo: mainplaylist.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK2_fallback_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
 
 ddb_gui_GTK2_fallback_la-gdkdrawing.lo: gdkdrawing.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK2_fallback_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
 
 ddb_gui_GTK2_fallback_la-progress.lo: progress.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK2_fallback_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
 ddb_gui_GTK2_fallback_la-search.lo: search.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK2_fallback_la-search.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK2_fallback_la-fileman.lo: fileman.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK2_fallback_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
 
 ddb_gui_GTK2_fallback_la-pluginconf.lo: pluginconf.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK2_fallback_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
 ddb_gui_GTK2_fallback_la-parser.lo: parser.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-parser.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Tpo -c -o ddb_gui_GTK2_fallback_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-parser.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Tpo -c -o ddb_gui_GTK2_fallback_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-parser.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='ddb_gui_GTK2_fallback_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
 
 ddb_gui_GTK2_fallback_la-ddbtabstrip.lo: ddbtabstrip.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK2_fallback_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
 
 ddb_gui_GTK2_fallback_la-ddbvolumebar.lo: ddbvolumebar.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK2_fallback_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK2_fallback_la-trkproperties.lo: trkproperties.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK2_fallback_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK2_fallback_la-coverart.lo: coverart.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK2_fallback_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
 
 ddb_gui_GTK2_fallback_la-plcommon.lo: plcommon.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK2_fallback_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
 
 ddb_gui_GTK2_fallback_la-prefwin.lo: prefwin.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK2_fallback_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
 
 ddb_gui_GTK2_fallback_la-eq.lo: eq.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK2_fallback_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK2_fallback_la-actions.lo: actions.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK2_fallback_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK2_fallback_la-dspconfig.lo: dspconfig.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK2_fallback_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
 ddb_gui_GTK2_fallback_la-tagwritersettings.lo: tagwritersettings.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK2_fallback_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
 
 ddb_gui_GTK2_fallback_la-wingeom.lo: wingeom.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK2_fallback_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
 
-ddb_gui_GTK2_la-ddbequalizer.lo: ddbequalizer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+ddb_gui_GTK2_fallback_la-ddbseekbar.lo: ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_fallback_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
 
-ddb_gui_GTK2_la-ddbseekbar.lo: ddbseekbar.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+ddb_gui_GTK2_fallback_la-ddbequalizer.lo: ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_fallback_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
 
-ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_fallback_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
 
 ddb_gui_GTK2_la-gtkui.lo: gtkui.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK2_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
 ddb_gui_GTK2_la-callbacks.lo: callbacks.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK2_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
 
 ddb_gui_GTK2_la-interface.lo: interface.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK2_la-interface.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK2_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
 
 ddb_gui_GTK2_la-support.lo: support.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-support.Tpo $(DEPDIR)/ddb_gui_GTK2_la-support.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK2_la-support.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_GTK2_la-ddblistview.lo: ddblistview.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK2_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
 
 ddb_gui_GTK2_la-mainplaylist.lo: mainplaylist.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK2_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
 
 ddb_gui_GTK2_la-gdkdrawing.lo: gdkdrawing.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK2_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
 
 ddb_gui_GTK2_la-progress.lo: progress.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK2_la-progress.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK2_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
 ddb_gui_GTK2_la-search.lo: search.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-search.Tpo $(DEPDIR)/ddb_gui_GTK2_la-search.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK2_la-search.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK2_la-fileman.lo: fileman.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK2_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
 
 ddb_gui_GTK2_la-pluginconf.lo: pluginconf.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK2_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
 ddb_gui_GTK2_la-parser.lo: parser.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-parser.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-parser.Tpo -c -o ddb_gui_GTK2_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-parser.Tpo $(DEPDIR)/ddb_gui_GTK2_la-parser.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-parser.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-parser.Tpo -c -o ddb_gui_GTK2_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-parser.Tpo $(DEPDIR)/ddb_gui_GTK2_la-parser.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='ddb_gui_GTK2_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
 
 ddb_gui_GTK2_la-ddbtabstrip.lo: ddbtabstrip.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK2_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
 
 ddb_gui_GTK2_la-ddbvolumebar.lo: ddbvolumebar.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK2_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK2_la-trkproperties.lo: trkproperties.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK2_la-trkproperties.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK2_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK2_la-coverart.lo: coverart.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK2_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
 
 ddb_gui_GTK2_la-plcommon.lo: plcommon.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK2_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
 
 ddb_gui_GTK2_la-prefwin.lo: prefwin.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK2_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
 
 ddb_gui_GTK2_la-eq.lo: eq.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK2_la-eq.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK2_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK2_la-actions.lo: actions.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actions.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK2_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK2_la-dspconfig.lo: dspconfig.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK2_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
 ddb_gui_GTK2_la-tagwritersettings.lo: tagwritersettings.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK2_la-tagwritersettings.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK2_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
 
 ddb_gui_GTK2_la-wingeom.lo: wingeom.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK2_la-wingeom.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK2_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+
+ddb_gui_GTK2_la-ddbseekbar.lo: ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK2_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+
+ddb_gui_GTK2_la-ddbequalizer.lo: ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK2_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+
+ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK2_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+
+ddb_gui_GTK3_la-gtkui.lo: gtkui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gtkui.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkui.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gtkui.c' object='ddb_gui_GTK3_la-gtkui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
+
+ddb_gui_GTK3_la-callbacks.lo: callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-callbacks.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Tpo $(DEPDIR)/ddb_gui_GTK3_la-callbacks.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='callbacks.c' object='ddb_gui_GTK3_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+
+ddb_gui_GTK3_la-interface.lo: interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-interface.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-interface.Tpo $(DEPDIR)/ddb_gui_GTK3_la-interface.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interface.c' object='ddb_gui_GTK3_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+
+ddb_gui_GTK3_la-support.lo: support.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-support.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-support.Tpo $(DEPDIR)/ddb_gui_GTK3_la-support.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='support.c' object='ddb_gui_GTK3_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+
+ddb_gui_GTK3_la-ddblistview.lo: ddblistview.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddblistview.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddblistview.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddblistview.c' object='ddb_gui_GTK3_la-ddblistview.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddblistview.lo `test -f 'ddblistview.c' || echo '$(srcdir)/'`ddblistview.c
+
+ddb_gui_GTK3_la-mainplaylist.lo: mainplaylist.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-mainplaylist.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Tpo $(DEPDIR)/ddb_gui_GTK3_la-mainplaylist.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainplaylist.c' object='ddb_gui_GTK3_la-mainplaylist.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-mainplaylist.lo `test -f 'mainplaylist.c' || echo '$(srcdir)/'`mainplaylist.c
+
+ddb_gui_GTK3_la-gdkdrawing.lo: gdkdrawing.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-gdkdrawing.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gdkdrawing.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gdkdrawing.c' object='ddb_gui_GTK3_la-gdkdrawing.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-gdkdrawing.lo `test -f 'gdkdrawing.c' || echo '$(srcdir)/'`gdkdrawing.c
+
+ddb_gui_GTK3_la-progress.lo: progress.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-progress.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-progress.Tpo $(DEPDIR)/ddb_gui_GTK3_la-progress.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progress.c' object='ddb_gui_GTK3_la-progress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
+
+ddb_gui_GTK3_la-search.lo: search.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-search.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-search.Tpo $(DEPDIR)/ddb_gui_GTK3_la-search.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='search.c' object='ddb_gui_GTK3_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
+
+ddb_gui_GTK3_la-fileman.lo: fileman.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-fileman.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-fileman.Tpo $(DEPDIR)/ddb_gui_GTK3_la-fileman.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fileman.c' object='ddb_gui_GTK3_la-fileman.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-fileman.lo `test -f 'fileman.c' || echo '$(srcdir)/'`fileman.c
+
+ddb_gui_GTK3_la-pluginconf.lo: pluginconf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-pluginconf.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pluginconf.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pluginconf.c' object='ddb_gui_GTK3_la-pluginconf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
+
+ddb_gui_GTK3_la-parser.lo: parser.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-parser.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-parser.Tpo -c -o ddb_gui_GTK3_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-parser.Tpo $(DEPDIR)/ddb_gui_GTK3_la-parser.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parser.c' object='ddb_gui_GTK3_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
+
+ddb_gui_GTK3_la-ddbtabstrip.lo: ddbtabstrip.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbtabstrip.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbtabstrip.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbtabstrip.c' object='ddb_gui_GTK3_la-ddbtabstrip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbtabstrip.lo `test -f 'ddbtabstrip.c' || echo '$(srcdir)/'`ddbtabstrip.c
+
+ddb_gui_GTK3_la-ddbvolumebar.lo: ddbvolumebar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbvolumebar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbvolumebar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbvolumebar.c' object='ddb_gui_GTK3_la-ddbvolumebar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
+
+ddb_gui_GTK3_la-trkproperties.lo: trkproperties.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-trkproperties.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Tpo $(DEPDIR)/ddb_gui_GTK3_la-trkproperties.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trkproperties.c' object='ddb_gui_GTK3_la-trkproperties.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
+
+ddb_gui_GTK3_la-coverart.lo: coverart.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-coverart.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-coverart.Tpo $(DEPDIR)/ddb_gui_GTK3_la-coverart.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coverart.c' object='ddb_gui_GTK3_la-coverart.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-coverart.lo `test -f 'coverart.c' || echo '$(srcdir)/'`coverart.c
+
+ddb_gui_GTK3_la-plcommon.lo: plcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-plcommon.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Tpo $(DEPDIR)/ddb_gui_GTK3_la-plcommon.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plcommon.c' object='ddb_gui_GTK3_la-plcommon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-plcommon.lo `test -f 'plcommon.c' || echo '$(srcdir)/'`plcommon.c
+
+ddb_gui_GTK3_la-prefwin.lo: prefwin.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-prefwin.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Tpo $(DEPDIR)/ddb_gui_GTK3_la-prefwin.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prefwin.c' object='ddb_gui_GTK3_la-prefwin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin.c' || echo '$(srcdir)/'`prefwin.c
+
+ddb_gui_GTK3_la-eq.lo: eq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-eq.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-eq.Tpo $(DEPDIR)/ddb_gui_GTK3_la-eq.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eq.c' object='ddb_gui_GTK3_la-eq.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
+
+ddb_gui_GTK3_la-actions.lo: actions.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-actions.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actions.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actions.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='actions.c' object='ddb_gui_GTK3_la-actions.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
+
+ddb_gui_GTK3_la-dspconfig.lo: dspconfig.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-dspconfig.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Tpo $(DEPDIR)/ddb_gui_GTK3_la-dspconfig.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='dspconfig.c' object='ddb_gui_GTK3_la-dspconfig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
+
+ddb_gui_GTK3_la-tagwritersettings.lo: tagwritersettings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-tagwritersettings.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Tpo $(DEPDIR)/ddb_gui_GTK3_la-tagwritersettings.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tagwritersettings.c' object='ddb_gui_GTK3_la-tagwritersettings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-tagwritersettings.lo `test -f 'tagwritersettings.c' || echo '$(srcdir)/'`tagwritersettings.c
+
+ddb_gui_GTK3_la-wingeom.lo: wingeom.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-wingeom.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Tpo $(DEPDIR)/ddb_gui_GTK3_la-wingeom.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='wingeom.c' object='ddb_gui_GTK3_la-wingeom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.c
+
+ddb_gui_GTK3_la-ddbseekbar.lo: ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbseekbar.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbseekbar.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbseekbar.c' object='ddb_gui_GTK3_la-ddbseekbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+
+ddb_gui_GTK3_la-ddbequalizer.lo: ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbequalizer.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbequalizer.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbequalizer.c' object='ddb_gui_GTK3_la-ddbequalizer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+
+ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -MT ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ddbcellrenderertextmultiline.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ddbcellrenderertextmultiline.c' object='ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_CFLAGS) $(CFLAGS) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1095,15 +1457,13 @@
 	 fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sdkdir)"; do \
 	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -1120,7 +1480,6 @@
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1129,7 +1488,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
@@ -1201,7 +1559,7 @@
 
 uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
 
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
@@ -1218,11 +1576,6 @@
 	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES \
 	uninstall-sdkHEADERS
 
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@vala.stamp: $(gtkui_VALASOURCES)
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	$(VALAC) -C -H ddbcellrenderertextmultiline.h --library ddbcellrenderertextmultiline --pkg=gtk+-2.0 gdk-keysyms.vapi ddbcellrenderertextmultiline.vala
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	$(VALAC) -C -H ddbequalizer.h --library ddbequalizer gtkui.vapi --pkg=gtk+-2.0 ddbequalizer.vala
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	$(VALAC) -C -H ddbseekbar.h --library ddbseekbar gtkui.vapi --pkg=gtk+-2.0 ddbseekbar.vala
-@HAVE_GTKUI_TRUE@@MAINTAINER_MODE_TRUE@	touch $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

deadbeef-0.5.1.tar.bz2/plugins/gtkui/actions.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/actions.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/actions.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/actions.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/callbacks.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/callbacks.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/callbacks.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/callbacks.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/coverart.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/coverart.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/coverart.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/coverart.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.c Changed

@@ -1,4 +1,4 @@
-/* ddbcellrenderertextmultiline.c generated by valac 0.10.2, the Vala compiler
+/* ddbcellrenderertextmultiline.c generated by valac 0.14.0, the Vala compiler
 * generated from ddbcellrenderertextmultiline.vala, do not modify */
 
 /*
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
+#include "support.h"
 
 
 #define DDB_TYPE_CELL_EDITABLE_TEXT_VIEW (ddb_cell_editable_text_view_get_type ())
@@ -58,7 +58,7 @@
 	GtkTextView parent_instance;
 	DdbCellEditableTextViewPrivate * priv;
 	gboolean editing_canceled;
-	char* tree_path;
+	gchar* tree_path;
 };
 
 struct _DdbCellEditableTextViewClass {
@@ -90,6 +90,9 @@
 };
 static gboolean ddb_cell_editable_text_view_real_key_press_event (GtkWidget* base, GdkEventKey* event);
 static void ddb_cell_editable_text_view_real_start_editing (GtkCellEditable* base, GdkEvent* event);
+#if GTK_CHECK_VERSION(2,20,0)
+static void ddb_cell_editable_text_view_real_editing_canceled (GtkCellRenderer*);
+#endif
 DdbCellEditableTextView* ddb_cell_editable_text_view_new (void);
 DdbCellEditableTextView* ddb_cell_editable_text_view_construct (GType object_type);
 static void ddb_cell_editable_text_view_finalize (GObject* obj);
@@ -100,22 +103,34 @@
 };
 static void ddb_cell_renderer_text_multiline_gtk_cell_renderer_text_editing_done (DdbCellEditableTextView* entry, DdbCellRendererTextMultiline* _self_);
 static gboolean ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event (DdbCellEditableTextView* entry, GdkEvent* event, DdbCellRendererTextMultiline* _self_);
-static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (GtkCellRenderer* base, GdkEvent* event, GtkWidget* widget, const char* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
+static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (GtkCellRenderer* base, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_new (void);
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_construct (GType object_type);
 static void ddb_cell_renderer_text_multiline_finalize (GObject* obj);
 
 
-
 static gboolean ddb_cell_editable_text_view_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
 	DdbCellEditableTextView * self;
 	gboolean result = FALSE;
 	gboolean res;
+	GdkEventKey _tmp0_;
+	guint _tmp1_;
 	self = (DdbCellEditableTextView*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	res = TRUE;
-	if ((*event).keyval == GDK_Return) {
-		if (((*event).state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-			res = GTK_WIDGET_CLASS (ddb_cell_editable_text_view_parent_class)->key_press_event ((GtkWidget*) GTK_TEXT_VIEW (self), event);
+	_tmp0_ = *event;
+	_tmp1_ = _tmp0_.keyval;
+	if (_tmp1_ == ((guint) GDK_Return)) {
+		GdkEventKey _tmp2_;
+		GdkModifierType _tmp3_;
+		_tmp2_ = *event;
+		_tmp3_ = _tmp2_.state;
+		if ((_tmp3_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
+			GdkEventKey _tmp4_;
+			gboolean _tmp5_ = FALSE;
+			_tmp4_ = *event;
+			_tmp5_ = GTK_WIDGET_CLASS (ddb_cell_editable_text_view_parent_class)->key_press_event ((GtkWidget*) GTK_TEXT_VIEW (self), &_tmp4_);
+			res = _tmp5_;
 		} else {
 			gtk_cell_editable_editing_done ((GtkCellEditable*) self);
 			gtk_cell_editable_remove_widget ((GtkCellEditable*) self);
@@ -123,14 +138,22 @@
 			return result;
 		}
 	} else {
-		if ((*event).keyval == GDK_Escape) {
+		GdkEventKey _tmp6_;
+		guint _tmp7_;
+		_tmp6_ = *event;
+		_tmp7_ = _tmp6_.keyval;
+		if (_tmp7_ == ((guint) GDK_Escape)) {
 			self->editing_canceled = TRUE;
 			gtk_cell_editable_editing_done ((GtkCellEditable*) self);
 			gtk_cell_editable_remove_widget ((GtkCellEditable*) self);
 			result = TRUE;
 			return result;
 		} else {
-			res = GTK_WIDGET_CLASS (ddb_cell_editable_text_view_parent_class)->key_press_event ((GtkWidget*) GTK_TEXT_VIEW (self), event);
+			GdkEventKey _tmp8_;
+			gboolean _tmp9_ = FALSE;
+			_tmp8_ = *event;
+			_tmp9_ = GTK_WIDGET_CLASS (ddb_cell_editable_text_view_parent_class)->key_press_event ((GtkWidget*) GTK_TEXT_VIEW (self), &_tmp8_);
+			res = _tmp9_;
 		}
 	}
 	result = res;
@@ -144,10 +167,14 @@
 	g_return_if_fail (event != NULL);
 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+static void ddb_cell_editable_text_view_real_editing_canceled (GtkCellRenderer* base) {
+}
+#endif
 
 DdbCellEditableTextView* ddb_cell_editable_text_view_construct (GType object_type) {
-	DdbCellEditableTextView * self;
-	self = g_object_newv (object_type, 0, NULL);
+	DdbCellEditableTextView * self = NULL;
+	self = (DdbCellEditableTextView*) g_object_new (object_type, NULL);
 	return self;
 }
 
@@ -166,7 +193,7 @@
 
 static void ddb_cell_editable_text_view_gtk_cell_editable_interface_init (GtkCellEditableIface * iface) {
 	ddb_cell_editable_text_view_gtk_cell_editable_parent_iface = g_type_interface_peek_parent (iface);
-	iface->start_editing = ddb_cell_editable_text_view_real_start_editing;
+	iface->start_editing = (void (*)(GtkCellEditable*, GdkEvent*)) ddb_cell_editable_text_view_real_start_editing;
 }
 
 
@@ -203,19 +230,53 @@
 
 
 static void ddb_cell_renderer_text_multiline_gtk_cell_renderer_text_editing_done (DdbCellEditableTextView* entry, DdbCellRendererTextMultiline* _self_) {
+	DdbCellEditableTextView* _tmp0_;
+	DdbCellRendererTextMultiline* _tmp1_;
+	gulong _tmp2_;
+	DdbCellRendererTextMultiline* _tmp3_;
+	DdbCellEditableTextView* _tmp4_;
+	gboolean _tmp5_;
+	DdbCellEditableTextView* _tmp6_;
+	GtkTextBuffer* _tmp7_ = NULL;
+	GtkTextBuffer* _tmp8_;
 	GtkTextBuffer* buf;
 	GtkTextIter begin = {0};
 	GtkTextIter end = {0};
-	char* new_text;
+	GtkTextIter _tmp9_ = {0};
+	GtkTextIter _tmp10_ = {0};
+	GtkTextIter _tmp11_;
+	GtkTextIter _tmp12_;
+	gchar* _tmp13_ = NULL;
+	gchar* new_text;
+	DdbCellRendererTextMultiline* _tmp14_;
+	DdbCellEditableTextView* _tmp15_;
+	const gchar* _tmp16_;
 	g_return_if_fail (entry != NULL);
 	g_return_if_fail (_self_ != NULL);
-	g_signal_handler_disconnect ((GObject*) entry, _self_->priv->focus_out_id);
-	gtk_cell_renderer_stop_editing ((GtkCellRenderer*) _self_, entry->editing_canceled);
-	buf = _g_object_ref0 (gtk_text_view_get_buffer ((GtkTextView*) entry));
-	gtk_text_buffer_get_iter_at_offset (buf, &begin, 0);
-	gtk_text_buffer_get_iter_at_offset (buf, &end, -1);
-	new_text = gtk_text_buffer_get_text (buf, &begin, &end, TRUE);
-	g_signal_emit_by_name ((GtkCellRendererText*) _self_, "edited", entry->tree_path, new_text);
+	_tmp0_ = entry;
+	_tmp1_ = _self_;
+	_tmp2_ = _tmp1_->priv->focus_out_id;
+	g_signal_handler_disconnect ((GObject*) _tmp0_, _tmp2_);
+	_tmp3_ = _self_;
+	_tmp4_ = entry;
+	_tmp5_ = _tmp4_->editing_canceled;
+	gtk_cell_renderer_stop_editing ((GtkCellRenderer*) _tmp3_, _tmp5_);
+	_tmp6_ = entry;
+	_tmp7_ = gtk_text_view_get_buffer ((GtkTextView*) _tmp6_);
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+	buf = _tmp8_;
+	gtk_text_buffer_get_iter_at_offset (buf, &_tmp9_, 0);
+	begin = _tmp9_;
+	gtk_text_buffer_get_iter_at_offset (buf, &_tmp10_, -1);
+	end = _tmp10_;
+	_tmp11_ = begin;
+	_tmp12_ = end;
+	_tmp13_ = gtk_text_buffer_get_text (buf, &_tmp11_, &_tmp12_, TRUE);
+	new_text = _tmp13_;
+	_tmp14_ = _self_;
+	_tmp15_ = entry;
+	_tmp16_ = _tmp15_->tree_path;
+	g_signal_emit_by_name ((GtkCellRendererText*) _tmp14_, "edited", _tmp16_, new_text);
 	_g_free0 (new_text);
 	_g_object_unref0 (buf);
 }
@@ -223,67 +284,152 @@
 
 static gboolean ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event (DdbCellEditableTextView* entry, GdkEvent* event, DdbCellRendererTextMultiline* _self_) {
 	gboolean result = FALSE;
+	DdbCellEditableTextView* _tmp0_;
+	DdbCellEditableTextView* _tmp1_;
 	g_return_val_if_fail (entry != NULL, FALSE);
 	g_return_val_if_fail (event != NULL, FALSE);
 	g_return_val_if_fail (_self_ != NULL, FALSE);
-	entry->editing_canceled = TRUE;
-	gtk_cell_editable_remove_widget ((GtkCellEditable*) entry);
+	_tmp0_ = entry;
+	_tmp0_->editing_canceled = TRUE;
+	_tmp1_ = entry;
+	gtk_cell_editable_remove_widget ((GtkCellEditable*) _tmp1_);
 	result = FALSE;
 	return result;
 }
 
 
-static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (GtkCellRenderer* base, GdkEvent* event, GtkWidget* widget, const char* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags) {
+static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (GtkCellRenderer* base, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags) {
 	DdbCellRendererTextMultiline * self;
 	GtkCellEditable* result = NULL;
-	gboolean _tmp0_;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_;
+	const gchar* _tmp2_;
+	GtkTreePath* _tmp3_;
 	GtkTreePath* p;
+	GtkWidget* _tmp4_;
+	GtkTreeView* _tmp5_;
 	GtkTreeView* tv;
+	GtkTreeView* _tmp6_;
+	GtkTreeModel* _tmp7_ = NULL;
+	GtkListStore* _tmp8_;
 	GtkListStore* store;
 	GtkTreeIter iter = {0};
+	GtkListStore* _tmp9_;
+	GtkTreePath* _tmp10_;
+	GtkTreeIter _tmp11_ = {0};
 	GValue v = {0};
-	GValue _tmp1_ = {0};
-	GValue _tmp2_;
+	GtkListStore* _tmp12_;
+	GtkTreeIter _tmp13_;
+	GValue _tmp14_ = {0};
+	gint _tmp15_ = 0;
 	gint mult;
-	DdbCellEditableTextView* _tmp3_;
-	char* _tmp4_;
+	DdbCellEditableTextView* _tmp16_;
+	DdbCellEditableTextView* _tmp17_;
+	gint _tmp18_;
+	DdbCellEditableTextView* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	GtkTextBuffer* _tmp22_;
 	GtkTextBuffer* buf;
-	char* _tmp5_ = NULL;
-	char* _tmp6_;
-	gboolean _tmp7_;
+	gchar* _tmp23_ = NULL;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
+	gboolean _tmp26_;
+	DdbCellEditableTextView* _tmp31_;
+	GtkTextBuffer* _tmp32_;
+	DdbCellEditableTextView* _tmp33_;
+	DdbCellEditableTextView* _tmp34_;
+	gulong _tmp35_ = 0UL;
+	DdbCellEditableTextView* _tmp36_;
+	GdkRectangle _tmp37_;
+	gint _tmp38_;
+	GdkRectangle _tmp39_;
+	gint _tmp40_;
+	DdbCellEditableTextView* _tmp41_;
+	DdbCellEditableTextView* _tmp42_;
 	self = (DdbCellRendererTextMultiline*) base;
 	g_return_val_if_fail (event != NULL, NULL);
 	g_return_val_if_fail (widget != NULL, NULL);
 	g_return_val_if_fail (path != NULL, NULL);
-	if (!(g_object_get ((GtkCellRendererText*) self, "editable", &_tmp0_, NULL), _tmp0_)) {
+	g_return_val_if_fail (background_area != NULL, NULL);
+	g_return_val_if_fail (cell_area != NULL, NULL);
+	g_object_get ((GtkCellRendererText*) self, "editable", &_tmp0_, NULL);
+	_tmp1_ = _tmp0_;
+	if (!_tmp1_) {
 		result = GTK_CELL_EDITABLE (NULL);
 		return result;
 	}
-	p = gtk_tree_path_new_from_string (path);
-	tv = _g_object_ref0 (GTK_TREE_VIEW (widget));
-	store = _g_object_ref0 (GTK_LIST_STORE (gtk_tree_view_get_model (tv)));
-	gtk_tree_model_get_iter ((GtkTreeModel*) store, &iter, p);
-	gtk_tree_model_get_value ((GtkTreeModel*) store, &iter, 3, &_tmp1_);
-	v = (_tmp2_ = _tmp1_, G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL, _tmp2_);
-	mult = g_value_get_int (&v);
-	self->priv->entry = (_tmp3_ = g_object_ref_sink (ddb_cell_editable_text_view_new ()), _g_object_unref0 (self->priv->entry), _tmp3_);
-	if (mult != 0) {
+	_tmp2_ = path;
+	_tmp3_ = gtk_tree_path_new_from_string (_tmp2_);
+	p = _tmp3_;
+	_tmp4_ = widget;
+	_tmp5_ = _g_object_ref0 (GTK_TREE_VIEW (_tmp4_));
+	tv = _tmp5_;
+	_tmp6_ = tv;
+	_tmp7_ = gtk_tree_view_get_model (_tmp6_);
+	_tmp8_ = _g_object_ref0 (GTK_LIST_STORE (_tmp7_));
+	store = _tmp8_;
+	_tmp9_ = store;
+	_tmp10_ = p;
+	gtk_tree_model_get_iter ((GtkTreeModel*) _tmp9_, &_tmp11_, _tmp10_);
+	iter = _tmp11_;
+	_tmp12_ = store;
+	_tmp13_ = iter;
+	gtk_tree_model_get_value ((GtkTreeModel*) _tmp12_, &_tmp13_, 3, &_tmp14_);
+	G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
+	v = _tmp14_;
+	_tmp15_ = g_value_get_int (&v);
+	mult = _tmp15_;
+	_tmp16_ = ddb_cell_editable_text_view_new ();
+	_tmp17_ = g_object_ref_sink (_tmp16_);
+	_g_object_unref0 (self->priv->entry);
+	self->priv->entry = _tmp17_;
+	_tmp18_ = mult;
+	if (_tmp18_ != 0) {
 		g_object_set ((GtkCellRendererText*) self, "text", "", NULL);
 	}
-	self->priv->entry->tree_path = (_tmp4_ = g_strdup (path), _g_free0 (self->priv->entry->tree_path), _tmp4_);
-	buf = gtk_text_buffer_new (NULL);
-	if ((_tmp7_ = (_tmp6_ = (g_object_get ((GtkCellRendererText*) self, "text", &_tmp5_, NULL), _tmp5_)) != NULL, _g_free0 (_tmp6_), _tmp7_)) {
-		char* _tmp8_ = NULL;
-		char* _tmp9_;
-		gtk_text_buffer_set_text (buf, _tmp9_ = (g_object_get ((GtkCellRendererText*) self, "text", &_tmp8_, NULL), _tmp8_), -1);
-		_g_free0 (_tmp9_);
+	_tmp19_ = self->priv->entry;
+	_tmp20_ = path;
+	_tmp21_ = g_strdup (_tmp20_);
+	_g_free0 (_tmp19_->tree_path);
+	_tmp19_->tree_path = _tmp21_;
+	_tmp22_ = gtk_text_buffer_new (NULL);
+	buf = _tmp22_;
+	g_object_get ((GtkCellRendererText*) self, "text", &_tmp23_, NULL);
+	_tmp24_ = _tmp23_;
+	_tmp25_ = _tmp24_;
+	_tmp26_ = _tmp25_ != NULL;
+	_g_free0 (_tmp25_);
+	if (_tmp26_) {
+		GtkTextBuffer* _tmp27_;
+		gchar* _tmp28_ = NULL;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
+		_tmp27_ = buf;
+		g_object_get ((GtkCellRendererText*) self, "text", &_tmp28_, NULL);
+		_tmp29_ = _tmp28_;
+		_tmp30_ = _tmp29_;
+		gtk_text_buffer_set_text (_tmp27_, _tmp30_, -1);
+		_g_free0 (_tmp30_);
 	}
-	gtk_text_view_set_buffer ((GtkTextView*) self->priv->entry, buf);
-	g_signal_connect (self->priv->entry, "editing-done", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_text_editing_done, self);
-	self->priv->focus_out_id = g_signal_connect_after (self->priv->entry, "focus-out-event", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event, self);
-	gtk_widget_set_size_request ((GtkWidget*) self->priv->entry, (*cell_area).width, (*cell_area).height);
-	gtk_widget_show ((GtkWidget*) self->priv->entry);
-	result = GTK_CELL_EDITABLE (self->priv->entry);
+	_tmp31_ = self->priv->entry;
+	_tmp32_ = buf;
+	gtk_text_view_set_buffer ((GtkTextView*) _tmp31_, _tmp32_);
+	_tmp33_ = self->priv->entry;
+	g_signal_connect (_tmp33_, "editing-done", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_text_editing_done, self);
+	_tmp34_ = self->priv->entry;
+	_tmp35_ = g_signal_connect_after (_tmp34_, "focus-out-event", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event, self);
+	self->priv->focus_out_id = _tmp35_;
+	_tmp36_ = self->priv->entry;
+	_tmp37_ = *cell_area;
+	_tmp38_ = _tmp37_.width;
+	_tmp39_ = *cell_area;
+	_tmp40_ = _tmp39_.height;
+	gtk_widget_set_size_request ((GtkWidget*) _tmp36_, _tmp38_, _tmp40_);
+	_tmp41_ = self->priv->entry;
+	gtk_widget_show ((GtkWidget*) _tmp41_);
+	_tmp42_ = self->priv->entry;
+	result = GTK_CELL_EDITABLE (_tmp42_);
 	_g_object_unref0 (buf);
 	G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
 	_g_object_unref0 (store);
@@ -294,8 +440,8 @@
 
 
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_construct (GType object_type) {
-	DdbCellRendererTextMultiline * self;
-	self = g_object_newv (object_type, 0, NULL);
+	DdbCellRendererTextMultiline * self = NULL;
+	self = (DdbCellRendererTextMultiline*) g_object_new (object_type, NULL);
 	return self;
 }
 
@@ -308,8 +454,10 @@
 static void ddb_cell_renderer_text_multiline_class_init (DdbCellRendererTextMultilineClass * klass) {
 	ddb_cell_renderer_text_multiline_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (DdbCellRendererTextMultilinePrivate));
-	GTK_CELL_RENDERER_CLASS (klass)->start_editing = ddb_cell_renderer_text_multiline_real_start_editing;
 	G_OBJECT_CLASS (klass)->finalize = ddb_cell_renderer_text_multiline_finalize;
+#if GTK_CHECK_VERSION(2,20,0)
+	GTK_CELL_RENDERER_CLASS (klass)->editing_canceled = (void (*)(GtkCellRenderer*)) ddb_cell_editable_text_view_real_editing_canceled;
+#endif
 }
 
 
@@ -339,4 +487,3 @@
 
 
 
-

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbequalizer.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbequalizer.c Changed

@@ -1,4 +1,4 @@
-/* ddbequalizer.c generated by valac 0.10.2, the Vala compiler
+/* ddbequalizer.c generated by valac 0.14.0, the Vala compiler
 * generated from ddbequalizer.vala, do not modify */
 
 /*
@@ -28,8 +28,10 @@
 #include <float.h>
 #include <math.h>
 #include <gdk/gdk.h>
-#include <gtkui.h>
 #include <drawing.h>
+#include <gtkui.h>
+#include <cairo.h>
+#include <pango/pangocairo.h>
 #include <pango/pango.h>
 
 
@@ -47,6 +49,7 @@
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _pango_font_description_free0(var) ((var == NULL) ? NULL : (var = (pango_font_description_free (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
 
 struct _DdbEqualizer {
 	GtkDrawingArea parent_instance;
@@ -58,15 +61,15 @@
 };
 
 struct _DdbEqualizerPrivate {
-	double* values;
+	gdouble* values;
 	gint values_length1;
 	gint _values_size_;
-	double preamp;
+	gdouble preamp;
 	gint mouse_y;
 	gboolean curve_hook;
 	gboolean preamp_hook;
-	gint margin_bottom;
-	gint margin_left;
+	gint eq_margin_bottom;
+	gint eq_margin_left;
 	GdkCursor* pointer_cursor;
 };
 
@@ -82,31 +85,51 @@
 #define DDB_EQUALIZER_spot_size 3
 static gboolean ddb_equalizer_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
 static void ddb_equalizer_real_realize (GtkWidget* base);
+#if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_equalizer_real_expose_event (GtkWidget* base, GdkEventExpose* event);
-static inline double ddb_equalizer_scale (DdbEqualizer* self, double val);
-static gboolean ddb_equalizer_in_curve_area (DdbEqualizer* self, double x, double y);
-static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, double x, double y);
+#endif
+static inline gdouble ddb_equalizer_scale (DdbEqualizer* self, gdouble val);
+static gboolean ddb_equalizer_in_curve_area (DdbEqualizer* self, gdouble x, gdouble y);
+static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, gdouble x, gdouble y);
 static gboolean ddb_equalizer_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_equalizer_real_button_release_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_equalizer_real_leave_notify_event (GtkWidget* base, GdkEventCrossing* event);
 static gboolean ddb_equalizer_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event);
-void ddb_equalizer_set_band (DdbEqualizer* self, gint band, double v);
-double ddb_equalizer_get_band (DdbEqualizer* self, gint band);
-void ddb_equalizer_set_preamp (DdbEqualizer* self, double v);
-double ddb_equalizer_get_preamp (DdbEqualizer* self);
+void ddb_equalizer_set_band (DdbEqualizer* self, gint band, gdouble v);
+gdouble ddb_equalizer_get_band (DdbEqualizer* self, gint band);
+void ddb_equalizer_set_preamp (DdbEqualizer* self, gdouble v);
+gdouble ddb_equalizer_get_preamp (DdbEqualizer* self);
 DdbEqualizer* ddb_equalizer_new (void);
 DdbEqualizer* ddb_equalizer_construct (GType object_type);
 static GObject * ddb_equalizer_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 static void ddb_equalizer_finalize (GObject* obj);
 
-const char* freqs[18] = {"55 Hz", "77 Hz", "110 Hz", "156 Hz", "220 Hz", "311 Hz", "440 Hz", "622 Hz", "880 Hz", "1.2 kHz", "1.8 kHz", "2.5 kHz", "3.5 kHz", "5 kHz", "7 kHz", "10 kHz", "14 kHz", "20 kHz"};
-
+const gchar* freqs[18] = {"55 Hz", "77 Hz", "110 Hz", "156 Hz", "220 Hz", "311 Hz", "440 Hz", "622 Hz", "880 Hz", "1.2 kHz", "1.8 kHz", "2.5 kHz", "3.5 kHz", "5 kHz", "7 kHz", "10 kHz", "14 kHz", "20 kHz"};
 
 static gboolean ddb_equalizer_real_configure_event (GtkWidget* base, GdkEventConfigure* event) {
 	DdbEqualizer * self;
 	gboolean result = FALSE;
 	self = (DdbEqualizer*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	gtkui_init_theme_colors ();
+
+	GtkStyle* _tmp0_ = NULL;
+	const PangoFontDescription* _tmp1_;
+	gint _tmp2_ = 0;
+	gdouble _tmp3_ = 0.0;
+	GdkScreen* _tmp4_ = NULL;
+	gdouble _tmp5_ = 0.0;
+	gint _tmp6_;
+
+	_tmp0_ = gtk_widget_get_style ((GtkWidget*) self);
+	_tmp1_ = _tmp0_->font_desc;
+	_tmp2_ = pango_font_description_get_size (_tmp1_);
+	_tmp3_ = pango_units_to_double (_tmp2_);
+	_tmp4_ = gdk_screen_get_default ();
+	_tmp5_ = gdk_screen_get_resolution (_tmp4_);
+	self->priv->eq_margin_bottom = (gint) (((_tmp3_ * _tmp5_) / 72) + 4);
+	_tmp6_ = self->priv->eq_margin_bottom;
+	self->priv->eq_margin_left = _tmp6_ * 4;
 	result = FALSE;
 	return result;
 }
@@ -125,317 +148,351 @@
 }
 
 
+static gboolean ddb_equalizer_real_draw (GtkWidget *widget, cairo_t *cr) {
+ DdbEqualizer *self = DDB_EQUALIZER (widget);
+ GdkColor fore_bright_color;
+ gtkui_get_bar_foreground_color (&fore_bright_color);
+ GdkColor c1 = fore_bright_color;
+ GdkColor c2;
+ gtkui_get_bar_background_color (&c2);
+ GdkColor fore_dark_color = c2;
+
+ fore_dark_color.red += (c1.red - c2.red) * 0.5;
+ fore_dark_color.green += (c1.green - c2.green) * 0.5;
+ fore_dark_color.blue += (c1.blue - c2.blue) * 0.5;
+
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (widget, &alloc);
+
+ int width = alloc.width;
+ int height = alloc.height;
+
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ cairo_set_line_width (cr, 1.0);
+ gdk_cairo_set_source_color (cr, &c2);
+ cairo_rectangle (cr, 0, 0, width, height);
+ cairo_fill (cr);
+
+ gdk_cairo_set_source_color (cr, &fore_dark_color);
+
+ //drawing grid:
+ double step = (double)(width - self->priv->eq_margin_left) / (double)(DDB_EQUALIZER_bands+1);
+ int i;
+ for (i = 0; i < DDB_EQUALIZER_bands; i++)
+ {
+ //does anyone know why this method is static?
+ cairo_move_to (cr, (int)((i+1)*step)+self->priv->eq_margin_left, 0);
+ cairo_line_to (cr, (int)((i+1)*step)+self->priv->eq_margin_left, height - self->priv->eq_margin_bottom);
+ }
+
+ double vstep = (double)(height-self->priv->eq_margin_bottom);
+ for (double di=0; di < 2; di += 0.25)
+ {
+ cairo_move_to (cr, self->priv->eq_margin_left, (int)((di-self->priv->preamp)*vstep));
+ cairo_line_to (cr, width, (int)((di-self->priv->preamp)*vstep));
+ }
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &fore_bright_color);
+
+ //drawing freqs:
+
+ PangoLayout *l = pango_cairo_create_layout (cr);
+ PangoContext *pctx = pango_layout_get_context (l);
+
+ GtkStyle *st = gtk_widget_get_style (widget);
+
+ PangoFontDescription *fd = pango_font_description_copy (st->font_desc);
+
+ pango_font_description_set_size (fd, (int)(pango_font_description_get_size (st->font_desc) * 0.7));
+ pango_context_set_font_description (pctx, fd);
+ for (i = 0; i < DDB_EQUALIZER_bands; i++)
+ {
+ cairo_save (cr);
+ pango_layout_set_text (l, freqs[i], strlen (freqs[i]));
+ PangoRectangle ink, log;
+ pango_layout_get_pixel_extents (l, &ink, &log);
+ int offs = 2;
+ if ((i % 2) != 0) {
+ offs += 2;
+ }
+ cairo_move_to (cr, (int)((i+1)*step)+self->priv->eq_margin_left - ink.width/2, height-self->priv->eq_margin_bottom + offs);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+ }
+ pango_font_description_set_size (fd, (int)(pango_font_description_get_size (st->font_desc)));
+ pango_context_set_font_description (pctx, fd);
+
+ //drawing db's:
+ pango_layout_set_width (l, self->priv->eq_margin_left-1);
+ pango_layout_set_alignment (l, PANGO_ALIGN_RIGHT);
+
+ int fontsize = (int)(pango_units_to_double (pango_font_description_get_size (fd)) * gdk_screen_get_resolution (gdk_screen_get_default ()) / 72);
+
+ char tmp[100];
+
+ if ((self->priv->mouse_y >= 0) && (self->priv->mouse_y < height - self->priv->eq_margin_bottom))
+ {
+ cairo_save (cr);
+ double db = ddb_equalizer_scale(self, (double)(self->priv->mouse_y-1) / (double)(height - self->priv->eq_margin_bottom - 2));
+ snprintf (tmp, sizeof (tmp), "%s%.1fdB", db > 0 ? "+" : "", db);
+ pango_layout_set_text (l, tmp, strlen (tmp));
+ cairo_move_to (cr, self->priv->eq_margin_left-1, self->priv->mouse_y-3);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+ }
+
+ cairo_save (cr);
+ double val = ddb_equalizer_scale(self, 1);
+ snprintf (tmp, sizeof (tmp), "%s%.1fdB", val > 0 ? "+" : "", val);
+ pango_layout_set_text (l, tmp, strlen(tmp));
+ cairo_move_to (cr, self->priv->eq_margin_left-1, height-self->priv->eq_margin_bottom-fontsize);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ val = ddb_equalizer_scale(self, 0);
+ snprintf (tmp, sizeof (tmp), "%s%.1fdB", val > 0 ? "+" : "", val);
+ pango_layout_set_text (l, tmp, strlen (tmp));
+ cairo_move_to (cr, self->priv->eq_margin_left-1, 1);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ pango_layout_set_text (l, "+0dB", 4);
+ cairo_move_to (cr, self->priv->eq_margin_left-1, (int)((1-self->priv->preamp)*(height-self->priv->eq_margin_bottom))-fontsize/2);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+
+ cairo_save (cr);
+ pango_layout_set_text (l, "preamp", 6);
+ pango_layout_set_alignment (l, PANGO_ALIGN_LEFT);
+ cairo_move_to (cr, 1, height-self->priv->eq_margin_bottom+2);
+ pango_cairo_show_layout (cr, l);
+ cairo_restore (cr);
+
+ // frame
+ cairo_rectangle (cr, self->priv->eq_margin_left, 0, width-self->priv->eq_margin_left, height-self->priv->eq_margin_bottom);
+ cairo_stroke (cr);
+
+ //draw preamp
+ cairo_rectangle (cr, 0, (int)(self->priv->preamp * (height-self->priv->eq_margin_bottom)), 11, height);
+ cairo_clip (cr);
+
+ gdk_cairo_set_source_color (cr, &fore_bright_color);
+ int count = (int)((height-self->priv->eq_margin_bottom) / 6)+1;
+ for (int j = 0; j < count; j++) {
+ cairo_rectangle (cr, 1, height-self->priv->eq_margin_bottom-j*6 - 6, 11, 4);
+ }
+ cairo_fill (cr);
+ cairo_reset_clip (cr);
+
+ //drawing bars:
+ int bar_w = 11;
+ if (step < bar_w)
+ bar_w = (int)step-1;
+
+
+ for (i = 0; i < DDB_EQUALIZER_bands; i++)
+ {
+ cairo_reset_clip (cr);
+ cairo_rectangle (cr, (int)((i+1)*step)+self->priv->eq_margin_left - bar_w/2, (int)(self->priv->values[i] * (height-self->priv->eq_margin_bottom)), 11, height);
+ cairo_clip (cr);
+ count = (int)((height-self->priv->eq_margin_bottom) * (1-self->priv->values[i]) / 6)+1;
+ for (int j = 0; j < count; j++) {
+ cairo_rectangle (cr, (int)((i+1)*step)+self->priv->eq_margin_left - bar_w/2, height-self->priv->eq_margin_bottom-j*6 - 6, bar_w, 4);
+ }
+ cairo_fill (cr);
+ }
+
+ //drawing mouse coordinates:
+ cairo_reset_clip (cr);
+ double dash[] = {4, 4};
+ cairo_set_dash (cr, dash, 2, 0);
+ cairo_move_to (cr, self->priv->eq_margin_left+1, self->priv->mouse_y);
+ cairo_line_to (cr, width, self->priv->mouse_y);
+ cairo_stroke (cr);
+
+ return FALSE;
+}
+
+#if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_equalizer_real_expose_event (GtkWidget* base, GdkEventExpose* event) {
-	DdbEqualizer * self;
-	gboolean result = FALSE;
-	GdkColor _tmp0_ = {0};
-	GdkColor fore_bright_color;
-	GdkColor c1;
-	GdkColor _tmp1_ = {0};
-	GdkColor c2;
-	GdkColor fore_dark_color;
-	gint width;
-	gint height;
-	GdkDrawable* d;
-	GdkGCValues _tmp2_ = {0};
-	GdkGCValues _tmp3_;
-	GdkGC* gc;
-	double step;
-	gint i = 0;
-	double vstep;
-	PangoLayout* l;
-	PangoContext* ctx;
-	PangoFontDescription* fd;
-	gint fontsize;
-	gboolean _tmp7_ = FALSE;
-	char* tmp;
-	double val;
-	const char* _tmp9_;
-	char* _tmp10_;
-	const char* _tmp11_;
-	char* _tmp12_;
-	GdkRectangle _tmp13_ = {0};
-	GdkRectangle _tmp14_;
-	gint count;
-	GdkRectangle _tmp16_ = {0};
-	GdkRectangle _tmp17_;
-	gint bar_w;
-	GdkRectangle _tmp22_ = {0};
-	GdkRectangle _tmp23_;
-	self = (DdbEqualizer*) base;
-	fore_bright_color = (gtkui_get_bar_foreground_color (&_tmp0_), _tmp0_);
-	c1 = fore_bright_color;
-	c2 = (gtkui_get_bar_background_color (&_tmp1_), _tmp1_);
-	fore_dark_color = c2;
-	fore_dark_color.red = fore_dark_color.red + ((guint16) ((gint16) ((c1.red - c2.red) * 0.5)));
-	fore_dark_color.green = fore_dark_color.green + ((guint16) ((gint16) ((c1.green - c2.green) * 0.5)));
-	fore_dark_color.blue = fore_dark_color.blue + ((guint16) ((gint16) ((c1.blue - c2.blue) * 0.5)));
-	width = ((GtkWidget*) self)->allocation.width;
-	height = ((GtkWidget*) self)->allocation.height;
-	d = _g_object_ref0 ((GdkDrawable*) gtk_widget_get_window ((GtkWidget*) self));
-	gc = _g_object_ref0 (GDK_DRAWABLE_GET_CLASS (d)->create_gc (d, (_tmp3_ = (memset (&_tmp2_, 0, sizeof (GdkGCValues)), _tmp2_), &_tmp3_), 0));
-	gdk_gc_set_rgb_fg_color (gc, &c2);
-	gdk_draw_rectangle (d, gc, TRUE, 0, 0, width, height);
-	gdk_gc_set_rgb_fg_color (gc, &fore_dark_color);
-	step = ((double) (width - self->priv->margin_left)) / ((double) (DDB_EQUALIZER_bands + 1));
-	{
-		gboolean _tmp4_;
-		i = 0;
-		_tmp4_ = TRUE;
-		while (TRUE) {
-			if (!_tmp4_) {
-				i++;
-			}
-			_tmp4_ = FALSE;
-			if (!(i < DDB_EQUALIZER_bands)) {
-				break;
-			}
-			gdk_draw_line (d, gc, ((gint) ((i + 1) * step)) + self->priv->margin_left, 0, ((gint) ((i + 1) * step)) + self->priv->margin_left, height - self->priv->margin_bottom);
-		}
-	}
-	vstep = (double) (height - self->priv->margin_bottom);
-	{
-		double di;
-		di = (double) 0;
-		{
-			gboolean _tmp5_;
-			_tmp5_ = TRUE;
-			while (TRUE) {
-				if (!_tmp5_) {
-					di = di + 0.25;
-				}
-				_tmp5_ = FALSE;
-				if (!(di < 2)) {
-					break;
-				}
-				gdk_draw_line (d, gc, self->priv->margin_left, (gint) ((di - self->priv->preamp) * vstep), width, (gint) ((di - self->priv->preamp) * vstep));
-			}
-		}
-	}
-	gdk_gc_set_rgb_fg_color (gc, &fore_bright_color);
-	l = gtk_widget_create_pango_layout ((GtkWidget*) self, NULL);
-	ctx = _g_object_ref0 (pango_layout_get_context (l));
-	fd = pango_font_description_copy (gtk_widget_get_style ((GtkWidget*) self)->font_desc);
-	pango_font_description_set_size (fd, (gint) (pango_font_description_get_size (gtk_widget_get_style ((GtkWidget*) self)->font_desc) * 0.7));
-	pango_context_set_font_description (ctx, fd);
-	{
-		gboolean _tmp6_;
-		i = 0;
-		_tmp6_ = TRUE;
-		while (TRUE) {
-			PangoRectangle ink = {0};
-			PangoRectangle log = {0};
-			gint offs;
-			if (!_tmp6_) {
-				i++;
-			}
-			_tmp6_ = FALSE;
-			if (!(i < DDB_EQUALIZER_bands)) {
-				break;
-			}
-			pango_layout_set_text (l, freqs[i], (gint) g_utf8_strlen (freqs[i], -1));
-			pango_layout_get_pixel_extents (l, &ink, &log);
-			offs = 2;
-			if ((i % 2) != 0) {
-				offs = offs + 2;
-			}
-			gdk_draw_layout (d, gc, (((gint) ((i + 1) * step)) + self->priv->margin_left) - (ink.width / 2), (height - self->priv->margin_bottom) + offs, l);
-		}
-	}
-	pango_font_description_set_size (fd, (gint) pango_font_description_get_size (gtk_widget_get_style ((GtkWidget*) self)->font_desc));
-	pango_context_set_font_description (ctx, fd);
-	pango_layout_set_width (l, self->priv->margin_left - 1);
-	pango_layout_set_alignment (l, PANGO_ALIGN_RIGHT);
-	fontsize = (gint) ((pango_units_to_double (pango_font_description_get_size (fd)) * gdk_screen_get_resolution (gdk_screen_get_default ())) / 72);
-	if (self->priv->mouse_y >= 0) {
-		_tmp7_ = self->priv->mouse_y < (height - self->priv->margin_bottom);
-	} else {
-		_tmp7_ = FALSE;
-	}
-	if (_tmp7_) {
-		double db;
-		const char* _tmp8_;
-		char* tmp;
-		db = ddb_equalizer_scale (self, ((double) (self->priv->mouse_y - 1)) / ((double) ((height - self->priv->margin_bottom) - 2)));
-		_tmp8_ = NULL;
-		if (db > 0) {
-			_tmp8_ = "+";
-		} else {
-			_tmp8_ = "";
-		}
-		tmp = g_strdup_printf ("%s%.1fdB", _tmp8_, db);
-		pango_layout_set_text (l, tmp, (gint) g_utf8_strlen (tmp, -1));
-		gdk_draw_layout (d, gc, self->priv->margin_left - 1, self->priv->mouse_y - 3, l);
-		_g_free0 (tmp);
-	}
-	tmp = NULL;
-	val = ddb_equalizer_scale (self, (double) 1);
-	_tmp9_ = NULL;
-	if (val > 0) {
-		_tmp9_ = "+";
-	} else {
-		_tmp9_ = "";
-	}
-	tmp = (_tmp10_ = g_strdup_printf ("%s%.1fdB", _tmp9_, val), _g_free0 (tmp), _tmp10_);
-	pango_layout_set_text (l, tmp, (gint) g_utf8_strlen (tmp, -1));
-	gdk_draw_layout (d, gc, self->priv->margin_left - 1, (height - self->priv->margin_bottom) - fontsize, l);
-	val = ddb_equalizer_scale (self, (double) 0);
-	_tmp11_ = NULL;
-	if (val > 0) {
-		_tmp11_ = "+";
-	} else {
-		_tmp11_ = "";
-	}
-	tmp = (_tmp12_ = g_strdup_printf ("%s%.1fdB", _tmp11_, val), _g_free0 (tmp), _tmp12_);
-	pango_layout_set_text (l, tmp, (gint) g_utf8_strlen (tmp, -1));
-	gdk_draw_layout (d, gc, self->priv->margin_left - 1, 1, l);
-	pango_layout_set_text (l, "+0dB", 4);
-	gdk_draw_layout (d, gc, self->priv->margin_left - 1, ((gint) ((1 - self->priv->preamp) * (height - self->priv->margin_bottom))) - (fontsize / 2), l);
-	pango_layout_set_text (l, "preamp", 6);
-	pango_layout_set_alignment (l, PANGO_ALIGN_LEFT);
-	gdk_draw_layout (d, gc, 1, (height - self->priv->margin_bottom) + 2, l);
-	gdk_draw_rectangle (d, gc, FALSE, self->priv->margin_left, 0, (width - self->priv->margin_left) - 1, (height - self->priv->margin_bottom) - 1);
-	gdk_gc_set_line_attributes (gc, 2, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
-	gdk_gc_set_clip_rectangle (gc, (_tmp14_ = (_tmp13_.x = 0, _tmp13_.y = (gint) (self->priv->preamp * (height - self->priv->margin_bottom)), _tmp13_.width = 11, _tmp13_.height = height, _tmp13_), &_tmp14_));
-	gdk_gc_set_rgb_fg_color (gc, &fore_bright_color);
-	count = ((gint) ((height - self->priv->margin_bottom) / 6)) + 1;
-	{
-		gint j;
-		j = 0;
-		{
-			gboolean _tmp15_;
-			_tmp15_ = TRUE;
-			while (TRUE) {
-				if (!_tmp15_) {
-					j++;
-				}
-				_tmp15_ = FALSE;
-				if (!(j < count)) {
-					break;
-				}
-				gdk_draw_rectangle (d, gc, TRUE, 1, ((height - self->priv->margin_bottom) - (j * 6)) - 6, 11, 4);
-			}
-		}
-	}
-	gdk_gc_set_clip_rectangle (gc, (_tmp17_ = (_tmp16_.x = self->priv->margin_left + 1, _tmp16_.y = 1, _tmp16_.width = (width - self->priv->margin_left) - 2, _tmp16_.height = (height - self->priv->margin_bottom) - 2, _tmp16_), &_tmp17_));
-	gdk_gc_set_rgb_fg_color (gc, &fore_bright_color);
-	bar_w = 11;
-	if (step < bar_w) {
-		bar_w = ((gint) step) - 1;
-	}
-	{
-		gboolean _tmp18_;
-		i = 0;
-		_tmp18_ = TRUE;
-		while (TRUE) {
-			GdkRectangle _tmp19_ = {0};
-			GdkRectangle _tmp20_;
-			if (!_tmp18_) {
-				i++;
-			}
-			_tmp18_ = FALSE;
-			if (!(i < DDB_EQUALIZER_bands)) {
-				break;
-			}
-			gdk_gc_set_clip_rectangle (gc, (_tmp20_ = (_tmp19_.x = (((gint) ((i + 1) * step)) + self->priv->margin_left) - (bar_w / 2), _tmp19_.y = (gint) (self->priv->values[i] * (height - self->priv->margin_bottom)), _tmp19_.width = 11, _tmp19_.height = height, _tmp19_), &_tmp20_));
-			count = ((gint) (((height - self->priv->margin_bottom) * (1 - self->priv->values[i])) / 6)) + 1;
-			{
-				gint j;
-				j = 0;
-				{
-					gboolean _tmp21_;
-					_tmp21_ = TRUE;
-					while (TRUE) {
-						if (!_tmp21_) {
-							j++;
-						}
-						_tmp21_ = FALSE;
-						if (!(j < count)) {
-							break;
-						}
-						gdk_draw_rectangle (d, gc, TRUE, (((gint) ((i + 1) * step)) + self->priv->margin_left) - (bar_w / 2), ((height - self->priv->margin_bottom) - (j * 6)) - 6, bar_w, 4);
-					}
-				}
-			}
-		}
-	}
-	gdk_gc_set_clip_rectangle (gc, (_tmp23_ = (_tmp22_.x = 0, _tmp22_.y = 0, _tmp22_.width = width, _tmp22_.height = height, _tmp22_), &_tmp23_));
-	gdk_gc_set_line_attributes (gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
-	gdk_draw_line (d, gc, self->priv->margin_left + 1, self->priv->mouse_y, width, self->priv->mouse_y);
-	result = FALSE;
-	_g_free0 (tmp);
-	_pango_font_description_free0 (fd);
-	_g_object_unref0 (ctx);
-	_g_object_unref0 (l);
-	_g_object_unref0 (gc);
-	_g_object_unref0 (d);
-	return result;
+	g_return_val_if_fail (event != NULL, FALSE);
+	cairo_t *cr= gdk_cairo_create ((GdkDrawable*) gtk_widget_get_window (base));
+ ddb_equalizer_real_draw (base, cr);
+	_cairo_destroy0 (cr);
+	return FALSE;
 }
+#endif
 
 
-static inline double ddb_equalizer_scale (DdbEqualizer* self, double val) {
-	double result = 0.0;
-	double k;
-	double d;
+static inline gdouble ddb_equalizer_scale (DdbEqualizer* self, gdouble val) {
+	gdouble result = 0.0;
+	gdouble k;
+	gdouble d;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
 	g_return_val_if_fail (self != NULL, 0.0);
-	k = (double) (-40);
-	d = (double) 20;
-	result = (((val + self->priv->preamp) - 0.5) * k) + d;
+	k = (gdouble) (-40);
+	d = (gdouble) 20;
+	_tmp0_ = val;
+	_tmp1_ = self->priv->preamp;
+	result = (((_tmp0_ + _tmp1_) - 0.5) * k) + d;
 	return result;
 }
 
 
-static gboolean ddb_equalizer_in_curve_area (DdbEqualizer* self, double x, double y) {
+static gboolean ddb_equalizer_in_curve_area (DdbEqualizer* self, gdouble x, gdouble y) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp8_;
+	gboolean _tmp10_;
+	gboolean _tmp15_;
 	g_return_val_if_fail (self != NULL, FALSE);
-	if (x > self->priv->margin_left) {
-		_tmp2_ = x < (((GtkWidget*) self)->allocation.width - 1);
+	_tmp3_ = x;
+	_tmp4_ = self->priv->eq_margin_left;
+ GtkAllocation _tmp6_;
+ gtk_widget_get_allocation ((GtkWidget*) self, &_tmp6_);
+	if (_tmp3_ > ((gdouble) _tmp4_)) {
+		gdouble _tmp5_;
+		gint _tmp7_;
+		_tmp5_ = x;
+		_tmp7_ = _tmp6_.width;
+		_tmp2_ = _tmp5_ < ((gdouble) (_tmp7_ - 1));
 	} else {
 		_tmp2_ = FALSE;
 	}
-	if (_tmp2_) {
-		_tmp1_ = y > 1;
+	_tmp8_ = _tmp2_;
+	if (_tmp8_) {
+		gdouble _tmp9_;
+		_tmp9_ = y;
+		_tmp1_ = _tmp9_ > ((gdouble) 1);
 	} else {
 		_tmp1_ = FALSE;
 	}
-	if (_tmp1_) {
-		_tmp0_ = y < (((GtkWidget*) self)->allocation.height - self->priv->margin_bottom);
+	_tmp10_ = _tmp1_;
+	if (_tmp10_) {
+		gdouble _tmp11_;
+		GtkAllocation _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		_tmp11_ = y;
+		_tmp13_ = _tmp6_.height;
+		_tmp14_ = self->priv->eq_margin_bottom;
+		_tmp0_ = _tmp11_ < ((gdouble) (_tmp13_ - _tmp14_));
 	} else {
 		_tmp0_ = FALSE;
 	}
-	result = _tmp0_;
+	_tmp15_ = _tmp0_;
+	result = _tmp15_;
 	return result;
 }
 
 
-static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, double x, double y) {
-	double band_width;
+static void ddb_equalizer_update_eq_drag (DdbEqualizer* self, gdouble x, gdouble y) {
+	GtkAllocation _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble band_width;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_ = 0.0;
 	gint band;
-	gboolean _tmp0_ = FALSE;
+	gint _tmp7_;
+	gint _tmp8_;
+	gboolean _tmp10_ = FALSE;
+	gint _tmp11_;
+	gboolean _tmp13_;
 	g_return_if_fail (self != NULL);
-	band_width = ((double) (((GtkWidget*) self)->allocation.width - self->priv->margin_left)) / ((double) (DDB_EQUALIZER_bands + 1));
-	band = (gint) floor (((x - self->priv->margin_left) / band_width) - 0.5);
-	if (band < 0) {
+	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp0_);
+	_tmp1_ = _tmp0_.width;
+	_tmp2_ = self->priv->eq_margin_left;
+	band_width = ((gdouble) (_tmp1_ - _tmp2_)) / ((gdouble) (DDB_EQUALIZER_bands + 1));
+	_tmp3_ = x;
+	_tmp4_ = self->priv->eq_margin_left;
+	_tmp5_ = band_width;
+	_tmp6_ = floor (((_tmp3_ - _tmp4_) / _tmp5_) - 0.5);
+	band = (gint) _tmp6_;
+	_tmp7_ = band;
+	if (_tmp7_ < 0) {
 		band = 0;
 	}
-	if (band >= DDB_EQUALIZER_bands) {
-		band = band - 1;
+	_tmp8_ = band;
+	if (_tmp8_ >= DDB_EQUALIZER_bands) {
+		gint _tmp9_;
+		_tmp9_ = band;
+		band = _tmp9_ - 1;
 	}
-	if (band >= 0) {
-		_tmp0_ = band < DDB_EQUALIZER_bands;
+	_tmp11_ = band;
+	if (_tmp11_ >= 0) {
+		gint _tmp12_;
+		_tmp12_ = band;
+		_tmp10_ = _tmp12_ < DDB_EQUALIZER_bands;
 	} else {
-		_tmp0_ = FALSE;
+		_tmp10_ = FALSE;
 	}
-	if (_tmp0_) {
-		self->priv->values[band] = y / ((double) (((GtkWidget*) self)->allocation.height - self->priv->margin_bottom));
-		if (self->priv->values[band] > 1) {
-			self->priv->values[band] = (double) 1;
+	_tmp13_ = _tmp10_;
+	if (_tmp13_) {
+		gdouble* _tmp14_;
+		gint _tmp14__length1;
+		gint _tmp15_;
+		gdouble _tmp16_;
+		GtkAllocation _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
+		gdouble _tmp20_;
+		gdouble* _tmp21_;
+		gint _tmp21__length1;
+		gint _tmp22_;
+		gdouble _tmp23_;
+		_tmp14_ = self->priv->values;
+		_tmp14__length1 = self->priv->values_length1;
+		_tmp15_ = band;
+		_tmp16_ = y;
+		gtk_widget_get_allocation ((GtkWidget*) self, &_tmp17_);
+		_tmp18_ = _tmp17_.height;
+		_tmp19_ = self->priv->eq_margin_bottom;
+		_tmp14_[_tmp15_] = _tmp16_ / ((gdouble) (_tmp18_ - _tmp19_));
+		_tmp20_ = _tmp14_[_tmp15_];
+		_tmp21_ = self->priv->values;
+		_tmp21__length1 = self->priv->values_length1;
+		_tmp22_ = band;
+		_tmp23_ = _tmp21_[_tmp22_];
+		if (_tmp23_ > ((gdouble) 1)) {
+			gdouble* _tmp24_;
+			gint _tmp24__length1;
+			gint _tmp25_;
+			gdouble _tmp26_;
+			_tmp24_ = self->priv->values;
+			_tmp24__length1 = self->priv->values_length1;
+			_tmp25_ = band;
+			_tmp24_[_tmp25_] = (gdouble) 1;
+			_tmp26_ = _tmp24_[_tmp25_];
 		} else {
-			if (self->priv->values[band] < 0) {
-				self->priv->values[band] = (double) 0;
+			gdouble* _tmp27_;
+			gint _tmp27__length1;
+			gint _tmp28_;
+			gdouble _tmp29_;
+			_tmp27_ = self->priv->values;
+			_tmp27__length1 = self->priv->values_length1;
+			_tmp28_ = band;
+			_tmp29_ = _tmp27_[_tmp28_];
+			if (_tmp29_ < ((gdouble) 0)) {
+				gdouble* _tmp30_;
+				gint _tmp30__length1;
+				gint _tmp31_;
+				gdouble _tmp32_;
+				_tmp30_ = self->priv->values;
+				_tmp30__length1 = self->priv->values_length1;
+				_tmp31_ = band;
+				_tmp30_[_tmp31_] = (gdouble) 0;
+				_tmp32_ = _tmp30_[_tmp31_];
 			}
 		}
 		g_signal_emit_by_name (self, "on-changed");
@@ -446,38 +503,103 @@
 static gboolean ddb_equalizer_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	DdbEqualizer * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	GdkEventButton _tmp0_;
+	gdouble _tmp1_;
+	GdkEventButton _tmp2_;
+	gdouble _tmp3_;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp11_ = FALSE;
+	gboolean _tmp12_ = FALSE;
+	gboolean _tmp13_ = FALSE;
+	GdkEventButton _tmp14_;
+	gdouble _tmp15_;
+	gboolean _tmp18_;
+	gboolean _tmp24_;
+	gboolean _tmp27_;
 	self = (DdbEqualizer*) base;
-	if (ddb_equalizer_in_curve_area (self, (double) ((gint) (*event).x), (double) ((gint) (*event).y))) {
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = _tmp0_.x;
+	_tmp2_ = *event;
+	_tmp3_ = _tmp2_.y;
+	_tmp4_ = ddb_equalizer_in_curve_area (self, (gdouble) ((gint) _tmp1_), (gdouble) ((gint) _tmp3_));
+	if (_tmp4_) {
+		GdkEventButton _tmp5_;
+		gdouble _tmp6_;
+		GdkEventButton _tmp7_;
+		gdouble _tmp8_;
+		GdkEventButton _tmp9_;
+		gdouble _tmp10_;
 		self->priv->curve_hook = TRUE;
-		ddb_equalizer_update_eq_drag (self, (double) ((gint) (*event).x), (double) ((gint) (*event).y));
-		self->priv->mouse_y = (gint) (*event).y;
+		_tmp5_ = *event;
+		_tmp6_ = _tmp5_.x;
+		_tmp7_ = *event;
+		_tmp8_ = _tmp7_.y;
+		ddb_equalizer_update_eq_drag (self, (gdouble) ((gint) _tmp6_), (gdouble) ((gint) _tmp8_));
+		_tmp9_ = *event;
+		_tmp10_ = _tmp9_.y;
+		self->priv->mouse_y = (gint) _tmp10_;
 		gtk_widget_queue_draw ((GtkWidget*) self);
 		result = FALSE;
 		return result;
 	}
-	if ((*event).x <= 11) {
-		_tmp2_ = (*event).y > 1;
+	_tmp14_ = *event;
+	_tmp15_ = _tmp14_.x;
+	if (_tmp15_ <= ((gdouble) 11)) {
+		GdkEventButton _tmp16_;
+		gdouble _tmp17_;
+		_tmp16_ = *event;
+		_tmp17_ = _tmp16_.y;
+		_tmp13_ = _tmp17_ > ((gdouble) 1);
 	} else {
-		_tmp2_ = FALSE;
+		_tmp13_ = FALSE;
 	}
-	if (_tmp2_) {
-		_tmp1_ = (*event).y <= (((GtkWidget*) self)->allocation.height - self->priv->margin_bottom);
+	_tmp18_ = _tmp13_;
+	if (_tmp18_) {
+		GdkEventButton _tmp19_;
+		gdouble _tmp20_;
+		GtkAllocation _tmp21_;
+		gint _tmp22_;
+		gint _tmp23_;
+		_tmp19_ = *event;
+		_tmp20_ = _tmp19_.y;
+		gtk_widget_get_allocation ((GtkWidget*) self, &_tmp21_);
+		_tmp22_ = _tmp21_.height;
+		_tmp23_ = self->priv->eq_margin_bottom;
+		_tmp12_ = _tmp20_ <= ((gdouble) (_tmp22_ - _tmp23_));
 	} else {
-		_tmp1_ = FALSE;
+		_tmp12_ = FALSE;
 	}
-	if (_tmp1_) {
-		_tmp0_ = (*event).button == 1;
+	_tmp24_ = _tmp12_;
+	if (_tmp24_) {
+		GdkEventButton _tmp25_;
+		guint _tmp26_;
+		_tmp25_ = *event;
+		_tmp26_ = _tmp25_.button;
+		_tmp11_ = _tmp26_ == ((guint) 1);
 	} else {
-		_tmp0_ = FALSE;
+		_tmp11_ = FALSE;
 	}
-	if (_tmp0_) {
-		self->priv->preamp = (*event).y / ((double) (((GtkWidget*) self)->allocation.height - self->priv->margin_bottom));
+	_tmp27_ = _tmp11_;
+	if (_tmp27_) {
+		GdkEventButton _tmp28_;
+		gdouble _tmp29_;
+		GtkAllocation _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		GdkEventButton _tmp33_;
+		gdouble _tmp34_;
+		_tmp28_ = *event;
+		_tmp29_ = _tmp28_.y;
+		gtk_widget_get_allocation ((GtkWidget*) self, &_tmp30_);
+		_tmp31_ = _tmp30_.height;
+		_tmp32_ = self->priv->eq_margin_bottom;
+		self->priv->preamp = _tmp29_ / ((gdouble) (_tmp31_ - _tmp32_));
 		g_signal_emit_by_name (self, "on-changed");
 		self->priv->preamp_hook = TRUE;
-		self->priv->mouse_y = (gint) (*event).y;
+		_tmp33_ = *event;
+		_tmp34_ = _tmp33_.y;
+		self->priv->mouse_y = (gint) _tmp34_;
 		gtk_widget_queue_draw ((GtkWidget*) self);
 	}
 	result = FALSE;
@@ -488,10 +610,15 @@
 static gboolean ddb_equalizer_real_button_release_event (GtkWidget* base, GdkEventButton* event) {
 	DdbEqualizer * self;
 	gboolean result = FALSE;
+	GdkWindow* _tmp0_ = NULL;
+	GdkCursor* _tmp1_;
 	self = (DdbEqualizer*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	self->priv->curve_hook = FALSE;
 	self->priv->preamp_hook = FALSE;
-	gdk_window_set_cursor (gtk_widget_get_window ((GtkWidget*) self), self->priv->pointer_cursor);
+	_tmp0_ = gtk_widget_get_window ((GtkWidget*) self);
+	_tmp1_ = self->priv->pointer_cursor;
+	gdk_window_set_cursor (_tmp0_, _tmp1_);
 	result = FALSE;
 	return result;
 }
@@ -501,6 +628,7 @@
 	DdbEqualizer * self;
 	gboolean result = FALSE;
 	self = (DdbEqualizer*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	self->priv->mouse_y = -1;
 	gtk_widget_queue_draw ((GtkWidget*) self);
 	result = FALSE;
@@ -511,30 +639,77 @@
 static gboolean ddb_equalizer_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
 	DdbEqualizer * self;
 	gboolean result = FALSE;
-	double y;
+	GdkEventMotion _tmp0_;
+	gdouble _tmp1_;
+	GtkAllocation _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gdouble y;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	gboolean _tmp7_;
+	GdkEventMotion _tmp9_;
+	gdouble _tmp10_;
+	GdkEventMotion _tmp11_;
+	gdouble _tmp12_;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp16_;
 	self = (DdbEqualizer*) base;
-	y = (*event).y / ((double) (((GtkWidget*) self)->allocation.height - self->priv->margin_bottom));
-	if (y < 0) {
-		y = (double) 0;
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = _tmp0_.y;
+	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp2_);
+	_tmp3_ = _tmp2_.height;
+	_tmp4_ = self->priv->eq_margin_bottom;
+	y = _tmp1_ / ((gdouble) (_tmp3_ - _tmp4_));
+	_tmp5_ = y;
+	if (_tmp5_ < ((gdouble) 0)) {
+		y = (gdouble) 0;
 	}
-	if (y > 1) {
-		y = (double) 1;
+	_tmp6_ = y;
+	if (_tmp6_ > ((gdouble) 1)) {
+		y = (gdouble) 1;
 	}
-	if (self->priv->preamp_hook) {
-		self->priv->preamp = y;
+	_tmp7_ = self->priv->preamp_hook;
+	if (_tmp7_) {
+		gdouble _tmp8_;
+		_tmp8_ = y;
+		self->priv->preamp = _tmp8_;
 		g_signal_emit_by_name (self, "on-changed");
 		gtk_widget_queue_draw ((GtkWidget*) self);
 		result = FALSE;
 		return result;
 	}
-	if (!ddb_equalizer_in_curve_area (self, (double) ((gint) (*event).x), (double) ((gint) (*event).y))) {
+	_tmp9_ = *event;
+	_tmp10_ = _tmp9_.x;
+	_tmp11_ = *event;
+	_tmp12_ = _tmp11_.y;
+	_tmp13_ = ddb_equalizer_in_curve_area (self, (gdouble) ((gint) _tmp10_), (gdouble) ((gint) _tmp12_));
+	if (!_tmp13_) {
 		self->priv->mouse_y = -1;
 	} else {
-		self->priv->mouse_y = (gint) (*event).y;
+		GdkEventMotion _tmp14_;
+		gdouble _tmp15_;
+		_tmp14_ = *event;
+		_tmp15_ = _tmp14_.y;
+		self->priv->mouse_y = (gint) _tmp15_;
 	}
-	if (self->priv->curve_hook) {
-		ddb_equalizer_update_eq_drag (self, (double) ((gint) (*event).x), (double) ((gint) (*event).y));
-		self->priv->mouse_y = (gint) (*event).y;
+	_tmp16_ = self->priv->curve_hook;
+	if (_tmp16_) {
+		GdkEventMotion _tmp17_;
+		gdouble _tmp18_;
+		GdkEventMotion _tmp19_;
+		gdouble _tmp20_;
+		GdkEventMotion _tmp21_;
+		gdouble _tmp22_;
+		_tmp17_ = *event;
+		_tmp18_ = _tmp17_.x;
+		_tmp19_ = *event;
+		_tmp20_ = _tmp19_.y;
+		ddb_equalizer_update_eq_drag (self, (gdouble) ((gint) _tmp18_), (gdouble) ((gint) _tmp20_));
+		_tmp21_ = *event;
+		_tmp22_ = _tmp21_.y;
+		self->priv->mouse_y = (gint) _tmp22_;
 	}
 	gtk_widget_queue_draw ((GtkWidget*) self);
 	result = FALSE;
@@ -542,37 +717,59 @@
 }
 
 
-void ddb_equalizer_set_band (DdbEqualizer* self, gint band, double v) {
+void ddb_equalizer_set_band (DdbEqualizer* self, gint band, gdouble v) {
+	gdouble* _tmp0_;
+	gint _tmp0__length1;
+	gint _tmp1_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	g_return_if_fail (self != NULL);
-	self->priv->values[band] = 1 - ((v + 20.0) / 40.0);
+	_tmp0_ = self->priv->values;
+	_tmp0__length1 = self->priv->values_length1;
+	_tmp1_ = band;
+	_tmp2_ = v;
+	_tmp0_[_tmp1_] = 1 - ((_tmp2_ + 20.0) / 40.0);
+	_tmp3_ = _tmp0_[_tmp1_];
 }
 
 
-double ddb_equalizer_get_band (DdbEqualizer* self, gint band) {
-	double result = 0.0;
+gdouble ddb_equalizer_get_band (DdbEqualizer* self, gint band) {
+	gdouble result = 0.0;
+	gdouble* _tmp0_;
+	gint _tmp0__length1;
+	gint _tmp1_;
+	gdouble _tmp2_;
 	g_return_val_if_fail (self != NULL, 0.0);
-	result = ((1 - self->priv->values[band]) * 40.0) - 20.0;
+	_tmp0_ = self->priv->values;
+	_tmp0__length1 = self->priv->values_length1;
+	_tmp1_ = band;
+	_tmp2_ = _tmp0_[_tmp1_];
+	result = ((1 - _tmp2_) * 40.0) - 20.0;
 	return result;
 }
 
 
-void ddb_equalizer_set_preamp (DdbEqualizer* self, double v) {
+void ddb_equalizer_set_preamp (DdbEqualizer* self, gdouble v) {
+	gdouble _tmp0_;
 	g_return_if_fail (self != NULL);
-	self->priv->preamp = 1 - ((v + 20.0) / 40.0);
+	_tmp0_ = v;
+	self->priv->preamp = 1 - ((_tmp0_ + 20.0) / 40.0);
 }
 
 
-double ddb_equalizer_get_preamp (DdbEqualizer* self) {
-	double result = 0.0;
+gdouble ddb_equalizer_get_preamp (DdbEqualizer* self) {
+	gdouble result = 0.0;
+	gdouble _tmp0_;
 	g_return_val_if_fail (self != NULL, 0.0);
-	result = ((1 - self->priv->preamp) * 40.0) - 20.0;
+	_tmp0_ = self->priv->preamp;
+	result = ((1 - _tmp0_) * 40.0) - 20.0;
 	return result;
 }
 
 
 DdbEqualizer* ddb_equalizer_construct (GType object_type) {
-	DdbEqualizer * self;
-	self = g_object_newv (object_type, 0, NULL);
+	DdbEqualizer * self = NULL;
+	self = (DdbEqualizer*) g_object_new (object_type, NULL);
 	return self;
 }
 
@@ -589,10 +786,6 @@
 	parent_class = G_OBJECT_CLASS (ddb_equalizer_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = DDB_EQUALIZER (obj);
-	{
-		self->priv->margin_bottom = (gint) (((pango_units_to_double (pango_font_description_get_size (gtk_widget_get_style ((GtkWidget*) self)->font_desc)) * gdk_screen_get_resolution (gdk_screen_get_default ())) / 72) + 4);
-		self->priv->margin_left = self->priv->margin_bottom * 4;
-	}
 	return obj;
 }
 
@@ -602,7 +795,11 @@
 	g_type_class_add_private (klass, sizeof (DdbEqualizerPrivate));
 	GTK_WIDGET_CLASS (klass)->configure_event = ddb_equalizer_real_configure_event;
 	GTK_WIDGET_CLASS (klass)->realize = ddb_equalizer_real_realize;
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS (klass)->draw = ddb_equalizer_real_draw;
+#else
 	GTK_WIDGET_CLASS (klass)->expose_event = ddb_equalizer_real_expose_event;
+#endif
 	GTK_WIDGET_CLASS (klass)->button_press_event = ddb_equalizer_real_button_press_event;
 	GTK_WIDGET_CLASS (klass)->button_release_event = ddb_equalizer_real_button_release_event;
 	GTK_WIDGET_CLASS (klass)->leave_notify_event = ddb_equalizer_real_leave_notify_event;
@@ -614,17 +811,21 @@
 
 
 static void ddb_equalizer_instance_init (DdbEqualizer * self) {
+	gdouble* _tmp0_ = NULL;
+	GdkCursor* _tmp1_;
 	self->priv = DDB_EQUALIZER_GET_PRIVATE (self);
-	self->priv->values = g_new0 (double, DDB_EQUALIZER_bands);
+	_tmp0_ = g_new0 (gdouble, DDB_EQUALIZER_bands);
+	self->priv->values = _tmp0_;
 	self->priv->values_length1 = DDB_EQUALIZER_bands;
 	self->priv->_values_size_ = self->priv->values_length1;
 	self->priv->preamp = 0.5;
 	self->priv->mouse_y = -1;
 	self->priv->curve_hook = FALSE;
 	self->priv->preamp_hook = FALSE;
-	self->priv->margin_bottom = -1;
-	self->priv->margin_left = -1;
-	self->priv->pointer_cursor = gdk_cursor_new (GDK_LEFT_PTR);
+	self->priv->eq_margin_bottom = -1;
+	self->priv->eq_margin_left = -1;
+	_tmp1_ = gdk_cursor_new (GDK_LEFT_PTR);
+	self->priv->pointer_cursor = _tmp1_;
 }
 
 
@@ -650,4 +851,3 @@
 
 
 
-

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbequalizer.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbequalizer.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddblistview.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddblistview.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
@@ -32,6 +31,7 @@
 #include "ddblistview.h"
 #include "drawing.h"
 #include "gtkui.h"
+#include "support.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -57,7 +57,7 @@
 
 struct _DdbListviewColumn {
 char *title;
- int width;
+ float width;
 int minheight;
 struct _DdbListviewColumn *next;
 void *user_data;
@@ -80,7 +80,7 @@
 //static void ddb_listview_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
 //static void ddb_listview_realize(GtkWidget *widget);
 //static void ddb_listview_paint(GtkWidget *widget);
-static void ddb_listview_destroy(GtkObject *object);
+static void ddb_listview_destroy(GObject *object);
 
 static void
 ddb_listview_build_groups (DdbListview *listview);
@@ -94,13 +94,11 @@
 
 ////// list functions ////
 void
-ddb_listview_list_render (DdbListview *ps, int x, int y, int w, int h);
+ddb_listview_list_render (DdbListview *ps, cairo_t *cr, int x, int y, int w, int h);
 void
-ddb_listview_list_render_row_background (DdbListview *ps, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h);
+ddb_listview_list_render_row_background (DdbListview *ps, cairo_t *cr, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h);
 void
-ddb_listview_list_render_row_foreground (DdbListview *ps, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int x, int y, int w, int h);
-//void
-//ddb_listview_list_render_row (DdbListview *ps, int row, DdbListviewIter it);
+ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int x, int y, int w, int h);
 void
 ddb_listview_list_track_dragdrop (DdbListview *ps, int y);
 int
@@ -120,7 +118,7 @@
 
 ////// header functions ////
 void
-ddb_listview_header_render (DdbListview *ps);
+ddb_listview_header_render (DdbListview *ps, cairo_t *cr);
 
 ////// column management functions ////
 void
@@ -148,9 +146,16 @@
 gpointer user_data);
 
 gboolean
+ddb_listview_header_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data);
+#if !GTK_CHECK_VERSION(3,0,0)
+
+gboolean
 ddb_listview_header_expose_event (GtkWidget *widget,
 GdkEventExpose *event,
 gpointer user_data);
+#endif
 
 gboolean
 ddb_listview_header_configure_event (GtkWidget *widget,
@@ -186,6 +191,11 @@
 GdkEventExpose *event,
 gpointer user_data);
 
+gboolean
+ddb_listview_list_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data);
+
 void
 ddb_listview_list_realize (GtkWidget *widget,
 gpointer user_data);
@@ -270,16 +280,15 @@
 ddb_listview_class_init(DdbListviewClass *class)
 {
 GtkTableClass *widget_class = (GtkTableClass *) class;
- GtkObjectClass *object_class = (GtkObjectClass *) class;
- // FIXME!!!
- object_class->destroy = ddb_listview_destroy;
+ GObjectClass *object_class = (GObjectClass *) class;
+ object_class->finalize = ddb_listview_destroy;
 }
 
 static void
 ddb_listview_init(DdbListview *listview)
 {
 // init instance - create all subwidgets, and insert into table
- draw_init_font (GTK_WIDGET(listview)->style);
+ draw_init_font (gtk_widget_get_style (GTK_WIDGET(listview)));
 
 listview->rowheight = draw_get_listview_rowheight ();
 
@@ -309,6 +318,7 @@
 listview->last_header_motion_ev = -1; //is it subject to remove?
 listview->prev_header_x = -1;
 listview->header_prepare = 0;
+ listview->header_width = 0;
 
 listview->columns = NULL;
 listview->groups = NULL;
@@ -372,9 +382,15 @@
 g_signal_connect ((gpointer) listview->scrollbar, "value_changed",
 G_CALLBACK (ddb_listview_vscroll_value_changed),
 NULL);
+#if !GTK_CHECK_VERSION(3,0,0)
 g_signal_connect ((gpointer) listview->header, "expose_event",
 G_CALLBACK (ddb_listview_header_expose_event),
 NULL);
+#else
+ g_signal_connect ((gpointer) listview->header, "draw",
+ G_CALLBACK (ddb_listview_header_draw),
+ NULL);
+#endif
 g_signal_connect ((gpointer) listview->header, "configure_event",
 G_CALLBACK (ddb_listview_header_configure_event),
 NULL);
@@ -390,9 +406,15 @@
 g_signal_connect ((gpointer) listview->header, "button_release_event",
 G_CALLBACK (ddb_listview_header_button_release_event),
 NULL);
+#if !GTK_CHECK_VERSION(3,0,0)
 g_signal_connect ((gpointer) listview->list, "expose_event",
 G_CALLBACK (ddb_listview_list_expose_event),
 NULL);
+#else
+ g_signal_connect ((gpointer) listview->list, "draw",
+ G_CALLBACK (ddb_listview_list_draw),
+ NULL);
+#endif
 g_signal_connect ((gpointer) listview->list, "realize",
 G_CALLBACK (ddb_listview_list_realize),
 NULL);
@@ -443,7 +465,7 @@
 }
 
 static void
-ddb_listview_destroy(GtkObject *object)
+ddb_listview_destroy(GObject *object)
 {
 DdbListview *listview;
 
@@ -511,7 +533,7 @@
 {
 DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
 
- draw_init_font (widget->style);
+ draw_init_font (gtk_widget_get_style (widget));
 int height = draw_get_listview_rowheight ();
 if (height != ps->rowheight) {
 ps->rowheight = height;
@@ -596,11 +618,17 @@
 }
 
 void
-ddb_listview_list_render (DdbListview *listview, int x, int y, int w, int h) {
+ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int w, int h) {
+ cairo_set_line_width (cr, 1);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
 GtkWidget *treeview = theme_treeview;
- if (treeview->style->depth == -1) {
+
+#if !GTK_CHECK_VERSION(3,0,0)
+// FIXME?
+ if (gtk_widget_get_style (treeview)->depth == -1) {
 return; // drawing was called too early
 }
+#endif
 int idx = 0;
 int abs_idx = 0;
 deadbeef->pl_lock ();
@@ -614,7 +642,8 @@
 abs_idx += grp->num_items;
 grp = grp->next;
 }
- draw_begin ((uintptr_t)listview->list->window);
+
+ draw_begin (cr);
 
 int ii = 0;
 while (grp && grp_y < y + h + listview->scrollpos) {
@@ -626,9 +655,9 @@
 }
 listview->binding->ref (it);
 if (grp_y + listview->grouptitle_height >= y + listview->scrollpos && grp_y < y + h + listview->scrollpos) {
- ddb_listview_list_render_row_background (listview, NULL, idx & 1, 0, -listview->hscrollpos, grp_y - listview->scrollpos, listview->totalwidth, listview->grouptitle_height);
+ ddb_listview_list_render_row_background (listview, cr, NULL, idx & 1, 0, -listview->hscrollpos, grp_y - listview->scrollpos, listview->totalwidth, listview->grouptitle_height);
 if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
- listview->binding->draw_group_title (listview, listview->list->window, it, -listview->hscrollpos, grp_y - listview->scrollpos, listview->totalwidth, listview->grouptitle_height);
+ listview->binding->draw_group_title (listview, cr, it, -listview->hscrollpos, grp_y - listview->scrollpos, listview->totalwidth, listview->grouptitle_height);
 }
 }
 for (int i = 0; i < grp->num_items; i++) {
@@ -641,9 +670,12 @@
 }
 if (grp_y + listview->grouptitle_height + (i+1) * listview->rowheight >= y + listview->scrollpos
 && grp_y + listview->grouptitle_height + i * listview->rowheight < y + h + listview->scrollpos) {
- gdk_draw_rectangle (listview->list->window, listview->list->style->bg_gc[GTK_STATE_NORMAL], TRUE, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
- ddb_listview_list_render_row_background (listview, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
- ddb_listview_list_render_row_foreground (listview, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ GtkStyle *st = gtk_widget_get_style (listview->list);
+ gdk_cairo_set_source_color (cr, &st->bg[GTK_STATE_NORMAL]);
+ cairo_rectangle (cr, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ cairo_fill (cr);
+ ddb_listview_list_render_row_background (listview, cr, it, (idx + 1 + i) & 1, (abs_idx+i) == listview->binding->cursor () ? 1 : 0, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
+ ddb_listview_list_render_row_foreground (listview, cr, it, grp->head, (idx + 1 + i) & 1, (idx+i) == listview->binding->cursor () ? 1 : 0, i * listview->rowheight, -listview->hscrollpos, grp_y + listview->grouptitle_height + i * listview->rowheight - listview->scrollpos, listview->totalwidth, listview->rowheight);
 }
 DdbListviewIter next = listview->binding->next (it);
 listview->binding->unref (it);
@@ -662,18 +694,22 @@
 if (filler > 0) {
 int theming = !gtkui_override_listview_colors ();
 if (theming) {
- gtk_paint_flat_box (treeview->style, listview->list->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "even_row_color", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+#else
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+#endif
 }
 else {
 GdkColor clr;
- GdkGC *gc = gdk_gc_new (listview->list->window);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_listview_even_row_color (&clr), &clr));
- gdk_draw_rectangle (listview->list->window, gc, TRUE, x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
- g_object_unref (gc);
+ gtkui_get_listview_even_row_color (&clr);
+ gdk_cairo_set_source_color (cr, &clr);
+ cairo_rectangle (cr, x, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, w, filler);
+ cairo_fill (cr);
 }
 
 
- ddb_listview_list_render_row_foreground (listview, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, -listview->hscrollpos, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, listview->totalwidth, filler);
+ ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, -listview->hscrollpos, grp_y - listview->scrollpos + listview->grouptitle_height + listview->rowheight * grp->num_items, listview->totalwidth, filler);
 }
 
 grp_y += grpheight;
@@ -684,14 +720,18 @@
 // gdk_draw_rectangle (listview->list->window, listview->list->style->bg_gc[GTK_STATE_NORMAL], TRUE, x, grp_y - listview->scrollpos, w, hh);
 int theming = !gtkui_override_listview_colors ();
 if (theming) {
- gtk_paint_flat_box (treeview->style, listview->list->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos, w, hh);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "even_row_color", x, grp_y - listview->scrollpos, w, hh);
+#else
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), listview->list->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos, w, hh);
+#endif
 }
 else {
 GdkColor clr;
- GdkGC *gc = gdk_gc_new (listview->list->window);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_listview_even_row_color (&clr), &clr));
- gdk_draw_rectangle (listview->list->window, gc, TRUE, x, grp_y - listview->scrollpos, w, hh);
- g_object_unref (gc);
+ gtkui_get_listview_even_row_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_rectangle (cr, x, grp_y - listview->scrollpos, w, hh);
+ cairo_fill (cr);
 }
 }
 deadbeef->pl_unlock ();
@@ -699,24 +739,43 @@
 }
 
 static void
-ddb_listview_draw_dnd_marker (DdbListview *ps) {
+ddb_listview_draw_dnd_marker (DdbListview *ps, cairo_t *cr) {
 if (ps->drag_motion_y < 0) {
 return;
 }
 int drag_motion_y = ps->drag_motion_y - ps->scrollpos;
 
 GtkWidget *widget = ps->list;
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
 GdkColor clr;
 gtkui_get_listview_cursor_color (&clr);
- GdkGC *gc = gdk_gc_new (widget->window);
- gdk_gc_set_rgb_fg_color (gc, &clr);
- gdk_draw_rectangle (widget->window, gc, TRUE, 0, drag_motion_y-1, widget->allocation.width, 3);
- gdk_draw_rectangle (widget->window, gc, TRUE, 0, drag_motion_y-3, 3, 7);
- gdk_draw_rectangle (widget->window, gc, TRUE, widget->allocation.width-3, drag_motion_y-3, 3, 7);
- g_object_unref (gc);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.0);
+ cairo_rectangle (cr, 0, drag_motion_y-1, a.width, 3);
+ cairo_fill (cr);
+ cairo_rectangle (cr, 0, drag_motion_y-3, 3, 7);
+ cairo_fill (cr);
+ cairo_rectangle (cr, a.width-3, drag_motion_y-3, 3, 7);
+ cairo_fill (cr);
 
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+gboolean
+ddb_listview_list_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data)
+{
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ widget = ps->list;
+ // FIXME: clip region
+ ddb_listview_list_render (ps, cr, 0, 0, gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
+ if (ps->drag_motion_y >= 0/* && ps->drag_motion_y-ps->scrollpos-3 < event->area.y+event->area.height && ps->drag_motion_y-ps->scrollpos+3 >= event->area.y*/) {
+ ddb_listview_draw_dnd_marker (ps, cr);
+ }
+ return FALSE;
+}
+#else
 gboolean
 ddb_listview_list_expose_event (GtkWidget *widget,
 GdkEventExpose *event,
@@ -724,14 +783,15 @@
 {
 DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
 widget = ps->list;
- if (widget->window) {
- ddb_listview_list_render (ps, event->area.x, event->area.y, event->area.width, event->area.height);
- }
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ ddb_listview_list_render (ps, cr, event->area.x, event->area.y, event->area.width, event->area.height);
 if (ps->drag_motion_y >= 0 && ps->drag_motion_y-ps->scrollpos-3 < event->area.y+event->area.height && ps->drag_motion_y-ps->scrollpos+3 >= event->area.y) {
- ddb_listview_draw_dnd_marker (ps);
+ ddb_listview_draw_dnd_marker (ps, cr);
 }
+ cairo_destroy (cr);
 return FALSE;
 }
+#endif
 
 gboolean
 ddb_listview_vscroll_event (GtkWidget *widget,
@@ -769,40 +829,8 @@
 return;
 }
 if (newscroll != ps->scrollpos) {
- GtkWidget *widget = ps->list;
- int di = newscroll - ps->scrollpos;
- int d = abs (di);
- int height = ps->list->allocation.height;
- if (d < height) {
- if (di > 0) {
- // scroll down
- // copy scrolled part of buffer
- gdk_draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, d, 0, 0, widget->allocation.width, widget->allocation.height-d);
-// draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, d, 0, 0, widget->allocation.width, widget->allocation.height-d);
- // redraw other part
- int start = height-d-1;
- ps->scrollpos = newscroll;
- gtk_widget_queue_draw_area (ps->list, 0, start, ps->list->allocation.width, widget->allocation.height-start);
-// ddb_listview_list_render (ps, 0, start, ps->list->allocation.width, widget->allocation.height-start);
- }
- else {
- // scroll up
- // copy scrolled part of buffer
- gdk_draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, 0, 0, d, widget->allocation.width, widget->allocation.height-d);
- //draw_drawable (ps->list->window, widget->style->black_gc, ps->list->window, 0, 0, 0, d, widget->allocation.width, widget->allocation.height-d);
- // redraw other part
- ps->scrollpos = newscroll;
- gtk_widget_queue_draw_area (ps->list, 0, 0, ps->list->allocation.width, d+1);
- //ddb_listview_list_render (ps, 0, 0, ps->list->allocation.width, d+1);
- }
- }
- else {
- // scrolled more than view height, redraw everything
- ps->scrollpos = newscroll;
- ddb_listview_list_render (ps, 0, 0, widget->allocation.width, widget->allocation.height);
- }
+ ps->scrollpos = newscroll;
 gtk_widget_queue_draw (ps->list);
-// draw_drawable (widget->window, widget->style->black_gc, ps->list->window, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
 }
 }
 
@@ -825,10 +853,11 @@
 {
 DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
 ddb_listview_list_track_dragdrop (pl, y);
- int cnt = g_list_length (drag_context->targets);
+ GList *targets = gdk_drag_context_list_targets (drag_context);
+ int cnt = g_list_length (targets);
 int i;
 for (i = 0; i < cnt; i++) {
- GdkAtom a = GDK_POINTER_TO_ATOM (g_list_nth_data (drag_context->targets, i));
+ GdkAtom a = GDK_POINTER_TO_ATOM (g_list_nth_data (targets, i));
 gchar *nm = gdk_atom_name (a);
 if (!strcmp (nm, "text/uri-list")) {
 g_free (nm);
@@ -898,7 +927,8 @@
 ps->binding->unref (it);
 it = next;
 }
- gtk_selection_data_set (selection_data, selection_data->target, sizeof (uint32_t) * 8, (gchar *)ptr, (nsel+1) * sizeof (uint32_t));
+ GdkAtom target = gtk_selection_data_get_target (selection_data);
+ gtk_selection_data_set (selection_data, target, sizeof (uint32_t) * 8, (gchar *)ptr, (nsel+1) * sizeof (uint32_t));
 free (ptr);
 }
 break;
@@ -936,23 +966,24 @@
 if (sel != -1) {
 it = ps->binding->get_for_idx (sel);
 }
- gchar *ptr=(char*)data->data;
+ gchar *ptr=(char*)gtk_selection_data_get_data (data);
+ gint len = gtk_selection_data_get_length (data);
 if (target_type == 0) { // uris
 // this happens when dropped from file manager
- char *mem = malloc (data->length+1);
- memcpy (mem, ptr, data->length);
- mem[data->length] = 0;
+ char *mem = malloc (len+1);
+ memcpy (mem, ptr, len);
+ mem[len] = 0;
 // we don't pass control structure, but there's only one drag-drop view currently
- ps->binding->external_drag_n_drop (it, mem, data->length);
+ ps->binding->external_drag_n_drop (it, mem, len);
 if (it) {
 UNREF (it);
 }
 }
- else if (target_type == 1 && data->format == 32) { // list of 32bit ints, DDB_URI_LIST target
+ else if (target_type == 1 && gtk_selection_data_get_format(data) == 32) { // list of 32bit ints, DDB_URI_LIST target
 uint32_t *d= (uint32_t *)ptr;
 int plt = *d;
 d++;
- int length = (data->length/4)-1;
+ int length = (len/4)-1;
 DdbListviewIter drop_before = it;
 // find last selected
 while (drop_before && ps->binding->is_selected (drop_before)) {
@@ -962,7 +993,8 @@
 }
 ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
 if (p) {
- ps->binding->drag_n_drop (drop_before, p, d, length, drag_context->action == GDK_ACTION_COPY ? 1 : 0);
+ // FIXME
+ ps->binding->drag_n_drop (drop_before, p, d, length, gdk_drag_context_get_selected_action (drag_context) == GDK_ACTION_COPY ? 1 : 0);
 deadbeef->plt_unref (p);
 }
 if (drop_before) {
@@ -1095,7 +1127,9 @@
 GtkWidget *list = ps->list;
 GtkWidget *scroll = ps->scrollbar;
 int vheight = ps->fullheight;
- if (ps->fullheight <= ps->list->allocation.height) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
+ if (ps->fullheight <= a.height) {
 gtk_widget_hide (scroll);
 ps->scrollpos = 0;
 gtk_widget_queue_draw (ps->list);
@@ -1106,7 +1140,7 @@
 ps->scrollpos = vheight-1;
 }
 }
- int h = list->allocation.height;
+ int h = a.height;
 GtkAdjustment *adj = (GtkAdjustment*)gtk_adjustment_new (gtk_range_get_value (GTK_RANGE (scroll)), 0, vheight, SCROLL_STEP, h/2, h);
 gtk_range_set_adjustment (GTK_RANGE (scroll), adj);
 gtk_range_set_value (GTK_RANGE (scroll), ps->scrollpos);
@@ -1115,15 +1149,17 @@
 void
 ddb_listview_list_setup_hscroll (DdbListview *ps) {
 GtkWidget *list = ps->list;
- int w = list->allocation.width;
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
+ int w = a.width;
 int size = 0;
 DdbListviewColumn *c;
 for (c = ps->columns; c; c = c->next) {
 size += c->width;
 }
 ps->totalwidth = size;
- if (ps->totalwidth < ps->list->allocation.width) {
- ps->totalwidth = ps->list->allocation.width;
+ if (ps->totalwidth < a.width) {
+ ps->totalwidth = a.width;
 }
 if (w >= size) {
 size = 0;
@@ -1178,35 +1214,6 @@
 return -1;
 }
 
-#if 0
-void
-ddb_listview_list_render_row (DdbListview *listview, int row, DdbListviewIter it) {
- DdbListviewGroup *grp;
- int even;
- int cursor;
- int x, y, w, h;
- int group_y;
- if (ddb_listview_list_get_drawinfo (listview, row, &grp, &even, &cursor, &group_y, &x, &y, &w, &h) == -1) {
- return;
- }
-
- if (y + h <= 0) {
- return;
- }
-
- if (y > GTK_WIDGET (listview)->allocation.height) {
- return;
- }
-
- draw_begin ((uintptr_t)listview->list->window);
- ddb_listview_list_render_row_background (listview, it, even, cursor, x, y, w, h);
-	if (it) {
- ddb_listview_list_render_row_foreground (listview, it, grp->head, even, cursor, group_y, x, y, w, h);
- }
- draw_end ();
-}
-#endif
-
 void
 ddb_listview_draw_row (DdbListview *listview, int row, DdbListviewIter it) {
 DdbListviewGroup *grp;
@@ -1222,51 +1229,63 @@
 return;
 }
 
- if (y > GTK_WIDGET (listview)->allocation.height) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (listview->list), &a);
+
+ if (y > a.height) {
 return;
 }
- gtk_widget_queue_draw_area (listview->list, 0, y, listview->list->allocation.width, h);
+ gtk_widget_queue_draw_area (listview->list, 0, y, a.width, h);
 }
 
 // coords passed are window-relative
 void
-ddb_listview_list_render_row_background (DdbListview *ps, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h) {
+ddb_listview_list_render_row_background (DdbListview *ps, cairo_t *cr, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h) {
 	// draw background
 	GtkWidget *treeview = theme_treeview;
 	int theming = !gtkui_override_listview_colors ();
 
 	if (theming) {
- if (treeview->style->depth == -1) {
+#if !GTK_CHECK_VERSION(3,0,0)
+ if (gtk_widget_get_style (treeview)->depth == -1) {
 return; // drawing was called too early
 }
 GTK_WIDGET_SET_FLAGS (GTK_WIDGET (treeview), GTK_HAS_FOCUS);
- //G_OBJECT_FLAGS (treeview) |= GTK_HAS_FOCUS;
+#endif
 }
 int sel = it && ps->binding->is_selected (it);
 if (theming || !sel) {
 if (theming) {
 // draw background for selection -- workaround for New Wave theme (translucency)
- gtk_paint_flat_box (treeview->style, ps->list->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, even ? "cell_even_ruled" : "cell_odd_ruled", x, y, w, h);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, even ? "even_row_color" : "odd_row_color", x, y, w, h);
+#else
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), ps->list->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, treeview, even ? "cell_even_ruled" : "cell_odd_ruled", x, y, w, h);
+#endif
 }
 else {
 GdkColor clr;
- GdkGC *gc = gdk_gc_new (ps->list->window);
- gdk_gc_set_rgb_fg_color (gc, even ? (gtkui_get_listview_even_row_color (&clr), &clr) : (gtkui_get_listview_odd_row_color (&clr), &clr));
- gdk_draw_rectangle (ps->list->window, gc, TRUE, x, y, w, h);
- g_object_unref (gc);
+ even ? gtkui_get_listview_even_row_color (&clr) : gtkui_get_listview_odd_row_color (&clr);
+ gdk_cairo_set_source_color (cr, &clr);
+ cairo_rectangle (cr, x, y, w, h);
+ cairo_fill (cr);
 }
 }
 
 if (sel) {
 if (theming) {
- gtk_paint_flat_box (treeview->style, ps->list->window, GTK_STATE_SELECTED, GTK_SHADOW_NONE, NULL, treeview, even ? "cell_even_ruled" : "cell_odd_ruled", x, y, w, h);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_SELECTED, GTK_SHADOW_NONE, treeview, even ? "even_row_color" : "odd_row_color", x, y, w, h);
+#else
+ gtk_paint_flat_box (gtk_widget_get_style (treeview), ps->list->window, GTK_STATE_SELECTED, GTK_SHADOW_NONE, NULL, treeview, even ? "cell_even_ruled" : "cell_odd_ruled", x, y, w, h);
+#endif
 }
 else {
 GdkColor clr;
- GdkGC *gc = gdk_gc_new (ps->list->window);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_listview_selection_color (&clr), &clr));
- gdk_draw_rectangle (ps->list->window, gc, TRUE, x, y, w, h);
- g_object_unref (gc);
+ gtkui_get_listview_selection_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_rectangle (cr, x, y, w, h);
+ cairo_fill (cr);
 }
 }
 	if (cursor) {
@@ -1274,24 +1293,27 @@
 // but we want it anyway
 //treeview->style->fg_gc[GTK_STATE_NORMAL]
 GdkColor clr;
- GdkGC *gc = gdk_gc_new (ps->list->window);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_listview_cursor_color (&clr), &clr));
- gdk_draw_rectangle (ps->list->window, gc, FALSE, x, y, w-1, h-1);
- g_object_unref (gc);
+ gtkui_get_listview_cursor_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_rectangle (cr, x+1, y+1, w-1, h-1);
+ cairo_stroke (cr);
 }
 }
 
 void
-ddb_listview_list_render_row_foreground (DdbListview *ps, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int x, int y, int w, int h) {
+ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int x, int y, int w, int h) {
 	int width, height;
-	draw_get_canvas_size ((uintptr_t)ps->list->window, &width, &height);
+	GtkAllocation a;
+	gtk_widget_get_allocation (ps->list, &a);
+	width = a.width;
+	height = a.height;
 	if (it && ps->binding->is_selected (it)) {
- GdkColor *clr = &theme_treeview->style->fg[GTK_STATE_SELECTED];
+ GdkColor *clr = &gtk_widget_get_style (theme_treeview)->fg[GTK_STATE_SELECTED];
 float rgb[3] = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
 draw_set_fg_color (rgb);
 }
 else {
- GdkColor *clr = &theme_treeview->style->fg[GTK_STATE_NORMAL];
+ GdkColor *clr = &gtk_widget_get_style (theme_treeview)->fg[GTK_STATE_NORMAL];
 float rgb[3] = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
 draw_set_fg_color (rgb);
 }
@@ -1299,15 +1321,15 @@
 int cidx = 0;
 for (c = ps->columns; c; c = c->next, cidx++) {
 int cw = c->width;
- ps->binding->draw_column_data (ps, ps->list->window, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, x, y, cw, h);
+ ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, x, y, cw, h);
 x += cw;
 }
 }
 
 
 void
-ddb_listview_header_expose (DdbListview *ps, int x, int y, int w, int h) {
- ddb_listview_header_render (ps);
+ddb_listview_header_expose (DdbListview *ps, cairo_t *cr, int x, int y, int w, int h) {
+ ddb_listview_header_render (ps, cr);
 }
 
 void
@@ -1347,7 +1369,7 @@
 }
 
 void
-ddb_listview_click_selection (DdbListview *ps, int ex, int ey, DdbListviewGroup *grp, int grp_index, int sel, int dnd) {
+ddb_listview_click_selection (DdbListview *ps, int ex, int ey, DdbListviewGroup *grp, int grp_index, int sel, int dnd, int button) {
 deadbeef->pl_lock ();
 ps->areaselect = 0;
 ddb_listview_groupcheck (ps);
@@ -1398,7 +1420,9 @@
 else {
 // clicked specific item - select, or start drag-n-drop
 DdbListviewIter it = ps->binding->get_for_idx (sel);
- if (!it || !ps->binding->is_selected (it) || !ps->binding->drag_n_drop) {
+ if (!it || !ps->binding->is_selected (it)
+ || (!ps->binding->drag_n_drop && button == 1)) // HACK: don't reset selection by right click in search window
+ {
 // reset selection, and set it to single item
 ddb_listview_select_single (ps, sel);
 if (dnd) {
@@ -1487,7 +1511,7 @@
 // handle multiple selection
 if (!(state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)))
 {
- ddb_listview_click_selection (ps, ex, ey, grp, grp_index, sel, 1);
+ ddb_listview_click_selection (ps, ex, ey, grp, grp_index, sel, 1, 1);
 }
 else if (state & GDK_CONTROL_MASK) {
 // toggle selection
@@ -1804,6 +1828,9 @@
 }
 }
 
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
+
 if (ey < 10) {
 ps->scroll_mode = 0;
 ps->scroll_pointer_y = ey;
@@ -1815,7 +1842,7 @@
 g_idle_add (ddb_listview_list_scroll_cb, ps);
 }
 }
- else if (ey > ps->list->allocation.height-10) {
+ else if (ey > a.height-10) {
 ps->scroll_mode = 0;
 ps->scroll_pointer_y = ey;
 // start scrolling down
@@ -1870,7 +1897,7 @@
 cursor++;
 }
 else {
- gtk_range_set_value (GTK_RANGE (range), adj->upper);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
 }
 }
 else if (keyval == GDK_Up) {
@@ -1878,7 +1905,7 @@
 cursor--;
 }
 else {
- gtk_range_set_value (GTK_RANGE (range), adj->lower);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
 if (cursor < 0 && ps->binding->count () > 0) {
 cursor = 0;
 }
@@ -1892,14 +1919,14 @@
 }
 }
 else {
- gtk_range_set_value (GTK_RANGE (range), adj->upper);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
 }
 }
 else if (keyval == GDK_Page_Up) {
 if (cursor > 0) {
 cursor -= 10;
 if (cursor < 0) {
- gtk_range_set_value (GTK_RANGE (range), adj->lower);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
 cursor = 0;
 }
 }
@@ -1907,16 +1934,16 @@
 if (cursor < 0 && ps->binding->count () > 0) {
 cursor = 0;
 }
- gtk_range_set_value (GTK_RANGE (range), adj->lower);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
 }
 }
 else if (keyval == GDK_End) {
 cursor = ps->binding->count () - 1;
- gtk_range_set_value (GTK_RANGE (range), adj->upper);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
 }
 else if (keyval == GDK_Home) {
 cursor = 0;
- gtk_range_set_value (GTK_RANGE (range), adj->lower);
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
 }
 else if (keyval == GDK_Delete) {
 ps->binding->delete_selected ();
@@ -1927,14 +1954,16 @@
 }
 
 if (state & GDK_SHIFT_MASK) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (ps->list, &a);
 if (cursor != prev) {
 int newscroll = ps->scrollpos;
 int cursor_scroll = ddb_listview_get_row_pos (ps, cursor);
 if (cursor_scroll < ps->scrollpos) {
 newscroll = cursor_scroll;
 }
- else if (cursor_scroll >= ps->scrollpos + ps->list->allocation.height) {
- newscroll = cursor_scroll - ps->list->allocation.height + 1;
+ else if (cursor_scroll >= ps->scrollpos + a.height) {
+ newscroll = cursor_scroll - a.height + 1;
 if (newscroll < 0) {
 newscroll = 0;
 }
@@ -2020,9 +2049,11 @@
 void
 ddb_listview_list_track_dragdrop (DdbListview *ps, int y) {
 GtkWidget *widget = ps->list;
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
 if (ps->drag_motion_y != -1) {
 // erase previous track
- gtk_widget_queue_draw_area (ps->list, 0, ps->drag_motion_y-ps->scrollpos-3, widget->allocation.width, 7);
+ gtk_widget_queue_draw_area (ps->list, 0, ps->drag_motion_y-ps->scrollpos-3, a.width, 7);
 
 }
 if (y == -1) {
@@ -2045,7 +2076,10 @@
 ps->drag_motion_y = ddb_listview_get_row_pos (ps, sel);
 }
 
- ddb_listview_draw_dnd_marker (ps);
+#if !GTK_CHECK_VERSION(3,0,0)
+ // FIXME
+// ddb_listview_draw_dnd_marker (ps, cr);
+#endif
 
 if (y < 10) {
 ps->scroll_pointer_y = y;
@@ -2058,7 +2092,7 @@
 g_idle_add (ddb_listview_list_scroll_cb, ps);
 }
 }
- else if (y > ps->list->allocation.height-10) {
+ else if (y > a.height-10) {
 ps->scroll_mode = 1;
 ps->scroll_pointer_y = y;
 // start scrolling up
@@ -2089,26 +2123,42 @@
 // #define HEADERS_GTKTHEME
 
 void
-ddb_listview_header_render (DdbListview *ps) {
+ddb_listview_header_render (DdbListview *ps, cairo_t *cr) {
+ cairo_set_line_width (cr, 1);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
 GtkWidget *widget = ps->header;
 int x = -ps->hscrollpos;
 int w = 100;
- int h = widget->allocation.height;
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
+ int h = a.height;
 const char *detail = "button";
 
 // fill background and draw bottom line
 #if !HEADERS_GTKTHEME
- GdkGC *gc = gdk_gc_new (ps->header->window);
 GdkColor clr;
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_base_color (&clr), &clr));
- gdk_draw_rectangle (ps->header->window, gc, TRUE, 0, 0, widget->allocation.width, widget->allocation.height);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_dark_color (&clr), &clr));
- gdk_draw_line (ps->header->window, gc, 0, widget->allocation.height-1, widget->allocation.width, widget->allocation.height-1);
+ gtkui_get_tabstrip_base_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_rectangle (cr, 0, 0, a.width, a.height);
+ cairo_fill (cr);
+ gtkui_get_tabstrip_dark_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_move_to (cr, 0, a.height);
+ cairo_line_to (cr, a.width, a.height);
+ cairo_stroke (cr);
 #else
- gtk_paint_box (theme_button->style, ps->header->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, widget, detail, -10, -10, widget->allocation.width+20, widget->allocation.height+20);
- gdk_draw_line (ps->header->window, widget->style->mid_gc[GTK_STATE_NORMAL], 0, widget->allocation.height-1, widget->allocation.width, widget->allocation.height-1);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_box (gtk_widget_get_style (theme_button), cr, GTK_STATE_NORMAL, GTK_SHADOW_OUT, widget, detail, -10, -10, a.width+20, a.height+20);
+#else
+ gtk_paint_box (theme_button->style, ps->header->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, widget, detail, -10, -10, a.width+20, a.height+20);
+#endif
+ clr = gtk_widget_get_style (widget)->mid[GTK_STATE_NORMAL]
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_move_to (cr, 0, a.height-1);
+ cairo_line_to (cr, a.width, a.height-1);
+ cairo_stroke (cr);
 #endif
- draw_begin ((uintptr_t)ps->header->window);
+ draw_begin (cr);
 x = -ps->hscrollpos;
 DdbListviewColumn *c;
 int need_draw_moving = 0;
@@ -2127,21 +2177,33 @@
 }
 #endif
 if (ps->header_dragging < 0 || idx != ps->header_dragging) {
- if (xx >= widget->allocation.width) {
+ if (xx >= a.width) {
 continue;
 }
 int arrow_sz = 10;
 int sort = c->sort_order;
 if (w > 0) {
 #if !HEADERS_GTKTHEME
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_dark_color (&clr), &clr));
- gdk_draw_line (ps->header->window, gc, xx+w - 2, 2, xx+w - 2, h-4);
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_light_color (&clr), &clr));
- gdk_draw_line (ps->header->window, gc, xx+w - 1, 2, xx+w - 1, h-4);
+ gtkui_get_tabstrip_dark_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+ cairo_move_to (cr, xx+w - 2, 2);
+ cairo_line_to (cr, xx+w - 2, h-4);
+ cairo_stroke (cr);
+ 
+ gtkui_get_tabstrip_light_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f);
+
+ cairo_move_to (cr, xx+w - 1, 2);
+ cairo_line_to (cr, xx+w - 1, h-4);
+ cairo_stroke (cr);
+#else
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_vline (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, widget, NULL, 2, h-4, xx+w - 2);
 #else
 gtk_paint_vline (widget->style, ps->header->window, GTK_STATE_NORMAL, NULL, widget, NULL, 2, h-4, xx+w - 2);
 #endif
- GdkColor *gdkfg = &theme_button->style->fg[0];
+#endif
+ GdkColor *gdkfg = &gtk_widget_get_style (theme_button)->fg[0];
 float fg[3] = {(float)gdkfg->red/0xffff, (float)gdkfg->green/0xffff, (float)gdkfg->blue/0xffff};
 draw_set_fg_color (fg);
 int ww = w-10;
@@ -2155,7 +2217,11 @@
 }
 if (sort) {
 int dir = sort == 1 ? GTK_ARROW_DOWN : GTK_ARROW_UP;
- gtk_paint_arrow (widget->style, ps->header->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, dir, TRUE, xx + w-arrow_sz-5, widget->allocation.height/2-arrow_sz/2, arrow_sz, arrow_sz);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_arrow (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL, dir, TRUE, xx + w-arrow_sz-5, a.height/2-arrow_sz/2, arrow_sz, arrow_sz);
+#else
+ gtk_paint_arrow (widget->style, ps->header->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, dir, TRUE, xx + w-arrow_sz-5, a.height/2-arrow_sz/2, arrow_sz, arrow_sz);
+#endif
 }
 }
 else {
@@ -2180,16 +2246,24 @@
 }
 #endif
 // draw empty slot
- if (x < widget->allocation.width) {
+ if (x < a.width) {
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_box (gtk_widget_get_style (theme_button), cr, GTK_STATE_ACTIVE, GTK_SHADOW_ETCHED_IN, widget, "button", x, 0, w, h);
+#else
 gtk_paint_box (theme_button->style, ps->header->window, GTK_STATE_ACTIVE, GTK_SHADOW_ETCHED_IN, NULL, widget, "button", x, 0, w, h);
+#endif
 }
 x = ps->col_movepos - ps->hscrollpos;
- if (x >= widget->allocation.width) {
+ if (x >= a.width) {
 break;
 }
 if (w > 0) {
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_box (gtk_widget_get_style (theme_button), cr, GTK_STATE_SELECTED, GTK_SHADOW_OUT, widget, "button", x, 0, w, h);
+#else
 gtk_paint_box (theme_button->style, ps->header->window, GTK_STATE_SELECTED, GTK_SHADOW_OUT, NULL, widget, "button", x, 0, w, h);
- GdkColor *gdkfg = &theme_button->style->fg[GTK_STATE_SELECTED];
+#endif
+ GdkColor *gdkfg = &gtk_widget_get_style (theme_button)->fg[GTK_STATE_SELECTED];
 float fg[3] = {(float)gdkfg->red/0xffff, (float)gdkfg->green/0xffff, (float)gdkfg->blue/0xffff};
 draw_set_fg_color (fg);
 draw_text (x + 5, 3, c->width-10, 0, c->title);
@@ -2200,21 +2274,36 @@
 }
 }
 draw_end ();
+}
 
-#if !HEADERS_GTKTHEME
- g_object_unref (gc);
-#endif
+gboolean
+ddb_listview_header_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data) {
+ DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ // FIXME: clip region
+ cairo_set_line_width (cr, 1);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
+ ddb_listview_header_expose (ps, cr, 0, 0, a.width, a.height);
+ return FALSE;
 }
 
+
+#if !GTK_CHECK_VERSION(3,0,0)
 gboolean
 ddb_listview_header_expose_event (GtkWidget *widget,
 GdkEventExpose *event,
 gpointer user_data)
 {
 DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- ddb_listview_header_expose (ps, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ ddb_listview_header_expose (ps, cr, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_destroy (cr);
 return FALSE;
 }
+#endif
 
 
 gboolean
@@ -2223,11 +2312,26 @@
 gpointer user_data)
 {
 DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- draw_init_font (widget->style);
+ draw_init_font (gtk_widget_get_style (widget));
 int height = draw_get_listview_rowheight ();
- if (height != widget->allocation.height) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
+ if (height != a.height) {
 gtk_widget_set_size_request (widget, -1, height);
 }
+
+ if (ps->header_width == 0) {
+ ps->header_width = a.width;
+ }
+ else if (ps->header_width != a.width && deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
+ float ratio = (float)a.width / ps->header_width;
+ ps->header_width = a.width;
+ struct _DdbListviewColumn *c;
+ for (c = ps->columns; c; c = c->next) {
+ c->width *= ratio;
+ }
+ }
+
 return FALSE;
 }
 
@@ -2276,7 +2380,7 @@
 }
 }
 if (!ps->header_prepare && ps->header_dragging >= 0) {
- gdk_window_set_cursor (widget->window, ps->cursor_drag);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_drag);
 DdbListviewColumn *c;
 int i;
 for (i = 0, c = ps->columns; i < ps->header_dragging && c; c = c->next, i++);
@@ -2314,7 +2418,7 @@
 else if (ps->header_sizing >= 0) {
 ps->last_header_motion_ev = event->time;
 ps->prev_header_x = ev_x;
- gdk_window_set_cursor (widget->window, ps->cursor_sz);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
 // get column start pos
 int x = -ps->hscrollpos;
 int i = 0;
@@ -2343,15 +2447,15 @@
 int w = c->width;
 if (w > 0) { // ignore collapsed columns (hack for search window)
 if (ev_x >= x + w - 2 && ev_x <= x + w) {
- gdk_window_set_cursor (widget->window, ps->cursor_sz);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
 break;
 }
 else {
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
 }
 }
 else {
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
 }
 x += w;
 }
@@ -2464,11 +2568,11 @@
 for (c = ps->columns; c; c = c->next) {
 int w = c->width;
 if (event->x >= x + w - 2 && event->x <= x + w) {
- gdk_window_set_cursor (widget->window, ps->cursor_sz);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
 break;
 }
 else {
- gdk_window_set_cursor (widget->window, NULL);
+ gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
 }
 x += w;
 }
@@ -2517,11 +2621,13 @@
 
 int cursor_scroll = ddb_listview_get_row_pos (sc->pl, sc->cursor);
 int newscroll = sc->pl->scrollpos;
+ GtkAllocation a;
+ gtk_widget_get_allocation (sc->pl->list, &a);
 if (cursor_scroll < sc->pl->scrollpos) {
 newscroll = cursor_scroll;
 }
- else if (cursor_scroll + sc->pl->rowheight >= sc->pl->scrollpos + sc->pl->list->allocation.height) {
- newscroll = cursor_scroll + sc->pl->rowheight - sc->pl->list->allocation.height + 1;
+ else if (cursor_scroll + sc->pl->rowheight >= sc->pl->scrollpos + a.height) {
+ newscroll = cursor_scroll + sc->pl->rowheight - a.height + 1;
 if (newscroll < 0) {
 newscroll = 0;
 }
@@ -2578,7 +2684,7 @@
 if (sel != -1) {
 ps->binding->set_cursor (sel);
 }
- ddb_listview_click_selection (ps, event->x, event->y, grp, grp_index, sel, 0);
+ ddb_listview_click_selection (ps, event->x, event->y, grp, grp_index, sel, 0, event->button);
 if (sel == -1 && grp_index < grp->num_items) {
 sel = ps->binding->get_idx (grp->head);
 }
@@ -2657,8 +2763,10 @@
 void
 ddb_listview_scroll_to (DdbListview *listview, int pos) {
 pos = ddb_listview_get_row_pos (listview, pos);
- if (pos < listview->scrollpos || pos >= listview->scrollpos + listview->list->allocation.height) {
- gtk_range_set_value (GTK_RANGE (listview->scrollbar), pos - listview->list->allocation.height/2);
+ GtkAllocation a;
+ gtk_widget_get_allocation (listview->list, &a);
+ if (pos < listview->scrollpos || pos >= listview->scrollpos + a.height) {
+ gtk_range_set_value (GTK_RANGE (listview->scrollbar), pos - a.height/2);
 }
 }
 int

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddblistview.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddblistview.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbseekbar.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbseekbar.c Changed

@@ -1,4 +1,4 @@
-/* ddbseekbar.c generated by valac 0.10.2, the Vala compiler
+/* ddbseekbar.c generated by valac 0.14.0, the Vala compiler
 * generated from ddbseekbar.vala, do not modify */
 
 /*
@@ -24,8 +24,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gtkui.h>
 #include <drawing.h>
+#include <gtkui.h>
 
 
 #define DDB_TYPE_SEEKBAR (ddb_seekbar_get_type ())
@@ -55,10 +55,14 @@
 enum {
 	DDB_SEEKBAR_DUMMY_PROPERTY
 };
-static void ddb_seekbar_real_realize (GtkWidget* base);
-static void ddb_seekbar_real_unrealize (GtkWidget* base);
-static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition);
+#if GTK_CHECK_VERSION(3,0,0)
+static void ddb_seekbar_get_preferred_width (GtkWidget* base, gint *minimal_width, gint *natural_width);
+static void ddb_seekbar_get_preferred_height (GtkWidget* base, gint *minimal_height, gint *natural_height);
+#else
 static gboolean ddb_seekbar_real_expose_event (GtkWidget* base, GdkEventExpose* event);
+#endif
+static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition);
+static gboolean ddb_seekbar_real_draw (GtkWidget* base, cairo_t *cr);
 static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_seekbar_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event);
@@ -68,43 +72,57 @@
 static GObject * ddb_seekbar_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 
 
+#if GTK_CHECK_VERSION(3,0,0)
+static void ddb_seekbar_get_preferred_width (GtkWidget* widget, gint *minimal_width, gint *natural_width) {
+ GtkRequisition requisition;
 
-static void ddb_seekbar_real_realize (GtkWidget* base) {
-	DdbSeekbar * self;
-	self = (DdbSeekbar*) base;
-	gtk_widget_set_has_window ((GtkWidget*) self, FALSE);
-	GTK_WIDGET_CLASS (ddb_seekbar_parent_class)->realize (GTK_WIDGET (self));
+ ddb_seekbar_real_size_request (widget, &requisition);
+
+ *minimal_width = *natural_width = requisition.width;
 }
 
+static void ddb_seekbar_get_preferred_height (GtkWidget* widget, gint *minimal_height, gint *natural_height) {
+ GtkRequisition requisition;
 
-static void ddb_seekbar_real_unrealize (GtkWidget* base) {
-	DdbSeekbar * self;
-	self = (DdbSeekbar*) base;
-	GTK_WIDGET_CLASS (ddb_seekbar_parent_class)->unrealize (GTK_WIDGET (self));
-}
+ ddb_seekbar_real_size_request (widget, &requisition);
 
+ *minimal_height = *natural_height = requisition.height;
+}
+#endif
 
 static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition) {
 	DdbSeekbar * self;
+	GtkRequisition _vala_requisition = {0};
 	self = (DdbSeekbar*) base;
+	if (requisition) {
+		*requisition = _vala_requisition;
+	}
 }
 
+static gboolean ddb_seekbar_real_draw (GtkWidget* base, cairo_t *cr) {
+	seekbar_draw (base, cr);
+	return FALSE;
+}
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_seekbar_real_expose_event (GtkWidget* base, GdkEventExpose* event) {
-	DdbSeekbar * self;
-	gboolean result = FALSE;
-	self = (DdbSeekbar*) base;
-	seekbar_draw (GTK_WIDGET (self));
-	result = TRUE;
-	return result;
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (base));
+ ddb_seekbar_real_draw (base, cr);
+ cairo_destroy (cr);
+	return FALSE;
 }
-
+#endif
 
 static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventButton _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_button_press_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_button_press_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -112,8 +130,13 @@
 static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEventButton* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventButton _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_button_release_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_button_release_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -121,8 +144,13 @@
 static gboolean ddb_seekbar_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventMotion _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_motion_notify_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_motion_notify_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -131,6 +159,7 @@
 	DdbSeekbar * self;
 	gboolean result = FALSE;
 	self = (DdbSeekbar*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	gtkui_init_theme_colors ();
 	result = FALSE;
 	return result;
@@ -156,18 +185,20 @@
 	parent_class = G_OBJECT_CLASS (ddb_seekbar_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = DDB_SEEKBAR (obj);
-	{
-	}
 	return obj;
 }
 
 
 static void ddb_seekbar_class_init (DdbSeekbarClass * klass) {
 	ddb_seekbar_parent_class = g_type_class_peek_parent (klass);
-	GTK_WIDGET_CLASS (klass)->realize = ddb_seekbar_real_realize;
-	GTK_WIDGET_CLASS (klass)->unrealize = ddb_seekbar_real_unrealize;
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS (klass)->get_preferred_width = ddb_seekbar_get_preferred_width;
+	GTK_WIDGET_CLASS (klass)->get_preferred_height = ddb_seekbar_get_preferred_height;
+	GTK_WIDGET_CLASS (klass)->draw = ddb_seekbar_real_draw;
+#else
 	GTK_WIDGET_CLASS (klass)->size_request = ddb_seekbar_real_size_request;
 	GTK_WIDGET_CLASS (klass)->expose_event = ddb_seekbar_real_expose_event;
+#endif
 	GTK_WIDGET_CLASS (klass)->button_press_event = ddb_seekbar_real_button_press_event;
 	GTK_WIDGET_CLASS (klass)->button_release_event = ddb_seekbar_real_button_release_event;
 	GTK_WIDGET_CLASS (klass)->motion_notify_event = ddb_seekbar_real_motion_notify_event;
@@ -177,6 +208,7 @@
 
 
 static void ddb_seekbar_instance_init (DdbSeekbar * self) {
+	gtk_widget_set_has_window ((GtkWidget*) self, FALSE);
 }
 
 
@@ -193,4 +225,3 @@
 
 
 
-

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbseekbar.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbseekbar.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbtabstrip.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbtabstrip.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbtabstrip.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbtabstrip.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbvolumebar.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbvolumebar.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/ddbvolumebar.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/ddbvolumebar.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/deadbeef.glade -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/deadbeef.glade Changed

@@ -2674,10 +2674,96 @@
 	 </child>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox100">
+		<widget class="GtkTable" id="table1">
 		 <property name="visible">True</property>
+		 <property name="n_rows">2</property>
+		 <property name="n_columns">2</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <property name="row_spacing">0</property>
+		 <property name="column_spacing">8</property>
+
+		 <child>
+		 <widget class="GtkHBox" id="hbox100">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
+
+		 <child>
+			<widget class="GtkLabel" id="label125">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">-12 dB</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkHScale" id="replaygain_preamp">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="draw_value">True</property>
+			 <property name="value_pos">GTK_POS_BOTTOM</property>
+			 <property name="digits">0</property>
+			 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			 <property name="inverted">False</property>
+			 <property name="adjustment">0 -12 12 0 0 0</property>
+			 <signal name="value_changed" handler="on_replaygain_preamp_value_changed" last_modification_time="Sat, 12 Mar 2011 14:20:29 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label126">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">+12 dB</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+		 </widget>
+		 <packing>
+		 <property name="left_attach">1</property>
+		 <property name="right_attach">2</property>
+		 <property name="top_attach">0</property>
+		 <property name="bottom_attach">1</property>
+		 </packing>
+		 </child>
 
 		 <child>
 		 <widget class="GtkLabel" id="label124">
@@ -2688,7 +2774,7 @@
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
+		 <property name="xalign">0</property>
 		 <property name="yalign">0.5</property>
 		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
@@ -2698,22 +2784,25 @@
 		 <property name="angle">0</property>
 		 </widget>
 		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="left_attach">0</property>
+		 <property name="right_attach">1</property>
+		 <property name="top_attach">0</property>
+		 <property name="bottom_attach">1</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkLabel" id="label125">
+		 <widget class="GtkLabel" id="label124a">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">-12 dB</property>
+		 <property name="label" translatable="yes">Global preamp:</property>
 		 <property name="use_underline">False</property>
 		 <property name="use_markup">False</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
+		 <property name="xalign">0</property>
 		 <property name="yalign">0.5</property>
 		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
@@ -2723,53 +2812,97 @@
 		 <property name="angle">0</property>
 		 </widget>
 		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="left_attach">0</property>
+		 <property name="right_attach">1</property>
+		 <property name="top_attach">1</property>
+		 <property name="bottom_attach">2</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkHScale" id="replaygain_preamp">
+		 <widget class="GtkHBox" id="hbox100a">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="draw_value">True</property>
-		 <property name="value_pos">GTK_POS_BOTTOM</property>
-		 <property name="digits">0</property>
-		 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		 <property name="inverted">False</property>
-		 <property name="adjustment">0 -12 12 0 0 0</property>
-		 <signal name="value_changed" handler="on_replaygain_preamp_value_changed" last_modification_time="Sat, 12 Mar 2011 14:20:29 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
 
-		 <child>
-		 <widget class="GtkLabel" id="label126">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">+12 dB</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
+		 <child>
+			<widget class="GtkLabel" id="label125a">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">-12 dB</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkHScale" id="global_preamp">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="draw_value">True</property>
+			 <property name="value_pos">GTK_POS_BOTTOM</property>
+			 <property name="digits">0</property>
+			 <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+			 <property name="inverted">False</property>
+			 <property name="adjustment">0 -12 12 0 0 0</property>
+			 <signal name="value_changed" handler="on_global_preamp_value_changed" last_modification_time="Thu, 01 Sep 2011 11:40:00 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label126a">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">+12 dB</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
 		 </widget>
 		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="left_attach">1</property>
+		 <property name="right_attach">2</property>
+		 <property name="top_attach">1</property>
+		 <property name="bottom_attach">2</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options">fill</property>
 		 </packing>
 		 </child>
 		</widget>

deadbeef-0.5.1.tar.bz2/plugins/gtkui/drawing.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/drawing.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/dspconfig.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/dspconfig.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/dspconfig.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/dspconfig.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/eq.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/eq.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/eq.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/eq.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/fileman.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/fileman.c Changed

@@ -74,12 +74,16 @@
     g_slist_free (lst);
     deadbeef->pl_add_files_end ();
     deadbeef->plt_unref (plt);
+    deadbeef->pl_save_all ();
+    deadbeef->conf_save ();
 }
 
 static void
 add_dirs_worker (void *data) {
     GSList *lst = (GSList *)data;
     gtkpl_add_dirs (lst);
+    deadbeef->pl_save_all ();
+    deadbeef->conf_save ();
 }
 
 void
@@ -104,6 +108,8 @@
 open_files_worker (void *data) {
     GSList *lst = (GSList *)data;
     gtkpl_add_files (lst);
+    deadbeef->pl_save_all ();
+    deadbeef->conf_save ();
     gtkui_playlist_changed ();
     extern GtkWidget *mainwin;
     DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist"));
@@ -207,6 +213,9 @@
             DdbListviewIter inserted = deadbeef->plt_insert_dir (plt, after, fname, &abort, gtkui_add_file_info_cb, NULL);
             if (!inserted && !abort) {
                 inserted = deadbeef->plt_insert_file (plt, after, fname, &abort, gtkui_add_file_info_cb, NULL);
+                if (!inserted && !abort) {
+                    inserted = gtkui_original_plt_load (plt, after, fname, &abort, gtkui_add_file_info_cb, NULL);
+                }
             }
             if (inserted) {
                 if (!first) {
@@ -232,6 +241,7 @@
 
     deadbeef->pl_add_files_end ();
     deadbeef->plt_unref (plt);
+    deadbeef->pl_save_all ();
     g_idle_add (set_dnd_cursor_idle, first);
 }

deadbeef-0.5.1.tar.bz2/plugins/gtkui/gdkdrawing.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/gdkdrawing.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/gtkui.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/gtkui.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/gtkui.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/gtkui.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/gtkui_api.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/gtkui_api.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/interface.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/interface.c Changed

@@ -21,7 +21,7 @@
 
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
   g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+    g_object_ref(G_OBJECT(widget)), (GDestroyNotify) g_object_unref)
 
 #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
   g_object_set_data (G_OBJECT (component), name, widget)
@@ -498,7 +498,7 @@
   stopbtn = gtk_button_new ();
   gtk_widget_show (stopbtn);
   gtk_box_pack_start (GTK_BOX (hbox3), stopbtn, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (stopbtn, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(stopbtn, FALSE);
   gtk_widget_add_accelerator (stopbtn, "activate", accel_group,
                               GDK_v, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
@@ -511,7 +511,7 @@
   playbtn = gtk_button_new ();
   gtk_widget_show (playbtn);
   gtk_box_pack_start (GTK_BOX (hbox3), playbtn, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (playbtn, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(playbtn, FALSE);
   gtk_widget_add_accelerator (playbtn, "activate", accel_group,
                               GDK_x, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
@@ -527,7 +527,7 @@
   pausebtn = gtk_button_new ();
   gtk_widget_show (pausebtn);
   gtk_box_pack_start (GTK_BOX (hbox3), pausebtn, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (pausebtn, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(pausebtn, FALSE);
   gtk_widget_add_accelerator (pausebtn, "activate", accel_group,
                               GDK_c, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
@@ -543,7 +543,7 @@
   prevbtn = gtk_button_new ();
   gtk_widget_show (prevbtn);
   gtk_box_pack_start (GTK_BOX (hbox3), prevbtn, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (prevbtn, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(prevbtn, FALSE);
   gtk_widget_add_accelerator (prevbtn, "activate", accel_group,
                               GDK_z, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
@@ -556,7 +556,7 @@
   nextbtn = gtk_button_new ();
   gtk_widget_show (nextbtn);
   gtk_box_pack_start (GTK_BOX (hbox3), nextbtn, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (nextbtn, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(nextbtn, FALSE);
   gtk_widget_add_accelerator (nextbtn, "activate", accel_group,
                               GDK_b, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
@@ -570,22 +570,22 @@
   gtk_widget_show (seekbar);
   gtk_box_pack_start (GTK_BOX (hbox2), seekbar, TRUE, TRUE, 2);
   gtk_widget_set_size_request (seekbar, 20, -1);
-  GTK_WIDGET_UNSET_FLAGS (seekbar, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (seekbar, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(seekbar, FALSE);
+  gtk_widget_set_can_default(seekbar, FALSE);
 
   volumebar = create_volumebar_widget ("volumebar", "", "", 0, 0);
   gtk_widget_show (volumebar);
   gtk_box_pack_start (GTK_BOX (hbox2), volumebar, FALSE, TRUE, 2);
   gtk_widget_set_size_request (volumebar, 70, -1);
-  GTK_WIDGET_UNSET_FLAGS (volumebar, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (volumebar, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(volumebar, FALSE);
+  gtk_widget_set_can_default(volumebar, FALSE);
 
   tabstrip = create_tabstrip_widget ("tabstrip", "", "", 0, 0);
   gtk_widget_show (tabstrip);
   gtk_box_pack_start (GTK_BOX (vbox1), tabstrip, FALSE, TRUE, 0);
   gtk_widget_set_size_request (tabstrip, -1, 24);
-  GTK_WIDGET_UNSET_FLAGS (tabstrip, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (tabstrip, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(tabstrip, FALSE);
+  gtk_widget_set_can_default(tabstrip, FALSE);
 
   frame1 = gtk_frame_new (NULL);
   gtk_widget_show (frame1);
@@ -595,8 +595,8 @@
   playlist = create_ddb_listview_widget ("playlist", "", "", 0, 0);
   gtk_widget_show (playlist);
   gtk_container_add (GTK_CONTAINER (frame1), playlist);
-  GTK_WIDGET_UNSET_FLAGS (playlist, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (playlist, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(playlist, FALSE);
+  gtk_widget_set_can_default(playlist, FALSE);
 
   plugins_bottom_vbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (plugins_bottom_vbox);
@@ -917,8 +917,8 @@
   searchlist = create_ddb_listview_widget ("searchlist", "", "", 0, 0);
   gtk_widget_show (searchlist);
   gtk_container_add (GTK_CONTAINER (frame2), searchlist);
-  GTK_WIDGET_UNSET_FLAGS (searchlist, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (searchlist, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(searchlist, FALSE);
+  gtk_widget_set_can_default(searchlist, FALSE);
 
   g_signal_connect ((gpointer) searchwin, "key_press_event",
                     G_CALLBACK (on_searchwin_key_press_event),
@@ -1115,7 +1115,7 @@
   gtk_widget_show (progresstitle);
   gtk_box_pack_start (GTK_BOX (vbox6), progresstitle, TRUE, FALSE, 0);
   gtk_widget_set_size_request (progresstitle, 500, -1);
-  GTK_WIDGET_UNSET_FLAGS (progresstitle, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(progresstitle, FALSE);
   gtk_editable_set_editable (GTK_EDITABLE (progresstitle), FALSE);
   gtk_entry_set_invisible_char (GTK_ENTRY (progresstitle), 8226);
 
@@ -1279,7 +1279,7 @@
   write_tags = gtk_button_new ();
   gtk_widget_show (write_tags);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), write_tags);
-  GTK_WIDGET_SET_FLAGS (write_tags, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(write_tags, TRUE);
 
   alignment11 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment11);
@@ -1300,7 +1300,7 @@
   closebtn = gtk_button_new ();
   gtk_widget_show (closebtn);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), closebtn);
-  GTK_WIDGET_SET_FLAGS (closebtn, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(closebtn, TRUE);
 
   alignment12 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment12);
@@ -1346,7 +1346,7 @@
   button2 = gtk_button_new ();
   gtk_widget_show (button2);
   gtk_container_add (GTK_CONTAINER (hbuttonbox2), button2);
-  GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(button2, TRUE);
 
   alignment13 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment13);
@@ -1472,7 +1472,7 @@
   gtk_window_set_modal (GTK_WINDOW (editcolumndlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (editcolumndlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox1 = GTK_DIALOG (editcolumndlg)->vbox;
+  dialog_vbox1 = gtk_dialog_get_content_area (GTK_DIALOG (editcolumndlg));
   gtk_widget_show (dialog_vbox1);
 
   vbox14 = gtk_vbox_new (FALSE, 8);
@@ -1504,20 +1504,20 @@
   gtk_box_pack_start (GTK_BOX (hbox30), label37, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label37), 0, 0.5);
 
-  id = gtk_combo_box_new_text ();
+  id = gtk_combo_box_text_new ();
   gtk_widget_show (id);
   gtk_box_pack_start (GTK_BOX (hbox30), id, TRUE, TRUE, 0);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Item Index"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Playing"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Album Art"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Artist - Album"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Artist"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Album"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Title"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Duration"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Track Number"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Band / Album Artist"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id), _("Custom"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Item Index"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Playing"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Album Art"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Artist - Album"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Artist"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Album"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Title"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Duration"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Track Number"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Band / Album Artist"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id), _("Custom"));
 
   hbox31 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox31);
@@ -1541,8 +1541,8 @@
   title_formatting_help_link = title_formatting_help_link_create ("title_formatting_help_link", "", "", 0, 0);
   gtk_widget_show (title_formatting_help_link);
   gtk_box_pack_start (GTK_BOX (hbox74), title_formatting_help_link, TRUE, TRUE, 0);
-  GTK_WIDGET_UNSET_FLAGS (title_formatting_help_link, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (title_formatting_help_link, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(title_formatting_help_link, FALSE);
+  gtk_widget_set_can_default(title_formatting_help_link, FALSE);
 
   hbox32 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox32);
@@ -1553,20 +1553,20 @@
   gtk_box_pack_start (GTK_BOX (hbox32), label38, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label38), 0, 0.5);
 
-  align = gtk_combo_box_new_text ();
+  align = gtk_combo_box_text_new ();
   gtk_widget_show (align);
   gtk_box_pack_start (GTK_BOX (hbox32), align, TRUE, TRUE, 0);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (align), _("Left"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (align), _("Right"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (align), _("Left"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (align), _("Right"));
 
-  dialog_action_area1 = GTK_DIALOG (editcolumndlg)->action_area;
+  dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (editcolumndlg));
   gtk_widget_show (dialog_action_area1);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
 
   cancelbutton1 = gtk_button_new ();
   gtk_widget_show (cancelbutton1);
   gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton1, TRUE);
 
   alignment9 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment9);
@@ -1587,7 +1587,7 @@
   okbutton1 = gtk_button_new ();
   gtk_widget_show (okbutton1);
   gtk_dialog_add_action_widget (GTK_DIALOG (editcolumndlg), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton1, TRUE);
 
   alignment8 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment8);
@@ -1662,11 +1662,17 @@
   GtkWidget *label8;
   GtkWidget *pref_replaygain_mode;
   GtkWidget *pref_replaygain_scale;
+  GtkWidget *table1;
   GtkWidget *hbox100;
-  GtkWidget *label124;
   GtkWidget *label125;
   GtkWidget *replaygain_preamp;
   GtkWidget *label126;
+  GtkWidget *label124;
+  GtkWidget *label124a;
+  GtkWidget *hbox100a;
+  GtkWidget *label125a;
+  GtkWidget *global_preamp;
+  GtkWidget *label126a;
   GtkWidget *hbox66;
   GtkWidget *cli_add_to_playlist;
   GtkWidget *cli_playlist_name;
@@ -1799,7 +1805,7 @@
   gtk_window_set_position (GTK_WINDOW (prefwin), GTK_WIN_POS_CENTER);
   gtk_window_set_type_hint (GTK_WINDOW (prefwin), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox2 = GTK_DIALOG (prefwin)->vbox;
+  dialog_vbox2 = gtk_dialog_get_content_area (GTK_DIALOG (prefwin));
   gtk_widget_show (dialog_vbox2);
 
   notebook = gtk_notebook_new ();
@@ -1821,7 +1827,7 @@
   gtk_box_pack_start (GTK_BOX (hbox11), label23, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label23), 0, 0.5);
 
-  pref_output_plugin = gtk_combo_box_new_text ();
+  pref_output_plugin = gtk_combo_box_text_new ();
   gtk_widget_show (pref_output_plugin);
   gtk_box_pack_start (GTK_BOX (hbox11), pref_output_plugin, TRUE, TRUE, 0);
 
@@ -1834,7 +1840,7 @@
   gtk_box_pack_start (GTK_BOX (hbox12), label4, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label4), 0, 0.5);
 
-  pref_soundcard = gtk_combo_box_new_text ();
+  pref_soundcard = gtk_combo_box_text_new ();
   gtk_widget_show (pref_soundcard);
   gtk_box_pack_start (GTK_BOX (hbox12), pref_soundcard, TRUE, TRUE, 0);
 
@@ -1860,25 +1866,28 @@
   gtk_box_pack_start (GTK_BOX (hbox10), label8, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5);
 
-  pref_replaygain_mode = gtk_combo_box_new_text ();
+  pref_replaygain_mode = gtk_combo_box_text_new ();
   gtk_widget_show (pref_replaygain_mode);
   gtk_box_pack_start (GTK_BOX (hbox10), pref_replaygain_mode, TRUE, TRUE, 0);
   gtk_widget_set_size_request (pref_replaygain_mode, 337, -1);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), _("Disable"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), _("Track"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_replaygain_mode), _("Album"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_mode), _("Disable"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_mode), _("Track"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_mode), _("Album"));
 
   pref_replaygain_scale = gtk_check_button_new_with_mnemonic (_("Replaygain peak scale"));
   gtk_widget_show (pref_replaygain_scale);
   gtk_box_pack_start (GTK_BOX (vbox8), pref_replaygain_scale, FALSE, FALSE, 0);
 
+  table1 = gtk_table_new (2, 2, FALSE);
+  gtk_widget_show (table1);
+  gtk_box_pack_start (GTK_BOX (vbox8), table1, FALSE, FALSE, 0);
+  gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
+
   hbox100 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox100);
-  gtk_box_pack_start (GTK_BOX (vbox8), hbox100, FALSE, FALSE, 0);
-
-  label124 = gtk_label_new (_("Replaygain preamp:"));
-  gtk_widget_show (label124);
-  gtk_box_pack_start (GTK_BOX (hbox100), label124, FALSE, FALSE, 0);
+  gtk_table_attach (GTK_TABLE (table1), hbox100, 1, 2, 0, 1,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
   label125 = gtk_label_new (_("-12 dB"));
   gtk_widget_show (label125);
@@ -1894,6 +1903,40 @@
   gtk_widget_show (label126);
   gtk_box_pack_start (GTK_BOX (hbox100), label126, FALSE, FALSE, 0);
 
+  label124 = gtk_label_new (_("Replaygain preamp:"));
+  gtk_widget_show (label124);
+  gtk_table_attach (GTK_TABLE (table1), label124, 0, 1, 0, 1,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label124), 0, 0.5);
+
+  label124a = gtk_label_new (_("Global preamp:"));
+  gtk_widget_show (label124a);
+  gtk_table_attach (GTK_TABLE (table1), label124a, 0, 1, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label124a), 0, 0.5);
+
+  hbox100a = gtk_hbox_new (FALSE, 8);
+  gtk_widget_show (hbox100a);
+  gtk_table_attach (GTK_TABLE (table1), hbox100a, 1, 2, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+  label125a = gtk_label_new (_("-12 dB"));
+  gtk_widget_show (label125a);
+  gtk_box_pack_start (GTK_BOX (hbox100a), label125a, FALSE, FALSE, 0);
+
+  global_preamp = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, -12, 12, 0, 0, 0)));
+  gtk_widget_show (global_preamp);
+  gtk_box_pack_start (GTK_BOX (hbox100a), global_preamp, TRUE, TRUE, 0);
+  gtk_scale_set_value_pos (GTK_SCALE (global_preamp), GTK_POS_BOTTOM);
+  gtk_scale_set_digits (GTK_SCALE (global_preamp), 0);
+
+  label126a = gtk_label_new (_("+12 dB"));
+  gtk_widget_show (label126a);
+  gtk_box_pack_start (GTK_BOX (hbox100a), label126a, FALSE, FALSE, 0);
+
   hbox66 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox66);
   gtk_box_pack_start (GTK_BOX (vbox8), hbox66, FALSE, FALSE, 0);
@@ -2070,7 +2113,7 @@
   gtk_widget_show (label128);
   gtk_box_pack_start (GTK_BOX (hbox101), label128, FALSE, FALSE, 0);
 
-  gui_plugin = gtk_combo_box_new_text ();
+  gui_plugin = gtk_combo_box_text_new ();
   gtk_widget_show (gui_plugin);
   gtk_box_pack_start (GTK_BOX (hbox101), gui_plugin, TRUE, TRUE, 0);
 
@@ -2357,15 +2400,15 @@
   gtk_box_pack_start (GTK_BOX (hbox15), label20, FALSE, FALSE, 0);
   gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5);
 
-  pref_network_proxytype = gtk_combo_box_new_text ();
+  pref_network_proxytype = gtk_combo_box_text_new ();
   gtk_widget_show (pref_network_proxytype);
   gtk_box_pack_start (GTK_BOX (hbox15), pref_network_proxytype, TRUE, TRUE, 0);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "HTTP_1_0");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS4A");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (pref_network_proxytype), "SOCKS5_HOSTNAME");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "HTTP");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "HTTP_1_0");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "SOCKS4");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "SOCKS5");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "SOCKS4A");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_network_proxytype), "SOCKS5_HOSTNAME");
 
   hbox61 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox61);
@@ -2496,22 +2539,22 @@
   weblink = create_plugin_weblink ("weblink", "", "", 0, 0);
   gtk_widget_show (weblink);
   gtk_box_pack_start (GTK_BOX (hbox20), weblink, TRUE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (weblink, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (weblink, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(weblink, FALSE);
+  gtk_widget_set_can_default(weblink, FALSE);
 
   label3 = gtk_label_new (_("Plugins"));
   gtk_widget_show (label3);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 6), label3);
   gtk_misc_set_alignment (GTK_MISC (label3), 0.48, 0.5);
 
-  dialog_action_area2 = GTK_DIALOG (prefwin)->action_area;
+  dialog_action_area2 = gtk_dialog_get_action_area (GTK_DIALOG (prefwin));
   gtk_widget_show (dialog_action_area2);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area2), GTK_BUTTONBOX_END);
 
   closebutton1 = gtk_button_new_from_stock ("gtk-close");
   gtk_widget_show (closebutton1);
   gtk_dialog_add_action_widget (GTK_DIALOG (prefwin), closebutton1, GTK_RESPONSE_CLOSE);
-  GTK_WIDGET_SET_FLAGS (closebutton1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(closebutton1, TRUE);
 
   g_signal_connect ((gpointer) prefwin, "configure_event",
                     G_CALLBACK (on_prefwin_configure_event),
@@ -2534,6 +2577,9 @@
   g_signal_connect ((gpointer) replaygain_preamp, "value_changed",
                     G_CALLBACK (on_replaygain_preamp_value_changed),
                     NULL);
+  g_signal_connect ((gpointer) global_preamp, "value_changed",
+                    G_CALLBACK (on_global_preamp_value_changed),
+                    NULL);
   g_signal_connect ((gpointer) cli_add_to_playlist, "toggled",
                     G_CALLBACK (on_cli_add_to_playlist_toggled),
                     NULL);
@@ -2694,11 +2740,17 @@
   GLADE_HOOKUP_OBJECT (prefwin, label8, "label8");
   GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_mode, "pref_replaygain_mode");
   GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_scale, "pref_replaygain_scale");
+  GLADE_HOOKUP_OBJECT (prefwin, table1, "table1");
   GLADE_HOOKUP_OBJECT (prefwin, hbox100, "hbox100");
-  GLADE_HOOKUP_OBJECT (prefwin, label124, "label124");
   GLADE_HOOKUP_OBJECT (prefwin, label125, "label125");
   GLADE_HOOKUP_OBJECT (prefwin, replaygain_preamp, "replaygain_preamp");
   GLADE_HOOKUP_OBJECT (prefwin, label126, "label126");
+  GLADE_HOOKUP_OBJECT (prefwin, label124, "label124");
+  GLADE_HOOKUP_OBJECT (prefwin, label124a, "label124a");
+  GLADE_HOOKUP_OBJECT (prefwin, hbox100a, "hbox100a");
+  GLADE_HOOKUP_OBJECT (prefwin, label125a, "label125a");
+  GLADE_HOOKUP_OBJECT (prefwin, global_preamp, "global_preamp");
+  GLADE_HOOKUP_OBJECT (prefwin, label126a, "label126a");
   GLADE_HOOKUP_OBJECT (prefwin, hbox66, "hbox66");
   GLADE_HOOKUP_OBJECT (prefwin, cli_add_to_playlist, "cli_add_to_playlist");
   GLADE_HOOKUP_OBJECT (prefwin, cli_playlist_name, "cli_playlist_name");
@@ -2855,7 +2907,7 @@
   gtk_window_set_destroy_with_parent (GTK_WINDOW (entrydialog), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (entrydialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox3 = GTK_DIALOG (entrydialog)->vbox;
+  dialog_vbox3 = gtk_dialog_get_content_area (GTK_DIALOG (entrydialog));
   gtk_widget_show (dialog_vbox3);
 
   vbox15 = gtk_vbox_new (FALSE, 0);
@@ -2877,14 +2929,14 @@
   gtk_entry_set_invisible_char (GTK_ENTRY (title), 8226);
   gtk_entry_set_activates_default (GTK_ENTRY (title), TRUE);
 
-  dialog_action_area3 = GTK_DIALOG (entrydialog)->action_area;
+  dialog_action_area3 = gtk_dialog_get_action_area (GTK_DIALOG (entrydialog));
   gtk_widget_show (dialog_action_area3);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area3), GTK_BUTTONBOX_END);
 
   cancelbutton2 = gtk_button_new ();
   gtk_widget_show (cancelbutton2);
   gtk_dialog_add_action_widget (GTK_DIALOG (entrydialog), cancelbutton2, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton2, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton2, TRUE);
 
   alignment17 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment17);
@@ -2905,7 +2957,7 @@
   okbutton2 = gtk_button_new ();
   gtk_widget_show (okbutton2);
   gtk_dialog_add_action_widget (GTK_DIALOG (entrydialog), okbutton2, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton2, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton2, TRUE);
 
   alignment16 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment16);
@@ -2970,7 +3022,7 @@
   gtk_window_set_title (GTK_WINDOW (addlocationdlg), _("Add location"));
   gtk_window_set_type_hint (GTK_WINDOW (addlocationdlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox4 = GTK_DIALOG (addlocationdlg)->vbox;
+  dialog_vbox4 = gtk_dialog_get_content_area (GTK_DIALOG (addlocationdlg));
   gtk_widget_show (dialog_vbox4);
 
   hbox34 = gtk_hbox_new (FALSE, 8);
@@ -2989,14 +3041,14 @@
   gtk_entry_set_invisible_char (GTK_ENTRY (addlocation_entry), 8226);
   gtk_entry_set_activates_default (GTK_ENTRY (addlocation_entry), TRUE);
 
-  addlocation_actionarea = GTK_DIALOG (addlocationdlg)->action_area;
+  addlocation_actionarea = gtk_dialog_get_action_area (GTK_DIALOG (addlocationdlg));
   gtk_widget_show (addlocation_actionarea);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (addlocation_actionarea), GTK_BUTTONBOX_END);
 
   cancelbutton3 = gtk_button_new ();
   gtk_widget_show (cancelbutton3);
   gtk_dialog_add_action_widget (GTK_DIALOG (addlocationdlg), cancelbutton3, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton3, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton3, TRUE);
 
   alignment18 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment18);
@@ -3017,7 +3069,7 @@
   okbutton3 = gtk_button_new ();
   gtk_widget_show (okbutton3);
   gtk_dialog_add_action_widget (GTK_DIALOG (addlocationdlg), okbutton3, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton3, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton3, TRUE);
 
   alignment19 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment19);
@@ -3083,7 +3135,7 @@
   gtk_window_set_title (GTK_WINDOW (groupbydlg), _("Group By"));
   gtk_window_set_type_hint (GTK_WINDOW (groupbydlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox5 = GTK_DIALOG (groupbydlg)->vbox;
+  dialog_vbox5 = gtk_dialog_get_content_area (GTK_DIALOG (groupbydlg));
   gtk_widget_show (dialog_vbox5);
 
   vbox25 = gtk_vbox_new (FALSE, 8);
@@ -3112,17 +3164,17 @@
   custom1 = title_formatting_help_link_create ("custom1", "", "", 0, 0);
   gtk_widget_show (custom1);
   gtk_box_pack_start (GTK_BOX (hbox75), custom1, TRUE, TRUE, 0);
-  GTK_WIDGET_UNSET_FLAGS (custom1, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (custom1, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(custom1, FALSE);
+  gtk_widget_set_can_default(custom1, FALSE);
 
-  dialog_action_area4 = GTK_DIALOG (groupbydlg)->action_area;
+  dialog_action_area4 = gtk_dialog_get_action_area (GTK_DIALOG (groupbydlg));
   gtk_widget_show (dialog_action_area4);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area4), GTK_BUTTONBOX_END);
 
   cancelbutton4 = gtk_button_new ();
   gtk_widget_show (cancelbutton4);
   gtk_dialog_add_action_widget (GTK_DIALOG (groupbydlg), cancelbutton4, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton4, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton4, TRUE);
 
   alignment7 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment7);
@@ -3143,7 +3195,7 @@
   okbutton4 = gtk_button_new ();
   gtk_widget_show (okbutton4);
   gtk_dialog_add_action_widget (GTK_DIALOG (groupbydlg), okbutton4, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton4, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton4, TRUE);
 
   alignment6 = gtk_alignment_new (0.5, 0.5, 0, 0);
   gtk_widget_show (alignment6);
@@ -3208,7 +3260,7 @@
   gtk_window_set_modal (GTK_WINDOW (sortbydlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (sortbydlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox8 = GTK_DIALOG (sortbydlg)->vbox;
+  dialog_vbox8 = gtk_dialog_get_content_area (GTK_DIALOG (sortbydlg));
   gtk_widget_show (dialog_vbox8);
 
   vbox28 = gtk_vbox_new (FALSE, 8);
@@ -3236,8 +3288,8 @@
   custom3 = title_formatting_help_link_create ("custom3", "", "", 0, 0);
   gtk_widget_show (custom3);
   gtk_box_pack_start (GTK_BOX (hbox77), custom3, TRUE, TRUE, 0);
-  GTK_WIDGET_UNSET_FLAGS (custom3, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (custom3, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_focus(custom3, FALSE);
+  gtk_widget_set_can_default(custom3, FALSE);
 
   hbox78 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox78);
@@ -3247,25 +3299,25 @@
   gtk_widget_show (label109);
   gtk_box_pack_start (GTK_BOX (hbox78), label109, FALSE, FALSE, 0);
 
-  sortorder = gtk_combo_box_new_text ();
+  sortorder = gtk_combo_box_text_new ();
   gtk_widget_show (sortorder);
   gtk_box_pack_start (GTK_BOX (hbox78), sortorder, TRUE, TRUE, 0);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (sortorder), _("Ascending"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (sortorder), _("Descending"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sortorder), _("Ascending"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sortorder), _("Descending"));
 
-  dialog_action_area7 = GTK_DIALOG (sortbydlg)->action_area;
+  dialog_action_area7 = gtk_dialog_get_action_area (GTK_DIALOG (sortbydlg));
   gtk_widget_show (dialog_action_area7);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area7), GTK_BUTTONBOX_END);
 
   cancelbutton5 = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton5);
   gtk_dialog_add_action_widget (GTK_DIALOG (sortbydlg), cancelbutton5, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton5, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton5, TRUE);
 
   okbutton5 = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton5);
   gtk_dialog_add_action_widget (GTK_DIALOG (sortbydlg), okbutton5, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton5, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton5, TRUE);
 
   g_signal_connect ((gpointer) sortfmt, "activate",
                     G_CALLBACK (on_sortfmt_activate),
@@ -3308,7 +3360,7 @@
   gtk_window_set_modal (GTK_WINDOW (select_dsp_plugin), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (select_dsp_plugin), GDK_WINDOW_TYPE_HINT_DIALOG);
 
-  dialog_vbox10 = GTK_DIALOG (select_dsp_plugin)->vbox;
+  dialog_vbox10 = gtk_dialog_get_content_area (GTK_DIALOG (select_dsp_plugin));
   gtk_widget_show (dialog_vbox10);
 
   vbox31 = gtk_vbox_new (FALSE, 8);
@@ -3324,23 +3376,23 @@
   gtk_widget_show (label113);
   gtk_box_pack_start (GTK_BOX (hbox85), label113, FALSE, FALSE, 0);
 
-  plugin = gtk_combo_box_new_text ();
+  plugin = gtk_combo_box_text_new ();
   gtk_widget_show (plugin);
   gtk_box_pack_start (GTK_BOX (hbox85), plugin, TRUE, TRUE, 0);
 
-  dialog_action_area9 = GTK_DIALOG (select_dsp_plugin)->action_area;
+  dialog_action_area9 = gtk_dialog_get_action_area (GTK_DIALOG (select_dsp_plugin));
   gtk_widget_show (dialog_action_area9);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area9), GTK_BUTTONBOX_END);
 
   cancelbutton7 = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_show (cancelbutton7);
   gtk_dialog_add_action_widget (GTK_DIALOG (select_dsp_plugin), cancelbutton7, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton7, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(cancelbutton7, TRUE);
 
   okbutton7 = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_show (okbutton7);
   gtk_dialog_add_action_widget (GTK_DIALOG (select_dsp_plugin), okbutton7, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton7, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(okbutton7, TRUE);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (select_dsp_plugin, select_dsp_plugin, "select_dsp_plugin");
@@ -3411,7 +3463,7 @@
   gtk_window_set_type_hint (GTK_WINDOW (tagwritersettings), GDK_WINDOW_TYPE_HINT_DIALOG);
   gtk_dialog_set_has_separator (GTK_DIALOG (tagwritersettings), FALSE);
 
-  dialog_vbox11 = GTK_DIALOG (tagwritersettings)->vbox;
+  dialog_vbox11 = gtk_dialog_get_content_area (GTK_DIALOG (tagwritersettings));
   gtk_widget_show (dialog_vbox11);
 
   vbox32 = gtk_vbox_new (FALSE, 0);
@@ -3473,11 +3525,11 @@
   gtk_widget_show (label118);
   gtk_box_pack_start (GTK_BOX (hbox91), label118, FALSE, FALSE, 0);
 
-  id3v2_version = gtk_combo_box_new_text ();
+  id3v2_version = gtk_combo_box_text_new ();
   gtk_widget_show (id3v2_version);
   gtk_box_pack_start (GTK_BOX (hbox91), id3v2_version, TRUE, TRUE, 0);
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id3v2_version), _("2.3 (Recommended)"));
-  gtk_combo_box_append_text (GTK_COMBO_BOX (id3v2_version), _("2.4"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), _("2.3 (Recommended)"));
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), _("2.4"));
 
   hbox92 = gtk_hbox_new (FALSE, 8);
   gtk_widget_show (hbox92);
@@ -3589,14 +3641,14 @@
   gtk_frame_set_label_widget (GTK_FRAME (frame10), label122);
   gtk_label_set_use_markup (GTK_LABEL (label122), TRUE);
 
-  dialog_action_area10 = GTK_DIALOG (tagwritersettings)->action_area;
+  dialog_action_area10 = gtk_dialog_get_action_area (GTK_DIALOG (tagwritersettings));
   gtk_widget_show (dialog_action_area10);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area10), GTK_BUTTONBOX_END);
 
   closebutton2 = gtk_button_new_from_stock ("gtk-close");
   gtk_widget_show (closebutton2);
   gtk_dialog_add_action_widget (GTK_DIALOG (tagwritersettings), closebutton2, GTK_RESPONSE_CLOSE);
-  GTK_WIDGET_SET_FLAGS (closebutton2, GTK_CAN_DEFAULT);
+  gtk_widget_set_can_default(closebutton2, TRUE);
 
   g_signal_connect ((gpointer) write_id3v2, "toggled",
                     G_CALLBACK (on_write_id3v2_toggled),

deadbeef-0.5.1.tar.bz2/plugins/gtkui/mainplaylist.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/mainplaylist.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/mainplaylist.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/mainplaylist.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/parser.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/parser.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/parser.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/parser.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/plcommon.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/plcommon.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/plcommon.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/plcommon.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/pluginconf.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/pluginconf.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/pluginconf.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/pluginconf.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/prefwin.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/prefwin.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/progress.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/progress.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/progress.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/progress.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/search.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/search.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/search.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/search.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/support.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/support.c Changed

@@ -27,7 +27,7 @@
       if (GTK_IS_MENU (widget))
         parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
       else
-        parent = widget->parent;
+        parent = gtk_widget_get_parent (widget);
       if (!parent)
         parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
       if (parent == NULL)
@@ -142,3 +142,57 @@
     }
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
+GtkWidget *
+gtk_combo_box_entry_new_text(void) {
+    GtkWidget *w = gtk_combo_box_text_new_with_entry ();
+}
+
+void
+gtk_dialog_set_has_separator (GtkDialog *dlg, gboolean has) {
+}
+#endif
+
+#if !GTK_CHECK_VERSION(2,22,0)
+GdkDragAction
+gdk_drag_context_get_selected_action (GdkDragContext *context) {
+    return context->action;
+}
+GList *
+gdk_drag_context_list_targets (GdkDragContext *context) {
+    return context->targets;
+}
+#endif
+
+#if !GTK_CHECK_VERSION(2,24,0)
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+GtkWidget *
+gtk_combo_box_text_new () {
+    return gtk_combo_box_new_text ();
+}
+
+GtkWidget *
+gtk_combo_box_text_new_with_entry   (void) {
+    return gtk_combo_box_entry_new ();
+}
+
+void
+gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_append_text (combo_box, text);
+}
+
+void
+gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, gint position, const gchar *text) {
+    gtk_combo_box_insert_text (combo_box, position, text);
+}
+
+void
+gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, const gchar *text) {
+    gtk_combo_box_prepend_text (combo_box, text);
+}
+gchar *
+gtk_combo_box_text_get_active_text  (GtkComboBoxText *combo_box) {
+    return gtk_combo_box_get_active_text (combo_box);
+}
+
+#endif

deadbeef-0.5.1.tar.bz2/plugins/gtkui/support.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/support.h Changed

@@ -1,12 +1,16 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
+#ifndef __GTKUI_SUPPORT_H
+#define __GTKUI_SUPPORT_H
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <gtk/gtk.h>
+#if GTK_CHECK_VERSION(3,0,0)
+#include <gdk/gdkkeysyms-compat.h>
+#else
+#include <gdk/gdkkeysyms.h>
+#endif
 
 /*
 * Standard gettext macros.
@@ -69,3 +73,30 @@
 const gchar *action_name,
 const gchar *description);
 
+#if GTK_CHECK_VERSION(3,0,0)
+GtkWidget *
+gtk_combo_box_entry_new_text(void);
+
+void
+gtk_dialog_set_has_separator (GtkDialog *dlg, gboolean has);
+#endif
+
+#if !GTK_CHECK_VERSION(2,22,0)
+GdkDragAction
+gdk_drag_context_get_selected_action (GdkDragContext *context);
+GList *
+gdk_drag_context_list_targets (GdkDragContext *context);
+#endif
+
+#if !GTK_CHECK_VERSION(2,24,0)
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+typedef GtkComboBox GtkComboBoxText;
+GtkWidget *gtk_combo_box_text_new ();
+GtkWidget *gtk_combo_box_text_new_with_entry (void);
+void gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text);
+void gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, gint position, const gchar *text);
+void gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, const gchar *text);
+gchar *gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box);
+#endif
+
+#endif

deadbeef-0.5.1.tar.bz2/plugins/gtkui/tagwritersettings.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/tagwritersettings.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/tagwritersettings.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/tagwritersettings.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/trkproperties.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/trkproperties.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/trkproperties.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/trkproperties.h Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/wingeom.c -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/wingeom.c Changed

deadbeef-0.5.1.tar.bz2/plugins/gtkui/wingeom.h -> deadbeef-0.5.2.tar.bz2/plugins/gtkui/wingeom.h Changed

deadbeef-0.5.1.tar.bz2/plugins/hotkeys/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/hotkeys/Makefile.in Changed

@@ -74,7 +74,10 @@
 @HAVE_HOTKEYS_TRUE@am_hotkeys_la_OBJECTS = hotkeys.lo
 am__EXTRA_hotkeys_la_SOURCES_DIST = keysyms.inc
 hotkeys_la_OBJECTS = $(am_hotkeys_la_OBJECTS)
-hotkeys_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+hotkeys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(hotkeys_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_HOTKEYS_TRUE@am_hotkeys_la_rpath = -rpath $(pkglibdir)
@@ -84,13 +87,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(hotkeys_la_SOURCES) $(EXTRA_hotkeys_la_SOURCES)
 DIST_SOURCES = $(am__hotkeys_la_SOURCES_DIST) \
 	$(am__EXTRA_hotkeys_la_SOURCES_DIST)
@@ -103,6 +119,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -150,14 +167,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -247,7 +267,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -258,6 +277,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -386,7 +406,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 hotkeys.la: $(hotkeys_la_OBJECTS) $(hotkeys_la_DEPENDENCIES) 
-	$(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(hotkeys_la_LINK) $(am_hotkeys_la_rpath) $(hotkeys_la_OBJECTS) $(hotkeys_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -397,22 +417,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hotkeys.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/hotkeys/hotkeys.c -> deadbeef-0.5.2.tar.bz2/plugins/hotkeys/hotkeys.c Changed

@@ -514,7 +514,7 @@
 .title = "Play",
 .name = "play",
 .flags = DB_ACTION_COMMON,
- .callback = action_play_cb,
+ .callback = DDB_ACTION_CALLBACK (action_play_cb),
 .next = NULL
 };
 
@@ -522,7 +522,7 @@
 .title = "Stop",
 .name = "stop",
 .flags = DB_ACTION_COMMON,
- .callback = action_stop_cb,
+ .callback = DDB_ACTION_CALLBACK(action_stop_cb),
 .next = &action_play
 };
 
@@ -530,7 +530,7 @@
 .title = "Previous",
 .name = "prev",
 .flags = DB_ACTION_COMMON,
- .callback = action_prev_cb,
+ .callback = DDB_ACTION_CALLBACK(action_prev_cb),
 .next = &action_stop
 };
 
@@ -538,7 +538,7 @@
 .title = "Next",
 .name = "next",
 .flags = DB_ACTION_COMMON,
- .callback = action_next_cb,
+ .callback = DDB_ACTION_CALLBACK(action_next_cb),
 .next = &action_prev
 };
 
@@ -546,7 +546,7 @@
 .title = "Toggle Pause",
 .name = "toggle_pause",
 .flags = DB_ACTION_COMMON,
- .callback = action_toggle_pause_cb,
+ .callback = DDB_ACTION_CALLBACK(action_toggle_pause_cb),
 .next = &action_next
 };
 
@@ -554,7 +554,7 @@
 .title = "Play\\/Pause",
 .name = "play_pause",
 .flags = DB_ACTION_COMMON,
- .callback = action_play_pause_cb,
+ .callback = DDB_ACTION_CALLBACK(action_play_pause_cb),
 .next = &action_toggle_pause
 };
 
@@ -562,7 +562,7 @@
 .title = "Play Random",
 .name = "playback_random",
 .flags = DB_ACTION_COMMON,
- .callback = action_play_random_cb,
+ .callback = DDB_ACTION_CALLBACK(action_play_random_cb),
 .next = &action_play_pause
 };
 
@@ -570,7 +570,7 @@
 .title = "Seek Forward",
 .name = "seek_fwd",
 .flags = DB_ACTION_COMMON,
- .callback = action_seek_forward_cb,
+ .callback = DDB_ACTION_CALLBACK(action_seek_forward_cb),
 .next = &action_play_random
 };
 
@@ -578,7 +578,7 @@
 .title = "Seek Backward",
 .name = "seek_back",
 .flags = DB_ACTION_COMMON,
- .callback = action_seek_backward_cb,
+ .callback = DDB_ACTION_CALLBACK(action_seek_backward_cb),
 .next = &action_seek_forward
 };
 
@@ -586,7 +586,7 @@
 .title = "Volume Up",
 .name = "volume_up",
 .flags = DB_ACTION_COMMON,
- .callback = action_volume_up_cb,
+ .callback = DDB_ACTION_CALLBACK(action_volume_up_cb),
 .next = &action_seek_backward
 };
 
@@ -594,7 +594,7 @@
 .title = "Volume Down",
 .name = "volume_down",
 .flags = DB_ACTION_COMMON,
- .callback = action_volume_down_cb,
+ .callback = DDB_ACTION_CALLBACK(action_volume_down_cb),
 .next = &action_volume_up
 };
 
@@ -602,7 +602,7 @@
 .title = "Toggle Stop After Current",
 .name = "toggle_stop_after_current",
 .flags = DB_ACTION_COMMON,
- .callback = action_toggle_stop_after_current_cb,
+ .callback = DDB_ACTION_CALLBACK(action_toggle_stop_after_current_cb),
 .next = &action_volume_down
 };
 
@@ -623,7 +623,7 @@
 .misc.plugin.name = "Global hotkeys support",
 .misc.plugin.descr = "Allows one to control player with global hotkeys",
 .misc.plugin.copyright = 
- "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
 "Copyright (C) 2009-2011 Viktor Semykin <thesame.ml@gmail.com>\n"
 "\n"
 "This program is free software; you can redistribute it and/or\n"

deadbeef-0.5.1.tar.bz2/plugins/hotkeys/hotkeys.h -> deadbeef-0.5.2.tar.bz2/plugins/hotkeys/hotkeys.h Changed

deadbeef-0.5.1.tar.bz2/plugins/lastfm/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/lastfm/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__lastfm_la_SOURCES_DIST = lastfm.c
 @HAVE_LASTFM_TRUE@am_lastfm_la_OBJECTS = lastfm.lo
 lastfm_la_OBJECTS = $(am_lastfm_la_OBJECTS)
-lastfm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+lastfm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(lastfm_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_LASTFM_TRUE@am_lastfm_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(lastfm_la_SOURCES)
 DIST_SOURCES = $(am__lastfm_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 lastfm.la: $(lastfm_la_OBJECTS) $(lastfm_la_DEPENDENCIES) 
-	$(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(lastfm_la_LINK) $(am_lastfm_la_rpath) $(lastfm_la_OBJECTS) $(lastfm_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastfm.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/lastfm/lastfm.c -> deadbeef-0.5.2.tar.bz2/plugins/lastfm/lastfm.c Changed

deadbeef-0.5.1.tar.bz2/plugins/m3u/Makefile.am -> deadbeef-0.5.2.tar.bz2/plugins/m3u/Makefile.am Changed

deadbeef-0.5.1.tar.bz2/plugins/m3u/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/m3u/Makefile.in Changed

@@ -72,8 +72,11 @@
 am__m3u_la_SOURCES_DIST = m3u.c
 @HAVE_M3U_TRUE@am_m3u_la_OBJECTS = m3u_la-m3u.lo
 m3u_la_OBJECTS = $(am_m3u_la_OBJECTS)
-m3u_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+m3u_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(m3u_la_CFLAGS) $(CFLAGS) \
 	$(m3u_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_M3U_TRUE@am_m3u_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -82,13 +85,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(m3u_la_SOURCES)
 DIST_SOURCES = $(am__m3u_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +116,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +164,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +264,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +274,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -312,7 +332,7 @@
 top_srcdir = @top_srcdir@
 @HAVE_M3U_TRUE@pkglib_LTLIBRARIES = m3u.la
 @HAVE_M3U_TRUE@m3u_la_SOURCES = m3u.c
-@HAVE_M3U_TRUE@m3u_la_LDFLAGS = -module
+@HAVE_M3U_TRUE@m3u_la_LDFLAGS = -module -lm
 @HAVE_M3U_TRUE@m3u_la_LIBADD = $(LIBADD)
 @HAVE_M3U_TRUE@m3u_la_CFLAGS = $(CFLAGS) -std=c99
 all: all-am
@@ -381,7 +401,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 m3u.la: $(m3u_la_OBJECTS) $(m3u_la_DEPENDENCIES) 
-	$(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m3u_la_LINK) $(am_m3u_la_rpath) $(m3u_la_OBJECTS) $(m3u_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -392,32 +412,36 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m3u_la-m3u.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 m3u_la-m3u.lo: m3u.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -MT m3u_la-m3u.lo -MD -MP -MF $(DEPDIR)/m3u_la-m3u.Tpo -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/m3u_la-m3u.Tpo $(DEPDIR)/m3u_la-m3u.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='m3u.c' object='m3u_la-m3u.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(m3u_la_CFLAGS) $(CFLAGS) -c -o m3u_la-m3u.lo `test -f 'm3u.c' || echo '$(srcdir)/'`m3u.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/m3u/m3u.c -> deadbeef-0.5.2.tar.bz2/plugins/m3u/m3u.c Changed

deadbeef-0.5.1.tar.bz2/plugins/mms/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/mms/Makefile.in Changed

@@ -77,9 +77,12 @@
 @HAVE_MMS_TRUE@am_mms_la_OBJECTS = mmsplug.lo mms.lo mmsh.lo mmsx.lo \
 @HAVE_MMS_TRUE@	uri.lo
 mms_la_OBJECTS = $(am_mms_la_OBJECTS)
-mms_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mms_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+mms_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mms_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MMS_TRUE@am_mms_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -87,13 +90,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(mms_la_SOURCES)
 DIST_SOURCES = $(am__mms_la_SOURCES_DIST)
 ETAGS = etags
@@ -105,6 +121,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -152,14 +169,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -249,7 +269,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -260,6 +279,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -400,7 +420,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 mms.la: $(mms_la_OBJECTS) $(mms_la_DEPENDENCIES) 
-	$(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(mms_la_LINK) $(am_mms_la_rpath) $(mms_la_OBJECTS) $(mms_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -415,53 +435,60 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uri.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mms.lo: libmms/mms.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mms.lo -MD -MP -MF $(DEPDIR)/mms.Tpo -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mms.Tpo $(DEPDIR)/mms.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mms.c' object='mms.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mms.lo `test -f 'libmms/mms.c' || echo '$(srcdir)/'`libmms/mms.c
 
 mmsh.lo: libmms/mmsh.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsh.lo -MD -MP -MF $(DEPDIR)/mmsh.Tpo -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mmsh.Tpo $(DEPDIR)/mmsh.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mmsh.c' object='mmsh.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsh.lo `test -f 'libmms/mmsh.c' || echo '$(srcdir)/'`libmms/mmsh.c
 
 mmsx.lo: libmms/mmsx.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmsx.lo -MD -MP -MF $(DEPDIR)/mmsx.Tpo -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mmsx.Tpo $(DEPDIR)/mmsx.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/mmsx.c' object='mmsx.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmsx.lo `test -f 'libmms/mmsx.c' || echo '$(srcdir)/'`libmms/mmsx.c
 
 uri.lo: libmms/uri.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uri.lo -MD -MP -MF $(DEPDIR)/uri.Tpo -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uri.Tpo $(DEPDIR)/uri.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libmms/uri.c' object='uri.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uri.lo `test -f 'libmms/uri.c' || echo '$(srcdir)/'`libmms/uri.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/mms/libmms/bswap.h -> deadbeef-0.5.2.tar.bz2/plugins/mms/libmms/bswap.h Changed

deadbeef-0.5.1.tar.bz2/plugins/mms/mmsplug.c -> deadbeef-0.5.2.tar.bz2/plugins/mms/mmsplug.c Changed

deadbeef-0.5.2.tar.bz2/plugins/mono2stereo Added

deadbeef-0.5.2.tar.bz2/plugins/mono2stereo/Makefile.am Added

deadbeef-0.5.2.tar.bz2/plugins/mono2stereo/Makefile.in Added

@@ -0,0 +1,650 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/mono2stereo
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_mono2stereo_la_DEPENDENCIES =
+am__ddb_mono2stereo_la_SOURCES_DIST = mono2stereo.c
+@HAVE_MONO2STEREO_TRUE@am_ddb_mono2stereo_la_OBJECTS = mono2stereo.lo
+ddb_mono2stereo_la_OBJECTS = $(am_ddb_mono2stereo_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ddb_mono2stereo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(ddb_mono2stereo_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@HAVE_MONO2STEREO_TRUE@am_ddb_mono2stereo_la_rpath = -rpath \
+@HAVE_MONO2STEREO_TRUE@	$(pkglibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(ddb_mono2stereo_la_SOURCES)
+DIST_SOURCES = $(am__ddb_mono2stereo_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
+ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
+IMLIB2_DEPS_LIBS = @IMLIB2_DEPS_LIBS@
+INSANE_CFLAGS = @INSANE_CFLAGS@
+INSANE_CXXFLAGS = @INSANE_CXXFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIB = @LIB@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMMS_LIBS = @LIBMMS_LIBS@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBSAMPLERATE_DEPS_CFLAGS = @LIBSAMPLERATE_DEPS_CFLAGS@
+LIBSAMPLERATE_DEPS_LIBS = @LIBSAMPLERATE_DEPS_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OSS_CFLAGS = @OSS_CFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
+PULSE_DEPS_LIBS = @PULSE_DEPS_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@HAVE_MONO2STEREO_TRUE@pkglib_LTLIBRARIES = ddb_mono2stereo.la
+@HAVE_MONO2STEREO_TRUE@ddb_mono2stereo_la_SOURCES = mono2stereo.c
+@HAVE_MONO2STEREO_TRUE@ddb_mono2stereo_la_LDFLAGS = -module
+@HAVE_MONO2STEREO_TRUE@ddb_mono2stereo_la_LIBADD = $(LDADD)
+@HAVE_MONO2STEREO_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	 case '$(am__configure_deps)' in \
+	 *$$dep*) \
+	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	 && { if test -f $@; then exit 0; else break; fi; }; \
+	 exit 1;; \
+	 esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/mono2stereo/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu plugins/mono2stereo/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	 *config.status*) \
+	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	 *) \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	 if test -f $$p; then \
+	 list2="$$list2 $$p"; \
+	 else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	 $(am__strip_dir) \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	 test "$$dir" != "$$p" || dir=.; \
+	 echo "rm -f \"$${dir}/so_locations\""; \
+	 rm -f "$${dir}/so_locations"; \
+	done
+ddb_mono2stereo.la: $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_mono2stereo_la_LINK) $(am_ddb_mono2stereo_la_rpath) $(ddb_mono2stereo_la_OBJECTS) $(ddb_mono2stereo_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono2stereo.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	 test -n "$$unique" || unique=$$empty_fix; \
+	 if test $$# -gt 0; then \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 "$$@" $$unique; \
+	 else \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 $$unique; \
+	 fi; \
+	fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	 $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	 && $(am__cd) $(top_srcdir) \
+	 && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	 dist_files=`for file in $$list; do echo $$file; done | \
+	 sed -e "s|^$$srcdirstrip/||;t" \
+	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	 */*) $(MKDIR_P) `echo "$$dist_files" | \
+			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			 sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	 if test -d $$d/$$file; then \
+	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	 if test -d "$(distdir)/$$file"; then \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	 else \
+	 test -f "$(distdir)/$$file" \
+	 || cp -p $$d/$$file "$(distdir)/$$file" \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 `test -z '$(STRIP)' || \
+	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

deadbeef-0.5.2.tar.bz2/plugins/mono2stereo/mono2stereo.c Added

@@ -0,0 +1,177 @@
+/*
+ DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "../../deadbeef.h"
+
+enum {
+ M2S_PARAM_LEFTMIX,
+ M2S_PARAM_RIGHTMIX,
+ M2S_PARAM_COUNT
+};
+
+static DB_functions_t *deadbeef;
+static DB_dsp_t plugin;
+
+typedef struct {
+ ddb_dsp_context_t ctx;
+ float leftmix;
+ float rightmix;
+} ddb_m2s_t;
+
+ddb_dsp_context_t*
+m2s_open (void) {
+ ddb_m2s_t *m2s = malloc (sizeof (ddb_m2s_t));
+ DDB_INIT_DSP_CONTEXT (m2s,ddb_m2s_t,&plugin);
+
+ // initialize
+ m2s->leftmix = 1;
+ m2s->rightmix = 1;
+
+ return (ddb_dsp_context_t *)m2s;
+}
+
+void
+m2s_close (ddb_dsp_context_t *ctx) {
+ ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
+
+ // free instance-specific allocations
+
+ free (m2s);
+}
+
+void
+m2s_reset (ddb_dsp_context_t *ctx) {
+ // use this method to flush dsp buffers, reset filters, etc
+}
+
+int
+m2s_process (ddb_dsp_context_t *ctx, float *samples, int nframes, int maxframes, ddb_waveformat_t *fmt, float *r) {
+ if (fmt->channels >= 2) {
+ return nframes;
+ }
+ ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
+
+ for (int i = nframes-1; i >= 0; i--) {
+ samples[i*2+1] = samples[i] * m2s->rightmix;
+ samples[i*2+0] = samples[i] * m2s->leftmix;
+ }
+ fmt->channels = 2;
+ fmt->channelmask = 3;
+ return nframes;
+}
+
+const char *
+m2s_get_param_name (int p) {
+ switch (p) {
+ case M2S_PARAM_LEFTMIX:
+ return "Left mix";
+ case M2S_PARAM_RIGHTMIX:
+ return "Right mix";
+ default:
+ fprintf (stderr, "m2s_param_name: invalid param index (%d)\n", p);
+ }
+ return NULL;
+}
+
+int
+m2s_num_params (void) {
+ return M2S_PARAM_COUNT;
+}
+
+void
+m2s_set_param (ddb_dsp_context_t *ctx, int p, const char *val) {
+ ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
+ switch (p) {
+ case M2S_PARAM_LEFTMIX:
+ m2s->leftmix = atof (val);
+ break;
+ case M2S_PARAM_RIGHTMIX:
+ m2s->rightmix = atof (val);
+ break;
+ default:
+ fprintf (stderr, "m2s_set_param: invalid param index (%d)\n", p);
+ }
+}
+
+void
+m2s_get_param (ddb_dsp_context_t *ctx, int p, char *val, int sz) {
+ ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
+ switch (p) {
+ case M2S_PARAM_LEFTMIX:
+ snprintf (val, sz, "%f", m2s->leftmix);
+ break;
+ case M2S_PARAM_RIGHTMIX:
+ snprintf (val, sz, "%f", m2s->rightmix);
+ break;
+ default:
+ fprintf (stderr, "m2s_get_param: invalid param index (%d)\n", p);
+ }
+}
+
+static const char settings_dlg[] =
+ "property \"Left mix:\" hscale[0,1,0.001] 0 1;\n"
+ "property \"Right mix:\" hscale[0,1,0.001] 1 1;\n"
+;
+
+static DB_dsp_t plugin = {
+ .plugin.api_vmajor = 1,
+ .plugin.api_vminor = 0,
+ .open = m2s_open,
+ .close = m2s_close,
+ .process = m2s_process,
+ .plugin.version_major = 1,
+ .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_DSP,
+ .plugin.id = "m2s",
+ .plugin.name = "Mono to stereo",
+ .plugin.descr = "DSP plugin to convert mono to stereo",
+ .plugin.copyright = 
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "This program is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License\n"
+ "as published by the Free Software Foundation; either version 2\n"
+ "of the License, or (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, USA.\n"
+ ,
+ .plugin.website = "http://deadbeef.sf.net",
+ .num_params = m2s_num_params,
+ .get_param_name = m2s_get_param_name,
+ .set_param = m2s_set_param,
+ .get_param = m2s_get_param,
+ .reset = m2s_reset,
+ .configdialog = settings_dlg,
+};
+
+DB_plugin_t *
+ddb_mono2stereo_load (DB_functions_t *f) {
+ deadbeef = f;
+ return &plugin.plugin;
+}
+

deadbeef-0.5.1.tar.bz2/plugins/mpgmad/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/mpgmad/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__mpgmad_la_SOURCES_DIST = mpgmad.c
 @HAVE_MPGMAD_TRUE@am_mpgmad_la_OBJECTS = mpgmad.lo
 mpgmad_la_OBJECTS = $(am_mpgmad_la_OBJECTS)
-mpgmad_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+mpgmad_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mpgmad_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MPGMAD_TRUE@am_mpgmad_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(mpgmad_la_SOURCES)
 DIST_SOURCES = $(am__mpgmad_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 mpgmad.la: $(mpgmad_la_OBJECTS) $(mpgmad_la_DEPENDENCIES) 
-	$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpgmad.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/mpgmad/mpgmad.c -> deadbeef-0.5.2.tar.bz2/plugins/mpgmad/mpgmad.c Changed

deadbeef-0.5.1.tar.bz2/plugins/musepack/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/musepack/Makefile.in Changed

@@ -79,7 +79,10 @@
 @HAVE_MUSEPACK_TRUE@	mpc_demux.lo mpc_reader.lo requant.lo \
 @HAVE_MUSEPACK_TRUE@	streaminfo.lo synth_filter.lo crc32.lo
 musepack_la_OBJECTS = $(am_musepack_la_OBJECTS)
-musepack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+musepack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(musepack_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_MUSEPACK_TRUE@am_musepack_la_rpath = -rpath $(pkglibdir)
@@ -89,13 +92,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(musepack_la_SOURCES)
 DIST_SOURCES = $(am__musepack_la_SOURCES_DIST)
 ETAGS = etags
@@ -107,6 +123,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -154,14 +171,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -251,7 +271,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -262,6 +281,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -409,7 +429,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 musepack.la: $(musepack_la_OBJECTS) $(musepack_la_DEPENDENCIES) 
-	$(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(musepack_la_LINK) $(am_musepack_la_rpath) $(musepack_la_OBJECTS) $(musepack_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -429,22 +449,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth_filter.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/musepack/musepack.c -> deadbeef-0.5.2.tar.bz2/plugins/musepack/musepack.c Changed

deadbeef-0.5.1.tar.bz2/plugins/notify/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/notify/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__notify_la_SOURCES_DIST = notify.c
 @HAVE_NOTIFY_TRUE@am_notify_la_OBJECTS = notify.lo
 notify_la_OBJECTS = $(am_notify_la_OBJECTS)
-notify_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+notify_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(notify_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_NOTIFY_TRUE@am_notify_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(notify_la_SOURCES)
 DIST_SOURCES = $(am__notify_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 notify.la: $(notify_la_OBJECTS) $(notify_la_DEPENDENCIES) 
-	$(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(notify_la_LINK) $(am_notify_la_rpath) $(notify_la_OBJECTS) $(notify_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/notify/notify.c -> deadbeef-0.5.2.tar.bz2/plugins/notify/notify.c Changed

deadbeef-0.5.1.tar.bz2/plugins/nullout/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/nullout/Makefile.in Changed

@@ -72,7 +72,10 @@
 am__nullout_la_SOURCES_DIST = nullout.c
 @HAVE_NULLOUT_TRUE@am_nullout_la_OBJECTS = nullout.lo
 nullout_la_OBJECTS = $(am_nullout_la_OBJECTS)
-nullout_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+nullout_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(nullout_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_NULLOUT_TRUE@am_nullout_la_rpath = -rpath $(pkglibdir)
@@ -82,13 +85,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(nullout_la_SOURCES)
 DIST_SOURCES = $(am__nullout_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +116,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +164,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +264,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +274,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -381,7 +401,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 nullout.la: $(nullout_la_OBJECTS) $(nullout_la_DEPENDENCIES) 
-	$(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(nullout_la_LINK) $(am_nullout_la_rpath) $(nullout_la_OBJECTS) $(nullout_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -392,22 +412,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nullout.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/nullout/nullout.c -> deadbeef-0.5.2.tar.bz2/plugins/nullout/nullout.c Changed

deadbeef-0.5.1.tar.bz2/plugins/oss/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/oss/Makefile.in Changed

@@ -72,9 +72,12 @@
 am__oss_la_SOURCES_DIST = oss.c
 @HAVE_OSS_TRUE@am_oss_la_OBJECTS = oss.lo
 oss_la_OBJECTS = $(am_oss_la_OBJECTS)
-oss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(oss_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+oss_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(oss_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_OSS_TRUE@am_oss_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -82,13 +85,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(oss_la_SOURCES)
 DIST_SOURCES = $(am__oss_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +116,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +164,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +264,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +274,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -381,7 +401,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 oss.la: $(oss_la_OBJECTS) $(oss_la_DEPENDENCIES) 
-	$(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(oss_la_LINK) $(am_oss_la_rpath) $(oss_la_OBJECTS) $(oss_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -392,22 +412,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oss.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/oss/oss.c -> deadbeef-0.5.2.tar.bz2/plugins/oss/oss.c Changed

deadbeef-0.5.1.tar.bz2/plugins/pulse/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/pulse/Makefile.in Changed

@@ -73,9 +73,12 @@
 am__pulse_la_SOURCES_DIST = pulse.c
 @HAVE_PULSE_TRUE@am_pulse_la_OBJECTS = pulse.lo
 pulse_la_OBJECTS = $(am_pulse_la_OBJECTS)
-pulse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(pulse_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+pulse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(pulse_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_PULSE_TRUE@am_pulse_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(pulse_la_SOURCES)
 DIST_SOURCES = $(am__pulse_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 pulse.la: $(pulse_la_OBJECTS) $(pulse_la_DEPENDENCIES) 
-	$(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(pulse_la_LINK) $(am_pulse_la_rpath) $(pulse_la_OBJECTS) $(pulse_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pulse.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/pulse/pulse.c -> deadbeef-0.5.2.tar.bz2/plugins/pulse/pulse.c Changed

deadbeef-0.5.1.tar.bz2/plugins/shellexec/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/shellexec/Makefile.in Changed

@@ -72,7 +72,10 @@
 am__shellexec_la_SOURCES_DIST = shellexec.c
 @HAVE_SHELLEXEC_TRUE@am_shellexec_la_OBJECTS = shellexec.lo
 shellexec_la_OBJECTS = $(am_shellexec_la_OBJECTS)
-shellexec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+shellexec_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(shellexec_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SHELLEXEC_TRUE@am_shellexec_la_rpath = -rpath $(pkglibdir)
@@ -82,13 +85,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(shellexec_la_SOURCES)
 DIST_SOURCES = $(am__shellexec_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +116,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +164,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +264,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +274,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -382,7 +402,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 shellexec.la: $(shellexec_la_OBJECTS) $(shellexec_la_DEPENDENCIES) 
-	$(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(shellexec_la_LINK) $(am_shellexec_la_rpath) $(shellexec_la_OBJECTS) $(shellexec_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -393,22 +413,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shellexec.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/shellexec/shellexec.c -> deadbeef-0.5.2.tar.bz2/plugins/shellexec/shellexec.c Changed

@@ -1,6 +1,6 @@
 /*
 Shellexec plugin for DeaDBeeF
- Copyright (C) 2010-2011 Alexey Yakovenko <waker@users.sf.net>
+ Copyright (C) 2010-2012 Alexey Yakovenko <waker@users.sf.net>
 Copyright (C) 2010 Viktor Semykin <thesame.ml@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,9 @@
 remote - command allowed only for non-local files
 disabled - ignore command
 */
-
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -119,6 +121,20 @@
 return (DB_plugin_action_t *)actions;
 }
 
+static char *
+shx_find_sep (char *str) {
+ while (*str && *str != ':') {
+ if (*str == '"') {
+ str++;
+ while (*str && *str !='"') {
+ str++;
+ }
+ }
+ str++;
+ }
+ return str;
+}
+
 static int
 shx_start ()
 {
@@ -139,7 +155,7 @@
 int idx = 0;
 char *p = tmp;
 while (idx < 4 && p) {
- char *e = strchr (p, ':');
+ char *e = shx_find_sep (p);
 args[idx++] = p;
 if (!e) {
 break;
@@ -188,6 +204,9 @@
 if (0 == strstr (flags, "single"))
 action->parent.flags |= DB_ACTION_ALLOW_MULTIPLE_TRACKS;
 
+ if (strstr (flags, "playlist"))
+ action->parent.flags |= DB_ACTION_PLAYLIST;
+
 if (prev)
 prev->parent.next = (DB_plugin_action_t *)action;
 prev = action;
@@ -226,7 +245,7 @@
 "this would show the name of selected track in notification popup"
 ,
 .plugin.copyright = 
- "Copyright (C) 2010-2011 Alexey Yakovenko <waker@users.sf.net>\n"
+ "Copyright (C) 2010-2012 Alexey Yakovenko <waker@users.sf.net>\n"
 "Copyright (C) 2010 Viktor Semykin <thesame.ml@gmail.com>\n"
 "\n"
 "This program is free software; you can redistribute it and/or\n"

deadbeef-0.5.2.tar.bz2/plugins/shn Added

deadbeef-0.5.2.tar.bz2/plugins/shn/AUTHORS Added

deadbeef-0.5.2.tar.bz2/plugins/shn/Makefile.am Added

deadbeef-0.5.2.tar.bz2/plugins/shn/Makefile.in Added

@@ -0,0 +1,663 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/shn
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	AUTHORS
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_shn_la_DEPENDENCIES =
+am__ddb_shn_la_SOURCES_DIST = array.c convert.c misc.c output.c seek.c \
+	shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c \
+	bitshift.h
+@HAVE_SHN_TRUE@am_ddb_shn_la_OBJECTS = array.lo convert.lo misc.lo \
+@HAVE_SHN_TRUE@	output.lo seek.lo shn.lo shorten.lo \
+@HAVE_SHN_TRUE@	sulawalaw.lo vario.lo wave.lo
+ddb_shn_la_OBJECTS = $(am_ddb_shn_la_OBJECTS)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+ddb_shn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(ddb_shn_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_SHN_TRUE@am_ddb_shn_la_rpath = -rpath $(pkglibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+SOURCES = $(ddb_shn_la_SOURCES)
+DIST_SOURCES = $(am__ddb_shn_la_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
+ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
+IMLIB2_DEPS_LIBS = @IMLIB2_DEPS_LIBS@
+INSANE_CFLAGS = @INSANE_CFLAGS@
+INSANE_CXXFLAGS = @INSANE_CXXFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIB = @LIB@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMMS_LIBS = @LIBMMS_LIBS@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBSAMPLERATE_DEPS_CFLAGS = @LIBSAMPLERATE_DEPS_CFLAGS@
+LIBSAMPLERATE_DEPS_LIBS = @LIBSAMPLERATE_DEPS_LIBS@
+LIBTHREAD = @LIBTHREAD@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OSS_CFLAGS = @OSS_CFLAGS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
+PULSE_DEPS_LIBS = @PULSE_DEPS_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VFS_CURL_LIBS = @VFS_CURL_LIBS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_LIBS = @WAVPACK_LIBS@
+WINDRES = @WINDRES@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@HAVE_SHN_TRUE@shndir = $(libdir)/$(PACKAGE)
+@HAVE_SHN_TRUE@pkglib_LTLIBRARIES = ddb_shn.la
+@HAVE_SHN_TRUE@ddb_shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h
+@HAVE_SHN_TRUE@ddb_shn_la_LDFLAGS = -module
+@HAVE_SHN_TRUE@ddb_shn_la_LIBADD = $(LDADD) -lm
+@HAVE_SHN_TRUE@AM_CFLAGS = $(CFLAGS) -std=c99
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	 case '$(am__configure_deps)' in \
+	 *$$dep*) \
+	 ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	 && { if test -f $@; then exit 0; else break; fi; }; \
+	 exit 1;; \
+	 esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/shn/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu plugins/shn/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	 *config.status*) \
+	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	 *) \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	 if test -f $$p; then \
+	 list2="$$list2 $$p"; \
+	 else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	 $(am__strip_dir) \
+	 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+	 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	 test "$$dir" != "$$p" || dir=.; \
+	 echo "rm -f \"$${dir}/so_locations\""; \
+	 rm -f "$${dir}/so_locations"; \
+	done
+ddb_shn.la: $(ddb_shn_la_OBJECTS) $(ddb_shn_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_shn_la_LINK) $(am_ddb_shn_la_rpath) $(ddb_shn_la_OBJECTS) $(ddb_shn_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shorten.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sulawalaw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vario.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wave.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	 test -n "$$unique" || unique=$$empty_fix; \
+	 if test $$# -gt 0; then \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 "$$@" $$unique; \
+	 else \
+	 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	 $$unique; \
+	 fi; \
+	fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	 done | \
+	 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	 END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	 $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	 && $(am__cd) $(top_srcdir) \
+	 && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	 dist_files=`for file in $$list; do echo $$file; done | \
+	 sed -e "s|^$$srcdirstrip/||;t" \
+	 -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	 */*) $(MKDIR_P) `echo "$$dist_files" | \
+			 sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			 sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	 if test -d $$d/$$file; then \
+	 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	 if test -d "$(distdir)/$$file"; then \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	 cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	 find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	 fi; \
+	 cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	 else \
+	 test -f "$(distdir)/$$file" \
+	 || cp -p $$d/$$file "$(distdir)/$$file" \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 `test -z '$(STRIP)' || \
+	 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

deadbeef-0.5.2.tar.bz2/plugins/shn/README Added

@@ -0,0 +1,360 @@
+NOTE: this is not original xmms-shn
+this code is a port of xmms-shn to deadbeef plugin API
+
+=== original xmms-shn README starts here ===
+
+xmms-shn version 2.4.x
+
+
+--------
+Overview
+--------
+
+xmms-shn provides playback support for shorten (.shn) files in XMMS. Real-time
+seeking support is provided for .shn files that have accompanying seek tables
+generated by shorten 3.x. Otherwise, seeking is not supported.
+
+See the "Shorten 3.x overview" section below for more information about this new
+seek-enabled version of shorten.
+
+
+-------
+License
+-------
+
+xmms-shn is dual-licensed. The code taken from the sources of 'shorten' remains
+under the shorten license (see doc/LICENSE.shorten), while the rest of the code
+is GPL (see COPYING).
+
+
+------------
+Availability
+------------
+
+The latest version of this plugin can always be found at the sites below:
+
+ http://www.etree.org/shnutils/
+ http://shnutils.freeshell.org/
+
+Please see the ChangeLog file for changes to this plugin since its creation.
+
+
+------------
+Dependencies
+------------
+
+As of version 2.0, xmms-shn no longer depends on an external shorten executable
+to work, since the core shorten algorithm has been incorporated directly into
+xmms-shn.
+
+You should have XMMS 1.0.0 or newer, and GTK & GLIB 1.2.2 or newer. The
+configure script will usually find these if you installed them from source.
+However, if you installed any of the above via .rpm's, then you may need to tell
+the configure script where to find them. To see what options are available,
+type:
+
+% ./configure --help
+
+The applicable options are the following:
+
+ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)
+ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)
+ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)
+ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)
+ --disable-glibtest Do not try to compile and run a test GLIB program
+ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)
+ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
+ --disable-gtktest Do not try to compile and run a test GTK program
+
+
+-----------------------------------
+Building and installing this plugin
+-----------------------------------
+
+For instructions on how to build and install this plugin, please consult the
+INSTALL file. It is usually as simple as the following:
+
+% ./configure
+% make
+% su -c "make install"
+Password: (give your root password here)
+%
+
+
+---------------------
+Configuration options
+---------------------
+
+This section details the options that can be found in the plugin's configuration
+window in XMMS, under Preferences -> Audio I/O Plugins -> SHN Player 2.4.x ->
+Configure.
+
+
+Error Display tab:
+==================
+
+ Error display options:
+ ----------------------
+
+ This option determines where any error messages go - to a popup window,
+ to standard error, or to the bit bucket. Pretty self-explanatory.
+
+
+Seek Tables tab:
+================
+
+ Alternate seek table file locations:
+ ------------------------------------
+
+ These options allow you to specify alternate directores to search for .skt
+ (seek table) files. These directories will be searched after all other attempts
+ to locate a seek table for a given file have failed.
+
+ The "Relative seek table path" option allows you to specify a subdirectory
+ relative to the base directory of a given file, where seek tables may reside.
+ This is useful if you create seek table files for a group of .shn files, and
+ store them in a commonly-named subdirectory of that group.
+
+ The "Absolute seek table path" option allows you to specify an absolute directory
+ where seek tables may reside. This is useful if you create seek table files for
+ multiple groups of .shn files and store them in the same directory.
+
+ When searching for seek tables belonging to a file (e.g. '/mnt/shn/filename.shn'),
+ xmms-shn will do the following, in this order, until it either finds a seek table
+ or runs out of places to check for one:
+
+ 1. look for a seek table appended to '/mnt/shn/filename.shn' (whether at the end,
+ or hidden behind an ID3v1 tag)
+
+ 2. look for a seek table in '/mnt/shn/filename.skt'
+
+ 3. look for a seek table in '/mnt/shn/relative_dir/filename.skt', where
+ 'relative_dir' is the directory specified in the "Relative seek table path"
+ option
+
+ 4. look for a seek table in '/absolute_dir/filename.skt', where 'absolute_dir'
+ is the directory specified in the "Absolute seek table path" option
+
+
+Miscellaneous tab:
+==================
+
+ Miscellaneous options:
+ ----------------------
+
+ The "Swap audio bytes on output" option is useful in situations where every file
+ you play back is static. This is known to help on the following platforms:
+
+ + Sun Ultra 10 and Ultra 30 both running Solaris 8
+ + SGI Octane/Irix 6.5
+
+
+ The "Display debug info to stderr" option specifies whether to display debugging
+ messages to stderr. This is potentially useful for remote debugging, and also
+ just to see what's going on. Debug lines are always shown with a prefix of
+ "xmms-shn [debug]:".
+
+ Note that if "Display debug info to stderr" is enabled, and the error display
+ option is set to /dev/null, then all non-debug messages that normally would be
+ suppressed are displayed to stderr with a prefix of "xmms-shn [error]:".
+
+ The "Load text files in file information box" option specifies whether text files
+ found in the same or parent directory as the given file should be loaded into the
+ file information box. Each file found will be loaded in a separate tab. The tabs
+ will be labeled "Text file n", where n starts at 1 and increases with each new
+ text file.
+
+ The "Text file extensions" option lets you specify a comma-separated list of case-
+ sensitive file extensions that xmms-shn will recognize as text files. The default
+ list is "txt,nfo". This option is only useful if "Load text files in file
+ information box" is enabled.
+
+ Note:
+
+ Text file support is useful for quickly determining information about the given
+ file and/or the show it belongs to, assuming such information is contained within
+ the text files.
+
+ Text file location assumes some combination of the following two directory
+ structures: all text files and .shn files in the same directory, or text files
+ in a directory with all .shn files in subdirectories one level deep. This
+ pretty much covers all directory structures seen on live music servers and file-
+ sharing programs.
+
+
+--------------------
+File information box
+--------------------
+
+This section describes the output shown in the file information window, which
+can be viewed by choosing 'File Inf.' from the 'Misc. Opt' button in the
+playlist editor, or selecting 'View File Info' from XMMS's main popup menu.
+
+Properties tab:
+===============
+
+ Filename: Shows the full path to the .shn file being examined.
+
+ Length: Shows the length of the WAVE data in the file, in m:ss.nnn format.
+ If the WAVE data is CD-quality (see below for definition), then the length is
+ shown in m:ss.ff format, where ff is a number from 00 to 74 that best
+ approximates the number of frames (2352-byte blocks) remaining after m:ss.
+
+ Note on rounding: If the WAVE data is CD-quality, then its length is
+ rounded to the nearest frame. Otherwise, it is rounded
+ to the nearest millisecond.
+
+ Seekable: Shows whether a seek table was found for the given file.
+
+ Seek table revision: Shows the revision number of the seek tables, if
+ present. Note that it is possible for this field to contain a numeric value,
+ even when the file is not seekable - for example, xmms-shn might detect that
+ certain seek tables are unsupported or buggy, and disable seeking in those
+ files.
+
+ Compression ratio: Shows the compression ratio for the given file. This is
+ simply the file's actual size divided by its total size, as calculated from
+ the chunk size contained in the WAVE header. Note that if the given file is
+ truncated (or has junk appended to it), then the compression ratio will be
+ skewed accordingly.
+
+ CD-quality properties:
+ ----------------------
+
+ CD-quality: Shows whether the given file is CD-quality. A file is considered
+ to be CD-quality if its header indicates 2 channels, 16 bits/sample, 44100
+ samples/second, and 176400 average bytes/second.
+
+ Cut on a sector boundary: If the given file is CD-quality, then this shows
+ whether the length of its WAVE data is a multiple of 2352 bytes (1/75 of a
+ second). Otherwise, "n/a" is displayed.
+
+ Sector misalignemt: If the file is CD-quality, then the sector misalignment
+ is simply the remainder when the data size is divided by 2352; i.e. it is the
+ number of bytes by which the audio data exceeds the previous sector boundary.
+
+ Long enough to be burned: If the given file is CD-quality, then this shows
+ whether the length of its WAVE data is long enough to be burned (705600 bytes,
+ or 3 seconds in length). Otherwise, "n/a" is displayed.
+
+ WAVE properties:
+ ----------------
+
+ Non-canonical header: Shows whether the WAVE header is canonical. A header
+ is considered canonical if it is 44 bytes long (this is the smallest possible
+ size that a WAVE header can be).
+
+ Extra RIFF chunks: Shows whether there are any extra RIFF chunks following
+ the data chunk in the WAVE stream.
+
+ Possible problems:
+ ------------------
+
+ File contains ID3v2 tag: Shows whether the file contains an ID3v2 tag, and
+ if so, how many bytes it occupies. This is not a problem for xmms-shn (it
+ was able to read the file after all), but could pose a problem for programs
+ that are not able to process files with ID3v2 tags.
+
+
+Details tab:
+============
+
+ This tab primarily shows the raw information taken from the WAVE header of the
+ given file. Each entry is self-explanatory.
+
+
+Text file n tab(s):
+===================
+
+ These tabs, if any, show the contents of all text files found in the same
+ directory or parent directory as the given file. The associated file name for
+ each tab is contained in the frame surrounding the text, and the full path to
+ the file being displayed is shown just above the text. You can control which
+ files are considered to be text files with the "Text file extensions" option in
+ the configuration window. Make sure to select the "Load text files in file
+ information box" option if you want to see these tabs.
+
+ 
+--------------------
+Shorten 3.x overview
+--------------------
+
+Wayne Stielau has extended shorten 2.3 to support the creation of seek tables.
+Seek tables are simply descriptions of the internal state of the shorten
+algorithm at specific points in the decompression. This allows a modified
+shorten decoder to restore the decoder state of the shorten algorithm for a
+point at (or very close to) the desired seek point. You can get the latest
+version at any of the URLs below:
+
+ http://www.etree.org/shnutils/shorten/
+ http://shnutils.freeshell.org/shorten/
+
+Seek tables may be appended to the .shn itself, or stored in a separate file
+(usually with a suffix of '.skt'). xmms-shn supports both of these options.
+
+The current implementation creates a seek table entry once every 25600 samples.
+For 'CD-quality' WAVE data (44100 samples/sec), this provides a granularity of 1
+seek table entry per 25600/44100 ~= 0.58 seconds, more than what is needed by
+either XMMS or WinAmp.
+
+At 80 bytes per seek table entry, you can expect the seek table to add about
+0.1% to the size of the existing shortened file, for 'CD-quality' WAVE data.
+So the seek table generated for 1 GB of already-shortened 'CD-quality' WAVE data
+will fit on a floppy! Quite a deal, if you ask me. :-)
+
+Best of all, shorten 3.x is fully backward compatible with version 2.3, meaning
+that any files created by shorten 3.x can be processed by version 2.3 with no
+problems.
+
+The command line options for dealing with seek tables in shorten 3.x are:
+
+ -e erase seek table appended to input file *
+ -i inquire as to whether a seek table is appended to input file *
+ -k append seek table information to existing shorten file
+ -s generate seek table information in separate file [input file].skt
+ -S[name] generate seek table information in separate file given by [name]
+ -v 3 format version number (2: no seek info; 3: default) *
+
+ * only available in versions 3.2 and up
+
+By default, any file shortened with version 3.x will automatically have seek
+tables appended to it. In later versions (3.2 and up), you can disable this
+with the -v2 switch.
+
+** NOTE ON SEEKING IN FILES ENCODED WITH NON-DEFAULT OPTIONS **
+
+Seek tables are unable to support all types of SHN files due to limitations in
+their original design. The only files they can fully support are ones encoded
+with the following values:
+
+ -c = 1 or 2 (number of channels, default is 1)
+ -p in the range [0 .. 3] (maximum LPC predictor order, default is 0)
+ -m in the range [0 .. 4] (number of block for mean estimation, default is 4)
+
+If xmms-shn detects a file encoded with parameters that fall outside of these
+ranges, then seeking is automatically disabled for that file.
+
+
+----------
+Known bugs
+----------
+
+I test this plugin aggressively until I can no longer make it crash. That does
+not mean that there are no bugs. If you can crash it, I want to hear about it -
+please report it to me at the address below. The xmms-shn webpage (see the
+Availability section above) will always contain an up-to-date list of reported
+bugs, so be sure to check that page before you send me a bug report.
+
+Also, feel free to send me any questions, comments, feature requests, patches...
+I always enjoy getting feedback.
+
+Enjoy!
+
+Jason Jordan <shnutils@freeshell.org>
+
+
+==================
+Document revision:
+==================
+
+$Id: README,v 1.27 2007/03/29 00:08:05 jason Exp $

deadbeef-0.5.2.tar.bz2/plugins/shn/array.c Added

@@ -0,0 +1,41 @@
+/******************************************************************************
+* *
+* Copyright (C) 1992-1995 Tony Robinson *
+* *
+* See the file doc/LICENSE.shorten for conditions on distribution and usage *
+* *
+******************************************************************************/
+
+/*
+ * $Id: array.c,v 1.7 2003/08/26 05:34:04 jason Exp $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "shorten.h"
+#include "shn.h"
+
+void *pmalloc(ulong size, shn_file *this_shn) {
+ void *ptr;
+
+ ptr = malloc(size);
+
+ if(ptr == NULL)
+ shn_error_fatal(this_shn,"Call to malloc(%ld) failed in pmalloc() -\nyour system may be low on memory", size);
+
+ return(ptr);
+}
+
+slong **long2d(ulong n0, ulong n1, shn_file *this_shn) {
+ slong **array0 = NULL;
+
+ if((array0 = (slong**) pmalloc((ulong) (n0 * sizeof(slong*) +
+					 n0 * n1 * sizeof(slong)),this_shn)) != NULL ) {
+ slong *array1 = (slong*) (array0 + n0);
+ int i;
+
+ for(i = 0; i < n0; i++)
+ array0[i] = array1 + i * n1;
+ }
+ return(array0);
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/bitshift.h Added

@@ -0,0 +1,33 @@
+char ulaw_maxshift[256] = {12,8,7,9,7,8,7,10,7,8,7,9,7,8,7,11,6,7,6,8,6,7,6,9,6,7,6,8,6,7,6,10,5,6,5,7,5,6,5,8,5,6,5,7,5,6,5,9,5,4,6,4,5,4,7,4,5,4,6,4,5,4,8,4,3,5,3,4,3,6,3,4,3,5,3,4,3,7,3,4,2,3,2,5,2,3,2,4,2,3,2,6,2,3,2,4,1,2,1,3,1,2,1,5,1,2,1,3,1,2,1,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,0,7,8,7,9,7,8,7,10,7,8,7,9,7,8,7,11,6,7,6,8,6,7,6,9,6,7,6,8,6,7,6,10,5,6,5,7,5,6,5,8,5,6,5,7,5,6,5,9,5,4,6,4,5,4,7,4,5,4,6,4,5,4,8,4,3,5,3,4,3,6,3,4,3,5,3,4,3,7,3,4,2,3,2,5,2,3,2,4,2,3,2,6,2,3,2,4,1,2,1,3,1,2,1,5,1,2,1,3,1,2,1,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,12};
+
+/*schar ulaw_inward[13][256] = {
+{4294967169,4294967170,4294967171,4294967172,4294967173,4294967174,4294967175,4294967176,4294967177,4294967178,4294967179,4294967180,4294967181,4294967182,4294967183,4294967184,4294967185,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,4294967288,4294967289,4294967290,4294967291,4294967292,4294967293,4294967294,4294967295,4294967168,127,126,125,124,123,122,121,120,119,118,117,116,115,114,113,112,111,110,109,108,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0},
+{4294967177,4294967178,4294967179,4294967180,4294967181,4294967182,4294967183,4294967184,4294967185,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,4294967288,4294967168,4294967289,4294967169,4294967290,4294967170,4294967291,4294967171,4294967292,4294967172,4294967293,4294967173,4294967294,4294967174,4294967295,4294967175,4294967176,119,118,117,116,115,114,113,112,111,110,109,108,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,127,7,126,6,125,5,124,4,123,3,122,2,121,1,120,0},
+{4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967168,4294967285,4294967169,4294967286,4294967170,4294967287,4294967171,4294967288,4294967172,4294967289,4294967173,4294967290,4294967174,4294967291,4294967175,4294967292,4294967176,4294967177,4294967178,4294967293,4294967179,4294967180,4294967181,4294967294,4294967182,4294967183,4294967184,4294967295,4294967185,4294967186,4294967187,4294967188,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,127,11,126,10,125,9,124,8,123,7,122,6,121,5,120,4,119,118,117,3,116,115,114,2,113,112,111,1,110,109,108,0},
+{4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967168,4294967283,4294967169,4294967284,4294967170,4294967285,4294967171,4294967286,4294967172,4294967287,4294967173,4294967288,4294967174,4294967289,4294967175,4294967290,4294967176,4294967177,4294967178,4294967291,4294967179,4294967180,4294967181,4294967292,4294967182,4294967183,4294967184,4294967293,4294967185,4294967186,4294967187,4294967294,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967295,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,127,13,126,12,125,11,124,10,123,9,122,8,121,7,120,6,119,118,117,5,116,115,114,4,113,112,111,3,110,109,108,2,107,106,105,104,103,102,101,1,100,99,98,97,96,95,94,0},
+{4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967168,4294967282,4294967169,4294967283,4294967170,4294967284,4294967171,4294967285,4294967172,4294967286,4294967173,4294967287,4294967174,4294967288,4294967175,4294967289,4294967176,4294967177,4294967178,4294967290,4294967179,4294967180,4294967181,4294967291,4294967182,4294967183,4294967184,4294967292,4294967185,4294967186,4294967187,4294967293,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967294,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967295,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,127,14,126,13,125,12,124,11,123,10,122,9,121,8,120,7,119,118,117,6,116,115,114,5,113,112,111,4,110,109,108,3,107,106,105,104,103,102,101,2,100,99,98,97,96,95,94,1,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,0},
+{4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967168,4294967282,4294967169,4294967283,4294967170,4294967284,4294967171,4294967285,4294967172,4294967286,4294967173,4294967287,4294967174,4294967288,4294967175,4294967176,4294967289,4294967177,4294967178,4294967179,4294967290,4294967180,4294967181,4294967182,4294967291,4294967183,4294967184,4294967185,4294967292,4294967186,4294967187,4294967188,4294967189,4294967190,4294967293,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967294,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967295,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,127,14,126,13,125,12,124,11,123,10,122,9,121,8,120,119,7,118,117,116,6,115,114,113,5,112,111,110,4,109,108,107,106,105,3,104,103,102,101,100,99,98,2,97,96,95,94,93,92,91,90,89,88,87,1,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,0},
+{4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967168,4294967281,4294967169,4294967282,4294967170,4294967283,4294967171,4294967284,4294967172,4294967285,4294967173,4294967286,4294967174,4294967287,4294967175,4294967288,4294967176,4294967177,4294967289,4294967178,4294967179,4294967180,4294967290,4294967181,4294967182,4294967183,4294967291,4294967184,4294967185,4294967186,4294967292,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967293,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967294,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967295,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,127,15,126,14,125,13,124,12,123,11,122,10,121,9,120,8,119,118,7,117,116,115,6,114,113,112,5,111,110,109,4,108,107,106,105,104,103,3,102,101,100,99,98,97,96,2,95,94,93,92,91,90,89,88,87,86,85,84,83,1,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,0},
+{4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967168,4294967281,4294967169,4294967282,4294967170,4294967283,4294967171,4294967284,4294967172,4294967285,4294967173,4294967286,4294967174,4294967287,4294967175,4294967288,4294967176,4294967177,4294967178,4294967289,4294967179,4294967180,4294967181,4294967290,4294967182,4294967183,4294967184,4294967291,4294967185,4294967186,4294967187,4294967292,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967293,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967294,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967295,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,127,15,126,14,125,13,124,12,123,11,122,10,121,9,120,8,119,118,117,7,116,115,114,6,113,112,111,5,110,109,108,4,107,106,105,104,103,102,3,101,100,99,98,97,96,95,2,94,93,92,91,90,89,88,87,86,85,84,83,82,81,1,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,0},
+{4294967280,4294967281,4294967168,4294967282,4294967169,4294967283,4294967170,4294967284,4294967171,4294967285,4294967172,4294967286,4294967173,4294967287,4294967174,4294967288,4294967175,4294967176,4294967177,4294967289,4294967178,4294967179,4294967180,4294967290,4294967181,4294967182,4294967183,4294967291,4294967184,4294967185,4294967186,4294967292,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967293,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967294,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967295,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,127,15,126,14,125,13,124,12,123,11,122,10,121,9,120,8,119,118,117,7,116,115,114,6,113,112,111,5,110,109,108,4,107,106,105,104,103,102,101,3,100,99,98,97,96,95,94,2,93,92,91,90,89,88,87,86,85,84,83,82,81,80,1,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,0},
+{4294967288,4294967168,4294967169,4294967289,4294967170,4294967171,4294967172,4294967290,4294967173,4294967174,4294967175,4294967291,4294967176,4294967177,4294967178,4294967292,4294967179,4294967180,4294967181,4294967182,4294967183,4294967184,4294967185,4294967293,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967294,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967295,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,127,126,125,7,124,123,122,6,121,120,119,5,118,117,116,4,115,114,113,112,111,110,109,3,108,107,106,105,104,103,102,2,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,1,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,0},
+{4294967292,4294967168,4294967169,4294967170,4294967171,4294967172,4294967173,4294967293,4294967174,4294967175,4294967176,4294967177,4294967178,4294967179,4294967180,4294967294,4294967181,4294967182,4294967183,4294967184,4294967185,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967295,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,4294967288,4294967289,4294967290,4294967291,127,126,125,124,123,122,121,3,120,119,118,117,116,115,114,2,113,112,111,110,109,108,107,106,105,104,103,102,101,100,99,1,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,0},
+{4294967294,4294967168,4294967169,4294967170,4294967171,4294967172,4294967173,4294967174,4294967175,4294967176,4294967177,4294967178,4294967179,4294967180,4294967181,4294967295,4294967182,4294967183,4294967184,4294967185,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,4294967288,4294967289,4294967290,4294967291,4294967292,4294967293,127,126,125,124,123,122,121,120,119,118,117,116,115,114,113,1,112,111,110,109,108,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,0},
+{4294967295,4294967168,4294967169,4294967170,4294967171,4294967172,4294967173,4294967174,4294967175,4294967176,4294967177,4294967178,4294967179,4294967180,4294967181,4294967182,4294967183,4294967184,4294967185,4294967186,4294967187,4294967188,4294967189,4294967190,4294967191,4294967192,4294967193,4294967194,4294967195,4294967196,4294967197,4294967198,4294967199,4294967200,4294967201,4294967202,4294967203,4294967204,4294967205,4294967206,4294967207,4294967208,4294967209,4294967210,4294967211,4294967212,4294967213,4294967214,4294967215,4294967216,4294967217,4294967218,4294967219,4294967220,4294967221,4294967222,4294967223,4294967224,4294967225,4294967226,4294967227,4294967228,4294967229,4294967230,4294967231,4294967232,4294967233,4294967234,4294967235,4294967236,4294967237,4294967238,4294967239,4294967240,4294967241,4294967242,4294967243,4294967244,4294967245,4294967246,4294967247,4294967248,4294967249,4294967250,4294967251,4294967252,4294967253,4294967254,4294967255,4294967256,4294967257,4294967258,4294967259,4294967260,4294967261,4294967262,4294967263,4294967264,4294967265,4294967266,4294967267,4294967268,4294967269,4294967270,4294967271,4294967272,4294967273,4294967274,4294967275,4294967276,4294967277,4294967278,4294967279,4294967280,4294967281,4294967282,4294967283,4294967284,4294967285,4294967286,4294967287,4294967288,4294967289,4294967290,4294967291,4294967292,4294967293,4294967294,127,126,125,124,123,122,121,120,119,118,117,116,115,114,113,112,111,110,109,108,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0}
+};*/
+
+uchar ulaw_outward[13][256] = {
+{127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,255,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128},
+{112,114,116,118,120,122,124,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,113,115,117,119,121,123,125,255,253,251,249,247,245,243,241,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,252,250,248,246,244,242,240},
+{96,98,100,102,104,106,108,110,112,113,114,116,117,118,120,121,122,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,97,99,101,103,105,107,109,111,115,119,123,255,251,247,243,239,237,235,233,231,229,227,225,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,250,249,248,246,245,244,242,241,240,238,236,234,232,230,228,226,224},
+{80,82,84,86,88,90,92,94,96,97,98,100,101,102,104,105,106,108,109,110,112,113,114,115,116,117,118,120,121,122,123,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,81,83,85,87,89,91,93,95,99,103,107,111,119,255,247,239,235,231,227,223,221,219,217,215,213,211,209,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,251,250,249,248,246,245,244,243,242,241,240,238,237,236,234,233,232,230,229,228,226,225,224,222,220,218,216,214,212,210,208},
+{64,66,68,70,72,74,76,78,80,81,82,84,85,86,88,89,90,92,93,94,96,97,98,99,100,101,102,104,105,106,107,108,109,110,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,65,67,69,71,73,75,77,79,83,87,91,95,103,111,255,239,231,223,219,215,211,207,205,203,201,199,197,195,193,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,238,237,236,235,234,233,232,230,229,228,227,226,225,224,222,221,220,218,217,216,214,213,212,210,209,208,206,204,202,200,198,196,194,192},
+{49,51,53,55,57,59,61,63,64,66,67,68,70,71,72,74,75,76,78,79,80,81,82,84,85,86,87,88,89,90,92,93,94,95,96,97,98,99,100,101,102,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,50,52,54,56,58,60,62,65,69,73,77,83,91,103,255,231,219,211,205,201,197,193,190,188,186,184,182,180,178,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,230,229,228,227,226,225,224,223,222,221,220,218,217,216,215,214,213,212,210,209,208,207,206,204,203,202,200,199,198,196,195,194,192,191,189,187,185,183,181,179,177},
+{32,34,36,38,40,42,44,46,48,49,51,52,53,55,56,57,59,60,61,63,64,65,66,67,68,70,71,72,73,74,75,76,78,79,80,81,82,83,84,85,86,87,88,89,90,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,33,35,37,39,41,43,45,47,50,54,58,62,69,77,91,255,219,205,197,190,186,182,178,175,173,171,169,167,165,163,161,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,218,217,216,215,214,213,212,211,210,209,208,207,206,204,203,202,201,200,199,198,196,195,194,193,192,191,189,188,187,185,184,183,181,180,179,177,176,174,172,170,168,166,164,162,160},
+{16,18,20,22,24,26,28,30,32,33,34,36,37,38,40,41,42,44,45,46,48,49,50,51,52,53,55,56,57,58,59,60,61,63,64,65,66,67,68,69,70,71,72,73,74,75,76,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,21,23,25,27,29,31,35,39,43,47,54,62,77,255,205,190,182,175,171,167,163,159,157,155,153,151,149,147,145,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,204,203,202,201,200,199,198,197,196,195,194,193,192,191,189,188,187,186,185,184,183,181,180,179,178,177,176,174,173,172,170,169,168,166,165,164,162,161,160,158,156,154,152,150,148,146,144},
+{2,4,6,8,10,12,14,16,17,18,20,21,22,24,25,26,28,29,30,32,33,34,35,36,37,38,40,41,42,43,44,45,46,48,49,50,51,52,53,54,55,56,57,58,59,60,61,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,1,3,5,7,9,11,13,15,19,23,27,31,39,47,62,255,190,175,167,159,155,151,147,143,141,139,137,135,133,131,129,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,189,188,187,186,185,184,183,182,181,180,179,178,177,176,174,173,172,171,170,169,168,166,165,164,163,162,161,160,158,157,156,154,153,152,150,149,148,146,145,144,142,140,138,136,134,132,130,128},
+{1,2,4,5,6,8,9,10,12,13,14,16,17,18,19,20,21,22,24,25,26,27,28,29,30,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,3,7,11,15,23,31,47,255,175,159,151,143,139,135,131,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,158,157,156,155,154,153,152,150,149,148,147,146,145,144,142,141,140,138,137,136,134,133,132,130,129,128},
+{1,2,3,4,5,6,8,9,10,11,12,13,14,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,7,15,31,255,159,143,135,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,142,141,140,139,138,137,136,134,133,132,131,130,129,128},
+{1,2,3,4,5,6,7,8,9,10,11,12,13,14,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,15,255,143,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128},
+{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,0,255,254,253,252,251,250,249,248,247,246,245,244,243,242,241,240,239,238,237,236,235,234,233,232,231,230,229,228,227,226,225,224,223,222,221,220,219,218,217,216,215,214,213,212,211,210,209,208,207,206,205,204,203,202,201,200,199,198,197,196,195,194,193,192,191,190,189,188,187,186,185,184,183,182,181,180,179,178,177,176,175,174,173,172,171,170,169,168,167,166,165,164,163,162,161,160,159,158,157,156,155,154,153,152,151,150,149,148,147,146,145,144,143,142,141,140,139,138,137,136,135,134,133,132,131,130,129,128}
+};

deadbeef-0.5.2.tar.bz2/plugins/shn/convert.c Added

@@ -0,0 +1,42 @@
+/* convert.c - functions to convert little-endian data to endian of host
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: convert.c,v 1.9 2007/03/23 05:49:48 jason Exp $
+ */
+
+#include <stdlib.h>
+#include "shorten.h"
+
+ulong shn_uchar_to_ulong_le(uchar *buf)
+/* converts 4 bytes stored in little-endian format to a ulong */
+{
+	return (ulong)((buf[3] << 24) + (buf[2] << 16) + (buf[1] << 8) + buf[0]);
+}
+
+slong shn_uchar_to_slong_le(uchar *buf)
+/* converts 4 bytes stored in little-endian format to an slong */
+{
+	return (slong)shn_uchar_to_ulong_le(buf);
+}
+
+ushort shn_uchar_to_ushort_le(uchar *buf)
+/* converts 4 bytes stored in little-endian format to a ushort */
+{
+	return (ushort)((buf[1] << 8) + buf[0]);
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/misc.c Added

@@ -0,0 +1,151 @@
+/* misc.c - miscellaneous functions
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: misc.c,v 1.14 2007/03/23 05:49:48 jason Exp $
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "shorten.h"
+
+void shn_snprintf(char *dest,int maxlen,char *formatstr, ...)
+/* acts like snprintf, but makes 100% sure the string is NULL-terminated */
+{
+ va_list args;
+
+ va_start(args,formatstr);
+
+ shn_vsnprintf(dest,maxlen,formatstr,args);
+
+ dest[maxlen-1] = 0;
+
+ va_end(args);
+}
+
+int shn_filename_contains_a_dot(const char *filename)
+{
+	char *slash,*dot;
+
+	dot = strrchr(filename,'.');
+	if (!dot)
+		return 0;
+
+	slash = strrchr(filename,'/');
+	if (!slash)
+		return 1;
+
+	if (slash < dot)
+		return 1;
+	else
+		return 0;
+}
+
+char *shn_get_base_filename(const char *filename)
+{
+	const char *b,*e,*p;
+	char *base;
+
+	b = strrchr(filename,'/');
+
+	if (b)
+		b++;
+	else
+		b = filename;
+
+	e = strrchr(filename,'.');
+
+	if (e < b)
+		e = filename + strlen(filename);
+
+	if (NULL == (base = malloc((e - b + 1) * sizeof(char))))
+	{
+		shn_debug("Could not allocate memory for base filename");
+		return NULL;
+	}
+
+	for (p=b;p<e;p++)
+		*(base + (p - b)) = *p;
+
+	*(base + (p - b)) = '\0';
+
+	return base;
+}
+
+char *shn_get_base_directory(const char *filename)
+{
+	const char *e,*p;
+	char *base;
+
+	e = strrchr(filename,'/');
+
+	if (!e)
+		e = filename;
+
+	if (NULL == (base = malloc((e - filename + 1) * sizeof(char))))
+	{
+		shn_debug("Could not allocate memory for base directory");
+		return NULL;
+	}
+
+	for (p=filename;p<e;p++)
+		*(base + (p - filename)) = *p;
+
+	*(base + (p - filename)) = '\0';
+
+	return base;
+}
+
+void shn_length_to_str(shn_file *info)
+/* converts length of file to a string in m:ss or m:ss.ff format */
+{
+ ulong newlength,rem1,rem2,frames,ms;
+ double tmp;
+
+ if (PROB_NOT_CD(info->wave_header)) {
+ newlength = (ulong)info->wave_header.exact_length;
+
+ tmp = info->wave_header.exact_length - (double)((ulong)info->wave_header.exact_length);
+ ms = (ulong)((tmp * 1000.0) + 0.5);
+
+ if (1000 == ms) {
+ ms = 0;
+ newlength++;
+ }
+
+ shn_snprintf(info->wave_header.m_ss,16,"%lu:%02lu.%03lu",newlength/60,newlength%60,ms);
+ }
+ else {
+ newlength = info->wave_header.length;
+
+ rem1 = info->wave_header.data_size % CD_RATE;
+ rem2 = rem1 % CD_BLOCK_SIZE;
+
+ frames = rem1 / CD_BLOCK_SIZE;
+ if (rem2 >= (CD_BLOCK_SIZE / 2))
+ frames++;
+
+ if (frames == CD_BLOCKS_PER_SEC) {
+ frames = 0;
+ newlength++;
+ }
+
+ shn_snprintf(info->wave_header.m_ss,16,"%lu:%02lu.%02lu",newlength/60,newlength%60,frames);
+ }
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/output.c Added

@@ -0,0 +1,99 @@
+/* output.c - functions for message and error output
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: output.c,v 1.11 2007/03/23 05:49:48 jason Exp $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include "shorten.h"
+#include "shn.h"
+
+void print_lines(char *prefix,char *message)
+{
+ char *head, *tail;
+
+ head = tail = message;
+ while (*head != '\0') {
+ if (*head == '\n') {
+ *head = '\0';
+ fprintf(stderr,"%s%s\n",prefix,tail);
+ tail = head + 1;
+ }
+ head++;
+ }
+ fprintf(stderr,"%s%s\n",prefix,tail);
+}
+
+void shn_error(char *msg, ...)
+{
+ va_list args;
+ char msgbuf[BUF_SIZE];
+
+ va_start(args,msg);
+
+ shn_vsnprintf(msgbuf,BUF_SIZE,msg,args);
+
+ switch (shn_cfg.error_output_method) {
+ case ERROR_OUTPUT_STDERR:
+ print_lines(PACKAGE ": ",msgbuf);
+ break;
+// case ERROR_OUTPUT_WINDOW:
+// shn_message_box(msgbuf);
+// break;
+ default:
+ if (0 != shn_cfg.verbose)
+ print_lines(PACKAGE " [error]: ",msgbuf);
+ }
+
+ va_end(args);
+}
+
+void shn_debug(char *msg, ...)
+{
+ va_list args;
+ char msgbuf[BUF_SIZE];
+
+ va_start(args,msg);
+
+ shn_vsnprintf(msgbuf,BUF_SIZE,msg,args);
+
+ if (0 != shn_cfg.verbose)
+ print_lines(PACKAGE " [debug]: ",msgbuf);
+
+ va_end(args);
+}
+
+void shn_error_fatal(shn_file *this_shn,char *complaint, ...)
+{
+ va_list args;
+
+ va_start(args,complaint);
+
+ if (NULL != this_shn) {
+ if (0 == this_shn->vars.fatal_error) {
+ this_shn->vars.fatal_error = 1;
+ this_shn->vars.going = 0;
+ shn_vsnprintf(this_shn->vars.fatal_error_msg,BUF_SIZE,complaint,args);
+ }
+ }
+
+ va_end(args);
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/seek.c Added

@@ -0,0 +1,274 @@
+/* seek.c - functions related to real-time seeking
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: seek.c,v 1.18 2007/03/23 05:49:48 jason Exp $
+ */
+
+#include <stdlib.h>
+#include "shorten.h"
+#include "shn.h"
+
+#define ID3V1_TAG_SIZE 128
+
+shn_seek_entry *shn_seek_entry_search(shn_seek_entry *table,ulong goal,ulong min,ulong max,ulong resolution)
+{
+	ulong med = (min + max) / 2;
+	shn_seek_entry *middle = table + med;
+	ulong sample = shn_uchar_to_ulong_le(middle->data);
+
+	shn_debug("Examining seek table entry %lu with sample %lu (min/max = %lu/%lu, goal sample is %lu, resolution is %lu samples)",med,sample,min,max,goal,resolution);
+
+	if (goal < sample)
+		return shn_seek_entry_search(table,goal,min,med-1,resolution);
+	if (goal > sample + resolution)
+		return shn_seek_entry_search(table,goal,med+1,max,resolution);
+	return middle;
+}
+
+int load_separate_seek_table_generic(char *filename,shn_file *this_shn)
+{
+	FILE *f;
+	slong seek_table_len;
+
+	shn_debug("Looking for seek table in separate file: '%s'",filename);
+
+	if (!(f=fopen(filename,"rb")))
+	{
+		return 0;
+	}
+
+	fseek(f,0,SEEK_END);
+	seek_table_len = (slong)ftell(f) - SEEK_HEADER_SIZE;
+	fseek(f,0,SEEK_SET);
+
+	if (fread((void *)this_shn->seek_header.data,1,SEEK_HEADER_SIZE,f) == SEEK_HEADER_SIZE)
+	{
+		this_shn->seek_header.version = (slong)shn_uchar_to_ulong_le(this_shn->seek_header.data+4);
+		this_shn->seek_header.shnFileSize = shn_uchar_to_ulong_le(this_shn->seek_header.data+8);
+		if (memcmp(this_shn->seek_header.data,SEEK_HEADER_SIGNATURE,strlen(SEEK_HEADER_SIGNATURE)) == 0)
+		{
+			if (this_shn->seek_header.shnFileSize != this_shn->wave_header.actual_size)
+			{
+				shn_debug("warning: Seek table expected .shn file size %lu differs from actual .shn file size %lu - seek table might not belong to this file",
+					this_shn->seek_header.shnFileSize,this_shn->wave_header.actual_size);
+			}
+
+			if ((this_shn->seek_table = malloc(seek_table_len)))
+			{
+				if (fread((void *)this_shn->seek_table,1,seek_table_len,f) == seek_table_len)
+				{
+					shn_debug("Successfully loaded seek table in separate file: '%s'",filename);
+
+					this_shn->vars.seek_table_entries = seek_table_len / SEEK_ENTRY_SIZE;
+
+					if (this_shn->vars.seek_table_entries > 1)
+						this_shn->vars.seek_resolution = shn_uchar_to_ulong_le(this_shn->seek_table->data+SEEK_ENTRY_SIZE);
+					else
+						this_shn->vars.seek_resolution = SEEK_RESOLUTION;
+
+					fclose(f);
+
+					return 1;
+				}
+			}
+		}
+	}
+
+	fclose(f);
+	return 0;
+}
+
+int load_appended_seek_table(shn_file *this_shn,const char *filename,long bytes_from_end)
+{
+	switch (bytes_from_end)
+	{
+		case 0:
+			shn_debug("Looking for seek table appended to file: '%s'",filename);
+			break;
+		case ID3V1_TAG_SIZE:
+			shn_debug("Looking for seek table hidden behind an ID3v1 tag at the end of file: '%s'",filename);
+			break;
+		default:
+			shn_debug("Looking for seek table located %ld bytes from the end of file: '%s'",bytes_from_end,filename);
+			break;
+	}
+
+	deadbeef->fseek(this_shn->vars.fd,-(SEEK_TRAILER_SIZE+bytes_from_end),SEEK_END);
+	if (deadbeef->fread((void *)this_shn->seek_trailer.data,1,SEEK_TRAILER_SIZE,this_shn->vars.fd) == SEEK_TRAILER_SIZE)
+	{
+		this_shn->seek_trailer.seekTableSize = shn_uchar_to_ulong_le(this_shn->seek_trailer.data);
+		if (memcmp(this_shn->seek_trailer.data+4,SEEK_TRAILER_SIGNATURE,strlen(SEEK_TRAILER_SIGNATURE)) == 0)
+		{
+			deadbeef->fseek(this_shn->vars.fd,-(this_shn->seek_trailer.seekTableSize+bytes_from_end),SEEK_END);
+			this_shn->seek_trailer.seekTableSize -= (SEEK_HEADER_SIZE + SEEK_TRAILER_SIZE);
+			if (deadbeef->fread((void *)this_shn->seek_header.data,1,SEEK_HEADER_SIZE,this_shn->vars.fd) == SEEK_HEADER_SIZE)
+			{
+				this_shn->seek_header.version = (slong)shn_uchar_to_ulong_le(this_shn->seek_header.data+4);
+				this_shn->seek_header.shnFileSize = shn_uchar_to_ulong_le(this_shn->seek_header.data+8);
+				if ((this_shn->seek_table = malloc(this_shn->seek_trailer.seekTableSize)))
+				{
+					if (deadbeef->fread((void *)this_shn->seek_table,1,this_shn->seek_trailer.seekTableSize,this_shn->vars.fd) == this_shn->seek_trailer.seekTableSize)
+					{
+						shn_debug("Successfully loaded seek table appended to file: '%s'",filename);
+
+						this_shn->vars.seek_table_entries = this_shn->seek_trailer.seekTableSize / SEEK_ENTRY_SIZE;
+
+						if (this_shn->vars.seek_table_entries > 1)
+							this_shn->vars.seek_resolution = shn_uchar_to_ulong_le(this_shn->seek_table->data+SEEK_ENTRY_SIZE);
+						else
+							this_shn->vars.seek_resolution = SEEK_RESOLUTION;
+
+						return 1;
+					}
+				}
+			}
+		}
+	}
+
+	return 0;
+}
+
+int load_separate_seek_table_samedir(shn_file *this_shn,const char *filename)
+{
+	char *altfilename,*basefile,*basedir;
+
+	if (!(basefile = shn_get_base_filename(filename)))
+	{
+		return 0;
+	}
+
+	if (!(basedir = shn_get_base_directory(filename)))
+	{
+		free(basefile);
+		return 0;
+	}
+
+	if (!(altfilename = malloc(strlen(basedir)+strlen(basefile)+sizeof(SEEK_SUFFIX)+3)))
+	{
+		shn_debug("Could not allocate memory for same dir filename");
+		free(basefile);
+		free(basedir);
+		return 0;
+	}
+
+	sprintf(altfilename,"%s/%s.%s",basedir,basefile,SEEK_SUFFIX);
+
+	free(basefile);
+	free(basedir);
+
+	if (load_separate_seek_table_generic(altfilename,this_shn))
+	{
+		free(altfilename);
+		return 1;
+	}
+
+	free(altfilename);
+	return 0;
+}
+
+int load_separate_seek_table_relative(shn_file *this_shn,const char *filename)
+{
+	char *altfilename,*basefile,*basedir;
+
+	if (0 == strcmp(shn_cfg.relative_seek_tables_path,""))
+		return 0;
+
+	if (!(basefile = shn_get_base_filename(filename)))
+	{
+		return 0;
+	}
+
+	if (!(basedir = shn_get_base_directory(filename)))
+	{
+		free(basefile);
+		return 0;
+	}
+
+	if (!(altfilename = malloc(strlen(basedir)+strlen(shn_cfg.relative_seek_tables_path)+strlen(basefile)+sizeof(SEEK_SUFFIX)+4)))
+	{
+		shn_debug("Could not allocate memory for absolute filename");
+		free(basefile);
+		free(basedir);
+		return 0;
+	}
+
+	sprintf(altfilename,"%s/%s/%s.%s",basedir,shn_cfg.relative_seek_tables_path,basefile,SEEK_SUFFIX);
+
+	free(basefile);
+	free(basedir);
+
+	if (load_separate_seek_table_generic(altfilename,this_shn))
+	{
+		free(altfilename);
+		return 1;
+	}
+
+	free(altfilename);
+	return 0;
+}
+
+int load_separate_seek_table_absolute(shn_file *this_shn,const char *filename)
+{
+	char *altfilename,*basefile;
+
+	if (!(basefile = shn_get_base_filename(filename)))
+	{
+		return 0;
+	}
+
+	if (!(altfilename = malloc(strlen(shn_cfg.seek_tables_path)+strlen(basefile)+sizeof(SEEK_SUFFIX)+3)))
+	{
+		shn_debug("Could not allocate memory for same dir filename");
+		free(basefile);
+		return 0;
+	}
+
+	sprintf(altfilename,"%s/%s.%s",shn_cfg.seek_tables_path,basefile,SEEK_SUFFIX);
+
+	free(basefile);
+
+	if (load_separate_seek_table_generic(altfilename,this_shn))
+	{
+		free(altfilename);
+		return 1;
+	}
+
+	free(altfilename);
+	return 0;
+}
+
+void shn_load_seek_table(shn_file *this_shn,const char *filename)
+{
+	if (load_appended_seek_table(this_shn,filename,0))
+		return;
+
+	if (load_appended_seek_table(this_shn,filename,ID3V1_TAG_SIZE))
+		return;
+
+	if (load_separate_seek_table_samedir(this_shn,filename))
+		return;
+
+	if (load_separate_seek_table_relative(this_shn,filename))
+		return;
+
+	if (load_separate_seek_table_absolute(this_shn,filename))
+		return;
+
+	shn_debug("Could not find any seek tables");
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/shn.c Added

@@ -0,0 +1,1842 @@
+/*
+ DeaDBeeF - ultimate music player for GNU/Linux systems with X11
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+// based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "shorten.h"
+#include "../../deadbeef.h"
+#include "bitshift.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+static DB_decoder_t plugin;
+DB_functions_t *deadbeef;
+
+shn_file *load_shn(const char *filename);
+
+typedef struct {
+ DB_fileinfo_t info;
+ shn_file *shnfile;
+
+ slong **buffer, **offset;
+ slong lpcqoffset;
+ int version, bitshift;
+ int ftype;
+ char *magic;
+ int blocksize, nchan;
+ int i, chan, nwrap, nskip;
+ int *qlpc, maxnlpc, nmean;
+ int cmd;
+ int internal_ftype;
+ int blk_size;
+ int cklen;
+ uchar tmp;
+
+ int currentsample;
+ int startsample;
+ int endsample;
+
+ int skipsamples;
+} shn_fileinfo_t;
+
+shn_config shn_cfg;
+
+DB_fileinfo_t *
+shn_open (uint32_t hints) {
+ DB_fileinfo_t *_info = malloc (sizeof (shn_fileinfo_t));
+ shn_fileinfo_t *info = (shn_fileinfo_t *)_info;
+ memset (info, 0, sizeof (shn_fileinfo_t));
+ return _info;
+}
+
+int
+ddb_getc (DB_FILE *fp) {
+ uint8_t c;
+ if (deadbeef->fread (&c, 1, 1, fp) != 1) {
+ return EOF;
+ }
+ return (int)c;
+}
+
+int init_decode_state(shn_file *this_shn)
+{
+	if (this_shn->decode_state)
+	{
+		if (this_shn->decode_state->getbuf)
+		{
+			free(this_shn->decode_state->getbuf);
+			this_shn->decode_state->getbuf = NULL;
+		}
+
+		if (this_shn->decode_state->writebuf)
+		{
+			free(this_shn->decode_state->writebuf);
+			this_shn->decode_state->writebuf = NULL;
+		}
+
+		if (this_shn->decode_state->writefub)
+		{
+			free(this_shn->decode_state->writefub);
+			this_shn->decode_state->writefub = NULL;
+		}
+
+		free(this_shn->decode_state);
+		this_shn->decode_state = NULL;
+	}
+
+	if (!(this_shn->decode_state = malloc(sizeof(shn_decode_state))))
+	{
+		shn_debug("Could not allocate memory for decode state data structure");
+		return 0;
+	}
+
+	this_shn->decode_state->getbuf = NULL;
+	this_shn->decode_state->getbufp = NULL;
+	this_shn->decode_state->nbitget = 0;
+	this_shn->decode_state->nbyteget = 0;
+	this_shn->decode_state->gbuffer = 0;
+	this_shn->decode_state->writebuf = NULL;
+ this_shn->decode_state->writefub = NULL;
+ this_shn->decode_state->nwritebuf = 0;
+
+ this_shn->vars.bytes_in_buf = 0;
+
+ return 1;
+}
+
+int
+shn_init_decoder (shn_fileinfo_t *info) {
+ int version = FORMAT_VERSION;
+ info->ftype = TYPE_EOF;
+ info->magic = MAGIC;
+ info->blocksize = DEFAULT_BLOCK_SIZE;
+ info->nchan = DEFAULT_NCHAN;
+ info->nskip = DEFAULT_NSKIP;
+ info->maxnlpc = DEFAULT_MAXNLPC;
+ info->nmean = UNDEFINED_UINT;
+
+ info->shnfile->vars.bytes_in_buf = 0;
+ if (!init_decode_state(info->shnfile)) {
+ trace ("shn: init_decode_state failed\n");
+ return -1;
+ }
+ info->shnfile->vars.going = 1;
+
+ info->blk_size = 512 * (info->shnfile->wave_header.bits_per_sample / 8) * info->shnfile->wave_header.channels;
+
+ /* read magic number */
+#ifdef STRICT_FORMAT_COMPATABILITY
+ if(FORMAT_VERSION < 2)
+ {
+ for(i = 0; i < strlen(magic); i++)
+ if(getc_exit(this_shn->vars.fd) != magic[i]) {
+ shn_error_fatal(this_shn,"Bad magic number");
+ goto exit_thread;
+ }
+
+ /* get version number */
+ version = getc_exit(this_shn->vars.fd);
+ }
+ else
+#endif /* STRICT_FORMAT_COMPATABILITY */
+ {
+ int nscan = 0;
+
+ version = MAX_VERSION + 1;
+ while(version > MAX_VERSION)
+ {
+ int byte = ddb_getc(info->shnfile->vars.fd);
+ if(byte == EOF) {
+ shn_error_fatal(info->shnfile,"No magic number");
+ trace ("shn_init: no magic number\n");
+ return -1;
+ }
+ if(info->magic[nscan] != '\0' && byte == info->magic[nscan]) {
+ nscan++;
+ }
+ else {
+ if(info->magic[nscan] == '\0' && byte <= MAX_VERSION)
+ version = byte;
+ else
+ {
+ if(byte == info->magic[0])
+ nscan = 1;
+ else
+ {
+ nscan = 0;
+ }
+ version = MAX_VERSION + 1;
+ }
+ }
+ }
+ }
+
+ /* check version number */
+ if(version > MAX_SUPPORTED_VERSION) {
+ shn_error_fatal(info->shnfile,"Can't decode version %d", version);
+ trace ("shn_init: can't decode version %d\n", version);
+ return -1;
+ }
+
+ /* set up the default nmean, ignoring the command line state */
+ info->nmean = (version < 2) ? DEFAULT_V0NMEAN : DEFAULT_V2NMEAN;
+
+ /* initialise the variable length file read for the compressed stream */
+ trace ("decode_state=%p\n", info->shnfile->decode_state);
+ var_get_init(info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("var_get_init failed\n");
+ return -1;
+ }
+
+ /* initialise the fixed length file write for the uncompressed stream */
+ fwrite_type_init(info->shnfile);
+
+ /* get the internal file type */
+ info->internal_ftype = UINT_GET(TYPESIZE, info->shnfile);
+ trace ("internal_ftype=%d\n", info->internal_ftype);
+
+ /* has the user requested a change in file type? */
+ if(info->internal_ftype != info->ftype) {
+ if(info->ftype == TYPE_EOF) {
+ info->ftype = info->internal_ftype; /* no problems here */
+ }
+ else { /* check that the requested conversion is valid */
+ if(info->internal_ftype == TYPE_AU1 || info->internal_ftype == TYPE_AU2 ||
+ info->internal_ftype == TYPE_AU3 || info->ftype == TYPE_AU1 || info->ftype == TYPE_AU2 || info->ftype == TYPE_AU3) {
+ shn_error_fatal(info->shnfile,"Not able to perform requested output format conversion");
+ trace ("shn_init_decoder: Not able to perform requested output format conversion\n");
+ return -1;
+ }
+ }
+ trace ("ftype=%d\n", info->ftype);
+ }
+
+ info->nchan = UINT_GET(CHANSIZE, info->shnfile);
+
+ /* get blocksize if version > 0 */
+ if(version > 0)
+ {
+ int byte;
+ info->blocksize = UINT_GET((int) (log((double) DEFAULT_BLOCK_SIZE) / M_LN2),info->shnfile);
+ info->maxnlpc = UINT_GET(LPCQSIZE, info->shnfile);
+ info->nmean = UINT_GET(0, info->shnfile);
+ info->nskip = UINT_GET(NSKIPSIZE, info->shnfile);
+ for(int i = 0; i < info->nskip; i++)
+ {
+ byte = uvar_get(XBYTESIZE,info->shnfile);
+ }
+ }
+ else
+ info->blocksize = DEFAULT_BLOCK_SIZE;
+
+ info->nwrap = MAX(NWRAP, info->maxnlpc);
+
+ /* grab some space for the input buffer */
+ info->buffer = long2d((ulong) info->nchan, (ulong) (info->blocksize + info->nwrap),info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("failed to alloc buffer\n");
+ return -1;
+ }
+ info->offset = long2d((ulong) info->nchan, (ulong) MAX(1, info->nmean),info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ if (info->buffer) {
+ free(info->buffer);
+ info->buffer = NULL;
+ }
+ trace ("failed to alloc offset\n");
+ return -1;
+ }
+
+ for(info->chan = 0; info->chan < info->nchan; info->chan++)
+ {
+ for(int i = 0; i < info->nwrap; i++)
+ info->buffer[info->chan][i] = 0;
+ info->buffer[info->chan] += info->nwrap;
+ }
+
+ if(info->maxnlpc > 0) {
+ info->qlpc = (int*) pmalloc((ulong) (info->maxnlpc * sizeof(*info->qlpc)),info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ if (info->buffer) {
+ free(info->buffer);
+ info->buffer = NULL;
+ }
+ if (info->offset) {
+ free(info->offset);
+ info->offset = NULL;
+ }
+ trace ("failed to alloc qlpc\n");
+ return -1;
+ }
+ }
+
+ if(version > 1)
+ info->lpcqoffset = V2LPCQOFFSET;
+
+ init_offset (info->offset, info->nchan, MAX(1, info->nmean), info->internal_ftype);
+
+ /* get commands from file and execute them */
+ info->chan = 0;
+ info->version = version;
+ trace ("shn_init: success\n");
+ return 0;
+}
+
+static void
+shn_init_config (void) {
+	shn_cfg.error_output_method = ERROR_OUTPUT_DEVNULL;
+
+	deadbeef->conf_get_str ("shn.seektable_path", "", shn_cfg.seek_tables_path, sizeof (shn_cfg.seek_tables_path));
+	deadbeef->conf_get_str ("shn.relative_seektable_path", "seektables", shn_cfg.relative_seek_tables_path, sizeof (shn_cfg.relative_seek_tables_path));
+	shn_cfg.verbose = 0;
+	shn_cfg.swap_bytes = deadbeef->conf_get_int ("shn.swap_bytes", 0);
+}
+
+int
+shn_init(DB_fileinfo_t *_info, DB_playItem_t *it) {
+ trace ("shn_init\n");
+ shn_fileinfo_t *info = (shn_fileinfo_t *)_info;
+ shn_init_config ();
+
+	char data[4];
+ DB_FILE *f;
+
+	f = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ if (!f) {
+ trace ("shn: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ return -1;
+ }
+
+ int id3v2_tag_size = deadbeef->junk_get_leading_size (f);
+ if (id3v2_tag_size > 0) {
+ deadbeef->fseek (f, id3v2_tag_size, SEEK_SET);
+ }
+
+	if (deadbeef->fread((void *)data,1,4,f) != 4)
+	{
+		deadbeef->fclose(f);
+ trace ("shn: failed to read magic from %s\n", deadbeef->pl_find_meta (it, ":URI"));
+		return -1;
+	}
+	deadbeef->fclose(f);
+
+	if (memcmp(data,MAGIC,4)) {
+ trace ("shn: invalid MAGIC\n");
+		return -1;
+ }
+
+	if (!(info->shnfile = load_shn(deadbeef->pl_find_meta (it, ":URI")))) {
+ trace ("shn: load_shn failed\n");
+		return -1;
+ }
+
+ _info->fmt.bps = info->shnfile->wave_header.bits_per_sample;
+ _info->fmt.channels = info->shnfile->wave_header.channels;
+ _info->fmt.samplerate = info->shnfile->wave_header.samples_per_sec;
+ for (int i = 0; i < _info->fmt.channels; i++) {
+ _info->fmt.channelmask |= 1 << i;
+ }
+ _info->plugin = &plugin;
+
+ int totalsamples = info->shnfile->wave_header.length * info->shnfile->wave_header.samples_per_sec;
+ trace ("totalsamples: %d\n", totalsamples);
+
+ if (it->endsample > 0) {
+ info->startsample = it->startsample;
+ info->endsample = it->endsample;
+ plugin.seek_sample (_info, 0);
+ }
+ else {
+ info->startsample = 0;
+ info->endsample = totalsamples-1;
+ }
+
+ if (info->shnfile->wave_header.file_has_id3v2_tag) {
+ deadbeef->fseek (info->shnfile->vars.fd, info->shnfile->wave_header.file_has_id3v2_tag, SEEK_SET);
+ }
+ else {
+ deadbeef->rewind (info->shnfile->vars.fd);
+ }
+
+ if (shn_init_decoder (info) < 0) {
+ trace ("shn_init_decoder failed\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+void
+shn_free_decoder (shn_fileinfo_t *info) {
+ if (info->shnfile) {
+ if (info->shnfile->decode_state) {
+ if(info->shnfile->decode_state->writebuf != NULL) {
+ free(info->shnfile->decode_state->writebuf);
+ info->shnfile->decode_state->writebuf = NULL;
+ }
+ if(info->shnfile->decode_state->writefub != NULL) {
+ free(info->shnfile->decode_state->writefub);
+ info->shnfile->decode_state->writefub = NULL;
+ }
+ }
+ }
+}
+
+void
+shn_free (DB_fileinfo_t *_info) {
+ shn_fileinfo_t *info = (shn_fileinfo_t *)_info;
+ shn_free_decoder (info);
+ if (info->shnfile) {
+ shn_unload(info->shnfile);
+ info->shnfile = NULL;
+ }
+ if (info->buffer) {
+ free(info->buffer);
+ info->buffer = NULL;
+ }
+ if (info->offset) {
+ free(info->offset);
+ info->offset = NULL;
+ }
+ if(info->maxnlpc > 0 && info->qlpc) {
+ free(info->qlpc);
+ info->qlpc = NULL;
+ }
+ free (info);
+}
+
+void
+swap_bytes(shn_file *this_shn,int bytes)
+{
+	int i;
+	uchar tmp;
+
+	for (i=0;i<bytes;i=i+2) {
+		tmp = this_shn->vars.buffer[i+1];
+		this_shn->vars.buffer[i+1] = this_shn->vars.buffer[i];
+		this_shn->vars.buffer[i] = tmp;
+	}
+}
+
+int
+shn_decode (shn_fileinfo_t *info) {
+ int i;
+ int version = info->version;
+ while(1)
+ {
+ info->cmd = uvar_get(FNSIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: uvar_get error\n");
+ return -1;
+ }
+
+ switch(info->cmd)
+ {
+ case FN_ZERO:
+ case FN_DIFF0:
+ case FN_DIFF1:
+ case FN_DIFF2:
+ case FN_DIFF3:
+ case FN_QLPC:
+ {
+ slong coffset, *cbuffer = info->buffer[info->chan];
+ int resn = 0, nlpc, j;
+
+ if(info->cmd != FN_ZERO)
+ {
+ resn = uvar_get(ENERGYSIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 1\n");
+ return -1;
+ }
+ /* this is a hack as version 0 differed in definition of var_get */
+ if(info->version == 0)
+ resn--;
+ }
+
+ /* find mean offset : N.B. this code duplicated */
+ if(info->nmean == 0)
+ coffset = info->offset[info->chan][0];
+ else
+ {
+ slong sum = (info->version < 2) ? 0 : info->nmean / 2;
+ for(i = 0; i < info->nmean; i++)
+ sum += info->offset[info->chan][i];
+ if(info->version < 2)
+ coffset = sum / info->nmean;
+ else
+ coffset = ROUNDEDSHIFTDOWN(sum / info->nmean, info->bitshift);
+ }
+
+ switch(info->cmd)
+ {
+ case FN_ZERO:
+ for(i = 0; i < info->blocksize; i++)
+ cbuffer[i] = 0;
+ break;
+ case FN_DIFF0:
+ for(i = 0; i < info->blocksize; i++) {
+ cbuffer[i] = var_get(resn,info->shnfile) + coffset;
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 2\n");
+ return -1;
+ }
+ }
+ break;
+ case FN_DIFF1:
+ for(i = 0; i < info->blocksize; i++) {
+ cbuffer[i] = var_get(resn,info->shnfile) + cbuffer[i - 1];
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 3\n");
+ return -1;
+ }
+ }
+ break;
+ case FN_DIFF2:
+ for(i = 0; i < info->blocksize; i++) {
+ cbuffer[i] = var_get(resn,info->shnfile) + (2 * cbuffer[i - 1] -	cbuffer[i - 2]);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 4\n");
+ return -1;
+ }
+ }
+ break;
+ case FN_DIFF3:
+ for(i = 0; i < info->blocksize; i++) {
+ cbuffer[i] = var_get(resn,info->shnfile) + 3 * (cbuffer[i - 1] - cbuffer[i - 2]) + cbuffer[i - 3];
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 5\n");
+ return -1;
+ }
+ }
+ break;
+ case FN_QLPC:
+ nlpc = uvar_get(LPCQSIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 6\n");
+ return -1;
+ }
+
+ for(i = 0; i < nlpc; i++) {
+ info->qlpc[i] = var_get(LPCQUANT,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 7\n");
+ return -1;
+ }
+ }
+ for(i = 0; i < nlpc; i++)
+ cbuffer[i - nlpc] -= coffset;
+ for(i = 0; i < info->blocksize; i++)
+ {
+ slong sum = info->lpcqoffset;
+
+ for(j = 0; j < nlpc; j++)
+ sum += info->qlpc[j] * cbuffer[i - j - 1];
+ cbuffer[i] = var_get(resn,info->shnfile) + (sum >> LPCQUANT);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 8\n");
+ return -1;
+ }
+ }
+ if(coffset != 0)
+ for(i = 0; i < info->blocksize; i++)
+ cbuffer[i] += coffset;
+ break;
+ }
+
+ /* store mean value if appropriate : N.B. Duplicated code */
+ if(info->nmean > 0)
+ {
+ slong sum = (info->version < 2) ? 0 : info->blocksize / 2;
+
+ for(i = 0; i < info->blocksize; i++)
+ sum += cbuffer[i];
+
+ for(i = 1; i < info->nmean; i++)
+ info->offset[info->chan][i - 1] = info->offset[info->chan][i];
+ if(info->version < 2)
+ info->offset[info->chan][info->nmean - 1] = sum / info->blocksize;
+ else
+ info->offset[info->chan][info->nmean - 1] = (sum / info->blocksize) << info->bitshift;
+ }
+
+ /* do the wrap */
+ for(i = -info->nwrap; i < 0; i++)
+ cbuffer[i] = cbuffer[i + info->blocksize];
+
+ fix_bitshift(cbuffer, info->blocksize, info->bitshift, info->internal_ftype);
+
+ if(info->chan == info->nchan - 1)
+ {
+ if (!info->shnfile->vars.going || info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 9\n");
+ return -1;
+ }
+
+ fwrite_type(info->buffer, info->ftype, info->nchan, info->blocksize, info->shnfile);
+ info->chan = (info->chan + 1) % info->nchan;
+ // now we have buffer of size info->shnfile->vars.bytes_in_buf
+ if (shn_cfg.swap_bytes) {
+ swap_bytes(info->shnfile, info->shnfile->vars.bytes_in_buf);
+ }
+ return info->shnfile->vars.bytes_in_buf;
+
+
+// !!!!!!!!!!!!!!!!!!FIXME
+ // write_and_wait(info->shnfile,blk_size);
+
+#if 0 // seeking
+ if (info->shnfile->vars.seek_to != -1)
+ {
+ shn_seek_entry *seek_info;
+ int j;
+
+ shn_debug("Seeking to %d:%02d",info->shnfile->vars.seek_to/60,info->shnfile->vars.seek_to%60);
+
+ seek_info = shn_seek_entry_search(info->shnfile->seek_table,info->shnfile->vars.seek_to * (ulong)info->shnfile->wave_header.samples_per_sec,0,
+ (ulong)(info->shnfile->vars.seek_table_entries - 1),info->shnfile->vars.seek_resolution);
+
+ /* loop through number of channels in this file */
+ for (i=0;i<info->nchan;i++) {
+ /* load the three sample buffer values for this channel */
+ for (j=0;j<3;j++)
+ info->buffer[i][j-3] = shn_uchar_to_slong_le(seek_info->data+32+12*i-4*j);
+
+ /* load the variable number of offset history values for this channel */
+ for (j=0;j<MAX(1,info->nmean);j++)
+ info->offset[i][j] = shn_uchar_to_slong_le(seek_info->data+48+16*i+4*j);
+ }
+
+ info->bitshift = shn_uchar_to_ushort_le(seek_info->data+22);
+
+ info->seekto_offset = shn_uchar_to_ulong_le(seek_info->data+8) + info->shnfile->vars.seek_offset;
+
+ deadbeef->fseek(info->shnfile->vars.fd,(slong)seekto_offset,SEEK_SET);
+ deadbeef->fread((uchar*) info->shnfile->decode_state->getbuf, 1, BUFSIZ, info->shnfile->vars.fd);
+
+ info->shnfile->decode_state->getbufp = info->shnfile->decode_state->getbuf + shn_uchar_to_ushort_le(seek_info->data+14);
+ info->shnfile->decode_state->nbitget = shn_uchar_to_ushort_le(seek_info->data+16);
+ info->shnfile->decode_state->nbyteget = shn_uchar_to_ushort_le(seek_info->data+12);
+ info->shnfile->decode_state->gbuffer = shn_uchar_to_ulong_le(seek_info->data+18);
+
+ info->shnfile->vars.bytes_in_buf = 0;
+
+ shn_ip.output->flush(info->shnfile->vars.seek_to * 1000);
+ info->shnfile->vars.seek_to = -1;
+ }
+#endif
+
+ }
+ info->chan = (info->chan + 1) % info->nchan;
+ break;
+ }
+
+ break;
+
+ case FN_QUIT:
+ /* empty out last of buffer */
+ info->shnfile->vars.eof = 1;
+ if (shn_cfg.swap_bytes) {
+ swap_bytes(info->shnfile, info->shnfile->vars.bytes_in_buf);
+ }
+ return info->shnfile->vars.bytes_in_buf;
+#if 0
+ write_and_wait(info->shnfile,info->shnfile->vars.bytes_in_buf);
+ info->shnfile->vars.eof = 1;
+
+ while (1)
+ {
+ if (!info->shnfile->vars.going)
+ goto finish;
+ if (info->shnfile->vars.seek_to != -1)
+ {
+ var_get_quit(info->shnfile);
+ fwrite_type_quit(info->shnfile);
+
+ if (buffer) free((void *) buffer);
+ if (offset) free((void *) offset);
+ if(maxnlpc > 0 && qlpc)
+ free((void *) qlpc);
+
+ fseek(info->shnfile->vars.fd,0,SEEK_SET);
+ goto restart;
+ }
+ else
+ xmms_usleep(10000);
+ }
+
+ goto cleanup;
+#endif
+ break;
+
+ case FN_BLOCKSIZE:
+ info->blocksize = UINT_GET((int) (log((double) info->blocksize) / M_LN2), info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 10\n");
+ return -1;
+ }
+ break;
+ case FN_BITSHIFT:
+ info->bitshift = uvar_get(BITSHIFTSIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 11\n");
+ return -1;
+ }
+ break;
+ case FN_VERBATIM:
+ info->cklen = uvar_get(VERBATIM_CKSIZE_SIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 12\n");
+ return -1;
+ }
+
+ while (info->cklen--) {
+ info->tmp = (uchar)uvar_get(VERBATIM_BYTE_SIZE,info->shnfile);
+ if (info->shnfile->vars.fatal_error) {
+ trace ("shn_decode: error 13\n");
+ return -1;
+ }
+ }
+
+ break;
+
+ default:
+ shn_error_fatal(info->shnfile,"Sanity check fails trying to decode function: %d",info->cmd);
+ trace ("shn_decode: error 14\n");
+ return -1;
+ }
+ }
+ return 0;
+}
+
+int
+shn_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ shn_fileinfo_t *info = (shn_fileinfo_t *)_info;
+ int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
+ if (info->currentsample + size / samplesize > info->endsample) {
+ size = (info->endsample - info->currentsample + 1) * samplesize;
+ if (size <= 0) {
+ return 0;
+ }
+ }
+ int initsize = size;
+
+ while (size > 0) {
+ if (info->shnfile->vars.bytes_in_buf > 0) {
+ int n = size / samplesize;
+ int nsamples = info->shnfile->vars.bytes_in_buf / samplesize;
+ if (info->skipsamples > 0) {
+ int nskip = min(nsamples, info->skipsamples);
+ info->skipsamples -= nskip;
+ if (nskip == nsamples) {
+ info->shnfile->vars.bytes_in_buf = 0;
+ continue;
+ }
+ else {
+ memmove (info->shnfile->vars.buffer, info->shnfile->vars.buffer + nskip * samplesize, info->shnfile->vars.bytes_in_buf - nskip * samplesize);
+ nsamples -= nskip;
+ continue;
+ }
+ }
+ n = min (nsamples, n);
+ char *src = (char *)info->shnfile->vars.buffer;
+ memcpy (bytes, src, samplesize * n);
+ src += samplesize * n;
+ bytes += samplesize * n;
+ size -= n * samplesize;
+ if (n == info->shnfile->vars.bytes_in_buf / samplesize) {
+ info->shnfile->vars.bytes_in_buf = 0;
+ }
+ else {
+ memmove (info->shnfile->vars.buffer, src, info->shnfile->vars.bytes_in_buf - n * samplesize);
+ info->shnfile->vars.bytes_in_buf -= n * samplesize;
+ }
+ continue;
+ }
+ if (shn_decode (info) <= 0) {
+ trace ("shn_decode returned error\n");
+ break;
+ }
+ }
+
+ info->currentsample += (initsize-size) / samplesize;
+ if (size != 0) {
+ trace ("shn_read_int16 eof\n");
+ }
+ return initsize-size;
+}
+
+int
+shn_seek_sample (DB_fileinfo_t *_info, int sample) {
+ shn_fileinfo_t *info = (shn_fileinfo_t *)_info;
+
+ sample += info->startsample;
+
+ info->shnfile->vars.seek_to = sample / _info->fmt.samplerate;
+
+ if (info->shnfile->vars.seek_table_entries == NO_SEEK_TABLE) {
+ // seek by skipping samples from the start
+ if (sample > info->currentsample) {
+ info->skipsamples = sample - info->currentsample;
+ }
+ else {
+ // restart
+ shn_free_decoder (info);
+ deadbeef->rewind (info->shnfile->vars.fd);
+ if (shn_init_decoder (info) < 0) {
+ return -1;
+ }
+ info->skipsamples = sample;
+ }
+ info->currentsample = info->shnfile->vars.seek_to * _info->fmt.samplerate;
+ _info->readpos = info->shnfile->vars.seek_to;
+ return 0;
+ }
+
+ ulong seekto_offset;
+ int i, j;
+ shn_seek_entry *seek_info;
+
+ trace ("Seeking to %d:%02d\n",info->shnfile->vars.seek_to/60,info->shnfile->vars.seek_to%60);
+
+ seek_info = shn_seek_entry_search(info->shnfile->seek_table,info->shnfile->vars.seek_to * (ulong)info->shnfile->wave_header.samples_per_sec,0,
+ (ulong)(info->shnfile->vars.seek_table_entries - 1),info->shnfile->vars.seek_resolution);
+
+ /* loop through number of channels in this file */
+ for (i=0;i<info->nchan;i++) {
+ /* load the three sample buffer values for this channel */
+ for (j=0;j<3;j++)
+ info->buffer[i][j-3] = shn_uchar_to_slong_le(seek_info->data+32+12*i-4*j);
+
+ /* load the variable number of offset history values for this channel */
+ for (j=0;j<MAX(1,info->nmean);j++)
+ info->offset[i][j] = shn_uchar_to_slong_le(seek_info->data+48+16*i+4*j);
+ }
+
+ info->bitshift = shn_uchar_to_ushort_le(seek_info->data+22);
+
+ seekto_offset = shn_uchar_to_ulong_le(seek_info->data+8) + info->shnfile->vars.seek_offset;
+
+ deadbeef->fseek(info->shnfile->vars.fd,(slong)seekto_offset,SEEK_SET);
+ deadbeef->fread((uchar*) info->shnfile->decode_state->getbuf, 1, BUFSIZ, info->shnfile->vars.fd);
+
+ info->shnfile->decode_state->getbufp = info->shnfile->decode_state->getbuf + shn_uchar_to_ushort_le(seek_info->data+14);
+ info->shnfile->decode_state->nbitget = shn_uchar_to_ushort_le(seek_info->data+16);
+ info->shnfile->decode_state->nbyteget = shn_uchar_to_ushort_le(seek_info->data+12);
+ info->shnfile->decode_state->gbuffer = shn_uchar_to_ulong_le(seek_info->data+18);
+
+ info->shnfile->vars.bytes_in_buf = 0;
+
+ info->currentsample = info->shnfile->vars.seek_to * _info->fmt.samplerate;
+ _info->readpos = info->shnfile->vars.seek_to;
+ return 0;
+}
+
+int
+shn_seek (DB_fileinfo_t *_info, float time) {
+ return shn_seek_sample (_info, time * _info->fmt.samplerate);
+ return 0;
+}
+
+DB_playItem_t *
+shn_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+	shn_file *tmp_file;
+	DB_FILE *f;
+	char data[4];
+
+	f = deadbeef->fopen (fname);
+ if (!f) {
+ return NULL;
+ }
+ int64_t fsize = deadbeef->fgetlength (f);
+
+ int id3v2_tag_size = deadbeef->junk_get_leading_size (f);
+ if (id3v2_tag_size > 0) {
+ deadbeef->fseek (f, id3v2_tag_size, SEEK_SET);
+ }
+
+	if (deadbeef->fread((void *)data,1,4,f) != 4)
+	{
+		deadbeef->fclose(f);
+		return NULL;
+	}
+	deadbeef->fclose(f);
+
+	if (memcmp(data,MAGIC,4)) {
+ trace ("shn: invalid MAGIC\n");
+		return NULL;
+ }
+
+ shn_init_config ();
+	if (!(tmp_file = load_shn(fname))) {
+ trace ("shn: load_shn failed\n");
+		return NULL;
+ }
+
+	DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ deadbeef->pl_add_meta (it, ":FILETYPE", "Shorten");
+ deadbeef->plt_set_item_duration (plt, it, tmp_file->wave_header.length);
+
+ int apeerr = deadbeef->junk_apev2_read (it, tmp_file->vars.fd);
+ int v2err = deadbeef->junk_id3v2_read (it, tmp_file->vars.fd);
+ int v1err = deadbeef->junk_id3v1_read (it, tmp_file->vars.fd);
+
+	shn_unload(tmp_file);
+
+ char s[100];
+ snprintf (s, sizeof (s), "%lld", fsize);
+ deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
+ snprintf (s, sizeof (s), "%d", tmp_file->wave_header.bits_per_sample);
+ deadbeef->pl_add_meta (it, ":BPS", s);
+ snprintf (s, sizeof (s), "%d", tmp_file->wave_header.channels);
+ deadbeef->pl_add_meta (it, ":CHANNELS", s);
+ snprintf (s, sizeof (s), "%d", tmp_file->wave_header.samples_per_sec);
+ deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
+ int br = (int)roundf(fsize / (float)tmp_file->wave_header.length * 8 / 1000);
+ snprintf (s, sizeof (s), "%d", br);
+ deadbeef->pl_add_meta (it, ":BITRATE", s);
+ deadbeef->pl_add_meta (it, "title", NULL);
+
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ return after;
+}
+
+#define CAPMAXSCHAR(x) ((x > 127) ? 127 : x)
+#define CAPMAXUCHAR(x) ((x > 255) ? 255 : x)
+#define CAPMAXSHORT(x) ((x > 32767) ? 32767 : x)
+#define CAPMAXUSHORT(x) ((x > 65535) ? 65535 : x)
+
+static int sizeof_sample[TYPE_EOF];
+
+void init_sizeof_sample() {
+ sizeof_sample[TYPE_AU1] = sizeof(uchar);
+ sizeof_sample[TYPE_S8] = sizeof(schar);
+ sizeof_sample[TYPE_U8] = sizeof(uchar);
+ sizeof_sample[TYPE_S16HL] = sizeof(ushort);
+ sizeof_sample[TYPE_U16HL] = sizeof(ushort);
+ sizeof_sample[TYPE_S16LH] = sizeof(ushort);
+ sizeof_sample[TYPE_U16LH] = sizeof(ushort);
+ sizeof_sample[TYPE_ULAW] = sizeof(uchar);
+ sizeof_sample[TYPE_AU2] = sizeof(uchar);
+ sizeof_sample[TYPE_AU3] = sizeof(uchar);
+ sizeof_sample[TYPE_ALAW] = sizeof(uchar);
+}
+
+
+/***************/
+/* fixed write */
+/***************/
+
+void fwrite_type_init(shn_file *this_shn) {
+ init_sizeof_sample();
+ this_shn->decode_state->writebuf = (schar*) NULL;
+ this_shn->decode_state->writefub = (schar*) NULL;
+ this_shn->decode_state->nwritebuf = 0;
+}
+
+void fwrite_type_quit(shn_file *this_shn) {
+ if(this_shn->decode_state->writebuf != NULL) {
+ free(this_shn->decode_state->writebuf);
+ this_shn->decode_state->writebuf = NULL;
+ }
+ if(this_shn->decode_state->writefub != NULL) {
+ free(this_shn->decode_state->writefub);
+ this_shn->decode_state->writefub = NULL;
+ }
+}
+
+/* convert from signed ints to a given type and write */
+void fwrite_type(slong **data,int ftype,int nchan,int nitem,shn_file *this_shn)
+{
+ int hiloint = 1, hilo = !(*((char*) &hiloint));
+ int i, nwrite = 0, datasize = sizeof_sample[ftype], chan;
+ slong *data0 = data[0];
+ int bufAvailable = OUT_BUFFER_SIZE - this_shn->vars.bytes_in_buf;
+
+ if(this_shn->decode_state->nwritebuf < nchan * nitem * datasize) {
+ this_shn->decode_state->nwritebuf = nchan * nitem * datasize;
+ if(this_shn->decode_state->writebuf != NULL) free(this_shn->decode_state->writebuf);
+ if(this_shn->decode_state->writefub != NULL) free(this_shn->decode_state->writefub);
+ this_shn->decode_state->writebuf = (schar*) pmalloc((ulong) this_shn->decode_state->nwritebuf,this_shn);
+ if (!this_shn->decode_state->writebuf)
+ return;
+ this_shn->decode_state->writefub = (schar*) pmalloc((ulong) this_shn->decode_state->nwritebuf,this_shn);
+ if (!this_shn->decode_state->writefub)
+ return;
+ }
+
+ switch(ftype) {
+ case TYPE_AU1: /* leave the conversion to fix_bitshift() */
+ case TYPE_AU2: {
+ uchar *writebufp = (uchar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = data0[i];
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = data[chan][i];
+ break;
+ }
+ case TYPE_U8: {
+ uchar *writebufp = (uchar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = CAPMAXUCHAR(data0[i]);
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = CAPMAXUCHAR(data[chan][i]);
+ break;
+ }
+ case TYPE_S8: {
+ schar *writebufp = (schar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = CAPMAXSCHAR(data0[i]);
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = CAPMAXSCHAR(data[chan][i]);
+ break;
+ }
+ case TYPE_S16HL:
+ case TYPE_S16LH: {
+ short *writebufp = (short*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = CAPMAXSHORT(data0[i]);
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = CAPMAXSHORT(data[chan][i]);
+ break;
+ }
+ case TYPE_U16HL:
+ case TYPE_U16LH: {
+ ushort *writebufp = (ushort*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = CAPMAXUSHORT(data0[i]);
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = CAPMAXUSHORT(data[chan][i]);
+ break;
+ }
+ case TYPE_ULAW: {
+ uchar *writebufp = (uchar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = Slinear2ulaw(CAPMAXSHORT((data0[i] << 3)));
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = Slinear2ulaw(CAPMAXSHORT((data[chan][i] << 3)));
+ break;
+ }
+ case TYPE_AU3: {
+ uchar *writebufp = (uchar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ if(data0[i] < 0)
+ *writebufp++ = (127 - data0[i]) ^ 0xd5;
+ else
+ *writebufp++ = (data0[i] + 128) ^ 0x55;
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ if(data[chan][i] < 0)
+ *writebufp++ = (127 - data[chan][i]) ^ 0xd5;
+ else
+ *writebufp++ = (data[chan][i] + 128) ^ 0x55;
+ break;
+ }
+ case TYPE_ALAW: {
+ uchar *writebufp = (uchar*) this_shn->decode_state->writebuf;
+ if(nchan == 1)
+ for(i = 0; i < nitem; i++)
+ *writebufp++ = Slinear2alaw(CAPMAXSHORT((data0[i] << 3)));
+ else
+ for(i = 0; i < nitem; i++)
+ for(chan = 0; chan < nchan; chan++)
+ *writebufp++ = Slinear2alaw(CAPMAXSHORT((data[chan][i] << 3)));
+ break;
+ }
+ }
+
+ switch(ftype) {
+ case TYPE_AU1:
+ case TYPE_S8:
+ case TYPE_U8:
+ case TYPE_ULAW:
+ case TYPE_AU2:
+ case TYPE_AU3:
+ case TYPE_ALAW:
+ if (datasize*nchan*nitem <= bufAvailable) {
+ memcpy((void *)&this_shn->vars.buffer[this_shn->vars.bytes_in_buf],(const void *)this_shn->decode_state->writebuf,datasize*nchan*nitem);
+ this_shn->vars.bytes_in_buf += datasize*nchan*nitem;
+ nwrite = nitem;
+ }
+ else
+ shn_debug("Buffer overrun in fwrite_type() [case 1]: %d bytes to read, but only %d bytes are available",datasize*nchan*nitem,bufAvailable);
+ break;
+ case TYPE_S16HL:
+ case TYPE_U16HL:
+ if(hilo)
+ {
+ if (datasize*nchan*nitem <= bufAvailable) {
+ memcpy((void *)&this_shn->vars.buffer[this_shn->vars.bytes_in_buf],(const void *)this_shn->decode_state->writebuf,datasize*nchan*nitem);
+ this_shn->vars.bytes_in_buf += datasize*nchan*nitem;
+ nwrite = nitem;
+ }
+ else
+ shn_debug("Buffer overrun in fwrite_type() [case 2]: %d bytes to read, but only %d bytes are available",datasize*nchan*nitem,bufAvailable);
+ }
+ else
+ {
+ swab(this_shn->decode_state->writebuf, this_shn->decode_state->writefub, datasize * nchan * nitem);
+ if (datasize*nchan*nitem <= bufAvailable) {
+ memcpy((void *)&this_shn->vars.buffer[this_shn->vars.bytes_in_buf],(const void *)this_shn->decode_state->writefub,datasize*nchan*nitem);
+ this_shn->vars.bytes_in_buf += datasize*nchan*nitem;
+ nwrite = nitem;
+ }
+ else
+ shn_debug("Buffer overrun in fwrite_type() [case 3]: %d bytes to read, but only %d bytes are available",datasize*nchan*nitem,bufAvailable);
+ }
+ break;
+ case TYPE_S16LH:
+ case TYPE_U16LH:
+ if(hilo)
+ {
+ swab(this_shn->decode_state->writebuf, this_shn->decode_state->writefub, datasize * nchan * nitem);
+ if (datasize*nchan*nitem <= bufAvailable) {
+ memcpy((void *)&this_shn->vars.buffer[this_shn->vars.bytes_in_buf],(const void *)this_shn->decode_state->writefub,datasize*nchan*nitem);
+ this_shn->vars.bytes_in_buf += datasize*nchan*nitem;
+ nwrite = nitem;
+ }
+ else
+ shn_debug("Buffer overrun in fwrite_type() [case 4]: %d bytes to read, but only %d bytes are available",datasize*nchan*nitem,bufAvailable);
+ }
+ else
+ {
+ if (datasize*nchan*nitem <= bufAvailable) {
+ memcpy((void *)&this_shn->vars.buffer[this_shn->vars.bytes_in_buf],(const void *)this_shn->decode_state->writebuf,datasize*nchan*nitem);
+ this_shn->vars.bytes_in_buf += datasize*nchan*nitem;
+ nwrite = nitem;
+ }
+ else
+ shn_debug("Buffer overrun in fwrite_type() [case 5]: %d bytes to read, but only %d bytes are available",datasize*nchan*nitem,bufAvailable);
+ }
+ break;
+ }
+
+ if(nwrite != nitem)
+ shn_error_fatal(this_shn,"Failed to write decompressed stream -\npossible corrupt or truncated file");
+}
+
+/*************/
+/* bitshifts */
+/*************/
+
+void fix_bitshift(buffer, nitem, bitshift, ftype) slong *buffer; int nitem,
+ bitshift, ftype; {
+ int i;
+
+ if(ftype == TYPE_AU1)
+ for(i = 0; i < nitem; i++)
+ buffer[i] = ulaw_outward[bitshift][buffer[i] + 128];
+ else if(ftype == TYPE_AU2)
+ for(i = 0; i < nitem; i++) {
+ if(buffer[i] >= 0)
+	buffer[i] = ulaw_outward[bitshift][buffer[i] + 128];
+ else if(buffer[i] == -1)
+	buffer[i] = NEGATIVE_ULAW_ZERO;
+ else
+	buffer[i] = ulaw_outward[bitshift][buffer[i] + 129];
+ }
+ else
+ if(bitshift != 0)
+ for(i = 0; i < nitem; i++)
+	buffer[i] <<= bitshift;
+}
+
+int get_wave_header(shn_file *this_shn)
+{
+ slong **buffer = NULL, **offset = NULL;
+ slong lpcqoffset = 0;
+ int version = FORMAT_VERSION, bitshift = 0;
+ int ftype = TYPE_EOF;
+ char *magic = MAGIC;
+ int blocksize = DEFAULT_BLOCK_SIZE, nchan = DEFAULT_NCHAN;
+ int i, chan, nwrap, nskip = DEFAULT_NSKIP;
+ int *qlpc = NULL, maxnlpc = DEFAULT_MAXNLPC, nmean = UNDEFINED_UINT;
+ int cmd;
+ int internal_ftype;
+ int cklen;
+ int retval = 0;
+
+ if (!init_decode_state(this_shn))
+ return 0;
+
+ /***********************/
+ /* EXTRACT starts here */
+ /***********************/
+
+ /* read magic number */
+#ifdef STRICT_FORMAT_COMPATABILITY
+ if(FORMAT_VERSION < 2)
+ {
+ for(i = 0; i < strlen(magic); i++) {
+ if(getc_exit(this_shn->vars.fd) != magic[i])
+ return 0;
+ this_shn->vars.bytes_read++;
+ }
+
+ /* get version number */
+ version = getc_exit(this_shn->vars.fd);
+ this_shn->vars.bytes_read++;
+ }
+ else
+#endif /* STRICT_FORMAT_COMPATABILITY */
+ {
+ int nscan = 0;
+
+ version = MAX_VERSION + 1;
+ while(version > MAX_VERSION)
+ {
+ int byte = ddb_getc(this_shn->vars.fd);
+ this_shn->vars.bytes_read++;
+ if(byte == EOF)
+ return 0;
+ if(magic[nscan] != '\0' && byte == magic[nscan])
+ nscan++;
+ else
+ if(magic[nscan] == '\0' && byte <= MAX_VERSION)
+ version = byte;
+ else
+ {
+ if(byte == magic[0])
+ nscan = 1;
+ else
+ {
+ nscan = 0;
+ }
+ version = MAX_VERSION + 1;
+ }
+ }
+ }
+
+ /* check version number */
+ if(version > MAX_SUPPORTED_VERSION)
+ return 0;
+
+ /* set up the default nmean, ignoring the command line state */
+ nmean = (version < 2) ? DEFAULT_V0NMEAN : DEFAULT_V2NMEAN;
+
+ /* initialise the variable length file read for the compressed stream */
+ var_get_init(this_shn);
+ if (this_shn->vars.fatal_error)
+ return 0;
+
+ /* initialise the fixed length file write for the uncompressed stream */
+ fwrite_type_init(this_shn);
+
+ /* get the internal file type */
+ internal_ftype = UINT_GET(TYPESIZE, this_shn);
+
+ /* has the user requested a change in file type? */
+ if(internal_ftype != ftype) {
+ if(ftype == TYPE_EOF) {
+ ftype = internal_ftype; /* no problems here */
+ }
+ else { /* check that the requested conversion is valid */
+ if(internal_ftype == TYPE_AU1 || internal_ftype == TYPE_AU2 ||
+ internal_ftype == TYPE_AU3 || ftype == TYPE_AU1 ||ftype == TYPE_AU2 || ftype == TYPE_AU3)
+ {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ }
+
+ nchan = UINT_GET(CHANSIZE, this_shn);
+ this_shn->vars.actual_nchan = nchan;
+
+ /* get blocksize if version > 0 */
+ if(version > 0)
+ {
+ int byte;
+ blocksize = UINT_GET((int) (log((double) DEFAULT_BLOCK_SIZE) / M_LN2),this_shn);
+ maxnlpc = UINT_GET(LPCQSIZE, this_shn);
+ this_shn->vars.actual_maxnlpc = maxnlpc;
+ nmean = UINT_GET(0, this_shn);
+ this_shn->vars.actual_nmean = nmean;
+ nskip = UINT_GET(NSKIPSIZE, this_shn);
+ for(i = 0; i < nskip; i++)
+ {
+ byte = uvar_get(XBYTESIZE,this_shn);
+ }
+ }
+ else
+ blocksize = DEFAULT_BLOCK_SIZE;
+
+ nwrap = MAX(NWRAP, maxnlpc);
+
+ /* grab some space for the input buffer */
+ buffer = long2d((ulong) nchan, (ulong) (blocksize + nwrap),this_shn);
+ if (this_shn->vars.fatal_error)
+ return 0;
+ offset = long2d((ulong) nchan, (ulong) MAX(1, nmean),this_shn);
+ if (this_shn->vars.fatal_error) {
+ if (buffer) {
+ free(buffer);
+ buffer = NULL;
+ }
+ return 0;
+ }
+
+ for(chan = 0; chan < nchan; chan++)
+ {
+ for(i = 0; i < nwrap; i++)
+ buffer[chan][i] = 0;
+ buffer[chan] += nwrap;
+ }
+
+ if(maxnlpc > 0) {
+ qlpc = (int*) pmalloc((ulong) (maxnlpc * sizeof(*qlpc)),this_shn);
+ if (this_shn->vars.fatal_error) {
+ if (buffer) {
+ free(buffer);
+ buffer = NULL;
+ }
+ if (offset) {
+ free(offset);
+ buffer = NULL;
+ }
+ return 0;
+ }
+ }
+
+ if(version > 1)
+ lpcqoffset = V2LPCQOFFSET;
+
+ init_offset(offset, nchan, MAX(1, nmean), internal_ftype);
+
+ /* get commands from file and execute them */
+ chan = 0;
+ while(1)
+ {
+ this_shn->vars.reading_function_code = 1;
+ cmd = uvar_get(FNSIZE,this_shn);
+ this_shn->vars.reading_function_code = 0;
+
+ switch(cmd)
+ {
+ case FN_ZERO:
+ case FN_DIFF0:
+ case FN_DIFF1:
+ case FN_DIFF2:
+ case FN_DIFF3:
+ case FN_QLPC:
+ {
+ slong coffset, *cbuffer = buffer[chan];
+ int resn = 0, nlpc, j;
+
+ if(cmd != FN_ZERO)
+ {
+ resn = uvar_get(ENERGYSIZE,this_shn);
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ /* this is a hack as version 0 differed in definition of var_get */
+ if(version == 0)
+ resn--;
+ }
+
+ /* find mean offset : N.B. this code duplicated */
+ if(nmean == 0)
+ coffset = offset[chan][0];
+ else
+ {
+ slong sum = (version < 2) ? 0 : nmean / 2;
+ for(i = 0; i < nmean; i++)
+ sum += offset[chan][i];
+ if(version < 2)
+ coffset = sum / nmean;
+ else
+ coffset = ROUNDEDSHIFTDOWN(sum / nmean, bitshift);
+ }
+
+ switch(cmd)
+ {
+ case FN_ZERO:
+ for(i = 0; i < blocksize; i++)
+ cbuffer[i] = 0;
+ break;
+ case FN_DIFF0:
+ for(i = 0; i < blocksize; i++) {
+ cbuffer[i] = var_get(resn,this_shn) + coffset;
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ break;
+ case FN_DIFF1:
+ for(i = 0; i < blocksize; i++) {
+ cbuffer[i] = var_get(resn,this_shn) + cbuffer[i - 1];
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ break;
+ case FN_DIFF2:
+ for(i = 0; i < blocksize; i++) {
+ cbuffer[i] = var_get(resn,this_shn) + (2 * cbuffer[i - 1] -	cbuffer[i - 2]);
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ break;
+ case FN_DIFF3:
+ for(i = 0; i < blocksize; i++) {
+ cbuffer[i] = var_get(resn,this_shn) + 3 * (cbuffer[i - 1] - cbuffer[i - 2]) + cbuffer[i - 3];
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ break;
+ case FN_QLPC:
+ nlpc = uvar_get(LPCQSIZE,this_shn);
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+
+ for(i = 0; i < nlpc; i++) {
+ qlpc[i] = var_get(LPCQUANT,this_shn);
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ for(i = 0; i < nlpc; i++)
+ cbuffer[i - nlpc] -= coffset;
+ for(i = 0; i < blocksize; i++)
+ {
+ slong sum = lpcqoffset;
+
+ for(j = 0; j < nlpc; j++)
+ sum += qlpc[j] * cbuffer[i - j - 1];
+ cbuffer[i] = var_get(resn,this_shn) + (sum >> LPCQUANT);
+ if (this_shn->vars.fatal_error) {
+ retval = 0;
+ goto got_enough_data;
+ }
+ }
+ if(coffset != 0)
+ for(i = 0; i < blocksize; i++)
+ cbuffer[i] += coffset;
+ break;
+ }
+
+ /* store mean value if appropriate : N.B. Duplicated code */
+ if(nmean > 0)
+ {
+ slong sum = (version < 2) ? 0 : blocksize / 2;
+
+ for(i = 0; i < blocksize; i++)
+ sum += cbuffer[i];
+
+ for(i = 1; i < nmean; i++)
+ offset[chan][i - 1] = offset[chan][i];
+ if(version < 2)
+ offset[chan][nmean - 1] = sum / blocksize;
+ else
+ offset[chan][nmean - 1] = (sum / blocksize) << bitshift;
+ }
+
+ if (0 == chan) {
+ this_shn->vars.initial_file_position = this_shn->vars.last_file_position_no_really;
+ goto got_enough_data;
+ }
+
+ /* do the wrap */
+ for(i = -nwrap; i < 0; i++)
+ cbuffer[i] = cbuffer[i + blocksize];
+
+ fix_bitshift(cbuffer, blocksize, bitshift, internal_ftype);
+
+ if(chan == nchan - 1)
+ {
+ fwrite_type(buffer, ftype, nchan, blocksize, this_shn);
+ this_shn->vars.bytes_in_buf = 0;
+ }
+
+ chan = (chan + 1) % nchan;
+ break;
+ }
+ break;
+
+ case FN_BLOCKSIZE:
+ UINT_GET((int) (log((double) blocksize) / M_LN2), this_shn);
+ break;
+
+ case FN_VERBATIM:
+ cklen = uvar_get(VERBATIM_CKSIZE_SIZE,this_shn);
+
+ while (cklen--) {
+ if (this_shn->vars.bytes_in_header >= OUT_BUFFER_SIZE) {
+ shn_debug("Unexpectedly large header - " PACKAGE " can only handle a maximum of %d bytes",OUT_BUFFER_SIZE);
+ goto got_enough_data;
+ }
+ this_shn->vars.bytes_in_buf = 0;
+ this_shn->vars.header[this_shn->vars.bytes_in_header++] = (char)uvar_get(VERBATIM_BYTE_SIZE,this_shn);
+ }
+ retval = 1;
+ break;
+
+ case FN_BITSHIFT:
+ bitshift = uvar_get(BITSHIFTSIZE,this_shn);
+ this_shn->vars.actual_bitshift = bitshift;
+ break;
+
+ default:
+ goto got_enough_data;
+ }
+ }
+
+got_enough_data:
+
+ /* wind up */
+ var_get_quit(this_shn);
+ fwrite_type_quit(this_shn);
+
+ if (buffer) free((void *) buffer);
+ if (offset) free((void *) offset);
+ if(maxnlpc > 0 && qlpc)
+ free((void *) qlpc);
+
+ this_shn->vars.bytes_in_buf = 0;
+
+ return retval;
+}
+
+void shn_unload(shn_file *this_shn)
+{
+	if (this_shn)
+	{
+		if (this_shn->vars.fd)
+		{
+			deadbeef->fclose(this_shn->vars.fd);
+			this_shn->vars.fd = NULL;
+		}
+
+		if (this_shn->decode_state)
+		{
+			if (this_shn->decode_state->getbuf)
+			{
+				free(this_shn->decode_state->getbuf);
+				this_shn->decode_state->getbuf = NULL;
+			}
+
+			if (this_shn->decode_state->writebuf)
+			{
+				free(this_shn->decode_state->writebuf);
+				this_shn->decode_state->writebuf = NULL;
+			}
+
+			if (this_shn->decode_state->writefub)
+			{
+				free(this_shn->decode_state->writefub);
+				this_shn->decode_state->writefub = NULL;
+			}
+
+			free(this_shn->decode_state);
+			this_shn->decode_state = NULL;
+		}
+
+		if (this_shn->seek_table)
+		{
+			free(this_shn->seek_table);
+			this_shn->seek_table = NULL;
+		}
+
+		free(this_shn);
+		this_shn = NULL;
+	}
+}
+
+shn_file *load_shn(const char *filename)
+{
+	shn_file *tmp_file;
+ shn_seek_entry *first_seek_table;
+
+	shn_debug("Loading file: '%s'",filename);
+
+	if (!(tmp_file = malloc(sizeof(shn_file))))
+	{
+		shn_debug("Could not allocate memory for SHN data structure");
+		return NULL;
+	}
+
+	memset(tmp_file, 0, sizeof(shn_file));
+
+	tmp_file->vars.fd = NULL;
+	tmp_file->vars.seek_to = -1;
+	tmp_file->vars.eof = 0;
+	tmp_file->vars.going = 0;
+	tmp_file->vars.seek_table_entries = NO_SEEK_TABLE;
+	tmp_file->vars.bytes_in_buf = 0;
+	tmp_file->vars.bytes_in_header = 0;
+	tmp_file->vars.reading_function_code = 0;
+	tmp_file->vars.initial_file_position = 0;
+	tmp_file->vars.last_file_position = 0;
+	tmp_file->vars.last_file_position_no_really = 0;
+	tmp_file->vars.bytes_read = 0;
+	tmp_file->vars.actual_bitshift = 0;
+	tmp_file->vars.actual_maxnlpc = 0;
+	tmp_file->vars.actual_nmean = 0;
+	tmp_file->vars.actual_nchan = 0;
+	tmp_file->vars.seek_offset = 0;
+
+	tmp_file->decode_state = NULL;
+
+	tmp_file->wave_header.filename = filename;
+	tmp_file->wave_header.wave_format = 0;
+	tmp_file->wave_header.channels = 0;
+	tmp_file->wave_header.block_align = 0;
+	tmp_file->wave_header.bits_per_sample = 0;
+	tmp_file->wave_header.samples_per_sec = 0;
+	tmp_file->wave_header.avg_bytes_per_sec = 0;
+	tmp_file->wave_header.rate = 0;
+	tmp_file->wave_header.header_size = 0;
+	tmp_file->wave_header.data_size = 0;
+	tmp_file->wave_header.file_has_id3v2_tag = 0;
+	tmp_file->wave_header.id3v2_tag_size = 0;
+
+	tmp_file->seek_header.version = NO_SEEK_TABLE;
+	tmp_file->seek_header.shnFileSize = 0;
+
+	tmp_file->seek_trailer.seekTableSize = 0;
+
+	tmp_file->seek_table = NULL;
+
+ tmp_file->vars.fd = deadbeef->fopen (filename);
+ if (!tmp_file->vars.fd) {
+		shn_debug("Could not open file: '%s'",filename);
+		shn_unload(tmp_file);
+		return NULL;
+ }
+
+ tmp_file->wave_header.id3v2_tag_size = deadbeef->junk_get_leading_size (tmp_file->vars.fd);
+ if (tmp_file->wave_header.id3v2_tag_size > 0) {
+ tmp_file->wave_header.file_has_id3v2_tag = 2;
+ trace ("found id3v2 tag, size: %d\n", tmp_file->wave_header.id3v2_tag_size);
+ if (0 != deadbeef->fseek(tmp_file->vars.fd,(long)tmp_file->wave_header.id3v2_tag_size,SEEK_SET)) {
+ shn_debug("Error while discarding ID3v2 tag in file '%s'.",filename);
+ deadbeef->rewind (tmp_file->vars.fd);
+ }
+ }
+
+	if (0 == get_wave_header(tmp_file))
+	{
+		shn_debug("Unable to read WAVE header from file '%s'",filename);
+		shn_unload(tmp_file);
+		return NULL;
+	}
+
+	if (tmp_file->wave_header.file_has_id3v2_tag)
+	{
+		deadbeef->fseek(tmp_file->vars.fd,tmp_file->wave_header.id3v2_tag_size,SEEK_SET);
+		tmp_file->vars.bytes_read += tmp_file->wave_header.id3v2_tag_size;
+		tmp_file->vars.seek_offset = tmp_file->wave_header.id3v2_tag_size;
+	}
+ else
+	{
+		deadbeef->fseek(tmp_file->vars.fd,0,SEEK_SET);
+	}
+
+	if (0 == shn_verify_header(tmp_file))
+	{
+		shn_debug("Invalid WAVE header in file: '%s'",filename);
+		shn_unload(tmp_file);
+		return NULL;
+	}
+
+	if (tmp_file->decode_state)
+	{
+		free(tmp_file->decode_state);
+		tmp_file->decode_state = NULL;
+	}
+
+	shn_load_seek_table(tmp_file,filename);
+
+	if (NO_SEEK_TABLE != tmp_file->vars.seek_table_entries)
+	{
+		/* verify seek tables */
+
+		first_seek_table = (shn_seek_entry *)tmp_file->seek_table;
+
+		if (tmp_file->vars.actual_bitshift != shn_uchar_to_ushort_le(first_seek_table->data+22))
+		{
+			/* initial bitshift value in the file does not match the first bitshift value of the first seektable entry - seeking is broken */
+			shn_debug("Broken seek table detected (invalid bitshift) - seeking disabled for this file.");
+			tmp_file->vars.seek_table_entries = NO_SEEK_TABLE;
+		}
+		else if (tmp_file->vars.actual_nchan > 2)
+		{
+			/* nchan is greater than the number of such entries stored in a seek table entry - seeking won't work */
+			shn_debug("Broken seek table detected (nchan %d not in range [1 .. 2]) - seeking disabled for this file.",tmp_file->vars.actual_nchan);
+			tmp_file->vars.seek_table_entries = NO_SEEK_TABLE;
+		}
+		else if (tmp_file->vars.actual_maxnlpc > 3)
+		{
+			/* maxnlpc is greater than the number of such entries stored in a seek table entry - seeking won't work */
+			shn_debug("Broken seek table detected (maxnlpc %d not in range [0 .. 3]) - seeking disabled for this file.",tmp_file->vars.actual_maxnlpc);
+			tmp_file->vars.seek_table_entries = NO_SEEK_TABLE;
+		}
+		else if (tmp_file->vars.actual_nmean > 4)
+		{
+			/* nmean is greater than the number of such entries stored in a seek table entry - seeking won't work */
+			shn_debug("Broken seek table detected (nmean %d not in range [0 .. 4]) - seeking disabled for this file.",tmp_file->vars.actual_nmean);
+			tmp_file->vars.seek_table_entries = NO_SEEK_TABLE;
+		}
+		else
+		{
+			/* seek table appears to be valid - now adjust byte offsets in seek table to match the file */
+			tmp_file->vars.seek_offset += tmp_file->vars.initial_file_position - shn_uchar_to_ulong_le(first_seek_table->data+8);
+
+			if (0 != tmp_file->vars.seek_offset)
+			{
+				shn_debug("Adjusting seek table offsets by %ld bytes due to mismatch between seek table values and input file - seeking might not work correctly.",
+					tmp_file->vars.seek_offset);
+			}
+		}
+	}
+
+	shn_debug("Successfully loaded file: '%s'",filename);
+
+	return tmp_file;
+}
+
+#if 0
+void write_and_wait(shn_file *this_shn,int block_size)
+{
+	int bytes_to_write,bytes_in_block,i;
+
+	if (this_shn->vars.bytes_in_buf < block_size)
+		return;
+
+	bytes_in_block = min(this_shn->vars.bytes_in_buf, block_size);
+
+	if (bytes_in_block <= 0)
+		return;
+
+	bytes_to_write = bytes_in_block;
+	while ((bytes_to_write + bytes_in_block) <= this_shn->vars.bytes_in_buf)
+		bytes_to_write += bytes_in_block;
+
+	shn_ip.add_vis_pcm(shn_ip.output->written_time(), (this_shn->wave_header.bits_per_sample == 16) ? FMT_S16_LE : FMT_U8,
+		this_shn->wave_header.channels, bytes_to_write, this_shn->vars.buffer);
+
+	while(shn_ip.output->buffer_free() < bytes_to_write && this_shn->vars.going && this_shn->vars.seek_to == -1)
+		xmms_usleep(10000);
+
+	if(this_shn->vars.going && this_shn->vars.seek_to == -1) {
+		if (shn_cfg.swap_bytes)
+			swap_bytes(this_shn, bytes_to_write);
+		shn_ip.output->write_audio(this_shn->vars.buffer, bytes_to_write);
+	} else
+		return;
+
+	/* shift data from end of buffer to the front */
+	this_shn->vars.bytes_in_buf -= bytes_to_write;
+
+	for(i=0;i<this_shn->vars.bytes_in_buf;i++)
+		this_shn->vars.buffer[i] = this_shn->vars.buffer[i+bytes_to_write];
+}
+#endif
+
+static const char * exts[] = { "shn", NULL };
+
+static const char settings_dlg[] =
+ "property \"Relative seek table path\" entry shn.relative_seektable_path seektables;\n"
+ "property \"Absolute seek table path\" entry shn.seektable_path \"\";\n"
+ "property \"Swap audio bytes (toggle if all you hear is static)\" checkbox shn.swap_bytes 0;\n"
+;
+
+// define plugin interface
+static DB_decoder_t plugin = {
+ .plugin.api_vmajor = 1,
+ .plugin.api_vminor = 0,
+ .plugin.version_major = 1,
+ .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_DECODER,
+ .plugin.id = "shn",
+ .plugin.name = "Shorten player",
+ .plugin.descr = "decodes shn files",
+ .plugin.copyright = 
+ "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/\n"
+ "Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>\n"
+ "\n"
+ "This program is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License\n"
+ "as published by the Free Software Foundation; either version 2\n"
+ "of the License, or (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, USA.\n"
+ ,
+ .plugin.website = "http://deadbeef.sf.net",
+ .plugin.configdialog = settings_dlg,
+ .open = shn_open,
+ .init = shn_init,
+ .free = shn_free,
+ .read = shn_read,
+ .seek = shn_seek,
+ .seek_sample = shn_seek_sample,
+ .insert = shn_insert,
+ .exts = exts,
+};
+
+DB_plugin_t *
+ddb_shn_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/shn.h Added

@@ -0,0 +1,274 @@
+/* xmms-shn - a shorten (.shn) plugin for XMMS
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: shn.h,v 1.27 2007/03/23 05:49:48 jason Exp $
+ */
+
+#ifndef _SHN_H
+#define _SHN_H
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include "../../deadbeef.h"
+
+extern DB_functions_t *deadbeef;
+
+#define shn_vsnprintf(a,b,c,d) vsnprintf(a,b,c,d)
+
+#define	min(a,b)			(((a)<(b))?(a):(b))
+
+/* surely no headers will be this large. right? RIGHT? */
+#define OUT_BUFFER_SIZE			16384
+
+#define BUF_SIZE 4096
+
+#define	ERROR_OUTPUT_DEVNULL		0
+#define	ERROR_OUTPUT_STDERR		1
+#define	ERROR_OUTPUT_WINDOW		2
+
+#define	SEEK_SUFFIX			"skt"
+
+#define	NO_SEEK_TABLE			-1
+
+#define	SEEK_HEADER_SIGNATURE		"SEEK"
+#define	SEEK_TRAILER_SIGNATURE		"SHNAMPSK"
+
+#define SEEK_HEADER_SIZE		12
+#define SEEK_TRAILER_SIZE		12
+#define SEEK_ENTRY_SIZE			80
+#define SEEK_RESOLUTION			25600
+
+#define WAVE_RIFF (0x46464952) /* 'RIFF' in little-endian */
+#define WAVE_WAVE (0x45564157) /* 'WAVE' in little-endian */
+#define WAVE_FMT (0x20746d66) /* ' fmt' in little-endian */
+#define WAVE_DATA (0x61746164) /* 'data' in little-endian */
+
+#define AIFF_FORM (0x4D524F46) /* 'FORM' in little-endian */
+
+#define WAVE_FORMAT_UNKNOWN (0x0000)
+#define WAVE_FORMAT_PCM (0x0001)
+#define WAVE_FORMAT_ADPCM (0x0002)
+#define WAVE_FORMAT_IEEE_FLOAT (0x0003)
+#define WAVE_FORMAT_ALAW (0x0006)
+#define WAVE_FORMAT_MULAW (0x0007)
+#define WAVE_FORMAT_OKI_ADPCM (0x0010)
+#define WAVE_FORMAT_IMA_ADPCM (0x0011)
+#define WAVE_FORMAT_DIGISTD (0x0015)
+#define WAVE_FORMAT_DIGIFIX (0x0016)
+#define WAVE_FORMAT_DOLBY_AC2 (0x0030)
+#define WAVE_FORMAT_GSM610 (0x0031)
+#define WAVE_FORMAT_ROCKWELL_ADPCM (0x003b)
+#define WAVE_FORMAT_ROCKWELL_DIGITALK (0x003c)
+#define WAVE_FORMAT_G721_ADPCM (0x0040)
+#define WAVE_FORMAT_G728_CELP (0x0041)
+#define WAVE_FORMAT_MPEG (0x0050)
+#define WAVE_FORMAT_MPEGLAYER3 (0x0055)
+#define WAVE_FORMAT_G726_ADPCM (0x0064)
+#define WAVE_FORMAT_G722_ADPCM (0x0065)
+
+#define CD_BLOCK_SIZE (2352)
+#define CD_BLOCKS_PER_SEC (75)
+#define CD_MIN_BURNABLE_SIZE (705600)
+#define CD_CHANNELS (2)
+#define CD_SAMPLES_PER_SEC (44100)
+#define CD_BITS_PER_SAMPLE (16)
+#define CD_RATE (176400)
+
+#define CANONICAL_HEADER_SIZE (44)
+
+#define PROBLEM_NOT_CD_QUALITY (0x00000001)
+#define PROBLEM_CD_BUT_BAD_BOUND (0x00000002)
+#define PROBLEM_CD_BUT_TOO_SHORT (0x00000004)
+#define PROBLEM_HEADER_NOT_CANONICAL (0x00000008)
+#define PROBLEM_EXTRA_CHUNKS (0x00000010)
+#define PROBLEM_HEADER_INCONSISTENT (0x00000020)
+
+#define PROB_NOT_CD(f) ((f.problems) & (PROBLEM_NOT_CD_QUALITY))
+#define PROB_BAD_BOUND(f) ((f.problems) & (PROBLEM_CD_BUT_BAD_BOUND))
+#define PROB_TOO_SHORT(f) ((f.problems) & (PROBLEM_CD_BUT_TOO_SHORT))
+#define PROB_HDR_NOT_CANONICAL(f) ((f.problems) & (PROBLEM_HEADER_NOT_CANONICAL))
+#define PROB_EXTRA_CHUNKS(f) ((f.problems) & (PROBLEM_EXTRA_CHUNKS))
+#define PROB_HDR_INCONSISTENT(f) ((f.problems) & (PROBLEM_HEADER_INCONSISTENT))
+
+#include <limits.h>
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024 /* max # of characters in a path name */
+#endif
+
+typedef struct _shn_config
+{
+	int error_output_method;
+	char seek_tables_path[PATH_MAX];
+	char relative_seek_tables_path[PATH_MAX];
+	int verbose;
+	int swap_bytes;
+} shn_config;
+
+typedef struct _shn_decode_state
+{
+	uchar *getbuf;
+	uchar *getbufp;
+	int nbitget;
+	int nbyteget;
+	ulong gbuffer;
+	schar *writebuf;
+	schar *writefub;
+	int nwritebuf;
+} shn_decode_state;
+
+typedef struct _shn_seek_header
+{
+	uchar data[SEEK_HEADER_SIZE];
+	slong version;
+	ulong shnFileSize;	
+} shn_seek_header;
+
+typedef struct _shn_seek_trailer
+{
+	uchar data[SEEK_TRAILER_SIZE];
+	ulong seekTableSize;
+} shn_seek_trailer;
+
+typedef struct _shn_seek_entry
+{
+	uchar data[SEEK_ENTRY_SIZE];
+} shn_seek_entry;
+
+/* old way, kept for reference.
+ (changed because some compilers apparently don't support #pragma pack(1))
+
+typedef struct _shn_seek_header
+{
+	char signature[4];
+	unsigned long version;
+	unsigned long shnFileSize;
+} shn_seek_header;
+
+typedef struct _shn_seek_trailer
+{
+	unsigned long seekTableSize;
+	char signature[8];
+} shn_seek_trailer;
+
+typedef struct _shn_seek_entry
+{
+	unsigned long shnSample;
+	unsigned long shnByteOffset;
+	unsigned long shnLastPosition;
+	unsigned short shnByteGet;
+	unsigned short shnBufferOffset;
+	unsigned short shnBitOffset;
+	unsigned long shnGBuffer;
+	unsigned short shnBitShift;
+	long cbuf0[3];
+	long cbuf1[3];
+	long offset0[4];
+	long offset1[4];
+} shn_seek_entry;
+*/
+
+typedef struct _shn_wave_header
+{
+	const char *filename;
+ char m_ss[16];
+
+	uint header_size;
+
+	ushort channels,
+	 block_align,
+	 bits_per_sample,
+	 wave_format;
+
+	ulong samples_per_sec,
+	 avg_bytes_per_sec,
+	 rate,
+	 length,
+	 data_size,
+	 total_size,
+	 chunk_size,
+	 actual_size;
+
+	double exact_length;
+
+	int file_has_id3v2_tag;
+	long id3v2_tag_size;
+
+	ulong problems;
+} shn_wave_header;
+
+typedef struct _shn_vars
+{
+	DB_FILE *fd;
+	int seek_to;
+	int eof;
+	int going;
+	slong seek_table_entries;
+	ulong seek_resolution;
+	int bytes_in_buf;
+	uchar buffer[OUT_BUFFER_SIZE];
+	int bytes_in_header;
+	uchar header[OUT_BUFFER_SIZE];
+	int fatal_error;
+	schar fatal_error_msg[BUF_SIZE];
+	int reading_function_code;
+	ulong last_file_position;
+	ulong last_file_position_no_really;
+	ulong initial_file_position;
+	ulong bytes_read;
+	unsigned short actual_bitshift;
+	int actual_maxnlpc;
+	int actual_nmean;
+	int actual_nchan;
+	long seek_offset;
+} shn_vars;
+
+typedef struct _shn_file
+{
+	shn_vars vars;
+	shn_decode_state *decode_state;
+	shn_wave_header wave_header;
+	shn_seek_header seek_header;
+	shn_seek_trailer seek_trailer;
+	shn_seek_entry *seek_table;
+} shn_file;
+
+extern shn_config shn_cfg;
+
+extern shn_seek_entry *shn_seek_entry_search(shn_seek_entry *,ulong,ulong,ulong,ulong);
+extern void shn_load_seek_table(shn_file *,const char *);
+extern void shn_unload(shn_file *);
+extern int shn_verify_header(shn_file *);
+extern int shn_filename_contains_a_dot(const char *);
+extern char *shn_get_base_filename(const char *);
+extern char *shn_get_base_directory(const char *);
+extern void shn_length_to_str(shn_file *);
+extern char *shn_format_to_str(ushort);
+extern ulong shn_uchar_to_ulong_le(uchar *);
+extern slong shn_uchar_to_slong_le(uchar *);
+extern ushort shn_uchar_to_ushort_le(uchar *);
+extern void shn_debug(char *, ...);
+extern void shn_error(char *, ...);
+extern void shn_error_fatal(shn_file *,char *, ...);
+extern void shn_snprintf(char *,int,char *, ...);
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/shn/shorten.c Added

@@ -0,0 +1,54 @@
+/******************************************************************************
+* *
+* Copyright (C) 1992-1995 Tony Robinson *
+* *
+* See the file doc/LICENSE.shorten for conditions on distribution and usage *
+* *
+******************************************************************************/
+
+/*
+ * $Id: shorten.c,v 1.7 2003/08/26 05:34:04 jason Exp $
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <setjmp.h>
+#include "shorten.h"
+
+void init_offset(slong **offset,int nchan,int nblock,int ftype)
+{
+ slong mean = 0;
+ int chan, i;
+
+ /* initialise offset */
+ switch(ftype)
+ {
+ 	case TYPE_AU1:
+ 	case TYPE_S8:
+ 	case TYPE_S16HL:
+ 	case TYPE_S16LH:
+ 	case TYPE_ULAW:
+ 	case TYPE_AU2:
+ 	case TYPE_AU3:
+ 	case TYPE_ALAW:
+ 	mean = 0;
+ 	break;
+ 	case TYPE_U8:
+ 	mean = 0x80;
+ 	break;
+ 	case TYPE_U16HL:
+ 	case TYPE_U16LH:
+ 	mean = 0x8000;
+ 	break;
+ 	default:
+ shn_debug("Unknown file type: %d", ftype);
+ }
+
+ for(chan = 0; chan < nchan; chan++)
+ for(i = 0; i < nblock; i++)
+ offset[chan][i] = mean;
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/shorten.h Added

@@ -0,0 +1,222 @@
+/******************************************************************************
+* *
+* Copyright (C) 1992-1995 Tony Robinson *
+* *
+* See the file doc/LICENSE.shorten for conditions on distribution and usage *
+* *
+******************************************************************************/
+
+/*
+ * $Id: shorten.h,v 1.4 2001/12/30 05:12:04 jason Exp $
+ */
+
+#ifndef _SHORTEN_H
+#define _SHORTEN_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <pthread.h>
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if SIZEOF_UNSIGNED_LONG == 4
+# define uint32_t unsigned long
+# define int32_t long
+# else
+# define uint32_t unsigned int
+# define int32_t int
+# endif
+# define uint16_t unsigned short
+# define uint8_t unsigned char
+# define int16_t short
+# define int8_t char
+#endif
+
+#undef ulong
+#undef ushort
+#undef uchar
+#undef slong
+#undef sshort
+#undef schar
+#define ulong uint32_t
+#define ushort uint16_t
+#define uchar uint8_t
+#define slong int32_t
+#define sshort int16_t
+#define schar int8_t
+
+#include "shn.h"
+
+extern shn_file *shnfile;
+
+#define MAGIC			"ajkg"
+#define FORMAT_VERSION		2
+#define MIN_SUPPORTED_VERSION	1
+#define MAX_SUPPORTED_VERSION	3
+#define MAX_VERSION		7
+
+#define UNDEFINED_UINT		-1
+#define DEFAULT_BLOCK_SIZE	256
+#define DEFAULT_V0NMEAN	0
+#define DEFAULT_V2NMEAN	4
+#define DEFAULT_MAXNLPC	0
+#define DEFAULT_NCHAN		1
+#define DEFAULT_NSKIP		0
+#define DEFAULT_NDISCARD	0
+#define NBITPERLONG		32
+#define DEFAULT_MINSNR 256
+#define DEFAULT_MAXRESNSTR	"32.0"
+#define DEFAULT_QUANTERROR	0
+#define MINBITRATE		2.5
+
+#define MAX_LPC_ORDER	64
+#define CHANSIZE	0
+#define ENERGYSIZE	3
+#define BITSHIFTSIZE	2
+#define NWRAP		3
+
+#define FNSIZE		2
+#define FN_DIFF0	0
+#define FN_DIFF1	1
+#define FN_DIFF2	2
+#define FN_DIFF3	3
+#define FN_QUIT		4
+#define FN_BLOCKSIZE	5
+#define FN_BITSHIFT	6
+#define FN_QLPC		7
+#define FN_ZERO		8
+#define FN_VERBATIM 9
+
+#define VERBATIM_CKSIZE_SIZE 5	/* a var_put code size */
+#define VERBATIM_BYTE_SIZE 8	/* code size 8 on single bytes means
+				 * no compression at all */
+#define VERBATIM_CHUNK_MAX 256	/* max. size of a FN_VERBATIM chunk */
+
+#define ULONGSIZE	2
+#define NSKIPSIZE	1
+#define LPCQSIZE	2
+#define LPCQUANT	5
+#define XBYTESIZE	7
+
+#define TYPESIZE	4
+#define TYPE_AU1	0	/* original lossless ulaw */
+#define TYPE_S8	 1	/* signed 8 bit characters */
+#define TYPE_U8 2	/* unsigned 8 bit characters */
+#define TYPE_S16HL	3	/* signed 16 bit shorts: high-low */
+#define TYPE_U16HL	4	/* unsigned 16 bit shorts: high-low */
+#define TYPE_S16LH	5	/* signed 16 bit shorts: low-high */
+#define TYPE_U16LH	6	/* unsigned 16 bit shorts: low-high */
+#define TYPE_ULAW	7	/* lossy ulaw: internal conversion to linear */
+#define TYPE_AU2	8	/* new ulaw with zero mapping */
+#define TYPE_AU3	9	/* lossless alaw */
+#define TYPE_ALAW 	10	/* lossy alaw: internal conversion to linear */
+#define TYPE_RIFF_WAVE 11	/* Microsoft .WAV files */
+#define TYPE_EOF	12
+#define TYPE_GENERIC_ULAW 128
+#define TYPE_GENERIC_ALAW 129
+
+#define POSITIVE_ULAW_ZERO 0xff
+#define NEGATIVE_ULAW_ZERO 0x7f
+
+#ifndef MAX_PATH
+#define MAX_PATH 2048
+#endif
+
+#ifndef	MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#ifndef	MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+#if defined(unix) && !defined(linux)
+#define labs abs
+#endif
+
+#define ROUNDEDSHIFTDOWN(x, n) (((n) == 0) ? (x) : ((x) >> ((n) - 1)) >> 1)
+
+#ifndef M_LN2
+#define	M_LN2	0.69314718055994530942
+#endif
+
+#ifndef M_PI
+#define M_PI	3.14159265358979323846
+#endif
+
+/* BUFSIZ must be a multiple of four to contain a whole number of words */
+#ifdef BUFSIZ
+#undef BUFSIZ
+#endif
+
+#define BUFSIZ 512
+
+#define V2LPCQOFFSET (1 << LPCQUANT);
+
+#define UINT_GET(nbit, shnfile) \
+ ((version == 0) ? uvar_get(nbit, shnfile) : ulong_get(shnfile))
+
+#define putc_exit(val, stream)\
+{ char rval;\
+ if((rval = putc((val), (stream))) != (char) (val))\
+ complain("FATALERROR: write failed: putc returns EOF");\
+}
+
+extern int getc_exit_val;
+#define getc_exit(stream)\
+(((getc_exit_val = getc(stream)) == EOF) ? \
+ complain("FATALERROR: read failed: getc returns EOF"), 0: getc_exit_val)
+
+/************************/
+/* defined in shorten.c */
+extern void	init_offset(slong**, int, int, int);
+extern int	shorten(FILE*, FILE*, int, char**);
+
+/**************************/
+/* defined in Sulawalaw.c */
+extern int Sulaw2lineartab[];
+#define Sulaw2linear(i) (Sulaw2lineartab[i])
+#ifndef Sulaw2linear
+extern int	Sulaw2linear(uchar);
+#endif
+extern uchar	Slinear2ulaw(int);
+
+extern int Salaw2lineartab[];
+#define Salaw2linear(i) (Salaw2lineartab[i])
+#ifndef Salaw2linear
+extern int	Salaw2linear(uchar);
+#endif
+extern uchar	Slinear2alaw(int);
+
+/**********************/
+/* defined in fixio.c */
+extern void	init_sizeof_sample(void);
+extern void fwrite_type_init(shn_file*);
+extern void fwrite_type(slong**,int,int,int,shn_file*);
+extern void fwrite_type_quit(shn_file*);
+extern void	fix_bitshift(slong*, int, int, int);
+
+/**********************/
+/* defined in vario.c */
+extern void	var_get_init(shn_file*);
+extern slong	uvar_get(int, shn_file*);
+extern slong	var_get(int, shn_file*);
+extern ulong	ulong_get(shn_file*);
+extern void	var_get_quit(shn_file*);
+
+extern int	sizeof_uvar(ulong, int);
+extern int	sizeof_var(slong, int);
+
+extern void	mkmasktab(void);
+extern ulong	word_get(shn_file*);
+
+/**********************/
+/* defined in array.c */
+extern void* 	pmalloc(ulong, shn_file*);
+extern slong**	long2d(ulong, ulong, shn_file*);
+
+#endif

deadbeef-0.5.2.tar.bz2/plugins/shn/sulawalaw.c Added

@@ -0,0 +1,192 @@
+/*
+ * $Id: sulawalaw.c,v 1.5 2001/12/30 05:12:04 jason Exp $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <math.h>
+#include "shorten.h"
+
+int Sulaw2lineartab[] = {-32124, -31100, -30076, -29052, -28028, -27004,
+ -25980, -24956, -23932, -22908, -21884, -20860, -19836, -18812,
+ -17788, -16764, -15996, -15484, -14972, -14460, -13948, -13436,
+ -12924, -12412, -11900, -11388, -10876, -10364, -9852, -9340, -8828,
+ -8316, -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140, -5884,
+ -5628, -5372, -5116, -4860, -4604, -4348, -4092, -3900, -3772, -3644,
+ -3516, -3388, -3260, -3132, -3004, -2876, -2748, -2620, -2492, -2364,
+ -2236, -2108, -1980, -1884, -1820, -1756, -1692, -1628, -1564, -1500,
+ -1436, -1372, -1308, -1244, -1180, -1116, -1052, -988, -924, -876,
+ -844, -812, -780, -748, -716, -684, -652, -620, -588, -556, -524,
+ -492, -460, -428, -396, -372, -356, -340, -324, -308, -292, -276,
+ -260, -244, -228, -212, -196, -180, -164, -148, -132, -120, -112,
+ -104, -96, -88, -80, -72, -64, -56, -48, -40, -32, -24, -16, -8, 0,
+ 32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956, 23932, 22908,
+ 21884, 20860, 19836, 18812, 17788, 16764, 15996, 15484, 14972, 14460,
+ 13948, 13436, 12924, 12412, 11900, 11388, 10876, 10364, 9852, 9340,
+ 8828, 8316, 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140, 5884,
+ 5628, 5372, 5116, 4860, 4604, 4348, 4092, 3900, 3772, 3644, 3516,
+ 3388, 3260, 3132, 3004, 2876, 2748, 2620, 2492, 2364, 2236, 2108,
+ 1980, 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436, 1372, 1308,
+ 1244, 1180, 1116, 1052, 988, 924, 876, 844, 812, 780, 748, 716, 684,
+ 652, 620, 588, 556, 524, 492, 460, 428, 396, 372, 356, 340, 324, 308,
+ 292, 276, 260, 244, 228, 212, 196, 180, 164, 148, 132, 120, 112, 104,
+ 96, 88, 80, 72, 64, 56, 48, 40, 32, 24, 16, 8, 0};
+
+#ifndef Sulaw2linear
+#ifdef __STDC__
+int Sulaw2linear(uchar ulaw) {
+#else
+int Sulaw2linear(ulaw) uchar ulaw; {
+#endif
+ return(Sulaw2lineartab[ulaw]);
+}
+#endif
+
+/* adapted by ajr for int input */
+#ifdef __STDC__
+uchar Slinear2ulaw(int sample) {
+#else
+uchar Slinear2ulaw(sample) int sample; {
+#endif
+/*
+** This routine converts from linear to ulaw.
+**
+** Craig Reese: IDA/Supercomputing Research Center
+** Joe Campbell: Department of Defense
+** 29 September 1989
+**
+** References:
+** 1) CCITT Recommendation G.711 (very difficult to follow)
+** 2) "A New Digital Technique for Implementation of Any
+** Continuous PCM Companding Law," Villeret, Michel,
+** et al. 1973 IEEE Int. Conf. on Communications, Vol 1,
+** 1973, pg. 11.12-11.17
+** 3) MIL-STD-188-113,"Interoperability and Performance Standards
+** for Analog-to_Digital Conversion Techniques,"
+** 17 February 1987
+**
+** Input: Signed 16 bit linear sample
+** Output: 8 bit ulaw sample
+*/
+
+#define BIAS 0x84 /* define the add-in bias for 16 bit samples */
+#define CLIP 32635
+
+ static int exp_lut[256] = {0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,
+ 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+ 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7};
+ int sign, exponent, mantissa;
+ uchar ulawbyte;
+
+ /* Get the sample into sign-magnitude. */
+ if(sample < 0) {
+ sign = 0x80;
+ sample = -sample;
+ }
+ else
+ sign = 0;
+
+ /* clip the magnitude */
+ if(sample > CLIP) sample = CLIP;
+
+ /* Convert from 16 bit linear to ulaw. */
+ sample = sample + BIAS;
+ exponent = exp_lut[( sample >> 7 ) & 0xFF];
+ mantissa = (sample >> (exponent + 3)) & 0x0F;
+ ulawbyte = ~(sign | (exponent << 4) | mantissa);
+
+ return(ulawbyte);
+}
+
+
+/******************
+ * ALAW starts here
+ */
+
+int Salaw2lineartab[] = {-5504, -5248, -6016, -5760, -4480, -4224,
+ -4992, -4736, -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784,
+ -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368, -3776, -3648,
+ -4032, -3904, -3264, -3136, -3520, -3392, -22016, -20992, -24064,
+ -23040, -17920, -16896, -19968, -18944, -30208, -29184, -32256,
+ -31232, -26112, -25088, -28160, -27136, -11008, -10496, -12032,
+ -11520, -8960, -8448, -9984, -9472, -15104, -14592, -16128, -15616,
+ -13056, -12544, -14080, -13568, -344, -328, -376, -360, -280, -264,
+ -312, -296, -472, -456, -504, -488, -408, -392, -440, -424, -88, -72,
+ -120, -104, -24, -8, -56, -40, -216, -200, -248, -232, -152, -136,
+ -184, -168, -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184,
+ -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696, -688, -656,
+ -752, -720, -560, -528, -624, -592, -944, -912, -1008, -976, -816,
+ -784, -880, -848, 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736,
+ 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784, 2752, 2624, 3008,
+ 2880, 2240, 2112, 2496, 2368, 3776, 3648, 4032, 3904, 3264, 3136,
+ 3520, 3392, 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
+ 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136, 11008, 10496,
+ 12032, 11520, 8960, 8448, 9984, 9472, 15104, 14592, 16128, 15616,
+ 13056, 12544, 14080, 13568, 344, 328, 376, 360, 280, 264, 312, 296,
+ 472, 456, 504, 488, 408, 392, 440, 424, 88, 72, 120, 104, 24, 8, 56,
+ 40, 216, 200, 248, 232, 152, 136, 184, 168, 1376, 1312, 1504, 1440,
+ 1120, 1056, 1248, 1184, 1888, 1824, 2016, 1952, 1632, 1568, 1760,
+ 1696, 688, 656, 752, 720, 560, 528, 624, 592, 944, 912, 1008, 976,
+ 816, 784, 880, 848};
+
+#ifndef Salaw2linear
+#ifdef __STDC__
+int Salaw2linear(uchar alaw) {
+#else
+int Salaw2linear(alaw) uchar alaw; {
+#endif
+ return(Salaw2lineartab[alaw]);
+}
+#endif
+
+/* this is derived from the Sun code - it is a bit simpler and has int input */
+#define QUANT_MASK (0xf) /* Quantization field mask. */
+#define NSEGS (8) /* Number of A-law segments. */
+#define SEG_SHIFT (4) /* Left shift for segment number. */
+#ifdef __STDC__
+uchar Slinear2alaw(int linear) {
+#else
+uchar Slinear2alaw(linear) int linear; {
+#endif
+ int	seg;
+ uchar aval, mask;
+ static sshort seg_aend[NSEGS] = {0x1f,0x3f,0x7f,0xff,0x1ff,0x3ff,0x7ff,0xfff};
+
+ linear = linear >> 3;
+
+ if(linear >= 0) {
+ mask = 0xd5;		/* sign (7th) bit = 1 */
+ } else {
+ mask = 0x55;		/* sign bit = 0 */
+ linear = -linear - 1;
+ }
+
+ /* Convert the scaled magnitude to segment number. */
+ for(seg = 0; seg < NSEGS && linear > seg_aend[seg]; seg++);
+
+ /* Combine the sign, segment, and quantization bits. */
+ if(seg >= NSEGS)		/* out of range, return maximum value. */
+ return (uchar) (0x7F ^ mask);
+ else {
+ aval = (uchar) seg << SEG_SHIFT;
+ if (seg < 2)
+ aval |= (linear >> 1) & QUANT_MASK;
+ else
+ aval |= (linear >> seg) & QUANT_MASK;
+ return (aval ^ mask);
+ }
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/vario.c Added

@@ -0,0 +1,146 @@
+/******************************************************************************
+* *
+* Copyright (C) 1992-1995 Tony Robinson *
+* *
+* See the file doc/LICENSE.shorten for conditions on distribution and usage *
+* *
+******************************************************************************/
+
+/*
+ * $Id: vario.c,v 1.10 2004/05/04 02:26:36 jason Exp $
+ */
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "shorten.h"
+
+#define MASKTABSIZE 33
+ulong masktab[MASKTABSIZE];
+
+void mkmasktab() {
+ int i;
+ ulong val = 0;
+
+ masktab[0] = val;
+ for(i = 1; i < MASKTABSIZE; i++) {
+ val <<= 1;
+ val |= 1;
+ masktab[i] = val;
+ }
+}
+
+void var_get_init(shn_file *this_shn)
+{
+ mkmasktab();
+
+ this_shn->decode_state->getbuf = (uchar*) pmalloc((ulong) BUFSIZ,this_shn);
+ this_shn->decode_state->getbufp = this_shn->decode_state->getbuf;
+ this_shn->decode_state->nbyteget = 0;
+ this_shn->decode_state->gbuffer = 0;
+ this_shn->decode_state->nbitget = 0;
+}
+
+ulong word_get(shn_file *this_shn)
+{
+ ulong buffer;
+ int bytes;
+
+ if(this_shn->decode_state->nbyteget < 4)
+ {
+ this_shn->vars.last_file_position = this_shn->vars.bytes_read;
+
+ bytes = deadbeef->fread((uchar*) this_shn->decode_state->getbuf, 1, BUFSIZ, this_shn->vars.fd);
+ this_shn->decode_state->nbyteget += bytes;
+
+ if(this_shn->decode_state->nbyteget < 4) {
+ shn_error_fatal(this_shn,"Premature EOF on compressed stream -\npossible corrupt or truncated file");
+ return (ulong)0;
+ }
+
+ this_shn->vars.bytes_read += bytes;
+
+ this_shn->decode_state->getbufp = this_shn->decode_state->getbuf;
+ }
+
+ buffer = (((slong) (this_shn->decode_state->getbufp[0])) << 24) | (((slong) (this_shn->decode_state->getbufp[1])) << 16) |
+ (((slong) (this_shn->decode_state->getbufp[2])) << 8) | ((slong) (this_shn->decode_state->getbufp[3]));
+
+ this_shn->decode_state->getbufp += 4;
+ this_shn->decode_state->nbyteget -= 4;
+
+ return(buffer);
+}
+
+slong uvar_get(int nbin,shn_file *this_shn)
+{
+ slong result;
+
+ if (this_shn->vars.reading_function_code) {
+ this_shn->vars.last_file_position_no_really = this_shn->vars.last_file_position;
+ }
+
+ if(this_shn->decode_state->nbitget == 0)
+ {
+ this_shn->decode_state->gbuffer = word_get(this_shn);
+ if (this_shn->vars.fatal_error)
+ return (ulong)0;
+ this_shn->decode_state->nbitget = 32;
+ }
+
+ for(result = 0; !(this_shn->decode_state->gbuffer & (1L << --(this_shn->decode_state->nbitget))); result++)
+ {
+ if(this_shn->decode_state->nbitget == 0)
+ {
+ this_shn->decode_state->gbuffer = word_get(this_shn);
+ if (this_shn->vars.fatal_error)
+ return (ulong)0;
+ this_shn->decode_state->nbitget = 32;
+ }
+ }
+
+ while(nbin != 0)
+ {
+ if(this_shn->decode_state->nbitget >= nbin)
+ {
+ result = (result << nbin) | ((this_shn->decode_state->gbuffer >> (this_shn->decode_state->nbitget-nbin)) &masktab[nbin]);
+ this_shn->decode_state->nbitget -= nbin;
+ nbin = 0;
+ }
+ else
+ {
+ result = (result << this_shn->decode_state->nbitget) | (this_shn->decode_state->gbuffer & masktab[this_shn->decode_state->nbitget]);
+ this_shn->decode_state->gbuffer = word_get(this_shn);
+ if (this_shn->vars.fatal_error)
+ return (ulong)0;
+ nbin -= this_shn->decode_state->nbitget;
+ this_shn->decode_state->nbitget = 32;
+ }
+ }
+
+ return(result);
+}
+
+ulong ulong_get(shn_file *this_shn)
+{
+ unsigned int nbit = uvar_get(ULONGSIZE,this_shn);
+ if (this_shn->vars.fatal_error)
+ return (ulong)0;
+ return(uvar_get(nbit,this_shn));
+}
+
+slong var_get(int nbin,shn_file *this_shn)
+{
+ ulong uvar = uvar_get(nbin + 1,this_shn);
+ if (this_shn->vars.fatal_error)
+ return (slong)0;
+
+ if(uvar & 1) return((slong) ~(uvar >> 1));
+ else return((slong) (uvar >> 1));
+}
+
+void var_get_quit(shn_file *this_shn)
+{
+ free((void *) this_shn->decode_state->getbuf);
+ this_shn->decode_state->getbuf = NULL;
+}

deadbeef-0.5.2.tar.bz2/plugins/shn/wave.c Added

@@ -0,0 +1,264 @@
+/* wave.c - functions to parse and verify WAVE headers
+ * Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * $Id: wave.c,v 1.13 2007/03/23 05:49:48 jason Exp $
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include "shorten.h"
+#include "shn.h"
+
+int is_valid_file(shn_file *info)
+/* determines whether the given filename (info->filename) is a regular file, and is readable */
+{
+ struct stat sz;
+ FILE *f;
+
+ if (0 != stat(info->wave_header.filename,&sz)) {
+ if (errno == ENOENT)
+ shn_error("cannot open '%s' because it does not exist",info->wave_header.filename);
+ else if (errno == EACCES)
+ shn_error("cannot open '%s' due to insufficient permissions",info->wave_header.filename);
+ else if (errno == EFAULT)
+ shn_error("cannot open '%s' due to bad address",info->wave_header.filename);
+ else if (errno == ENOMEM)
+ shn_error("cannot open '%s' because the kernel ran out of memory",info->wave_header.filename);
+ else if (errno == ENAMETOOLONG)
+ shn_error("cannot open '%s' because the file name is too long",info->wave_header.filename);
+ else
+ shn_error("cannot open '%s' due to an unknown problem",info->wave_header.filename);
+ return 0;
+ }
+ if (0 == S_ISREG(sz.st_mode)) {
+ if (S_ISLNK(sz.st_mode))
+ shn_error("'%s' is a symbolic link, not a regular file",info->wave_header.filename);
+ else if (S_ISDIR(sz.st_mode))
+ shn_error("'%s' is a directory, not a regular file",info->wave_header.filename);
+ else if (S_ISCHR(sz.st_mode))
+ shn_error("'%s' is a character device, not a regular file",info->wave_header.filename);
+ else if (S_ISBLK(sz.st_mode))
+ shn_error("'%s' is a block device, not a regular file",info->wave_header.filename);
+ else if (S_ISFIFO(sz.st_mode))
+ shn_error("'%s' is a fifo, not a regular file",info->wave_header.filename);
+ else if (S_ISSOCK(sz.st_mode))
+ shn_error("'%s' is a socket, not a regular file",info->wave_header.filename);
+ return 0;
+ }
+ info->wave_header.actual_size = (ulong)sz.st_size;
+
+ if (NULL == (f = fopen(info->wave_header.filename,"rb"))) {
+ shn_error("could not open '%s': %s",info->wave_header.filename,strerror(errno));
+ return 0;
+ }
+ fclose(f);
+
+ return 1;
+}
+
+int shn_verify_header(shn_file *this_shn)
+{
+	ulong l;
+	int cur = 0;
+
+	if (0 == is_valid_file(this_shn))
+	{
+		shn_debug("while processing '%s': something went wrong while opening this file, see above",this_shn->wave_header.filename);
+		return 0;
+	}
+
+	if (this_shn->vars.bytes_in_header < CANONICAL_HEADER_SIZE) {
+		shn_debug("while processing '%s': header is only %d bytes (should be at least %d bytes)",
+			this_shn->wave_header.filename,this_shn->vars.bytes_in_header,CANONICAL_HEADER_SIZE);
+		return 0;
+	}
+
+	if (WAVE_RIFF != shn_uchar_to_ulong_le(this_shn->vars.header+cur))
+	{
+		if (AIFF_FORM == shn_uchar_to_ulong_le(this_shn->vars.header+cur))
+			shn_debug("while processing '%s': file contains AIFF data, which is currently not supported",this_shn->wave_header.filename);
+		else
+			shn_debug("while processing '%s': WAVE header is missing RIFF tag - possible corrupt file",this_shn->wave_header.filename);
+		return 0;
+	}
+	cur += 4;
+
+	this_shn->wave_header.chunk_size = shn_uchar_to_ulong_le(this_shn->vars.header+cur);
+	cur += 4;
+
+	if (WAVE_WAVE != shn_uchar_to_ulong_le(this_shn->vars.header+cur))
+	{
+		shn_debug("while processing '%s': WAVE header is missing WAVE tag",this_shn->wave_header.filename);
+		return 0;
+	}
+	cur += 4;
+
+	for (;;)
+	{
+		cur += 4;
+
+		l = shn_uchar_to_ulong_le(this_shn->vars.header+cur);
+		cur += 4;
+
+		if (WAVE_FMT == shn_uchar_to_ulong_le(this_shn->vars.header+cur-8))
+			break;
+
+		cur += l;
+	}
+
+	if (l < 16)
+	{
+		shn_debug("while processing '%s': fmt chunk in WAVE header was too short",this_shn->wave_header.filename);
+		return 0;
+	}
+
+	this_shn->wave_header.wave_format = shn_uchar_to_ushort_le(this_shn->vars.header+cur);
+	cur += 2;
+
+	switch (this_shn->wave_header.wave_format)
+	{
+		case WAVE_FORMAT_PCM:
+			break;
+		default:
+			shn_debug("while processing '%s': unsupported format 0x%04x (%s) - only PCM data is supported at this time",
+				this_shn->wave_header.filename,this_shn->wave_header.wave_format,shn_format_to_str(this_shn->wave_header.wave_format));
+ return 0;
+	}
+
+	this_shn->wave_header.channels = shn_uchar_to_ushort_le(this_shn->vars.header+cur);
+	cur += 2;
+	this_shn->wave_header.samples_per_sec = shn_uchar_to_ulong_le(this_shn->vars.header+cur);
+	cur += 4;
+	this_shn->wave_header.avg_bytes_per_sec = shn_uchar_to_ulong_le(this_shn->vars.header+cur);
+	cur += 4;
+	this_shn->wave_header.block_align = shn_uchar_to_ushort_le(this_shn->vars.header+cur);
+	cur += 2;
+	this_shn->wave_header.bits_per_sample = shn_uchar_to_ushort_le(this_shn->vars.header+cur);
+	cur += 2;
+
+	if (this_shn->wave_header.bits_per_sample != 8 && this_shn->wave_header.bits_per_sample != 16)
+	{
+		shn_debug("while processing '%s': bits per sample is neither 8 nor 16",this_shn->wave_header.filename);
+		return 0;
+	}
+
+	l -= 16;
+
+	if (l > 0)
+		cur += l;
+
+	for (;;)
+	{
+		cur += 4;
+
+		l = shn_uchar_to_ulong_le(this_shn->vars.header+cur);
+		cur += 4;
+
+		if (WAVE_DATA == shn_uchar_to_ulong_le(this_shn->vars.header+cur-8))
+			break;
+
+		cur += l;
+	}
+
+	this_shn->wave_header.rate = ((uint)this_shn->wave_header.samples_per_sec *
+				 (uint)this_shn->wave_header.channels *
+				 (uint)this_shn->wave_header.bits_per_sample) / 8;
+	this_shn->wave_header.header_size = cur;
+	this_shn->wave_header.data_size = l;
+	this_shn->wave_header.total_size = this_shn->wave_header.chunk_size + 8;
+	this_shn->wave_header.length = this_shn->wave_header.data_size / this_shn->wave_header.rate;
+	this_shn->wave_header.exact_length = (double)this_shn->wave_header.data_size / (double)this_shn->wave_header.rate;
+
+	if (this_shn->wave_header.channels == CD_CHANNELS &&
+	 this_shn->wave_header.bits_per_sample == CD_BITS_PER_SAMPLE &&
+	 this_shn->wave_header.samples_per_sec == CD_SAMPLES_PER_SEC &&
+	 this_shn->wave_header.avg_bytes_per_sec == CD_RATE &&
+	 this_shn->wave_header.rate == CD_RATE)
+	{
+		if (this_shn->wave_header.data_size < CD_MIN_BURNABLE_SIZE)
+			this_shn->wave_header.problems |= PROBLEM_CD_BUT_TOO_SHORT;
+		if (this_shn->wave_header.data_size % CD_BLOCK_SIZE != 0)
+			this_shn->wave_header.problems |= PROBLEM_CD_BUT_BAD_BOUND;
+	}
+	else
+		this_shn->wave_header.problems |= PROBLEM_NOT_CD_QUALITY;
+
+	if (this_shn->wave_header.header_size != CANONICAL_HEADER_SIZE)
+		this_shn->wave_header.problems |= PROBLEM_HEADER_NOT_CANONICAL;
+
+	if ((ulong)this_shn->wave_header.header_size + this_shn->wave_header.data_size > this_shn->wave_header.total_size)
+		this_shn->wave_header.problems |= PROBLEM_HEADER_INCONSISTENT;
+
+	if ((ulong)this_shn->wave_header.header_size + this_shn->wave_header.data_size < this_shn->wave_header.total_size)
+		this_shn->wave_header.problems |= PROBLEM_EXTRA_CHUNKS;
+
+	shn_length_to_str(this_shn);
+
+	/* header looks ok */
+	return 1;
+}
+
+char *shn_format_to_str(ushort format)
+{
+ switch (format) {
+ case WAVE_FORMAT_UNKNOWN:
+ return "Microsoft Official Unknown";
+ case WAVE_FORMAT_PCM:
+ return "Microsoft PCM";
+ case WAVE_FORMAT_ADPCM:
+ return "Microsoft ADPCM";
+ case WAVE_FORMAT_IEEE_FLOAT:
+ return "IEEE Float";
+ case WAVE_FORMAT_ALAW:
+ return "Microsoft A-law";
+ case WAVE_FORMAT_MULAW:
+ return "Microsoft U-law";
+ case WAVE_FORMAT_OKI_ADPCM:
+ return "OKI ADPCM format";
+ case WAVE_FORMAT_IMA_ADPCM:
+ return "IMA ADPCM";
+ case WAVE_FORMAT_DIGISTD:
+ return "Digistd format";
+ case WAVE_FORMAT_DIGIFIX:
+ return "Digifix format";
+ case WAVE_FORMAT_DOLBY_AC2:
+ return "Dolby AC2";
+ case WAVE_FORMAT_GSM610:
+ return "GSM 6.10";
+ case WAVE_FORMAT_ROCKWELL_ADPCM:
+ return "Rockwell ADPCM";
+ case WAVE_FORMAT_ROCKWELL_DIGITALK:
+ return "Rockwell DIGITALK";
+ case WAVE_FORMAT_G721_ADPCM:
+ return "G.721 ADPCM";
+ case WAVE_FORMAT_G728_CELP:
+ return "G.728 CELP";
+ case WAVE_FORMAT_MPEG:
+ return "MPEG";
+ case WAVE_FORMAT_MPEGLAYER3:
+ return "MPEG Layer 3";
+ case WAVE_FORMAT_G726_ADPCM:
+ return "G.726 ADPCM";
+ case WAVE_FORMAT_G722_ADPCM:
+ return "G.722 ADPCM";
+ }
+ return "Unknown";
+}

deadbeef-0.5.1.tar.bz2/plugins/sid/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/sid/Makefile.in Changed

@@ -169,9 +169,12 @@
 @HAVE_SID_TRUE@	envelope.lo voice.lo sid.lo wave8580__ST.lo \
 @HAVE_SID_TRUE@	wave8580_P_T.lo reloc65.lo
 sid_la_OBJECTS = $(am_sid_la_OBJECTS)
-sid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(sid_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+sid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(sid_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SID_TRUE@am_sid_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -179,22 +182,42 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo " CXX " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(sid_la_SOURCES)
 DIST_SOURCES = $(am__sid_la_SOURCES_DIST)
 ETAGS = etags
@@ -206,6 +229,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -253,14 +277,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -350,7 +377,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -361,6 +387,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -589,7 +616,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 sid.la: $(sid_la_OBJECTS) $(sid_la_DEPENDENCIES) 
-	$(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(sid_la_LINK) $(am_sid_la_rpath) $(sid_la_OBJECTS) $(sid_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -638,305 +665,348 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsid.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 reloc65.lo: sidplay-libs/libsidplay/src/reloc65.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT reloc65.lo -MD -MP -MF $(DEPDIR)/reloc65.Tpo -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/reloc65.Tpo $(DEPDIR)/reloc65.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sidplay-libs/libsidplay/src/reloc65.c' object='reloc65.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o reloc65.lo `test -f 'sidplay-libs/libsidplay/src/reloc65.c' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/reloc65.c
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 mixer.lo: sidplay-libs/libsidplay/src/mixer.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mixer.lo -MD -MP -MF $(DEPDIR)/mixer.Tpo -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mixer.Tpo $(DEPDIR)/mixer.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mixer.cpp' object='mixer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mixer.lo `test -f 'sidplay-libs/libsidplay/src/mixer.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mixer.cpp
 
 player.lo: sidplay-libs/libsidplay/src/player.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.lo -MD -MP -MF $(DEPDIR)/player.Tpo -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/player.Tpo $(DEPDIR)/player.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/player.cpp' object='player.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.lo `test -f 'sidplay-libs/libsidplay/src/player.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/player.cpp
 
 mos656x.lo: sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos656x.lo -MD -MP -MF $(DEPDIR)/mos656x.Tpo -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos656x.Tpo $(DEPDIR)/mos656x.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' object='mos656x.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos656x.lo `test -f 'sidplay-libs/libsidplay/src/mos656x/mos656x.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos656x/mos656x.cpp
 
 mos6510.lo: sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6510.lo -MD -MP -MF $(DEPDIR)/mos6510.Tpo -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos6510.Tpo $(DEPDIR)/mos6510.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' object='mos6510.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6510.lo `test -f 'sidplay-libs/libsidplay/src/mos6510/mos6510.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6510/mos6510.cpp
 
 sid6526.lo: sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid6526.lo -MD -MP -MF $(DEPDIR)/sid6526.Tpo -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sid6526.Tpo $(DEPDIR)/sid6526.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' object='sid6526.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid6526.lo `test -f 'sidplay-libs/libsidplay/src/sid6526/sid6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sid6526/sid6526.cpp
 
 MUS.lo: sidplay-libs/libsidplay/src/sidtune/MUS.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MUS.lo -MD -MP -MF $(DEPDIR)/MUS.Tpo -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MUS.Tpo $(DEPDIR)/MUS.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/MUS.cpp' object='MUS.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MUS.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/MUS.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/MUS.cpp
 
 SidTuneTools.lo: sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTuneTools.lo -MD -MP -MF $(DEPDIR)/SidTuneTools.Tpo -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SidTuneTools.Tpo $(DEPDIR)/SidTuneTools.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' object='SidTuneTools.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTuneTools.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp
 
 InfoFile.lo: sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT InfoFile.lo -MD -MP -MF $(DEPDIR)/InfoFile.Tpo -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/InfoFile.Tpo $(DEPDIR)/InfoFile.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' object='InfoFile.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InfoFile.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp
 
 SidTune.lo: sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SidTune.lo -MD -MP -MF $(DEPDIR)/SidTune.Tpo -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SidTune.Tpo $(DEPDIR)/SidTune.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' object='SidTune.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SidTune.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/SidTune.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/SidTune.cpp
 
 PSID.lo: sidplay-libs/libsidplay/src/sidtune/PSID.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSID.lo -MD -MP -MF $(DEPDIR)/PSID.Tpo -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PSID.Tpo $(DEPDIR)/PSID.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/PSID.cpp' object='PSID.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSID.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PSID.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PSID.cpp
 
 PP20.lo: sidplay-libs/libsidplay/src/sidtune/PP20.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PP20.lo -MD -MP -MF $(DEPDIR)/PP20.Tpo -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PP20.Tpo $(DEPDIR)/PP20.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/PP20.cpp' object='PP20.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PP20.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/PP20.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/PP20.cpp
 
 IconInfo.lo: sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT IconInfo.lo -MD -MP -MF $(DEPDIR)/IconInfo.Tpo -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/IconInfo.Tpo $(DEPDIR)/IconInfo.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' object='IconInfo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o IconInfo.lo `test -f 'sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp
 
 event.lo: sidplay-libs/libsidplay/src/event.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT event.lo -MD -MP -MF $(DEPDIR)/event.Tpo -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/event.Tpo $(DEPDIR)/event.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/event.cpp' object='event.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o event.lo `test -f 'sidplay-libs/libsidplay/src/event.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/event.cpp
 
 psiddrv.lo: sidplay-libs/libsidplay/src/psiddrv.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT psiddrv.lo -MD -MP -MF $(DEPDIR)/psiddrv.Tpo -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/psiddrv.Tpo $(DEPDIR)/psiddrv.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/psiddrv.cpp' object='psiddrv.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o psiddrv.lo `test -f 'sidplay-libs/libsidplay/src/psiddrv.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/psiddrv.cpp
 
 config.lo: sidplay-libs/libsidplay/src/config.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sidplay-libs/libsidplay/src/config.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/config.cpp
 
 sidplay2.lo: sidplay-libs/libsidplay/src/sidplay2.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sidplay2.lo -MD -MP -MF $(DEPDIR)/sidplay2.Tpo -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sidplay2.Tpo $(DEPDIR)/sidplay2.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/sidplay2.cpp' object='sidplay2.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sidplay2.lo `test -f 'sidplay-libs/libsidplay/src/sidplay2.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/sidplay2.cpp
 
 xsid.lo: sidplay-libs/libsidplay/src/xsid/xsid.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xsid.lo -MD -MP -MF $(DEPDIR)/xsid.Tpo -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xsid.Tpo $(DEPDIR)/xsid.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/xsid/xsid.cpp' object='xsid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xsid.lo `test -f 'sidplay-libs/libsidplay/src/xsid/xsid.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/xsid/xsid.cpp
 
 mos6526.lo: sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mos6526.lo -MD -MP -MF $(DEPDIR)/mos6526.Tpo -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mos6526.Tpo $(DEPDIR)/mos6526.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' object='mos6526.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mos6526.lo `test -f 'sidplay-libs/libsidplay/src/mos6526/mos6526.cpp' || echo '$(srcdir)/'`sidplay-libs/libsidplay/src/mos6526/mos6526.cpp
 
 resid.lo: sidplay-libs/builders/resid-builder/src/resid.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid.lo -MD -MP -MF $(DEPDIR)/resid.Tpo -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resid.Tpo $(DEPDIR)/resid.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/builders/resid-builder/src/resid.cpp' object='resid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid.cpp
 
 resid-builder.lo: sidplay-libs/builders/resid-builder/src/resid-builder.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resid-builder.lo -MD -MP -MF $(DEPDIR)/resid-builder.Tpo -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/resid-builder.Tpo $(DEPDIR)/resid-builder.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/builders/resid-builder/src/resid-builder.cpp' object='resid-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resid-builder.lo `test -f 'sidplay-libs/builders/resid-builder/src/resid-builder.cpp' || echo '$(srcdir)/'`sidplay-libs/builders/resid-builder/src/resid-builder.cpp
 
 wave8580_PS_.lo: sidplay-libs/resid/wave8580_PS_.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PS_.lo -MD -MP -MF $(DEPDIR)/wave8580_PS_.Tpo -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PS_.Tpo $(DEPDIR)/wave8580_PS_.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_PS_.cpp' object='wave8580_PS_.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PS_.lo `test -f 'sidplay-libs/resid/wave8580_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PS_.cpp
 
 filter.lo: sidplay-libs/resid/filter.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filter.lo -MD -MP -MF $(DEPDIR)/filter.Tpo -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/filter.Tpo $(DEPDIR)/filter.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/filter.cpp' object='filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filter.lo `test -f 'sidplay-libs/resid/filter.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/filter.cpp
 
 pot.lo: sidplay-libs/resid/pot.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pot.lo -MD -MP -MF $(DEPDIR)/pot.Tpo -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pot.Tpo $(DEPDIR)/pot.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/pot.cpp' object='pot.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pot.lo `test -f 'sidplay-libs/resid/pot.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/pot.cpp
 
 wave.lo: sidplay-libs/resid/wave.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave.lo -MD -MP -MF $(DEPDIR)/wave.Tpo -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave.Tpo $(DEPDIR)/wave.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave.cpp' object='wave.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave.lo `test -f 'sidplay-libs/resid/wave.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave.cpp
 
 version.lo: sidplay-libs/resid/version.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT version.lo -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/version.cpp' object='version.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o version.lo `test -f 'sidplay-libs/resid/version.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/version.cpp
 
 wave6581__ST.lo: sidplay-libs/resid/wave6581__ST.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581__ST.lo -MD -MP -MF $(DEPDIR)/wave6581__ST.Tpo -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581__ST.Tpo $(DEPDIR)/wave6581__ST.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581__ST.cpp' object='wave6581__ST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581__ST.lo `test -f 'sidplay-libs/resid/wave6581__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581__ST.cpp
 
 extfilt.lo: sidplay-libs/resid/extfilt.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extfilt.lo -MD -MP -MF $(DEPDIR)/extfilt.Tpo -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/extfilt.Tpo $(DEPDIR)/extfilt.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/extfilt.cpp' object='extfilt.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extfilt.lo `test -f 'sidplay-libs/resid/extfilt.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/extfilt.cpp
 
 wave8580_PST.lo: sidplay-libs/resid/wave8580_PST.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_PST.lo -MD -MP -MF $(DEPDIR)/wave8580_PST.Tpo -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_PST.Tpo $(DEPDIR)/wave8580_PST.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_PST.cpp' object='wave8580_PST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_PST.lo `test -f 'sidplay-libs/resid/wave8580_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_PST.cpp
 
 wave6581_PST.lo: sidplay-libs/resid/wave6581_PST.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PST.lo -MD -MP -MF $(DEPDIR)/wave6581_PST.Tpo -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PST.Tpo $(DEPDIR)/wave6581_PST.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_PST.cpp' object='wave6581_PST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PST.lo `test -f 'sidplay-libs/resid/wave6581_PST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PST.cpp
 
 wave6581_P_T.lo: sidplay-libs/resid/wave6581_P_T.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_P_T.lo -MD -MP -MF $(DEPDIR)/wave6581_P_T.Tpo -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_P_T.Tpo $(DEPDIR)/wave6581_P_T.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_P_T.cpp' object='wave6581_P_T.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_P_T.lo `test -f 'sidplay-libs/resid/wave6581_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_P_T.cpp
 
 wave6581_PS_.lo: sidplay-libs/resid/wave6581_PS_.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave6581_PS_.lo -MD -MP -MF $(DEPDIR)/wave6581_PS_.Tpo -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave6581_PS_.Tpo $(DEPDIR)/wave6581_PS_.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave6581_PS_.cpp' object='wave6581_PS_.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave6581_PS_.lo `test -f 'sidplay-libs/resid/wave6581_PS_.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave6581_PS_.cpp
 
 envelope.lo: sidplay-libs/resid/envelope.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT envelope.lo -MD -MP -MF $(DEPDIR)/envelope.Tpo -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/envelope.Tpo $(DEPDIR)/envelope.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/envelope.cpp' object='envelope.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o envelope.lo `test -f 'sidplay-libs/resid/envelope.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/envelope.cpp
 
 voice.lo: sidplay-libs/resid/voice.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT voice.lo -MD -MP -MF $(DEPDIR)/voice.Tpo -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/voice.Tpo $(DEPDIR)/voice.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/voice.cpp' object='voice.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o voice.lo `test -f 'sidplay-libs/resid/voice.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/voice.cpp
 
 sid.lo: sidplay-libs/resid/sid.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sid.lo -MD -MP -MF $(DEPDIR)/sid.Tpo -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sid.Tpo $(DEPDIR)/sid.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/sid.cpp' object='sid.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sid.lo `test -f 'sidplay-libs/resid/sid.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/sid.cpp
 
 wave8580__ST.lo: sidplay-libs/resid/wave8580__ST.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580__ST.lo -MD -MP -MF $(DEPDIR)/wave8580__ST.Tpo -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580__ST.Tpo $(DEPDIR)/wave8580__ST.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580__ST.cpp' object='wave8580__ST.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580__ST.lo `test -f 'sidplay-libs/resid/wave8580__ST.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580__ST.cpp
 
 wave8580_P_T.lo: sidplay-libs/resid/wave8580_P_T.cpp
-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wave8580_P_T.lo -MD -MP -MF $(DEPDIR)/wave8580_P_T.Tpo -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wave8580_P_T.Tpo $(DEPDIR)/wave8580_P_T.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='sidplay-libs/resid/wave8580_P_T.cpp' object='wave8580_P_T.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wave8580_P_T.lo `test -f 'sidplay-libs/resid/wave8580_P_T.cpp' || echo '$(srcdir)/'`sidplay-libs/resid/wave8580_P_T.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/sid/csid.cpp -> deadbeef-0.5.2.tar.bz2/plugins/sid/csid.cpp Changed

deadbeef-0.5.1.tar.bz2/plugins/sid/csid.h -> deadbeef-0.5.2.tar.bz2/plugins/sid/csid.h Changed

deadbeef-0.5.1.tar.bz2/plugins/sid/plugin.c -> deadbeef-0.5.2.tar.bz2/plugins/sid/plugin.c Changed

deadbeef-0.5.1.tar.bz2/plugins/sndfile/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/sndfile/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__sndfile_la_SOURCES_DIST = sndfile.c
 @HAVE_SNDFILE_TRUE@am_sndfile_la_OBJECTS = sndfile.lo
 sndfile_la_OBJECTS = $(am_sndfile_la_OBJECTS)
-sndfile_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+sndfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(sndfile_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SNDFILE_TRUE@am_sndfile_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(sndfile_la_SOURCES)
 DIST_SOURCES = $(am__sndfile_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 sndfile.la: $(sndfile_la_OBJECTS) $(sndfile_la_DEPENDENCIES) 
-	$(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(sndfile_la_LINK) $(am_sndfile_la_rpath) $(sndfile_la_OBJECTS) $(sndfile_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfile.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/sndfile/sndfile.c -> deadbeef-0.5.2.tar.bz2/plugins/sndfile/sndfile.c Changed

deadbeef-0.5.1.tar.bz2/plugins/supereq/Equ.cpp -> deadbeef-0.5.2.tar.bz2/plugins/supereq/Equ.cpp Changed

deadbeef-0.5.1.tar.bz2/plugins/supereq/Equ.h -> deadbeef-0.5.2.tar.bz2/plugins/supereq/Equ.h Changed

deadbeef-0.5.1.tar.bz2/plugins/supereq/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/supereq/Makefile.in Changed

@@ -74,7 +74,10 @@
 @HAVE_SUPEREQ_TRUE@am_supereq_la_OBJECTS = supereq.lo Equ.lo \
 @HAVE_SUPEREQ_TRUE@	Fftsg_fl.lo
 supereq_la_OBJECTS = $(am_supereq_la_OBJECTS)
-supereq_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+supereq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(supereq_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_SUPEREQ_TRUE@am_supereq_la_rpath = -rpath $(pkglibdir)
@@ -84,22 +87,42 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo " CXX " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(supereq_la_SOURCES)
 DIST_SOURCES = $(am__supereq_la_SOURCES_DIST)
 ETAGS = etags
@@ -111,6 +134,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -158,14 +182,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -255,7 +282,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -266,6 +292,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -435,7 +462,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 supereq.la: $(supereq_la_OBJECTS) $(supereq_la_DEPENDENCIES) 
-	$(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(supereq_la_LINK) $(am_supereq_la_rpath) $(supereq_la_OBJECTS) $(supereq_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -448,43 +475,49 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/supereq.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/supereq/supereq.c -> deadbeef-0.5.2.tar.bz2/plugins/supereq/supereq.c Changed

deadbeef-0.5.1.tar.bz2/plugins/tta/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/tta/Makefile.in Changed

@@ -72,9 +72,12 @@
 am__tta_la_SOURCES_DIST = ttaplug.c filter.h ttadec.c ttadec.h
 @HAVE_TTA_TRUE@am_tta_la_OBJECTS = ttaplug.lo ttadec.lo
 tta_la_OBJECTS = $(am_tta_la_OBJECTS)
-tta_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tta_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+tta_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(tta_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_TTA_TRUE@am_tta_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -82,13 +85,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(tta_la_SOURCES)
 DIST_SOURCES = $(am__tta_la_SOURCES_DIST)
 ETAGS = etags
@@ -100,6 +116,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -147,14 +164,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -244,7 +264,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -255,6 +274,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -382,7 +402,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 tta.la: $(tta_la_OBJECTS) $(tta_la_DEPENDENCIES) 
-	$(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(tta_la_LINK) $(am_tta_la_rpath) $(tta_la_OBJECTS) $(tta_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttaplug.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/tta/ttaplug.c -> deadbeef-0.5.2.tar.bz2/plugins/tta/ttaplug.c Changed

deadbeef-0.5.1.tar.bz2/plugins/vfs_curl/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/vfs_curl/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__vfs_curl_la_SOURCES_DIST = vfs_curl.c
 @HAVE_VFS_CURL_TRUE@am_vfs_curl_la_OBJECTS = vfs_curl.lo
 vfs_curl_la_OBJECTS = $(am_vfs_curl_la_OBJECTS)
-vfs_curl_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+vfs_curl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vfs_curl_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VFS_CURL_TRUE@am_vfs_curl_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(vfs_curl_la_SOURCES)
 DIST_SOURCES = $(am__vfs_curl_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 vfs_curl.la: $(vfs_curl_la_OBJECTS) $(vfs_curl_la_DEPENDENCIES) 
-	$(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vfs_curl_la_LINK) $(am_vfs_curl_la_rpath) $(vfs_curl_la_OBJECTS) $(vfs_curl_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_curl.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/vfs_curl/vfs_curl.c -> deadbeef-0.5.2.tar.bz2/plugins/vfs_curl/vfs_curl.c Changed

deadbeef-0.5.1.tar.bz2/plugins/vfs_zip/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/vfs_zip/Makefile.in Changed

@@ -74,7 +74,10 @@
 am__vfs_zip_la_SOURCES_DIST = vfs_zip.c
 @HAVE_VFS_ZIP_TRUE@am_vfs_zip_la_OBJECTS = vfs_zip.lo
 vfs_zip_la_OBJECTS = $(am_vfs_zip_la_OBJECTS)
-vfs_zip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+vfs_zip_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vfs_zip_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VFS_ZIP_TRUE@am_vfs_zip_la_rpath = -rpath $(pkglibdir)
@@ -84,13 +87,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(vfs_zip_la_SOURCES)
 DIST_SOURCES = $(am__vfs_zip_la_SOURCES_DIST)
 ETAGS = etags
@@ -102,6 +118,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -149,14 +166,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -246,7 +266,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -257,6 +276,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 vfs_zip.la: $(vfs_zip_la_OBJECTS) $(vfs_zip_la_DEPENDENCIES) 
-	$(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vfs_zip_la_LINK) $(am_vfs_zip_la_rpath) $(vfs_zip_la_OBJECTS) $(vfs_zip_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vfs_zip.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/vfs_zip/vfs_zip.c -> deadbeef-0.5.2.tar.bz2/plugins/vfs_zip/vfs_zip.c Changed

deadbeef-0.5.1.tar.bz2/plugins/vorbis/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/vorbis/Makefile.in Changed

@@ -74,7 +74,10 @@
 	i18n.h
 @HAVE_VORBIS_TRUE@am_vorbis_la_OBJECTS = vorbis.lo vcedit.lo
 vorbis_la_OBJECTS = $(am_vorbis_la_OBJECTS)
-vorbis_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+vorbis_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(vorbis_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VORBIS_TRUE@am_vorbis_la_rpath = -rpath $(pkglibdir)
@@ -84,13 +87,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(vorbis_la_SOURCES)
 DIST_SOURCES = $(am__vorbis_la_SOURCES_DIST)
 ETAGS = etags
@@ -102,6 +118,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -149,14 +166,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -246,7 +266,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -257,6 +276,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -384,7 +404,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 vorbis.la: $(vorbis_la_OBJECTS) $(vorbis_la_DEPENDENCIES) 
-	$(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vorbis_la_LINK) $(am_vorbis_la_rpath) $(vorbis_la_OBJECTS) $(vorbis_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -396,22 +416,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbis.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/vorbis/vorbis.c -> deadbeef-0.5.2.tar.bz2/plugins/vorbis/vorbis.c Changed

deadbeef-0.5.1.tar.bz2/plugins/vtx/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/vtx/Makefile.in Changed

@@ -74,9 +74,12 @@
 @HAVE_VTX_TRUE@am_vtx_la_OBJECTS = vtx.lo ay8912.lo lh5dec.lo \
 @HAVE_VTX_TRUE@	vtxfile.lo
 vtx_la_OBJECTS = $(am_vtx_la_OBJECTS)
-vtx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(vtx_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+vtx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(vtx_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_VTX_TRUE@am_vtx_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -84,13 +87,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(vtx_la_SOURCES)
 DIST_SOURCES = $(am__vtx_la_SOURCES_DIST)
 ETAGS = etags
@@ -102,6 +118,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -149,14 +166,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -246,7 +266,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -257,6 +276,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 vtx.la: $(vtx_la_OBJECTS) $(vtx_la_DEPENDENCIES) 
-	$(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(vtx_la_LINK) $(am_vtx_la_rpath) $(vtx_la_OBJECTS) $(vtx_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -397,22 +417,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtxfile.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/vtx/vtx.c -> deadbeef-0.5.2.tar.bz2/plugins/vtx/vtx.c Changed

deadbeef-0.5.1.tar.bz2/plugins/wavpack/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/wavpack/Makefile.in Changed

@@ -73,7 +73,10 @@
 am__wavpack_la_SOURCES_DIST = wavpack.c
 @HAVE_WAVPACK_TRUE@am_wavpack_la_OBJECTS = wavpack.lo
 wavpack_la_OBJECTS = $(am_wavpack_la_OBJECTS)
-wavpack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+wavpack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(wavpack_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_WAVPACK_TRUE@am_wavpack_la_rpath = -rpath $(pkglibdir)
@@ -83,13 +86,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(wavpack_la_SOURCES)
 DIST_SOURCES = $(am__wavpack_la_SOURCES_DIST)
 ETAGS = etags
@@ -101,6 +117,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -148,14 +165,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -245,7 +265,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -256,6 +275,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -383,7 +403,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 wavpack.la: $(wavpack_la_OBJECTS) $(wavpack_la_DEPENDENCIES) 
-	$(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(wavpack_la_LINK) $(am_wavpack_la_rpath) $(wavpack_la_OBJECTS) $(wavpack_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -394,22 +414,25 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wavpack.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<

deadbeef-0.5.1.tar.bz2/plugins/wildmidi/Makefile.in -> deadbeef-0.5.2.tar.bz2/plugins/wildmidi/Makefile.in Changed

@@ -75,7 +75,10 @@
 @HAVE_WILDMIDI_TRUE@am_wildmidi_la_OBJECTS = wildmidiplug.lo \
 @HAVE_WILDMIDI_TRUE@	wildmidi_lib.lo
 wildmidi_la_OBJECTS = $(am_wildmidi_la_OBJECTS)
-wildmidi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+wildmidi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(wildmidi_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_WILDMIDI_TRUE@am_wildmidi_la_rpath = -rpath $(pkglibdir)
@@ -85,13 +88,26 @@
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
 SOURCES = $(wildmidi_la_SOURCES)
 DIST_SOURCES = $(am__wildmidi_la_SOURCES_DIST)
 ETAGS = etags
@@ -103,6 +119,7 @@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -150,14 +167,17 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
-GTKUI_DEPS_CFLAGS = @GTKUI_DEPS_CFLAGS@
-GTKUI_DEPS_LIBS = @GTKUI_DEPS_LIBS@
+GTK2_DEPS_CFLAGS = @GTK2_DEPS_CFLAGS@
+GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
+GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
+GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HAVE_WPRINTF = @HAVE_WPRINTF@
+HAVE_YASM = @HAVE_YASM@
 HOTKEYS_LIBS = @HOTKEYS_LIBS@
 ICONV_LIB = @ICONV_LIB@
 IMLIB2_DEPS_CFLAGS = @IMLIB2_DEPS_CFLAGS@
@@ -247,7 +267,6 @@
 STRIP = @STRIP@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
-VALAC = @VALAC@
 VERSION = @VERSION@
 VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_LIBS = @VORBIS_LIBS@
@@ -258,6 +277,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+YASM_FLAGS = @YASM_FLAGS@
 ZIP_LIBS = @ZIP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
@@ -386,7 +406,7 @@
 	 rm -f "$${dir}/so_locations"; \
 	done
 wildmidi.la: $(wildmidi_la_OBJECTS) $(wildmidi_la_DEPENDENCIES) 
-	$(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(wildmidi_la_LINK) $(am_wildmidi_la_rpath) $(wildmidi_la_OBJECTS) $(wildmidi_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -398,32 +418,36 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wildmidiplug.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 wildmidi_lib.lo: src/wildmidi_lib.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wildmidi_lib.lo -MD -MP -MF $(DEPDIR)/wildmidi_lib.Tpo -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wildmidi_lib.Tpo $(DEPDIR)/wildmidi_lib.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/wildmidi_lib.c' object='wildmidi_lib.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wildmidi_lib.lo `test -f 'src/wildmidi_lib.c' || echo '$(srcdir)/'`src/wildmidi_lib.c
 
 mostlyclean-libtool:
 	-rm -f *.lo

deadbeef-0.5.1.tar.bz2/plugins/wildmidi/src/wildmidi_lib.c -> deadbeef-0.5.2.tar.bz2/plugins/wildmidi/src/wildmidi_lib.c Changed

deadbeef-0.5.1.tar.bz2/plugins/wildmidi/wildmidiplug.c -> deadbeef-0.5.2.tar.bz2/plugins/wildmidi/wildmidiplug.c Changed

deadbeef-0.5.1.tar.bz2/po/LINGUAS -> deadbeef-0.5.2.tar.bz2/po/LINGUAS Changed

deadbeef-0.5.1.tar.bz2/po/be.po -> deadbeef-0.5.2.tar.bz2/po/be.po Changed

@@ -8,1112 +8,1148 @@
 msgstr ""
 "Project-Id-Version: 0.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 22:33+0300\n"
-"PO-Revision-Date: 2011-02-15 00:37+0200\n"
-"Last-Translator: Максім Тамковіч <quendimax@tut.by>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-15 20:32+0200\n"
+"Last-Translator: Мікалай <crom-a@tut.by>\n"
 "Language-Team: Belarusian <>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: be\n"
-"Plural-Forms: \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"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
-msgstr "Падтрымліваемыя фарматы"
+msgstr "Падтрыманыя фарматы"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Іншыя файлы (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Усе файлы (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Адкрыць файл(ы)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Дадаць файл(ы) у плэйліст..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Дадаць каталог(і) у плэйліст..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Ісці па сімвалічных спасылках"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
-msgstr "Не атрымалася прачытаць файл даведкі"
+msgstr "Не ўдалося прачытаць файл даведкі"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
-msgstr "Не атрымалася загрузіць файл даведкі"
+msgstr "Не ўдалося загрузіць файл даведкі"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
-msgstr "help.ru.txt"
+msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Даведка"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
-msgstr "Аб праграме DeaDBeeF %s"
+msgstr "Пра праграму DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:705
-msgid "about.txt"
-msgstr "about.txt"
-
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Змены ў DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:718
-msgid "ChangeLog"
-msgstr "Змены"
-
-#: ../plugins/gtkui/callbacks.c:729
-msgid "COPYING.GPLv2"
-msgstr "COPYING.GPLv2"
-
-#: ../plugins/gtkui/callbacks.c:740
-msgid "COPYING.LGPLv2.1"
-msgstr "COPYING.LGPLv2.1"
-
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
-msgstr "Перакладчыкі DeaDBeeF "
-
-#: ../plugins/gtkui/callbacks.c:1082
-msgid "translators.txt"
-msgstr "translators.txt"
+msgstr "Перакладчыкі DeaDBeeF"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Рэдагаваць плэйліст"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Назва:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Перайменаваць плэйліст"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
-msgstr "Выдаліць плэйліст"
+msgstr "Сцерці плэйліст"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Дадаць новы плэйліст"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Захаваць перадусталёўкі эквалайзера DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Файлы перадусталёвак DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Загрузіць перадусталёўкі эквалайзера DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Перадусталёўкі эквалайзера DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Імпартаваць перадусталёўку эквалайзера Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Перадусталёўкі эквалайзера Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Запісаць"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Загрузіць"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Імпартаваць перадусталёўку Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Уключыць"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Абнуліць усё"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Абнуліць перадузмацненне"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Абнуліць частоты"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Захаваць"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Загрузіць"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Імпартаваць перадусталёўку Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Профілі"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 дзень %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дзён %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Стоп | %d трэкаў | %s агульны час"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Мона"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Стэрэа"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбіт/с "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Паўза | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d трэкаў | %s агульны час"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
-msgstr "Захаваць плэйліст як"
+msgstr "Запісаць плэйліст як"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Файлы плэйлістоў DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
-msgstr "Загрузіць плэйліст"
+msgstr "Прачытаць плэйліст"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Іншыя файлы (*)"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Новы плэйліст"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новы плэйліст (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Адкрыць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Дадаць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Дадаць каталог(і)"
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Дадаць месцазнаходжанне"
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Новы плэйліст"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
-msgstr "Загрузіць плэйліст"
+msgstr "Прачытаць плэйліст"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
-msgstr "Захаваць плэйліст"
-
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Захаваць плэйліст як"
+msgstr "Запісаць плэйліст"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Выйсцi"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
-msgstr "_Праўка"
+msgstr "_Рэдагаваць"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Ачысціць"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Вылучыць усё"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Зняць вылучэнне"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
-msgstr "Звярнуць вылучэнне"
+msgstr "Інвертаваць вылучэнне"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
-msgstr "Вылучанае"
+msgstr "Вылучэнне"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
-msgstr "Выдаліць"
+msgstr "Сцерці"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Пакінуць вылучанае"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Знайсці"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Парадкаваць па"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Назва"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Нумар трэка"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Альбом"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Выканаўца"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Дата"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Карыстальніцкі"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Наладкі"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Выгляд"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Радок стану"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Загалоўкі слупкоў"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
-msgstr "Устаўкі"
+msgstr "Карткі"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Прай_граванне"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Чарга"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
-msgstr "Па чарзе"
+msgstr "Лінейная"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Перамяшаць трэкі"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Уперамешку"
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Перамяшаць альбомы"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Выпадкова"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Паўтараць"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Паўтараць усё"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Паўтараць адзін трэк"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Не паўтараць"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Пракручваць плэйліст аўтаматычна"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Вылучаць бягучы трэк"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Спыніць пасля бягучага"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Перайсці на бягучы трэк"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Змены"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
-msgstr "_Аб праграме"
+msgstr "_Пра праграму"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Перакладчыкі"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Прайграць"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Паўза"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Папярэдняя"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Наступная"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Граць выпадкова"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
-msgstr "Аб праграме"
+msgstr "Пра праграму"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
-msgstr "Выйсце"
-
-#: ../plugins/gtkui/interface.c:1045 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Даданне файлаў..."
-
-#: ../plugins/gtkui/interface.c:1089 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Скасаваць"
+msgstr "Выйсці"
 
-#: ../plugins/gtkui/interface.c:1189 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Уласцівасці трэка"
 
-#: ../plugins/gtkui/interface.c:1235 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Настаўленні"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Ужыць"
 
-#: ../plugins/gtkui/interface.c:1256 ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
-msgstr "_Зачыніць"
+msgstr "_Замкнуць"
 
-#: ../plugins/gtkui/interface.c:1260 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
-msgstr "Метададзеныя"
+msgstr "Метаданыя"
 
-#: ../plugins/gtkui/interface.c:1306 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: ../plugins/gtkui/interface.c:1391 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "Рэдагаваць слупок"
-
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Назва:"
-
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Увядзіце назву новага слупка"
 
-#: ../plugins/gtkui/interface.c:1422 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Тып:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Нумар"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Прайграецца"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
-msgstr "Вокладка альбому"
+msgstr "Вокладка альбома"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Выканаўца - Альбом"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Выканаўца"
-
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Альбом"
-
-#: ../plugins/gtkui/interface.c:1436 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Назва"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
-msgstr "Даўжыня"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Працягласць"
 
-#: ../plugins/gtkui/interface.c:1438 ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Трэк"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Нумар трэка"
 
-#: ../plugins/gtkui/interface.c:1439 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
-msgstr "Гурт / Выканаўца альбому"
+msgstr "Гурт / Выканаўца альбома"
 
-#: ../plugins/gtkui/interface.c:1440 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Карыстальніцкі"
-
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Фармат:"
 
-#: ../plugins/gtkui/interface.c:1461 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Выраўніванне:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Па леваму краю"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Па праваму краю"
 
-#: ../plugins/gtkui/interface.c:1472 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Пераўтварэнне фармата (пачынаецца з %):\n"
-" %a-выканаўца, %t-назва, %b-альбом, %B-гурт,\n"
-" %C-кампазітар, %n-нумар трэка, %N-усяго трэкаў,\n"
-" %l-даўжыня, %y-год, %g-жанр, %c-каментар,\n"
-" %r-аўтарскія правы, %f-імя файла, %F-шлях да файла\n"
-" %T-тэгі, %d-дырэкторыя, %D-поўны шлях да дырэкторыі\n"
-"Прыклад: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501 ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040 ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../plugins/gtkui/interface.c:1522 ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061 ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1753 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
-msgstr "Модуль вывада:"
+msgstr "Модуль вываду:"
 
-#: ../plugins/gtkui/interface.c:1766 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
-msgstr "Прылада вывада:"
+msgstr "Прылада вываду:"
 
-#: ../plugins/gtkui/interface.c:1775 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Заўсёды канверсаваць 8-біт аўдыё ў 16-біт"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Гук"
 
-#: ../plugins/gtkui/interface.c:1784 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Дазволіць дынамічную змену частаты дыскрэтызацыі"
-
-#: ../plugins/gtkui/interface.c:1792 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Алгарытм інтэрпаляцыі:"
-
-#: ../plugins/gtkui/interface.c:1811 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Рэжым аўтаўстаноўкі гучнасці:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Адключаны"
 
-#: ../plugins/gtkui/interface.c:1824 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Трэк"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Выкарыстоўваць пікавае значэнне"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 дБ"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 дБ"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Перадузмацненне з рыплэйгейна:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Глабальнае перадузмацненне:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
-"Дадаваць файлы з каманднага радка\n"
-"(ці файлавага кіраўніка) у гэты плэйліст:"
+"Дадаваць файлы з загаднага радка (ці файлавага кіраўніка) у гэты плэйліст:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
-msgstr "Аднаўляць папярэднюю сесію пры запуску"
+msgstr "Узнаўляць папярэдні сеанс пры запуску"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Не дадаваць з архіваў пры праглядзе каталога"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: ../plugins/gtkui/interface.c:1854 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Канфігурацыя"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Профіль ланцужкоў DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Чытаць"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
-msgstr "Згортваць у трэй паводле зачынення"
+msgstr "Згортваць у трэй замест закрыцця"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
-msgstr "Сярэдняя кнопка мышы зачыняе плэйліст"
+msgstr "Сярэдняя кнопка мышы закрывае плэйліст"
 
-#: ../plugins/gtkui/interface.c:1862 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
-msgstr "Не адлюстроўваць іконку у трэі"
+msgstr "Не паказваць іконку у трэі"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
-msgstr "Выкарыстоўваць тлусты шрыфт для бягучага трэка"
+msgstr "Выкарыстоўваць цёмны шрыфт для бягучага трэка"
 
-#: ../plugins/gtkui/interface.c:1870 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Прыбраць пункт \"Выдаліць з дыска\" з кантэкстнага меню"
+msgstr "Прыбраць пункт \"Сцерці з дыска\" з кантэкстнага меню"
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Аўтаматычна называць плэйліст, калі дадаецца адзін каталог"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Частата абнаўлення інтэрфейсу (разоў за сек.):"
 
-#: ../plugins/gtkui/interface.c:1878 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Тэкст загалоўка пры прайграванні:"
 
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Тэкст загалоўка пры спыненні:"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Плагін графічнага інтэрфейсу (змена патрабуе перазапуску):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Інтэрфейс"
 
-#: ../plugins/gtkui/interface.c:1916 ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Замяніць"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Пярэдні план"
 
-#: ../plugins/gtkui/interface.c:1932 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Асноўныя колеры"
 
-#: ../plugins/gtkui/interface.c:1969 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Сярэдні"
 
-#: ../plugins/gtkui/interface.c:1976 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Светлы"
 
-#: ../plugins/gtkui/interface.c:1983 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Цёмны"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Грунтоўны"
 
-#: ../plugins/gtkui/interface.c:2021 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Тэкст"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
-msgstr "Колеры ўставак"
+msgstr "Колеры картак"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
-"Замяніць (губляюцца наладкі тэмы GTK, але павялічваецца\n"
-"хуткасць адлюстроўвання"
+"Замяніць (губляюцца настаўленні тэмы GTK, але павялічваецца хуткасць "
+"адлюстравання)"
 
-#: ../plugins/gtkui/interface.c:2039 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
-msgstr ""
-"Цотны\n"
-"радок"
+msgstr "Цотны радок"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
-msgstr ""
-"Няцотны\n"
-"радок"
-
-#: ../plugins/gtkui/interface.c:2065 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Тэкст"
+msgstr "Няцотны радок"
 
-#: ../plugins/gtkui/interface.c:2072 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
-msgstr ""
-"Вылучаны\n"
-"радок"
+msgstr "Вылучаны радок"
 
-#: ../plugins/gtkui/interface.c:2091 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
-msgstr "Вылучаны радок"
+msgstr "Вылучаны тэкст"
 
-#: ../plugins/gtkui/interface.c:2104 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Колеры плэйліста"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Колеры"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Уключыць проксі-сервер"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Адрас:"
 
-#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Порт:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Тып проксі:"
 
-#: ../plugins/gtkui/interface.c:2185 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Імя карыстальніка:"
 
-#: ../plugins/gtkui/interface.c:2198 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Пароль:"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Сетка"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Версія: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Аўтарскія правы"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Дадаткі"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Групаваць па"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Парадкаваць па..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Фармат"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Да павелічэння"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Да памяншэння"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Вылучце плагін DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Плагін"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Настаўленні рэдактара тэгаў"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Пісаць ID3v2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Пісаць ID3v1"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Пісаць APEv2"
 
-#: ../plugins/gtkui/interface.c:2252 ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Выразаць ID3v2"
 
-#: ../plugins/gtkui/interface.c:2256 ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Выразаць ID3v1"
 
-#: ../plugins/gtkui/interface.c:2260 ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Выразаць APEv2"
 
-#: ../plugins/gtkui/interface.c:2268 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
-msgstr "2.3 (Параіная)"
+msgstr "2.3 (рэкамендавана)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Кадыроўка ID3v1 (па змаўчанні iso8859-1)"
+msgstr "Знаказбор ID3v1 (прадвызначаны iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Пісать ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Рэдактар тэгаў"
-
-#: ../plugins/gtkui/interface.c:2419 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Апісанне:"
-
-#: ../plugins/gtkui/interface.c:2434 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Аўтар(ы):"
-
-#: ../plugins/gtkui/interface.c:2449 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Электронны адрас:"
-
-#: ../plugins/gtkui/interface.c:2464 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Вэб-сайт:"
-
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Наладзіць"
-
-#: ../plugins/gtkui/interface.c:2499 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Дадаткі"
-
-#: ../plugins/gtkui/interface.c:2881 ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "Рэдактаваць плэйліст"
-
-#: ../plugins/gtkui/interface.c:3008 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Гуртаваць па"
-
-#: ../plugins/gtkui/interface.c:3134 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Пераўтварэнне фармату (пачыная з %):\n"
-" %a-выканаўца, %t-назва, %b-альбом, %B-гурт,\n"
-" %C-кампазітар, %n-нумар трэка, %N-усяго трэкаў,\n"
-" %l-даўжыня, %y-год, %g-жанр, %c-каментар,\n"
-" %r-аўтарскія правы, %f-імя файла, %T-тэгі\n"
-"Прыклад: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Выканаўца / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Трэк №"
 
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Загаловак / Выканаўца"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Працягласць"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
-msgstr "Выдаліць файлы з жорсткага дыска"
+msgstr "Выдаліць файлы з цвёрдага дыска"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 "Файлы будуць выдалены. Працягваць?\n"
-"(Гэты дыялог можы быць адключаны ў наладках GTKUI)"
+"(Гэты дыялог можы быць адключаны ў настаўленнях плагіна GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Увага"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Дадаць у чаргу"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Выдаліць з чаргі"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Аднавіць метададзеныя"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Выдаліць з жорсткага дыска"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Дадаць слупок"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
-msgstr "Рэдактаваць слупок"
+msgstr "Рэдагаваць слупок"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
-msgstr "Выдаліць слупок"
+msgstr "Прыбраць слупок"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
-msgstr "Гуртаваць па"
+msgstr "Групаваць па"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
-msgstr "Адсутнічае"
+msgstr "Няма"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Выканаўца/Дата/Альбом"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Адкрыць файл..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Усталёўкі %s"
+msgid "Configure %s"
+msgstr "Наставіць %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
-msgstr "Аўдыё прыстасаванне па змаўчанні"
+msgstr "Прадвызначаная прылада аўдыё"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Дадаць"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Гарачыя клавішы"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Слот"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Камбінацыя клавіш"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "Модуль вывада ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Даданне файлаў..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Ініцыялізацыя..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Дадзеныя для гэтага трэка былі зменены."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
-msgstr "Зачыніць вакно?"
+msgstr "Закрыць акно?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Месцазнаходжанне"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Некалькі велічынь] "
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Нумар укладзенага трэка"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Тып(ы) тэгаў"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Значэнне"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Укладзены файл cue"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Запісанне тэгаў..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Да"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Назва:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Не"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Назвы палёў не могуць пачынацца з : ці _"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Кодек"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Немагчыма дадаць поле"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Ключ"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Поле з такой назвай ужо ёсць, паспрабуйце назваць інакш."
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Значэнне"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Сцерці вылучаныя палі?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Дадаць поле"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF зараз грае"
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Сцерці поле"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
-msgstr "Выкарыстоўванне: deadbeef [опцыі] [файл(ы)]\n"
+msgstr "Ужыванне: deadbeef [опцыі] [файл(ы)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Опцыі:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help ці -h Адлюстраваць даведку (гэты тэкст) і выйсці\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Выйсці з плэера\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr ""
 " --version Адлюстраваць інфармацыю аб версіі праграмы і выйсці\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Пачаць граць\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Спыніць прайграванне\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Прыпыніць прайграванне\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Пераключыць паўзу\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Пачаць прайграванне, калі спынена, іначай пераключыць "
+"паўзу\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Настуная песня ў плэйлісце\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Папярэдняя песня ў плэйлісце\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Выпадковая песня ў плэлісце\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Дадаць файл(ы) у існуючы плэйліст\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Адлюстраваць адфарматыраваную назву трэка\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
-" FMT %%-сінтаксіс: %%a-выканаўца, %%t-назва, %%b-"
-"альбом,\n"
-" %%l-даўжыня, %%n-нумар трэка, %%y-год, %%c-каментар,\n"
-" %%r-аўтарскія правы, %%e-пройдзены час \n"
+" FMT %%-сінтаксіс: %%a-выканаўца, %%t-назва, %%"
+"b-альбом,\n"
+" %%l-даўжыня, %%n-нумар трэка, %%y-год, %%"
+"c-каментарый,\n"
+" %%r-аўтарскія правы, %%e-пройдзены час\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1122,19 +1158,43 @@
 " Напрыклад: --nowplaying \"%%a - %%t\" павінна вывесці "
 "на экран \"artist - title\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " за падрабязнымі звесткамі, гл. http://sourceforge.net/a"
+"pps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
-msgstr "Плэйліст"
+msgstr "Прадвызначана"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Так"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Не"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
-"2.3 (Параіная)\n"
+"2.3 (Рэкамендавана)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Да павелічэння\n"
+"Да памяншэння"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1144,7 +1204,7 @@
 "Трэк\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1153,8 +1213,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1167,10 +1227,10 @@
 "Назва\n"
 "Даўжыня\n"
 "Трэк\n"
-"Гурт / Выканаўца альбому\n"
+"Гурт / Выканаўца альбома\n"
 "Рознае"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1179,9 +1239,10 @@
 "Правы"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "Не атрымалася знайсці файл выявы: %s"
+msgstr "Не ўдалося знайсці файл выявы: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
@@ -1211,7 +1272,7 @@
 msgid "Release device while stopped"
 msgstr "Вызваляць прыстасаванне ў час спынення"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Упадабаны памер буферу"
 
@@ -1240,167 +1301,568 @@
 msgid "Scrobble URL"
 msgstr "Адрас для скроблінга"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Файл прылады"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Абход хібы OSS4 samplerate"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Перыяд аднаўлення кэша (гадзіны)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Атрымліваць з унутраных тэгаў"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Атрымліваць з лакальнай тэчкі"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Файлавая маска для лакальных вокладак"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Атрымліваць з last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Атрымліваць з albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Маштабаваць выявы па даўжэйшым баку"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Выкарыстоўваць CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Выкарытоўваць CD-Text замест CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB url (напрыклад, 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Нумар парта CDDB (напрыклад, '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Выкарыстоўваць пратакол CDDB замест HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Уключыць падтрымку NRG вобразаў"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Якасць перадысрэтызацыі (0..2, вышэй - лепш)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Максімальная даўжыня трэка (у хвілінах)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Запытваць пацверджанне на выдаленне файлаў з жорсткага дыска"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Адчувальнасць рэгулятара гучнасці ў значку статусу"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Карстальніцкі значок статусу"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Запускаць gtk_init з ключом --sync (рэжым адладкі)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Дадаваць раздзельнікі паміж пунктамі кантэкстнага меню плагінаў"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Фармат паведамлення"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Фармат загалоўка паведамлення"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Фармат зместу паведамлення"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Паказваць вокладку альбома"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Памер вокладкі альбома (пікс.)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Сервер PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Частата дыскрэтызацыі"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Адносны шлях табліцы пошуку"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Абсолютный путь таблицы поиска"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Пераставіць месцамі аўдыё байты"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "Уключыць падтрымку HVSC"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Уключыць падтрымку HVSC Songlength DB"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Шлях да HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (from HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Бітаў на сэмпл (8 ці 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Тыповая даўжыня трэка (сек.)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Файл канфігурацыі для банка Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Назва трэка"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Выканаўца"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Дата"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Нумар трэка"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Усяго трэкаў"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Кампазітар"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Нумар дыска"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Каментар"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Кодер / Продавец"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Аўтарскія правы"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Месцазнаходжанне"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Нумар укладзенага трэка"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Тып(ы) тэгаў"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Укладзены файл cue"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Кодэк"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Канчаткі файлаў (праз ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Канверсаваць"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Мэтавая частата дыскрэтызацыі"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Якасць / Алгарытм"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Аўтаматычная частата дыскрэтызацыі (перакрывае Мэтавую)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Файл ужо існуе. Перапісаць?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Папярэджанне канвертара"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Выберыце кадавальнік"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Памылка кадавальніка"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Пераўтварэнне..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Вылучыць каталог..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Не ўдалося запісаць профіль кадавальніка"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Праверце правы доступу каталога, паспрабуйце іншую назву, ці высвабадзіце "
+"месца на дыску"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Профіль з такой назвай ужо існуе. Паспрабуйце іншую назву."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Памылка"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Дадаць кадавальнік"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Рэдагаваць кадавальнік"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Сцерці профіль"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Гэта дзеянне выдаліць вылучаны профіль. Упэўнены?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Кадавальнікі"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Дадаць плагін у ланцуг DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Не ўдалося запісаць профіль DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Новы профіль DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Рэдагаваць профіль DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Профілі DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Каталог вываду:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Назва файла вываду:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Канчатак файла (напр. mp3) будзе дададзены аўтаматычна.\n"
+"Пакіньце гэта поле пустым для прадвызначэння (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Кадавальнік:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Профіль DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Колькасць нітак:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Фармат выходнага сэмпла:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Захоўваць фармат крыніцы"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8-біт знакавая цэлая"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16-біт знакавая цэлая"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24-біт знакавая цэлая"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32-біт знакавая цэлая"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32-біт плыўная"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Калі файл існуе:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Спытаць"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Перапісаць"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Захоўваць структуру каталогаў, пачынаючы з:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Рэдагаваць профіль кадавальніка"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Неназваны кадавальнік"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Канчатак файла вываду:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Напр. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Загадны радок:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Прыклад: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - назва файла вываду\n"
+"%i - назва файла часовага ўводу"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Метад:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Канвеер"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Часовы файл"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Рэдактар тэгаў"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Рэдактар профіляў DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Неназваны профіль DSP"
+
+#~ msgid "about.txt"
+#~ msgstr "about.txt"
+
+#~ msgid "ChangeLog"
+#~ msgstr "Змены"
+
+#~ msgid "COPYING.GPLv2"
+#~ msgstr "COPYING.GPLv2"
+
+#~ msgid "COPYING.LGPLv2.1"
+#~ msgstr "COPYING.LGPLv2.1"
+
+#~ msgid "translators.txt"
+#~ msgstr "translators.txt"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Захаваць плэйліст як"
+
+#~ msgid "_Abort"
+#~ msgstr "_Скасаваць"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "Рэдагаваць слупок"
+
+#~ msgid "Length"
+#~ msgstr "Даўжыня"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Пераўтварэнне фармата (пачынаецца з %):\n"
+#~ " %a-выканаўца, %t-назва, %b-альбом, %B-гурт,\n"
+#~ " %C-кампазітар, %n-нумар трэка, %N-усяго трэкаў,\n"
+#~ " %l-даўжыня, %y-год, %g-жанр, %c-каментар,\n"
+#~ " %r-аўтарскія правы, %f-імя файла, %F-шлях да файла\n"
+#~ " %T-тэгі, %d-дырэкторыя, %D-поўны шлях да дырэкторыі\n"
+#~ "Прыклад: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Дазволіць дынамічную змену частаты дыскрэтызацыі"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Алгарытм інтэрпаляцыі:"
+
+#~ msgid "Description:"
+#~ msgstr "Апісанне:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Аўтар(ы):"
+
+#~ msgid "Email:"
+#~ msgstr "Электронны адрас:"
+
+#~ msgid "Website:"
+#~ msgstr "Вэб-сайт:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "Рэдактаваць плэйліст"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Пераўтварэнне фармату (пачыная з %):\n"
+#~ " %a-выканаўца, %t-назва, %b-альбом, %B-гурт,\n"
+#~ " %C-кампазітар, %n-нумар трэка, %N-усяго трэкаў,\n"
+#~ " %l-даўжыня, %y-год, %g-жанр, %c-каментар,\n"
+#~ " %r-аўтарскія правы, %f-імя файла, %T-тэгі\n"
+#~ "Прыклад: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Загаловак / Выканаўца"
+
+#~ msgid "Setup %s"
+#~ msgstr "Усталёўкі %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Модуль вывада ALSA"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF зараз грае"
+
+#~ msgid "HVSC path"
+#~ msgstr "Шлях да HVSC"
 
 #~ msgid "Couldn't get enough memory for input buffering."
 #~ msgstr ""

deadbeef-0.5.1.tar.bz2/po/bg.po -> deadbeef-0.5.2.tar.bz2/po/bg.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2011-03-03 11:27+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-01 01:02+0200\n"
 "Last-Translator: Радослав <Rec.ku@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: bg\n"
@@ -18,838 +18,903 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Поддържани звукови формати"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Други файлове (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Всички файлове (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Отвори файл(ове)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Добави файл(ове) в списъка за изпълнение..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Добави папка/и в списъка за изпълнение..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Последвай символните връзки"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Грешка при четене на помощен файл"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Грешка при зареждане на помощен файл"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Помощ"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Относно DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
-#, c-format, 
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Списък с промени"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Преводачи на DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Редактирай Списъка за изпълнение"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Заглавие:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Преименувай Списъка за изпълнение"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Премахни Списъка за изпълнение"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Добави нов Списък за изпълнение"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Запамети стойностите на Тонкоректора"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Файлове със стойности на Тонкоректора (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Зареждане стойности на Тонкоректора..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Зададени стойности на Тонкоректора (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Внасяне на стойности за Тонкоректор: Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Стойности на Тонкоректора Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Зареди зададено"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Внасяне на стойности Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Активирай"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Анулирай всичко"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Анулирай предусилвателя"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Анулирай лентите"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Запамети зададеното"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Зареди зададено"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Внасяне на стойности Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Предварително зададени"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 ден %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дена %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Спрян | %d песни | %s времетраене"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбвс"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Паузиран |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dХц | %d бит | %s | %d:%02d / %s | %d песни | %s времетраене"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Запамети списъка като..."
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF списъци за изпълнение (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Зареди Списък"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Други файлове (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Нов Списък"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Нов Списък (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Отваряне на файл(ове)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Добави файл(ове)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Добави папка/и"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Добави местоположение"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Нов списък"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Зареждане на списък"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Зпаметяване на списъка"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Запаметяване на списъка като..."
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Изход от приложението"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Изчистване"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Маркиране на всички"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Демаркиране на всички"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Обръщане на избора"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Подбиране"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Премахване"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Изрязване"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Търсене"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Сортиране по"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Заглавие"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Номер на файла"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Албум"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Изпълнител"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Дата"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Предпочитани"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Предпочитания"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
-msgstr "Лента на състоянието"
+msgstr "Панел на състоянието"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Заглавия на колоните"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Етикети"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Тонкоректор"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Изпълнява се"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Подредба"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Линейно"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "Разбъркване"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Разбъркване на песни"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Разбъркване на албуми"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Произволно"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Повтаряемост"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Повтаряне след всички"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Повтаряне на една песен"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Без повтаряне"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Превъртане следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Курсора следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Спри след текущото"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Прескачане до текущата песен"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Отчет"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
-msgstr "_Относно"
+msgstr "От_носно"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "П_реводачи"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Търсене"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Спиране"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Пускане"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Паузиране"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Предишна"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Следваща"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Произволно изпълняване"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Относно"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Изход"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Добавяне на файлове..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Прекъсване"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Свойства за Песента"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"ВНИМАНИЕ: поставянето на етикети е в разбработка.\n"
-"Направете възстановяващи копия преди да го използвате."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Прилагане"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Метаданни"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-#, fuzzy
-msgid "editcolumndlg"
-msgstr "Редактиране на Колоните"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Заглавие:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Име на нова колона:"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Вид:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Номер на файла"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Индекс на елемента"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Изпълнява се"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Обложка на албума"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Изпълнител - Албум"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Изпълнител"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Албум"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Заглавие"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Времетраене"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Продължителност"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-#, fuzzy
-msgid "Track"
-msgstr "Име на файла"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Номер на песента"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Група / Изпълнител на албума"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Предпочитани"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Подравняване:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Ляво"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Дясно"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Символи за формат (започват с %):\n"
-"[a]-Артист, [t]-Заглавие, [b]-Албум, [B]-Група, [C]-Композитор\n"
-"[n]-Номер на файла, [N]-Всички файлове,\n"
-"[l]-Времетраене, [y]-Година, [g]-Жанр, [c]-Коментар,\n"
-"[r]-Запазени права, [f]-Име на файла, [F]-Път до папката, [T]Етикети,\n"
-"[d]-Папка, [D]-Път до (и име на) папката\n"
-"Пример: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
-msgstr "_Добре"
+msgstr "_Да"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Изходна приставка:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Иходно устройство:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Винаги да се конвертира 8-битов звук в 16-битов"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Позволи динамична промяна на честотата"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Конвертирано качество:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Режим на усилване:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Деактивиране"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Име на файла"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Скала за усилване на максимума"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 дБ"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 дБ"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Режим на усилване:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Усилване за цялата система:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Добавяне на файлове с команда (или файлов мениджър) в този лист за "
 "изпълнение:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "При следващото стартиране, продължи предишната сесия"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Да не се добавят от архиви, когато се добавят папки"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Възпроизвеждане"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Настройване"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "Заре_ждане"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "При затваряне, минимизирай в таблата"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Средният бутон на мишката затваря листа за изпълнение"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Скрий иконата в таблата"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Използване на удебелен шрифт за текущата песен"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Скриване на елемент от менюто - \"Изтриване от Диска\""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+"Автоматично именуване на листа за изпълнение, когато е добавена само една "
+"папка"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Опресняване (пъти в секунда):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Заглавен текст при изпълнение:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Заглавен текст при спиране:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Приставка за графичния вид (промяната изисква рестарт):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Графичен вид"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Презапис"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "На преден план"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "На фон"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Цвят на бутона за Превъртане/Усилване"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Среден"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Светъл"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Тъмен"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Основен"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Текст"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Цветове на разделната лента"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Презапис (увеличава се производителността, но се губи естетиката)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Четен ред"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Нечетен ред"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Маркираният ред"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Маркираният текст"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Цветове на листа"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Цветове"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Активиране на помощен сървър"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Адрес на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Порт на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Вид помощен сървър:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Потребителско име:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Парола:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Версия:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Приставки"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "Адрес:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Групиране по"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Сортиране по..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Формат"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Възходящ"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Низходящ"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Подбиране"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Приставка"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Настройки на редактора на етикети"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Запиши ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Запиши ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Зпаиши APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Лента ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Лента ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Лента APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Версия на ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Препоръчителна)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Транслиране на символите за ID3v1 (по подразбиране е iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Запиши ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Създаване на етикети"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Описание:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Автор(и):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Електронна поща:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Уебсайт:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Настройване"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Приставки"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-#, fuzzy
-msgid "editplaylistdlg"
-msgstr "Редактиране на Листа"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "Адрес:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Групиране по"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Символи за формат (започват с %):\n"
-"[a]-Артист, [t]-Заглавие, [b]-Албум, [B]-Група, [C]-Композитор\n"
-"[n]-Номер на песента, [N]-Всички файлове,\n"
-"[l]-Времетраене, [y]-Година, [g]-Жанр, [c]-Коментар,\n"
-"[r]-Запазени права, [f]-Име на файла, [T]-Етикети,\n"
-"Пример: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Артист/Албум"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Номер на Песента"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Заглавие/Изпълнител"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Продължителност"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Изтрий файловете от носителя"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -858,195 +923,220 @@
 "(Това съобщение, може да бъде деактивирано от настройките\n"
 "на приставката за Графичния вид)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Добави в опашката за изпълнение"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Премахни от опашката за изпълнение"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Презареди метаданните"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Прехани от носителя"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Добавяне на Колона"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Редактиране на Колона"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Премахване на Колона"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Групиране по"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Нищо"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Изпълнител/Дата/Албум"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Отвори файл..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Настройки %s"
+msgid "Configure %s"
+msgstr "Настройване на %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Аудио устройство по подразбиране"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Добави"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Системни \"Бързи\" клавиши"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Слот"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Клавишна комбинация"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA изходна приставка"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Добавяне на файлове..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Разпознаване..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Имате променяни данни за тази песен."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Да се затвори ли прозореца?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Тип(ове) Етикет(и)"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Вградени фрази"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Да"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Не"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Кодек"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Множество стойности]"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Стойност"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF в момента изпълнява:"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Записване на етикетите..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Име:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Имената на полетата не могат да започват с \":\" или \"_\""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Не може да бъде добавено поле"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Вече съществува поле със същото име, моля пробвайте с друго!"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Да се премахне ли избраното поле?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Добавяне на поле"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Премахване на поле"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Употреба: deadbeef [опции] [файл(ове)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr "--help или -h Изписва помощ (това съобщение) и излиза\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr "--quit Изход от Плейъра\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr "--version Изписва информация за версията и излиза\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr "--play Възпроизвеждане\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr "--stop Спиране\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr "--pause Паузиране\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr "--toggle-pause Превключване в\\от режим на пауза\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause Започване на възпроизвеждане, ако е спряно или излизане от "
+"режим на пауза\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr "--next Следващата песен в листа\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr "--prev Предишната песен в листа\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr "--random Произволна песен от листа\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr "--queue Прибавяне на файл(ове) в съществуващия лист\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr "--nowplaying \"Формат\" Изписва Форматирано име\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1057,18 +1147,34 @@
 "[b]-Албум, [l]-Времетраене, [n]-Номер на песента,\n"
 "[y]-Година, [c]-Коментар, [r]-Авторски права, [e]-Изминали\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "пр.: --nowplaying \"%%a - %%t\" ще изведе \"изпълнител - песен\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr "За повече информация: http://sourceforge.net/apps/mediawiki/deadbeef/index.p"
+"hp?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Да"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Не"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1076,7 +1182,15 @@
 "2.3 (Препоръчителна)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Възходящо\n"
+"Низходящо"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1086,17 +1200,17 @@
 "Песен\n"
 "Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1112,7 +1226,7 @@
 "Група/Албумен Изпълнител\n"
 "Обичайни"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1121,70 +1235,669 @@
 "Дясно"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не е открито Х-изображение: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Няма достатъчно памет за входящо буфериране."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: Файлът с настройките - freepats не е открит. Моля, инсталирайте "
+"пакета \"timidity-freepats\" или опишете пътя до freepats.cfg, в настройките "
+"на приставката!"
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Добавяне на Аудио диск"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Грешка при прочитането на първия слой от Ogg потоците."
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Свързване към Last.fm"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Грешка при прочитането на първия заглавен пакет."
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Използване на ALSA ресемплинг"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Няма достатъчно памет за регистриране номера на новия поток."
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Освободи устройство след спиране"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Входящият е прекъснат или празен."
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Предпочитан размер на буфера"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Входящото не е Ogg битов поток."
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Предпочитана дължина на периода"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg потока не съдържа Vorbis данни."
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Активиране на помощен сървър"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Край на файла преди разпознаването на потока."
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Деактивиране на настоящо изпълнение"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg потока не съдържа, поддържания тип данни."
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Потребителско име:"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Увредена втора заглавна част."
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Парола:"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Край на файла преди последната Vorbis заглавна част."
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Адрес на помощния сървър"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Увредени или липсващи данни, продължаване..."
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Файл за устройство"
 
-#: ../plugins/vorbis/vcedit.c:874
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
 msgstr ""
-"Грешка при записването. Вероятно изходящия поток е увреден или прекъснат."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
-#, c-format, 
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
 msgstr ""
-"wildmidi: Файлът с настройките - freepats не е открит. Моля, инсталирайте "
-"пакета \"timidity-freepats\" или опишете пътя до freepats.cfg, в настройките "
-"на приставката!"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Изтрий файловете от носителя"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Обложка на албума"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Номер на Песента"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Заглавие/Изпълнител"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Номер на файла"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Добави местоположение"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Тип(ове) Етикет(и)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Вградени фрази"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Кодек"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Маркиране на всички"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Редактиране на Колона"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Запамети зададеното"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Иходно устройство:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Изходна приставка:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Запамети зададеното"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Презапис"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Зареди зададено"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Изходна приставка:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Зпаиши APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Запиши ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Запиши ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Създаване на етикети"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Запаметяване на списъка като..."
+
+#~ msgid "_Abort"
+#~ msgstr "_Прекъсване"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "ВНИМАНИЕ: поставянето на етикети е в разбработка.\n"
+#~ "Направете възстановяващи копия преди да го използвате."
+
+#, fuzzy
+#~ msgid "editcolumndlg"
+#~ msgstr "Редактиране на Колоните"
+
+#~ msgid "Length"
+#~ msgstr "Времетраене"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Символи за формат (започват с %):\n"
+#~ "[a]-Артист, [t]-Заглавие, [b]-Албум, [B]-Група, [C]-Композитор\n"
+#~ "[n]-Номер на файла, [N]-Всички файлове,\n"
+#~ "[l]-Времетраене, [y]-Година, [g]-Жанр, [c]-Коментар,\n"
+#~ "[r]-Запазени права, [f]-Име на файла, [F]-Път до папката, [T]Етикети,\n"
+#~ "[d]-Папка, [D]-Път до (и име на) папката\n"
+#~ "Пример: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Позволи динамична промяна на честотата"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Конвертирано качество:"
+
+#~ msgid "Description:"
+#~ msgstr "Описание:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Автор(и):"
+
+#~ msgid "Email:"
+#~ msgstr "Електронна поща:"
+
+#~ msgid "Website:"
+#~ msgstr "Уебсайт:"
+
+#, fuzzy
+#~ msgid "editplaylistdlg"
+#~ msgstr "Редактиране на Листа"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Символи за формат (започват с %):\n"
+#~ "[a]-Артист, [t]-Заглавие, [b]-Албум, [B]-Група, [C]-Композитор\n"
+#~ "[n]-Номер на песента, [N]-Всички файлове,\n"
+#~ "[l]-Времетраене, [y]-Година, [g]-Жанр, [c]-Коментар,\n"
+#~ "[r]-Запазени права, [f]-Име на файла, [T]-Етикети,\n"
+#~ "Пример: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Настройки %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA изходна приставка"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Няма достатъчно памет за входящо буфериране."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Грешка при прочитането на първия слой от Ogg потоците."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Грешка при прочитането на първия заглавен пакет."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "Няма достатъчно памет за регистриране номера на новия поток."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Входящият е прекъснат или празен."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Входящото не е Ogg битов поток."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg потока не съдържа Vorbis данни."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Край на файла преди разпознаването на потока."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg потока не съдържа, поддържания тип данни."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Увредена втора заглавна част."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Край на файла преди последната Vorbis заглавна част."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Увредени или липсващи данни, продължаване..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Грешка при записването. Вероятно изходящия поток е увреден или прекъснат."

deadbeef-0.5.1.tar.bz2/po/bn.po -> deadbeef-0.5.2.tar.bz2/po/bn.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-06-15 12:31+0600\n"
 "Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
 "Language-Team: LBengali <ankur-bd-l10n@googlegroups.com>\n"
@@ -18,154 +18,176 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "সমর্থিত শব্দ ফরম্যাট"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "অন্যান্য ফাইলসমূহ (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "ফাইল খুলুন..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "প্লেলিস্টে ফাইল সংযুক্ত করুন..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "প্লেলিস্টে ফোল্ডার সংযুক্ত করুন..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "সহায়িকা ফাইল পড়তে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "সহায়িকা ফাইল লোড করতে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "সহায়তা"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s সম্বন্ধে"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s লগপরিবর্তন"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF এখন চালাচ্ছে"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "প্লেলিস্ট সম্পাদন করুন"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "শিরোনাম:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "প্লেলিস্ট পুনরায় নামকরণ করুন"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "প্লেলিস্ট অপসারণ করুন"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "নতুন প্লেলিস্ট যোগ করুন"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ ফাইলসমূহ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ লোড করুন..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "পূর্বনির্ধারিত Foobar2000 EQ ইম্পোর্ট করুন..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "পূর্বনির্ধারিত Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "পূর্বনির্ধারিত অংশ লোড করুন"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "পূর্বনির্ধারিত Foobar2000 ইম্পোর্ট করুন"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "সক্রিয়"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "সবগুলো শূন্য"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "শূন্য প্রিম্প"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "শূন্য ব্যান্ড"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "পূর্বনির্ধারিত অংশ লোড করুন"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "পূর্বনির্ধারিত Foobar2000 ইম্পোর্ট করুন"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "প্রথম দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "বন্ধ | %d ট্র্যাকসমুহ | %s সর্বমোট যতটুকু সময় চালানো হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "মোনো"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "স্টেরিও"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "বিরত | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -173,680 +195,735 @@
 "%s%s %s| %dHz | %d বিট | %s | %d:%02d / %s | %d ট্র্যাকসমূহ | %s যতটুকু সময় "
 "চালানো হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "নতুন ভাবে প্লেলিস্ট সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF প্লেলিস্ট ফাইলসমূহ (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "প্লেলিস্ট লোড করুন"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "অন্যান্য ফাইলসমূহ (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "নতুন প্লেলিস্ট"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "নতুন প্লেলিস্ট (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "ফাইল (_F)"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "ফাইল খুলুন (_O)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "ফাইল যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "ফোল্ডার যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "অবস্থান যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "নতুন প্লেলিস্ট"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "প্লেলিস্ট লোড করুন"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "প্লেলিস্ট সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "প্লেলিস্ট নতুনভাবে সংরক্ষণ করুন"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "প্রস্থান করুন (_Q)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "সম্পাদনা করুন (_Q)"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "মুছে ফেলুন (_C)"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "সব নির্বাচন করুন"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "সব অনির্বাচিত করুন"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "বিপরীতমুখী নির্বাচন"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "নির্বাচন"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "অপসারণ"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "ছাঁটা"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "খুঁজুন (_F)"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "শিরোনাম"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "ফাইল সংখ্যা"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "অ্যালবাম"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "শিল্পী"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "স্বনির্ধারিত"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "পছন্দসমূহ"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "প্রদর্শন করুন (_V)"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "স্ট্যাটাস বার"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "কলাম শীর্ষচরণ"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "ট্যাব"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "ইকুয়ালাইজার"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "প্লেব্যাক (_P)"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "ক্রম"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "রৈখিক"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "এলোমেলো করা"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "এলোমেলো করা"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "এলোমেলো"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "পুনরাবৃত্তি হচ্ছে"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "সবগুলো পুনরাবৃত্তি করুন"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "একক গান পুনরাবৃত্তি করুন"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "পুনরাবৃত্তি হবে না"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "স্ক্রল প্লেব্যাককে অনুসরণ করে"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "কার্সার প্লেব্যাককে অনুসরণ করে"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "বর্তমানটি হয়ে যাওয়ার পর থামুন"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "সহায়তা (_H)"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "লগপরিবর্তন (_C)"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "সম্বন্ধে (_A)"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "অনুসন্ধান করুন"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "বন্ধ করুন"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "চালান"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "বিরতি"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "পূর্ববর্তী"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "পরবর্তী"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "এলোমেলোভাবে চালান"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "সম্বন্ধে"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "প্রস্থান করুন"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "ফাইল যোগ করা হচ্ছে..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "বাতিল করুন (_A)"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "ট্র্যাক বৈশিষ্ট্যাবলী"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"সতর্কবানী: ট্যাগ লেখার বৈশিষ্ট্যের উন্নয়নের কাজ এখনও চলছে। ব্যবহারের পূর্বে \n"
-"ব্যাকআপ অনুলিপি তৈরি করে।"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "প্রয়োগ করুন (_A)"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "বন্ধ করুন (_C)"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "মেটাডাটা"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "বৈশিষ্ট্যাবলী"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "কলামসম্পাদনাডায়ালগ"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "শিরোনাম:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "নতুন কলাম শিরোনাম দিন"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "টাইপ করুন:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "ফাইল সংখ্যা"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "চলছে"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "অ্যালবাম শিল্প"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "শিল্পী - অ্যালবাম"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "শিল্পী"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "অ্যালবাম"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "শিরোনাম"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "দৈর্ঘ্য"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "স্থিতিকাল"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "ট্র্যাক"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "ট্র্যাক নং"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "ব্যান্ড / অ্যালবাম শিল্পী"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "স্বনির্ধারিত"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "বিন্যাস:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "প্রান্তিককরণ:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "বাম"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "ডান"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, fuzzy, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"রূপান্তরের বিন্যাস (শুরু হয় % দিয়ে):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"উদাহরণ: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "বাতিল (_C)"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "ঠিক আছে (_O)"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "অাউটপুট প্লাগইন:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "অাউটপুট ডিভাইস:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "শব্দ"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "ডাইনামিক স্যাম্পলরেট বদলের অনুমোদন দেয়া হবে"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "স্যাম্পলরেট রূপান্তরের গুণগত মান:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "পুনরায় চালানোর মোড:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "নিষ্ক্রিয়"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "ট্র্যাক"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "পুনরায় চালনার সর্বোচ্চ মান"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "পুনরায় চালানোর মোড:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "প্লেব্যাক (_P)"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "কনফিগার"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "ট্রে ছোট করতে বন্ধ করুন"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "মাউসের মধ্যবর্তী বোতাম দ্বারা প্লেলিস্ট বন্ধ করা হয়"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "উপেক্ষা করা"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "পুরোভূমি"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "পটভূমি"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "সিকবার/ভলিউমবার এর রঙ"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "মধ্যবর্তী"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "হালকা"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "গাঢ়"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "টেক্সট"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "ট্যাবের অংশের রং"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "উপেক্ষা (GTK ট্রিভিউ থিমিং হারায়, কিন্তু পরিণত করার গতি বাড়ায়)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "জোড় সংখ্যক সারি"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "বিজোড় সংখ্যক সারি"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "টেক্সট"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "নির্বাচিত সারি"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "নির্বাচিত টেক্সট"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "কারসার"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "প্লেলিস্টের রং"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "প্রক্সি সার্ভার সক্রিয় করুন"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "প্রক্সি সার্ভারের ঠিকানা:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "প্রক্সি সার্ভারের পোর্ট:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "প্রক্সির ধরণ:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "প্রক্সি ব্যবহারকাীর নাম:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "প্রক্সি পাসওয়ার্ড:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "নেটওয়ার্ক"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "প্লাগইন"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "যা অনুসারে গ্রুপ হবে"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "বিন্যাস:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "নির্বাচন"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "প্লাগইন"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "ট্যাগ লেখক"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "ID3v2 লিখুন"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "ID3v1 লিখুন"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 লিখুন"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 অংশ"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 অংশ"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 অংশ"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 সংস্করণ"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "২.৩ (সুপারিশকৃত)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "২.৪"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 অক্ষর এনকোড করছে (iso8859-1 পূর্বনির্ধারিত)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 লিখুন"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "ট্যাগ লেখক"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "বর্ণনা:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "লেখক:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "ইমেইল:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "ওয়েবসাইট:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "কনফিগার"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "প্লাগইন"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "প্লেলিস্টডায়ালগসম্পাদনা"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "যা অনুসারে গ্রুপ হবে"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"রূপান্তরের বিন্যাস (শুরু হয় % দিয়ে):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"উদাহরণ: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "শিল্পী / অ্যালবাম"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "ট্র্যাক নং"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "শিরোনাম / ট্র্যাক শিল্পী"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "স্থিতিকাল"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "ডিস্ক থেকে ফাইল অপসারণ করুন"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -854,195 +931,222 @@
 "ফাইল মুছে যাবে। চালিয়ে যেতে চান?\n"
 "(GTKUI প্লাগইন সেটিং এ এই ডায়ালগটি বন্ধ করা যেতে পারে)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "সতর্কবানী"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "প্লেব্যাকের সারিতে যোগ করুন"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "প্লেব্যাক সারি থেকে অপসারণ করুন"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "মেটাডাটা পুনরায় লোড করুন"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "ডিস্ক থেকে অপসারণ করুন"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "কলাম যোগ করুন"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "কলাম সম্পাদনা করুন"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "কলাম অপসারণ করুন"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "যা অনুসারে গ্রুপ হবে"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "কোনটি না"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "শিল্পী/তারিখ/অ্যালবাম"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "ফাইল খুলুন..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "নির্ধারণ %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "কনফিগার"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "পূর্বনির্ধারিত অডিও ডিভাইস"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "যোগ"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "গ্লোবাল হটকীসমূহ"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "স্লট"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "কী সমাবেশ"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA অাউটপুট প্লাগইন"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "ফাইল যোগ করা হচ্ছে..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "আরম্ভ করা হচ্ছে..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "আপনি এই ট্র্যাকে ডাটা পরিবর্তন করেছেন।"
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "সত্যিই উইন্ডোটি বন্ধ করতে চান?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "ট্যাগের ধরণ"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "সন্নিবেশিত তথ্যপৃষ্ঠা"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "হ্যাঁ"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "না"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "কী"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "মান"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF এখন চালাচ্ছে"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "সত্যিই উইন্ডোটি বন্ধ করতে চান?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "ফাইল যোগ করুন"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "অপসারণ"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "ব্যবহারের নিয়ম: deadbeef [অপশন] [ফাইল]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "অপশন:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --সহায়তা অথবা -h সহায়তা মুদ্রণ করুন (এই বার্তা) এবং প্রস্থান করুন\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --বন্ধ করুন প্লেয়ার বন্ধ করুন\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --সংস্করণ সংস্করণের তথ্য মুদ্রণ করে বন্ধ করুন\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --চালান প্লেব্যাক শুরু করুন\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --বন্ধ করুন প্লেব্যাক বন্ধ করুন\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --বিরতি প্লেব্যাক বিরত রাখুন\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --পরবর্তী প্লেলিস্টে পরবর্তী গান\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --পূর্ববর্তী প্লেলিস্টে পূর্ববর্তী গান\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --এলোমেলো প্লেলিস্টে এলোমেলো গান\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --সারি বিদ্যমান প্লেলিস্টে সবশেষে যোগ করা ফাইল\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --FMT এখন চলছে স্ট্যান্ডআউটে বিন্যাসিত ট্র্যাক নাম মুদ্রণ করুন\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1053,7 +1157,7 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1062,11 +1166,26 @@
 " e.g.: --এখন চলছে \"%%a - %%t\" মুদ্রণ হবে \"শিল্পী - "
 "শিরোনাম\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "পূর্বনির্ধারিত"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "হ্যাঁ"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "না"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1074,7 +1193,13 @@
 "২.৩ (সুপারিশকৃত)‌‌\n"
 "২.৪"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1084,17 +1209,18 @@
 "ট্র্যাক\n"
 "অ্যালবাম"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1110,7 +1236,7 @@
 "ব্যান্ড / অ্যালবাম শিল্পী\n"
 "স্বনির্ধারিত"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1119,74 +1245,673 @@
 "ডান"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "pixmap ফাইল পায়নি: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "ইনপুট বাফারিং এর জন্য যথেষ্ট মেমরি পায়নি।"
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "অডিও CD যোগ করুন"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "প্রক্সি সার্ভার সক্রিয় করুন"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF এখন চালাচ্ছে"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "প্রক্সি ব্যবহারকাীর নাম:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "প্রক্সি পাসওয়ার্ড:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "ডিস্ক থেকে ফাইল অপসারণ করুন"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "অ্যালবাম শিল্প"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "ট্র্যাক নং"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "শিরোনাম / ট্র্যাক শিল্পী"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "ফাইল সংখ্যা"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "অবস্থান যোগ করুন"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Ogg বিটস্ট্রীমের প্রথম পৃষ্ঠা পড়ার সময় ত্রুটি ঘটেছে।"
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "প্রাথমিক শীর্ষচরণ প্যাকেট পড়ার সময় ত্রুটি ঘটেছে।"
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "ট্যাগের ধরণ"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "নতুন স্ট্রীমের সিরিয়াল নাম্বার রেজিস্টার করার মত পর্যাপ্ত মেমরি পায়নি।"
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "সন্নিবেশিত তথ্যপৃষ্ঠা"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "ইনপুটটি কাঁটছাট করা অথবা ফাঁকা আছে।"
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "ইনপুট কোনো Ogg বিটস্ট্রীম নয়।"
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg বিটস্ট্রীম কোনো ভরবিস ডাটা ধারণ করেনা।"
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "সনাক্তকৃত স্ট্রীমের আগে ফাইলের শেষ।"
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg বিটস্ট্রীম সমর্থিত ধরণের ডাটা ধারণ করেনা।"
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "বিকৃত গৌণ শীর্ষচরণ।"
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "ভরবিস শীর্ষচরণ সমাপ্ত হওয়ার আগে ফাইলের শেষ।"
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "ডাটা বিকৃত বা অনুপস্থিত আছে, চলছে..."
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "সব নির্বাচন করুন"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"আউটপুটে স্ট্রীম লেখার সময় ত্রুটি ঘটেছে। আউটপুট স্ট্রীমকে বিকৃত করা হয়েছে বা কাঁটছাট "
-"করা হয়েছে।"
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "কলাম সম্পাদনা করুন"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "অাউটপুট ডিভাইস:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "অাউটপুট প্লাগইন:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "উপেক্ষা করা"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "পূর্বনির্ধারিত অংশ লোড করুন"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "অাউটপুট প্লাগইন:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "অডিও CD যোগ করুন"
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "APEv2 লিখুন"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "ID3v1 লিখুন"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "ID3v2 লিখুন"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "ট্যাগ লেখক"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "প্লেলিস্ট নতুনভাবে সংরক্ষণ করুন"
+
+#~ msgid "_Abort"
+#~ msgstr "বাতিল করুন (_A)"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "সতর্কবানী: ট্যাগ লেখার বৈশিষ্ট্যের উন্নয়নের কাজ এখনও চলছে। ব্যবহারের "
+#~ "পূর্বে \n"
+#~ "ব্যাকআপ অনুলিপি তৈরি করে।"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "কলামসম্পাদনাডায়ালগ"
+
+#~ msgid "Length"
+#~ msgstr "দৈর্ঘ্য"
+
+#, fuzzy
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "রূপান্তরের বিন্যাস (শুরু হয় % দিয়ে):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "উদাহরণ: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "ডাইনামিক স্যাম্পলরেট বদলের অনুমোদন দেয়া হবে"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "স্যাম্পলরেট রূপান্তরের গুণগত মান:"
+
+#~ msgid "Description:"
+#~ msgstr "বর্ণনা:"
+
+#~ msgid "Author(s):"
+#~ msgstr "লেখক:"
+
+#~ msgid "Email:"
+#~ msgstr "ইমেইল:"
+
+#~ msgid "Website:"
+#~ msgstr "ওয়েবসাইট:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "প্লেলিস্টডায়ালগসম্পাদনা"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "রূপান্তরের বিন্যাস (শুরু হয় % দিয়ে):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "উদাহরণ: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "নির্ধারণ %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA অাউটপুট প্লাগইন"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "ইনপুট বাফারিং এর জন্য যথেষ্ট মেমরি পায়নি।"
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Ogg বিটস্ট্রীমের প্রথম পৃষ্ঠা পড়ার সময় ত্রুটি ঘটেছে।"
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "প্রাথমিক শীর্ষচরণ প্যাকেট পড়ার সময় ত্রুটি ঘটেছে।"
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "নতুন স্ট্রীমের সিরিয়াল নাম্বার রেজিস্টার করার মত পর্যাপ্ত মেমরি পায়নি।"
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "ইনপুটটি কাঁটছাট করা অথবা ফাঁকা আছে।"
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "ইনপুট কোনো Ogg বিটস্ট্রীম নয়।"
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg বিটস্ট্রীম কোনো ভরবিস ডাটা ধারণ করেনা।"
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "সনাক্তকৃত স্ট্রীমের আগে ফাইলের শেষ।"
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg বিটস্ট্রীম সমর্থিত ধরণের ডাটা ধারণ করেনা।"
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "বিকৃত গৌণ শীর্ষচরণ।"
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "ভরবিস শীর্ষচরণ সমাপ্ত হওয়ার আগে ফাইলের শেষ।"
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "ডাটা বিকৃত বা অনুপস্থিত আছে, চলছে..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "আউটপুটে স্ট্রীম লেখার সময় ত্রুটি ঘটেছে। আউটপুট স্ট্রীমকে বিকৃত করা হয়েছে বা কাঁটছাট "
+#~ "করা হয়েছে।"
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "শব্দ (adv.)"

deadbeef-0.5.1.tar.bz2/po/ca.po -> deadbeef-0.5.2.tar.bz2/po/ca.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-09-01 00:39+0200\n"
 "Last-Translator: sisco <sisco.garcia@ubuntu.cat>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,1061 +18,1154 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formats de so suportats"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Altres fitxers (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Obre fitxer(s)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Afegeix fitxer(s) a la llista..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Afegeix directori(s) a la llista..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 #, fuzzy
 msgid "Failed while reading help file"
 msgstr "Errada mentre llegia el fitxer d'ajuda"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Error en la càrrega del fitxer d'ajuda"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, fuzzy, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, fuzzy, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Registre de canvis al DeaDBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Edita la llista de reproducció"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Títol:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Reanomena la Llista de Reproducció"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Elimina la Llista de Reproducció"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Afegeix una Nova Llista de Reproducció"
 
 # Suposo que el més correcte seria «Desa els preajustaments d'equalització del DeaDBeeF», però ho trobo excessiu.
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 #, fuzzy
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Desa el DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 #, fuzzy
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Fitxers de preajustament del DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Carrega els Preajustaments del DeaDBeeF EQ..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Preajustaments del DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importa els Preajustaments Foobar2000 EQ..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Preajustaments Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Carrega els preajustaments"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importa els preajustaments del Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Activa"
 
 # podria ser «tots muts»?
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 #, fuzzy
 msgid "Zero All"
 msgstr "Tots nuls"
 
 # Podria ser «emmudeix el preamplificador»?
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 #, fuzzy
 msgid "Zero Preamp"
 msgstr "Preamplificador a Zero"
 
 # Podria ser «emmudeix les bandes»?
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 #, fuzzy
 msgid "Zero Bands"
 msgstr "Bandes a zero"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Desa els preajustaments"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Carrega els preajustaments"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importa els preajustaments del Foobar2000"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, fuzzy, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, fuzzy, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dies %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, fuzzy, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Aturat | %d temes | %s temps total"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 #, fuzzy
 msgid "Stereo"
 msgstr "Estèreo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, fuzzy, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "En pausa |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, fuzzy, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d temes | %s temps total"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Anomena i desa la Llista de Reproducció"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Fitxers de la Llista de Reproducció DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Carrega la Llista de Reproducció"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Altres fitxers (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Llista de Reproducció Nova"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Llista de Reproducció Nova (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Obre fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Afegeix fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Afegeix fitxer(s)"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Afegeix localització"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nova llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Carrega la llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Desa la llista de reproducció"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Anomena i desa la llista de reproducció"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Neteja"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Deselecciona-ho tot"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverteix la selecció"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Selecció"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Elimina"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 #, fuzzy
 msgid "_Find"
 msgstr "_Troba"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Títol"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Nombre de fitxer"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Àlbum"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personalització"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Vista"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra d'estat"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Encapçalaments de columna"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Pestanyes"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalitzador"
 
 # Suposo que «Playback» és admès hores d'ara.
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reproducció"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ordre"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 #, fuzzy
 msgid "Linear"
 msgstr "Lineal"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Shuffle"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
 #, fuzzy
-msgid "Shuffle"
+msgid "Shuffle albums"
 msgstr "Shuffle"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Aleatori"
 
 # Podria ser «bucle»?
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 #, fuzzy
 msgid "Looping"
 msgstr "Repeteix"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 #, fuzzy
 msgid "Loop All"
 msgstr "Repeteix totes"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 #, fuzzy
 msgid "Loop Single Song"
 msgstr "Repeteix una sola cançó"
 
 # Potser és millor «Deixa de repetir»?
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 #, fuzzy
 msgid "Don't Loop"
 msgstr "No repeteixis"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 #, fuzzy
 msgid "Scroll follows playback"
 msgstr "L'escroll segueix la reproducció"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 #, fuzzy
 msgid "Cursor follows playback"
 msgstr "El cursor segueix la reproducció"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Atura't en acabar l'actual"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Registre de Canvis"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Atura"
 
 # Potser ja s'admet «Play»?
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 #, fuzzy
 msgid "Play"
 msgstr "Engega"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "En pausa"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Següent"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Reproducció aleatòria"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Surt"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Afegint fitxers..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-#, fuzzy
-msgid "_Abort"
-msgstr "_Avorta"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propietats del tema"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-#, fuzzy
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"AVÍS: l'opció d'escriptura d'etiquetes encara és en fase de "
-"desenvolupament. \n"
-"Fes còpies de seguretat abans d'utilitzar-ho."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Aplica"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadada"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propietats"
 
-# editcolumndlg
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-#, fuzzy
-msgid "editcolumndlg"
-msgstr "editacolumnadlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Títol:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Introduïu un nou títol de columna aquí"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Nombre de fitxer"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Reproduint"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artista - Àlbum"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Àlbum"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Títol"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Durada"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
 
-# Pista?
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-#, fuzzy
-msgid "Track"
-msgstr "Tema"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Banda / Àlbum Artista"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Personalització"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Alineació:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Esquerra"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Dreta"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, fuzzy, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format de conversions (comença amb %):\n"
-"[a]rtista, [t]ítol, al[b]um, [B]anda, [C]ompositor\n"
-"[n]ombre de tema, [N]temestotals,\n"
-"[l]largada, an[y], [g]ènere, [c]omentari,\n"
-"copy[r]ight, nom[f]itxer, e[T]iquetes\n"
-"Exemple: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Correcte"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 #, fuzzy
 msgid "Output plugin:"
 msgstr "Connexió de sortida:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositiu de sortida"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "So"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Replaygain mode:"
+# Pista?
+#: ../plugins/gtkui/interface.c:1874
+#, fuzzy
+msgid "Track"
+msgstr "Tema"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1792
-msgid "Disable"
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
-msgid "Replaygain peak scale"
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
 # Suposo que «Playback» és admès hores d'ara.
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "_Reproducció"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Write ID3v2"
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Write ID3v1"
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Write APEv2"
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Strip ID3v2"
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Strip ID3v1"
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Strip APEv2"
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
-msgid "ID3v2 version"
-msgstr ""
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:2247
-msgid "2.3 (Recommended)"
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2248
-msgid "2.4"
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr ""
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Selecció"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Write ID3v2.4"
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format de conversions (comença amb %):\n"
-"[a]rtista, [t]ítol, al[b]um, [B]anda, [C]ompositor\n"
-"[n]ombre de tema, [N]temestotals,\n"
-"[l]largada, an[y], [g]ènere, [c]omentari,\n"
-"copy[r]ight, nom[f]itxer, e[T]iquetes\n"
-"Exemple: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
-msgid "Artist / Album"
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
-msgid "Track No"
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr ""
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr ""
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Afegint fitxers..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
 msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Afegeix fitxer(s)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Elimina"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1080,115 +1173,658 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
 msgstr ""
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Afegeix Àudio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Títol"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Nombre de fitxer"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Afegeix localització"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Selecciona-ho tot"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Dispositiu de sortida"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Connexió de sortida:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Desa els preajustaments"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Carrega els preajustaments"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Connexió de sortida:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Afegeix Àudio CD"
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Anomena i desa la llista de reproducció"
+
+#, fuzzy
+#~ msgid "_Abort"
+#~ msgstr "_Avorta"
+
+#, fuzzy
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "AVÍS: l'opció d'escriptura d'etiquetes encara és en fase de "
+#~ "desenvolupament. \n"
+#~ "Fes còpies de seguretat abans d'utilitzar-ho."
+
+# editcolumndlg
+#, fuzzy
+#~ msgid "editcolumndlg"
+#~ msgstr "editacolumnadlg"
+
+#~ msgid "Length"
+#~ msgstr "Durada"
+
+#, fuzzy
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format de conversions (comença amb %):\n"
+#~ "[a]rtista, [t]ítol, al[b]um, [B]anda, [C]ompositor\n"
+#~ "[n]ombre de tema, [N]temestotals,\n"
+#~ "[l]largada, an[y], [g]ènere, [c]omentari,\n"
+#~ "copy[r]ight, nom[f]itxer, e[T]iquetes\n"
+#~ "Exemple: %a - %t [%l]"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format de conversions (comença amb %):\n"
+#~ "[a]rtista, [t]ítol, al[b]um, [B]anda, [C]ompositor\n"
+#~ "[n]ombre de tema, [N]temestotals,\n"
+#~ "[l]largada, an[y], [g]ènere, [c]omentari,\n"
+#~ "copy[r]ight, nom[f]itxer, e[T]iquetes\n"
+#~ "Exemple: %a - %t [%l]"

deadbeef-0.5.2.tar.bz2/po/cs.po Added

@@ -0,0 +1,1801 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Vašek Kovářík <l3d9z6@seznam.cz>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-11-18 18:16+0100\n"
+"Last-Translator: Vašek Kovářík <l3d9z6@seznam.cz>\n"
+"Language-Team: čeština <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Country: Czech Republic\n"
+"X-Poedit-Language: Czech\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Podporované zvukové formáty"
+
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
+msgstr "Další soubory (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Otevřít soubor(y)..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Přidat soubor(y) do playlistu..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Přidat adresář(e) do playlistu..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Následovat symbolické odkazy"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Chyba při čtení souboru nápovědy"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Selhalo načtení souboru nápovědy"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Nápověda"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O aplikaci DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s ChangeLog"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF přeložili"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Upravit playlist"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Název:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Přejmenovat playlist"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Odstranit playlist"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Přidat nový playlist"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Uložit předvolbu ekvalizéru DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Soubory předvoleb ekvalizéru DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Načíst předvolby ekvalizéru DeaDBeeF..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Předvolby ekvalizéru DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importovat předvolby ekvalizéru Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Předvolby ekvalizéru Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Uložit předvolbu"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Načíst předvolbu"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importovat předvolby Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "Povolit"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "Vynulovat vše"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "Vynulovat předzesilovač"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "Vynulovat pásma"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Předvolby"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 den %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dní %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "Zastaveno | %d stop | %s celkový čas přehrávání"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "Zastaveno | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d stop | %s celkový čas "
+"přehrávání"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "Uložit playlist jako"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Soubory playlistů DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "Načíst playlist"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Další soubory (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "Nový playlist"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nový playlist (%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "_Soubor"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "_Otevřít soubor(y)"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "Přidat soubor(y)"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "Přidat složku(y)"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "Přidat umístění"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "Nový playlist"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "Načíst playlist"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "Uložit playlist"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "_Zavřít"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "_Upravit"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "_Smazat"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "Vybrat vše"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "Zrušit výběr "
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "Invertovat výběr"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "Výběr"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr "Ořez"
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "_Hledat"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Třídit dle"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Název"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Číslo stopy"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Umělec"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Vlastní"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "Stavový řádek"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "Záhlaví sloupců"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "Záložky"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "Ekvalizér"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "_Přehrát"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr "Pořadí"
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "Lineárně"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Náhodné stopy"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Náhodná alba"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "Náhodně"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr "Opakování"
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr "Opakovat vše"
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr "Opakovat jednotlivou skladbu"
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr "Neopakovat"
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr "Posunovat s přehráváním"
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr "Sledovat kurzorem přehrávání"
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr "Zastavit po aktuální"
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Přeskočit na aktuální stopu"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "_Nápověda"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "_ChangeLog"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "_O aplikaci"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Přeložili"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "Hledat"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "Zastavit"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "Přehrát"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "Předchozí"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "Následující"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "Přehrát náhodně"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "Info"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "Konec"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "Vlastnosti skladby"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Nastavení"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "_Použít"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "_Zavřít"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "Zde vložit nový název sloupce"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Rejstřík"
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "Přehrávání"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "Obal alba"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "Umělec - Album"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Trvání"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Číslo stopy"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "Skupina/umělec alba"
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "Formát:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr "Zarovnání:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "Vlevo"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "Vpravo"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "_Zrušit"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr "Výstupní zásuvné moduly:"
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr "Výstupní zařízení:"
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Vždy převést 8 bit audio na 16 bit"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "Zvuk"
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr "Režim replaygain:"
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "Zakázat"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Stopa"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr "Měřítko vrcholu replaygain"
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Předzesilovač replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+#, fuzzy
+msgid "Global preamp:"
+msgstr "Předzesilovač replaygain:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+"Přidat soubory z příkazové řádky (nebo souborového manažeru) do tohoto "
+"playlistu:"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr "Při startu obnovit předchozí sezení"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Ignorovat archivy během přidávání adresářů"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr "Přehrát"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Nastavit"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Předvolba DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Načíst"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr "Zavřít do traye"
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr "Zavřít playlist prostředním tlačítkem myši"
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr "Skrýt ikonu v trayi"
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr "Použít tučný font pro přehrávanou stopu"
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "Skrýt položku \"Smazat z disku\" z kontextového menu"
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Automaticky pojmenovat přidaný adresář"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Četnost obnovení rozhraní (za vteřinu):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr "Titulní text během přehrávání:"
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr "Titulní text během zastavení:"
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI Plugin (vyžaduje restart):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "GUI"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr "Předefinovat"
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "Popředí"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr "Pozadí"
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr "Barvy průběhu hledání/hlasitosti"
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr "Střední"
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr "Světlé"
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr "Tmavé"
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr "Základní"
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Text"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr "Barvy lišty záložek"
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr "Předefinovat (ztratí GTK téma, ale zrychlí vykreslování)"
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr "Sudý řádek"
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr "Lichý řádek"
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "Vybraný řádek"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "Vybraný text"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "Kurzor"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "Barvy playlistu"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "Barvy"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "Povolit server Proxy"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "Adresa Proxy serveru:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "Port Proxy serveru:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "Typ Proxy:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "Uživatelské jméno Proxy:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "Heslo Proxy:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "Síť"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Verze:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Seskupit dle"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Třídit dle..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Formát"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Vzestupně"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Sestupně"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Vybrat zásuvný modul DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Zásuvný modul"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Nastavení autora popisku"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "Zapsat ID3v2"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "Zapsat ID3v1"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "Zapsat APEv2"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr "Odstranit ID3v2"
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr "Odstranit ID3v1"
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr "Odstranit APEv2"
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "Verze ID3v2"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Doporučeno)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Kódování znaků ID3v1 (výchozí je iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "Zapsat ID3v2.4"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "Umělec / Album"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Stopa č."
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "Smazat soubory z disku"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"Soubory budou ztraceny. Pokračovat?\n"
+"(Tento dialog lze vypnout v nastavení zásuvného modulu GTKUI)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "Upozornění"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "Přidat do fronty přehrávání"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "Odstranit z fronty přehrávání"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "Znovu načíst metadata"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "Odstranit z disku"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "Přidat sloupec"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "Upravit sloupec"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "Odstranit sloupec"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr "Seskupit dle"
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "Žádné"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "Umělec/Datum/Album"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "Otevřít soubor..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr "Nastavit %s"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "Výchozí audio zařízení"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "Přidat"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "Globální klávesové zkratky"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr "Slot"
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "Kombinace kláves"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Přidávají se soubory..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "Inicializuje se..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "Byla změněna data této stopy."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "Opravdu zavřít okno?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Vícenásobné hodnoty]"
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Klávesa"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Hodnota"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Zapisují se tagy..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Jméno:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Název pole nesmí začínat : nebo _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Nelze přidat pole"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Pole s tímto názvem již existuje, prosím, zvolte jiný název."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Opravdu odstranit vybrané pole?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Přidat pole"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Odstranit pole"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Použití: deadbeef [volby] [soubor(y)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Volby:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Zobrazit nápovědu (tuto zprávu) a ukončit\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Zavřít přehrávač\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Zobrazit verzi a ukončit\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Zahájit přehrávání\n"
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zastavit přehrávání\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pauza přehrávání\n"
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Přepnout pauzu\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+" --play-pause Spustit přehrávání, pokud je zastaveno, jinak přepnout "
+"pauzu\n"
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Další skladba z playlistu\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Předchozí skladba z playlistu\n"
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Náhodná skladba z playlistu\n"
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Připojit soubor(y) do existujícího playlistu\n"
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Zapsat zformátovaný název stopy do stdout\n"
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" např.: --nowplaying \"%%a - %%t\" zapíše \"umělec - "
+"název\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+" pro další informace navštivte http://sourceforge.net/"
+"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ano"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (Doporučeno)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Vzestupně\n"
+"Sestupně"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"Zakázat\n"
+"Stopa\n"
+"Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"Rejstřík\n"
+"Přehrávání\n"
+"Obal alba\n"
+"Umělec - Album\n"
+"Umělec\n"
+"Název\n"
+"Trvání\n"
+"Číslo stopy\n"
+"Skupina / umělec alba\n"
+"Vlastní"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"Vlevo\n"
+"Vpravo"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nelze najít pixmap soubor: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wilmidi: konfigurační soubor freepats nenalezen. Instalujte balíček timidity-"
+"freepats nebo v nastavení zásuvného modulu nastavte cestu k souboru freepats."
+"cfg"
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Přidat Audio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Vyhledat na Last.fm"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Použít ALSA převzorkování"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Při zastavení uvolnit zařízení"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Preferovaná velikost bufferu"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Preferovaná perioda bufferu"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Povolit scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Zakázat nowplaying"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Heslo"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Soubor zařízení"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Obcházení chyb vzorkovací frekvence OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Perioda aktualizace vyrovnávací paměti (hod)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "Získat z vložených popisků"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "Získat z místního adresáře"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "Maska místního souboru s obalem"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Získat z Last.fm"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Získat z albumart.org"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Přizpůsobit obrázek delší straně"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "Použít CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "Upřednostnit CD-Text před CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "CDDB url (např. 'freedb.org')"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "Číslo portu CDDB (např. '888')"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "Upřednostnit protokol CDDB před HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "Povolit podporu obrázků NRG"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "Převzorkovat kvalitu (0..2, vyšší je lepší)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "Maximální délka skladby (v minutách)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Potvrzovat mazání souborů z disku"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "Citlivost ovládání hlasitosti"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "Vlastní ikona stavu"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "Spustit gtk_init se --sync (ladící režim )"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Přidat oddělovače mezi položky kontextového menu zásuvných modulů"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Formát titulku upozornění"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Formát obsahu upozornění"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Zobrazit obal alba"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Velikost obalu alba (px)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "Server PulseAudio"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "Vzorkovací frekvence"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "Relativní cesta vyhledávací tabulky"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "Absolutní cesta vyhledávací tabulky"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Přehození audio bajtů (zapnout pokud je zvuk statický)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Povolit HVSC Songlength DB"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (z HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bitů na vzorek (8 or 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Výchozí délka skladby (s)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Konfigurační soubor Timidity++ bank"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Název stopy"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Protagonista"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Celkem stop"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Žánr"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Skladatel"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Číslo disku"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Komentář"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "Kódování / Vydavatel"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Umístění"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Subtrack rejstřík"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Typ(y) popisků"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Vložený Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Přípony souborů (oddělené s ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Převést"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Cílová vzorkovací frekvence"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Kvalita / Algorytmus"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+"Automatická vzorkovací frekvence (přepíše cílovou vzorkovací frekvenci)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Soubor již existuje. Přepsat?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Varování konvertoru"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Vyberte enkodér"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Chyba konvertoru"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Převádí se..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Vybrat adresář..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Selhalo ukládání předvolby enkodéru"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Ověřte oprávnění k adresáři předvolby, zvolte jiný název nebo uvolněte místo "
+"na disku"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Předvolba stejného jména již existuje. Zkuste zvolit jiný název."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Chyba"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Přidat nový enkodér"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Upravit enkodér"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Odstranit předvolbu"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Tato akce odstraní vybranou předvolbu. Pokračovat?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Enkodéry"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Přidat zásuvný modul do řetězce DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Selhalo ukládání předvolby DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Nová předvolba DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Upravit předvolbu DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Předvolby DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Výstupní adresář:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Název výstupního souboru:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Přípona (např. .mp3) bude připojena automaticky.\n"
+"Ponechte pole prázdné pro výchozí (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Enkodér:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Předvolba DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Počet vláken:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Výstupní formát vzorku:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Zachovat zdrojový formát"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bit plovoucí"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Pokud soubor existuje:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Prompt"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Zachovat strukturu adresáře, počínaje od:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Upravit předvolbu enkodéru"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Enkodér bez názvu"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Přípona výstupního souboru:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Např. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Příkazový řádek:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Příklad: lame - %o\n"
+"%i pro vstupní soubor, %o pro výstupní soubor, - pro stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - název výstupního souboru\n"
+"%i - název dočasného vstupního souboru"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Metoda:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Roura"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Dočasný soubor"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Autor popisku"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Editor předvolby DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Předvolba DSP bez názvu"
+
+#~ msgid ""
+#~ "Keep source format\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+#~ msgstr ""
+#~ "Zachovat zdrojový formát\n"
+#~ "8 bit podepsaný int\n"
+#~ "16 bit podepsaný int\n"
+#~ "24 bit podepsaný int\n"
+#~ "32 bit podepsaný int\n"
+#~ "32 bit plovoucí"
+
+#~ msgid ""
+#~ "Pipe\n"
+#~ "Temporary file"
+#~ msgstr ""
+#~ "Roura\n"
+#~ "Dočasný soubor"
+
+#~ msgid ""
+#~ "Prompt\n"
+#~ "Overwrite"
+#~ msgstr ""
+#~ "Prompt\n"
+#~ "Přepsat"

deadbeef-0.5.1.tar.bz2/po/da.po -> deadbeef-0.5.2.tar.bz2/po/da.po Changed

@@ -16,108 +16,138 @@
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 04:23+0000\n"
-"PO-Revision-Date: 2010-09-11 17:30+01:00\n"
-"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-27 13:40+0200\n"
+"Last-Translator: mjjzf <mjjzf@syntaktisk.dk>\n"
 "Language-Team: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Understøttede lydformater"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Andre filer (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Alle filer (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Åbn filer..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Tilføj filer til afspilningsliste..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Tilføj mapper til afspilningsliste..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Følg symbolske henvisninger"
 
 # Måske lidt mere direkte. "Fejlede under læsning af hjælpefil"
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Kunne ikke læse hjælpefil"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Kunne ikke indlæse hjælpefil"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Om DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s - ændringslog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Oversættere af DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Rediger afspilningsliste"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Omdøb afspilningsliste"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Fjern afspilningsliste"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Tilføj ny afspilningsliste"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Gem DeaDBeef EQ-forhåndsindstilling"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ-forhåndsindstillede filer (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Indlæs DeaDBeeF EQ forhåndsindstilling..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ-forhåndsindstillinger (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importer Foobar2000 EQ-forhåndsindstilling..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ-forhåndsindstillinger (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Indlæs forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importer Foobar2000-forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Aktiver"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Nulstil alle"
 
@@ -125,62 +155,54 @@
 # Hmm, altså det kommer jo an på om man taler om det den gør ved
 # lydniveauet (forforstærkning) eller den enhed som gør det, som hedder
 # en forforstærker
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Nulstil forforstærkning"
 
 # KDE amarok: Bands -> bands
 # hvis det er sådan nogle frekvensintervaller i en equlizer så kan man
 # måske godt kommen afsted med at kalde det bånd, frekvensbånd.
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Nulstil frekvensbånd"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gem forhåndsindstilling"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Indlæs forhåndsindstilling"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importer Foobar2000-forhåndsindstilling"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Forhåndsindstillinger"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dage %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stoppet | %d numre | %s samlet afspilningstid"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pause | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -188,699 +210,752 @@
 "%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d numre | %s samlet "
 "afspilningstid"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Gem afspilningsliste som"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF-afspilningsfiler (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Indlæs afspilningsliste"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Andre filer (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Ny afspilningsliste"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Ny afspilningsliste (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Fil"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Åbn filer"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Tilføj filer"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Tilføj mapper"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Tilføj placering"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Ny afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Indlæs afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Gem afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Gem afspilningsliste som"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Ryd"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Fravælg alle"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverter markering"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Beskær"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Sorter efter"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Nummer"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Kunstner"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Dato"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Vis"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Statusbjælke"
 
 # kunne også være ..overskrifter men man er lige nødt til at sikre sig at det går
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Kolonnehoveder"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Faneblade"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Afspilning"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Rækkefølge"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineær"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "Bland"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Bland numre"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Bland albums"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Tilfældig"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Gentage"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Gentag alle"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Gentag enkelt sang"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Gentag ikke"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Rul følger afspilning"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Markør følger afspilning"
 
 # mon ikke det passer bedre med aktuelle, sådan som jeg kan forestille
 # mig den streng brugt
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Stop efter aktuelle"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Spring til aktuelle nummer"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Ændringslog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Om"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "Oversæ_ttere"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Søg"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stop"
 
 # afspil, spil
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Afspil"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Næste"
 
 # spørgsmålet er så om den betyder, afspil en tilfældig fil, eller mere
 # generelt afspil tilfældigt, det er måske værd at spørge om
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Afspil tilfældig"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Om"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Tilføjer filer..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Om"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Nummeregenskaber"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"ADVARSEL: muligheden for mærkeskrivning er stadig under udvikling.\n"
-"Lav sikkerhedskopier før brug."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Indstillinger"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Anvend"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Luk"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Egenskaber"
 
-# den er da helt sort?
-# ja spørgsmålet er hvad dlg er, fejlmeld
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Indtast ny kolonnetitel her"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Filnummer"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Indeks"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Spiller"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Albumomslag"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Kunstner - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Kunstner"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Titel"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Længde"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Varighed"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Band-/albumkunstner"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Tilpasset"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Venstre"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Højre"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatkonverteringer (starter med %):\n"
-" [a] kunstner, [t] titel, [b] album, [B] band, [C] komponist\n"
-" [n] nummer på sang, [N] samlet antal numre,\n"
-" [l] længde, [y] år, [g] genre, [c] bemærkning,\n"
-" [r] ophavsret, [f] filnavn, [F] fuld stinavn, [T] mærker\n"
-"Eksempel: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_O.k."
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Udvidelsesmodul for uddata:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Uddataenhed:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Konverter altid 8-bits lyd til 16-bit"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Tillad dynamisk skift af målefrekvens"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Kvalitet af målefrekvenskonvertering:"
-
 # gain er en form for forstærkning, f.eks. ved lydafspilning for at
 # sikre at det hele har samme lydniveau før det kommer til lydkortet.
 # Jeg tror at hvis du kigger på wikipedia omkring gain kan du måske få
 # en ide til oversættelse. Jeg tror måske at vi kan kalde det sådan
 # noget som afspilningsforstærkning måske:
 # "Tilstand for afspilningsforstærkning:"
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Replaygains tilstand:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Nummer"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Replaygains niveauskala"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+# gain er en form for forstærkning, f.eks. ved lydafspilning for at
+# sikre at det hele har samme lydniveau før det kommer til lydkortet.
+# Jeg tror at hvis du kigger på wikipedia omkring gain kan du måske få
+# en ide til oversættelse. Jeg tror måske at vi kan kalde det sådan
+# noget som afspilningsforstærkning måske:
+# "Tilstand for afspilningsforstærkning:"
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Replaygains tilstand:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Tilføj filer fra kommandolinje (eller filhåndtering) til afspilningslisten:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Genoptag forrige session ved opstart"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Afspilning"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Konfigurer"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Luk minimeringer til statusfelt"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Midterste museknap lukker afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Skjul statusikon"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Brug fed skrift for det nummer som aktuelt afspilles"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Skjul kontekstmenupunktet »Slet fra disk«"
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Titelbjælketekst under afspilning:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Titelbjælketekst når stoppet:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Overskriv"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Forgrund"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Baggrund"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Farver for søgebjælke/lydstyrkebjælke"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Midt"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Lys"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Mørk"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Tekst"
+
 # hvad er dette?
 # Den her tror jeg at jeg ville fejlmelde og bede om information
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Farver for fanebladsfjernelse"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Overskriv (mister tema for GTK-trævisning, men øger optegningshastigheden)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Lige række"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Ulige række"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Markeret række"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Markeret tekst"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Markør"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Farver på afspilningsliste"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Farver"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Aktiver proxyserver"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresse for proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port til proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Proxytype:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Brugernavn til proxy:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Adgangskode til proxy:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Netværk"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Udvidelsesmoduler"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "Internetadresse:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grupper efter"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Markering"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Udvidelsesmoduler"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Mærkeskrivning"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Skriv ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Skriv ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Skriv APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Fjern ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Fjern ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Fjern APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2-version"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Anbefalet)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1-tegnkodning (standard er iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Skriv ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Mærkeskrivning"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Beskrivelse:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Forfattere:"
-
-# måske "..postadresse:"
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Internetside:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Konfigurer"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Udvidelsesmoduler"
-
-# hvad er dette?
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "Internetadresse:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Grupper efter"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatkonverteringer (starter med %):\n"
-" [a] kunstner, [t] titel, [b] album, [B] band, [C] komponist\n"
-" [n] nummer på sang, [N] samlet antal numre,\n"
-" [l] længde, [y] år, [g] genre, [c] bemærkning,\n"
-" [r] ophavsret, [f] filnavn, [T] mærker\n"
-"Eksempel: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Kunster / album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Nummer"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Titel / kunstner"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Varighed"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Slet filer fra disk"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -888,198 +963,222 @@
 "Filer vil gå tabt. Fortsæt?\n"
 "(Denne dialog kan fjernes i opsætningen for GTKUI-udvidelsesmodulet)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Tilføj til afspilningskø"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Fjern fra afspilningskø"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Genindlæs metadata"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Fjern fra disk"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Tilføj kolonne"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Rediger kolonne"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Fjern kolonne"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Grupper efter"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Kunster/dato/album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Åbn fil..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Opsæt %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Konfigurer"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Standardlydenhed"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Tilføj"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Globale genveje"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Plads"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Tastekombination"
 
-# Mon ikke det er et udvidelsesmodul som gør at man kan sende lyd ud via
-# ALSA, jeg vil mene det skal være "ALSA-uddataudvidelsesmodul" eller
-# "Uddataudvidelsesmodul til ALSA"
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Uddataudvidelsesmodul til ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Tilføjer filer..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Du har ændret data for dette nummer."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Luk vinduet?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Mærketyper"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Indlejret stikordsliste (cuesheet)"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ja"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nej"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Tast"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Værdi"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF spiller nu"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Luk vinduet?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Tilføj filer"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Fjern"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Brug: deadbeef [tilvalg] [filer]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Tilvalg:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help eller -h Vis hjælp (denne besked) og afslut\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Afslut afspiller\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Vis versionsinfo og afslut\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Start afspilning\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Stop afspilning\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pause afspilning\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Næste sang i afspilningsliste\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Forrige sang i afspilningsliste\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Tilfældig sang i afspilningsliste\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Tilføj filer til eksisterende afspilningsliste\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Vis formateret nummernavn til stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1090,7 +1189,7 @@
 " [l] længde, [n] nummer, [y] år, [c] bemærkning,\n"
 " [r] ophavsret, [e] forløbet\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1099,11 +1198,26 @@
 " f.eks.: --nowplaying \"%%a - %%t\" skal vise »kunstner "
 "- titel«\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
-msgid "Default"
-msgstr "Standard"
-
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "Standard"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nej"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1111,7 +1225,13 @@
 "2.3 (Anbefalet)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1121,17 +1241,18 @@
 "Nummer\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1147,7 +1268,7 @@
 "Band / albumkunstner\n"
 "Tilpasset"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1156,74 +1277,682 @@
 "Højre"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunne ikke finde pixmapfil: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Kunne ikke indhente nok hukommelse til inddatamellemlager."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: Konfigurationsfil til freepats ikke fundes. Installer venligst "
+"pakken timidity-freepats, eller angiv stien til freepats.cfg i "
+"udvidelsesmodulopsætningen."
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Kunne ikke læse første side af Ogg-bitstrøm."
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Kunne ikke læse oprindelig teksthovedpakke."
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
 msgstr ""
-"Kunne ikke indhente nok hukommelse til at registrere nyt strømserielnummer."
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Inddata afkortet eller tom."
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "Titelbjælketekst når stoppet:"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Inddata er ikke en Ogg-bitstrøm."
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg-bitstrøm indeholder ikke Vorbisdata."
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "EOF før genkendt strøm."
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Aktiver proxyserver"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg-bitstrøm indeholder ikke en understøttet datatype."
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF spiller nu"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Ødelagt sekundært hoved."
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Brugernavn til proxy:"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF før afslutning på Vorbishoveder."
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Adgangskode til proxy:"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Ødelagt eller manglende data, fortsætter..."
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Slet filer fra disk"
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Albumomslag"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Nummer"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Titel / kunstner"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Filnummer"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Tilføj placering"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Mærketyper"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Indlejret stikordsliste (cuesheet)"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Vælg alle"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"Fejl ved skrivning af strøm til uddata. Uddatastrøm er måske ødelagt eller "
-"afkortet."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Rediger kolonne"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Uddataenhed:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Udvidelsesmodul for uddata:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Indlæs forhåndsindstilling"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Udvidelsesmodul for uddata:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"wildmidi: Konfigurationsfil til freepats ikke fundes. Installer venligst "
-"pakken timidity-freepats, eller angiv stien til freepats.cfg i "
-"udvidelsesmodulopsætningen."
 
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Skriv APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Skriv ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Skriv ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Mærkeskrivning"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Gem afspilningsliste som"
+
+#~ msgid "_Abort"
+#~ msgstr "_Om"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "ADVARSEL: muligheden for mærkeskrivning er stadig under "
+#~ "udvikling.\n"
+#~ "Lav sikkerhedskopier før brug."
+
+# den er da helt sort?
+# ja spørgsmålet er hvad dlg er, fejlmeld
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Længde"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formatkonverteringer (starter med %):\n"
+#~ " [a] kunstner, [t] titel, [b] album, [B] band, [C] komponist\n"
+#~ " [n] nummer på sang, [N] samlet antal numre,\n"
+#~ " [l] længde, [y] år, [g] genre, [c] bemærkning,\n"
+#~ " [r] ophavsret, [f] filnavn, [F] fuld stinavn, [T] mærker\n"
+#~ "Eksempel: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Tillad dynamisk skift af målefrekvens"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Kvalitet af målefrekvenskonvertering:"
+
+#~ msgid "Description:"
+#~ msgstr "Beskrivelse:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Forfattere:"
+
+# måske "..postadresse:"
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Website:"
+#~ msgstr "Internetside:"
+
+# hvad er dette?
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formatkonverteringer (starter med %):\n"
+#~ " [a] kunstner, [t] titel, [b] album, [B] band, [C] komponist\n"
+#~ " [n] nummer på sang, [N] samlet antal numre,\n"
+#~ " [l] længde, [y] år, [g] genre, [c] bemærkning,\n"
+#~ " [r] ophavsret, [f] filnavn, [T] mærker\n"
+#~ "Eksempel: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Opsæt %s"
+
+# Mon ikke det er et udvidelsesmodul som gør at man kan sende lyd ud via
+# ALSA, jeg vil mene det skal være "ALSA-uddataudvidelsesmodul" eller
+# "Uddataudvidelsesmodul til ALSA"
+#~ msgid "ALSA output plugin"
+#~ msgstr "Uddataudvidelsesmodul til ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Kunne ikke indhente nok hukommelse til inddatamellemlager."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Kunne ikke læse første side af Ogg-bitstrøm."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Kunne ikke læse oprindelig teksthovedpakke."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Kunne ikke indhente nok hukommelse til at registrere nyt "
+#~ "strømserielnummer."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Inddata afkortet eller tom."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Inddata er ikke en Ogg-bitstrøm."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg-bitstrøm indeholder ikke Vorbisdata."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF før genkendt strøm."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg-bitstrøm indeholder ikke en understøttet datatype."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Ødelagt sekundært hoved."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF før afslutning på Vorbishoveder."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Ødelagt eller manglende data, fortsætter..."
 
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Fejl ved skrivning af strøm til uddata. Uddatastrøm er måske ødelagt "
+#~ "eller afkortet."

deadbeef-0.5.1.tar.bz2/po/de.po -> deadbeef-0.5.2.tar.bz2/po/de.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-10 18:04+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-06-03 17:59+0100\n"
 "Last-Translator: Jan D. Behrens <zykure@web.de>\n"
 "Language-Team: \n"
@@ -18,80 +18,83 @@
 "X-Poedit-Country: Germany\n"
 "X-Poedit-Language: German\n"
 
-#: ../plugins/gtkui/callbacks.c:121
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Unterstützte Tonformate"
 
-#: ../plugins/gtkui/callbacks.c:132 ../plugins/gtkui/gtkui.c:789
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Andere Dateien (*)"
 
-#: ../plugins/gtkui/callbacks.c:142
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Dateien öffnen..."
 
-#: ../plugins/gtkui/callbacks.c:177
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Dateien zur Wiedergabeliste hinzufügen..."
 
-#: ../plugins/gtkui/callbacks.c:218
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Verzeichnisse zur Wiedergabeliste hinzufügen..."
 
-#: ../plugins/gtkui/callbacks.c:223
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Symbolischen Links folgen"
 
-#: ../plugins/gtkui/callbacks.c:697
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Fehler beim Lesen der Hilfedatei"
 
-#: ../plugins/gtkui/callbacks.c:707
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Fehler beim Laden der Hilfedatei"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:723 ../plugins/gtkui/interface.c:1150
-#: ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../plugins/gtkui/callbacks.c:733
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Über DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:746
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/callbacks.c:1091
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Übersetzer"
 
-#: ../plugins/gtkui/ddbtabstrip.c:660 ../plugins/gtkui/trkproperties.c:597
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Wiedergabeliste bearbeiten"
 
-#: ../plugins/gtkui/ddbtabstrip.c:663 ../plugins/gtkui/interface.c:1481
-#: ../plugins/gtkui/interface.c:2836 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/ddbtabstrip.c:716
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Wiedergabeliste umbenennen"
 
-#: ../plugins/gtkui/ddbtabstrip.c:720
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Wiedergabeliste löschen"
 
-#: ../plugins/gtkui/ddbtabstrip.c:724
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Neue Wiedergabeliste hinzufügen"
 
@@ -147,7 +150,7 @@
 msgid "Zero Bands"
 msgstr "Equalizer zurücksetzen"
 
-#: ../plugins/gtkui/eq.c:387
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
 msgid "Presets"
 msgstr "Voreinstellungen"
 
@@ -190,700 +193,728 @@
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d Titel | %s gesamte Spielzeit"
 
-#: ../plugins/gtkui/gtkui.c:670
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Wiedergabeliste speichern unter..."
 
-#: ../plugins/gtkui/gtkui.c:681
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF Wiedergabeliste (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:774
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Wiedergabeliste laden..."
 
-#: ../plugins/gtkui/gtkui.c:925
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Andere Dateien (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/gtkui/gtkui.c:928
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Neue Wiedergabeliste (%d)"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Datei"
 
-#: ../plugins/gtkui/interface.c:156 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "Dateien ö_ffnen"
 
-#: ../plugins/gtkui/interface.c:172 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Dateien hinzufügen"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Verzeichnisse hinzufügen"
 
-#: ../plugins/gtkui/interface.c:188 ../plugins/gtkui/interface.c:2936
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Ort hinzufügen"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/gtkui/interface.c:204 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Wiedergabeliste laden"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Wiedergabeliste speichern"
 
-#: ../plugins/gtkui/interface.c:212 ../plugins/gtkui/deadbeef.glade.h:109
-msgid "Save playlist as"
-msgstr "Wiedergabeliste speichern unter"
-
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../plugins/gtkui/interface.c:239 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Löschen"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Alles auswählen"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Alles abwählen"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../plugins/gtkui/interface.c:272 ../plugins/gtkui/plcommon.c:421
-#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../plugins/gtkui/interface.c:280 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Abschneiden"
 
-#: ../plugins/gtkui/interface.c:284 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "Suchen"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Sort By"
 msgstr "Sortieren nach"
 
-#: ../plugins/gtkui/interface.c:298 ../plugins/gtkui/interface.c:1510
-#: ../plugins/gtkui/interface.c:1856 ../plugins/gtkui/deadbeef.glade.h:10
-#: ../translation/extra.c:68
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Track-Nummer"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/interface.c:1509
-#: ../plugins/gtkui/plcommon.c:882 ../plugins/gtkui/deadbeef.glade.h:12
-#: ../translation/extra.c:64
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
 msgid "Artist"
 msgstr "Künstler"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/interface.c:1515
-#: ../plugins/gtkui/plcommon.c:886 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/interface.c:1789
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Statusleiste"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Spaltentitel"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Reiter"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:346 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:353 ../plugins/gtkui/interface.c:3212
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Reihenfolge"
 
-#: ../plugins/gtkui/interface.c:360 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:366 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "Shuffle tracks"
 msgstr "Track-Shuffle"
 
-#: ../plugins/gtkui/interface.c:372 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Shuffle albums"
 msgstr "Album-Shuffle"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Wiederholen"
 
-#: ../plugins/gtkui/interface.c:391 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Wiederhole alle"
 
-#: ../plugins/gtkui/interface.c:397 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Wiederhole einzelnes Lied"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Nicht wiederholen"
 
-#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Bildlauf folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Mauszeiger folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Nach aktuellem Titel beenden"
 
-#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Zu aktuellem Titel springen"
 
 #: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Info"
 
-#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Übersetzer"
 
-#: ../plugins/gtkui/interface.c:894 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Suche"
 
-#: ../plugins/gtkui/interface.c:969 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:977 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../plugins/gtkui/interface.c:985 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Anhalten"
 
-#: ../plugins/gtkui/interface.c:993 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: ../plugins/gtkui/interface.c:1001 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Nächstes"
 
-#: ../plugins/gtkui/interface.c:1009 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Zufälliges Abspielen"
 
-#: ../plugins/gtkui/interface.c:1018 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Info"
 
-#: ../plugins/gtkui/interface.c:1031 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../plugins/gtkui/interface.c:1220 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Titeleigenschaften"
 
-#: ../plugins/gtkui/interface.c:1265 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:1291 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "A_nwenden"
 
-#: ../plugins/gtkui/interface.c:1312 ../plugins/gtkui/interface.c:1358
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../plugins/gtkui/interface.c:1316 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: ../plugins/gtkui/interface.c:1362 ../plugins/gtkui/plcommon.c:508
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../plugins/gtkui/interface.c:1489 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Neuen Spaltentitel eingeben"
 
-#: ../plugins/gtkui/interface.c:1497 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1505
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Index"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1506 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1507
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Album Artwork"
 
-#: ../plugins/gtkui/interface.c:1508
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Künstler - Album"
 
-#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/prefwin.c:620 ../plugins/gtkui/search.c:387
-msgid "Title"
-msgstr "Titel"
-
-#: ../plugins/gtkui/interface.c:1512 ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:388
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
 msgid "Duration"
 msgstr "Dauer"
 
-#: ../plugins/gtkui/interface.c:1513 ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:386
-msgid "Track No"
-msgstr "Track-Nr."
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Track-Nummer"
 
-#: ../plugins/gtkui/interface.c:1514 ../translation/extra.c:67
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Band / Album-Künstler"
 
-#: ../plugins/gtkui/interface.c:1521 ../plugins/gtkui/interface.c:3064
-#: ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1546 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../plugins/gtkui/interface.c:1554
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Linksbündig"
 
-#: ../plugins/gtkui/interface.c:1555
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Rechtsbündig"
 
-#: ../plugins/gtkui/interface.c:1578 ../plugins/gtkui/interface.c:2867
-#: ../plugins/gtkui/interface.c:2979 ../plugins/gtkui/interface.c:3105
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../plugins/gtkui/interface.c:1599 ../plugins/gtkui/interface.c:2888
-#: ../plugins/gtkui/interface.c:3000 ../plugins/gtkui/interface.c:3126
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1810 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Ausgabeplugin:"
 
-#: ../plugins/gtkui/interface.c:1823 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Ausgabegerät:"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Immer 8-bit Audio nach 16-bit konvertieren"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Replaygain-Modus:"
 
-#: ../plugins/gtkui/interface.c:1854
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../plugins/gtkui/interface.c:1855
+#: ../plugins/gtkui/interface.c:1874
 msgid "Track"
 msgstr "Titel"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Replaygain-Ausschlagschutz"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "Replaygain preamp:"
-msgstr "Replaygain-Vorverstärkung:"
-
-#: ../plugins/gtkui/interface.c:1870 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1880 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Replaygain-Vorverstärkung:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Globale Vorverstärkung:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Datein beim Hinzufügen von Kommandozeile (oder Dateimanager) an Liste "
 "anhängen:"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Beim Start letzte Sitzung wiederherstellen"
 
-#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Don't add from archives when adding folders"
 msgstr ""
 "Dateien innerhalb von Archiven beim Hinzufügen von Verzeichnissen auslassen"
 
-#: ../plugins/gtkui/interface.c:1905 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1926 ../plugins/gtkui/interface.c:2444
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
 msgid "Configure"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "DSP Chain Preset"
 msgstr "DSP Voreinstellung"
 
-#: ../plugins/gtkui/interface.c:1973 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "_Load"
 msgstr "_Laden"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Beim Schließen minimieren"
 
-#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Mittlere Maustaste zum Schließen der Wiedergabeliste verwenden"
 
-#: ../plugins/gtkui/interface.c:1994 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Systemleisten-Icon verstecken"
 
-#: ../plugins/gtkui/interface.c:1998 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Aktuellen Titel hervorheben"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Eintrag \"Vom Datenträger entfernen\" im Kontextmenü verstecken"
 
-#: ../plugins/gtkui/interface.c:2006 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
 msgid "Auto-name playlists when adding a single folder"
 msgstr ""
 "Wiedergabeliste beim Hinzufügen einzelner Verzeichnisse automatisch benennen"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Interface refresh rate (times per second):"
 msgstr "Aktualisierungsrate der Benutzeroberfläche (Ereignisse pro Sekunde):"
 
-#: ../plugins/gtkui/interface.c:2028 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Fenstertitel beim Abspielen:"
 
-#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Fenstertitel wenn angehalten:"
 
-#: ../plugins/gtkui/interface.c:2056 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI-Plugin (Änderung benötigt Neustart):"
 
-#: ../plugins/gtkui/interface.c:2064 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:2079 ../plugins/gtkui/interface.c:2123
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Überschreiben"
 
-#: ../plugins/gtkui/interface.c:2088 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Vordergrund"
 
-#: ../plugins/gtkui/interface.c:2095 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Hintergrund"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Farben von Suchleiste und Lautstärkeregler"
 
-#: ../plugins/gtkui/interface.c:2132 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Mittel"
 
-#: ../plugins/gtkui/interface.c:2139 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Hell"
 
-#: ../plugins/gtkui/interface.c:2146 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Dunkel"
 
-#: ../plugins/gtkui/interface.c:2177 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:2184 ../plugins/gtkui/interface.c:2241
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Text"
 msgstr "Text"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Farben der Reiterleiste"
 
-#: ../plugins/gtkui/interface.c:2206 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Überschreiben (beschleunigt die Darstellung)"
 
-#: ../plugins/gtkui/interface.c:2215 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Gerade Zeile"
 
-#: ../plugins/gtkui/interface.c:2222 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Ungerade Zeile"
 
-#: ../plugins/gtkui/interface.c:2248 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Ausgewählte Zeile"
 
-#: ../plugins/gtkui/interface.c:2267 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Ausgewählter Text"
 
-#: ../plugins/gtkui/interface.c:2280 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Mauszeiger"
 
-#: ../plugins/gtkui/interface.c:2293 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Farben der Wiedergabeliste"
 
-#: ../plugins/gtkui/interface.c:2297 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Farben"
 
-#: ../plugins/gtkui/interface.c:2306 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Proxyserver aktivieren"
 
-#: ../plugins/gtkui/interface.c:2314 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresse des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2328 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2342 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Art des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2361 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Benutzername für Proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Passwort für Proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../plugins/gtkui/interface.c:2465 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:77
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Version: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../plugins/gtkui/interface.c:2475 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: ../plugins/gtkui/interface.c:2947 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3049 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "Group By"
 msgstr "Gruppieren nach"
 
-#: ../plugins/gtkui/interface.c:3173 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Sort by..."
 msgstr "Sortieren nach..."
 
-#: ../plugins/gtkui/interface.c:3189 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
 msgid "Format"
 msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3219
+#: ../plugins/gtkui/interface.c:3305
 msgid "Ascending"
 msgstr "Auftseigend"
 
-#: ../plugins/gtkui/interface.c:3220
+#: ../plugins/gtkui/interface.c:3306
 msgid "Descending"
 msgstr "Absteigend"
 
-#: ../plugins/gtkui/interface.c:3273 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
 msgid "Select DSP Plugin"
 msgstr "Auswahl des DSP-Plugins"
 
-#: ../plugins/gtkui/interface.c:3289 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Tag Writer Settings"
 msgstr "Einstellungen für den Tag-Editor"
 
-#: ../plugins/gtkui/interface.c:3406 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Schreibe ID3v2"
 
-#: ../plugins/gtkui/interface.c:3410 ../plugins/gtkui/interface.c:3537
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Schreibe ID3v1"
 
-#: ../plugins/gtkui/interface.c:3414 ../plugins/gtkui/interface.c:3493
-#: ../plugins/gtkui/interface.c:3533 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 schreiben"
 
-#: ../plugins/gtkui/interface.c:3422 ../plugins/gtkui/interface.c:3501
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3426 ../plugins/gtkui/interface.c:3549
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 entfernen"
 
-#: ../plugins/gtkui/interface.c:3430 ../plugins/gtkui/interface.c:3505
-#: ../plugins/gtkui/interface.c:3545 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3438 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 Version"
 
-#: ../plugins/gtkui/interface.c:3445
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (empfohlen)"
 
-#: ../plugins/gtkui/interface.c:3446
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3452 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 Zeichensatz (Vorgabe ist iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3489 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Schreibe ID3v2.4"
 
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:385
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Künstler / Album"
 
-#: ../plugins/gtkui/plcommon.c:319
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Track-Nr."
+
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Dateien vom Datenträger entfernen"
 
-#: ../plugins/gtkui/plcommon.c:320
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -891,48 +922,49 @@
 "Dateien werden verloren gehen. Weitermachen?\n"
 "(Diese Abfrage kann in den Einstellungen des GTK-Plugin abgeschaltet werden)"
 
-#: ../plugins/gtkui/plcommon.c:321 ../plugins/gtkui/trkproperties.c:162
-#: ../plugins/gtkui/trkproperties.c:672
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../plugins/gtkui/plcommon.c:397
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Zur Warteschlange hinzufügen"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Von Warteschlange entfernen"
 
-#: ../plugins/gtkui/plcommon.c:410
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Metadaten neu laden"
 
-#: ../plugins/gtkui/plcommon.c:429
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Vom Datenträger entfernen"
 
-#: ../plugins/gtkui/plcommon.c:724 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Spalte hinzufügen"
 
-#: ../plugins/gtkui/plcommon.c:754 ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Spalte bearbeiten"
 
-#: ../plugins/gtkui/plcommon.c:857
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Spalte entfernen"
 
-#: ../plugins/gtkui/plcommon.c:867
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Gruppieren nach"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Nichts"
 
-#: ../plugins/gtkui/plcommon.c:878
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Künstler/Datum/Album"
 
@@ -949,7 +981,7 @@
 msgid "Default Audio Device"
 msgstr "Standard Ausgabegerät"
 
-#: ../plugins/gtkui/prefwin.c:318
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -969,7 +1001,7 @@
 msgid "Adding files..."
 msgstr "Dateien hinzufügen..."
 
-#: ../plugins/gtkui/progress.c:91
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Initialisiere..."
 
@@ -987,121 +1019,128 @@
 msgid "[Multiple values] "
 msgstr "[Mehrere Werte] "
 
-#: ../plugins/gtkui/trkproperties.c:398 ../plugins/gtkui/trkproperties.c:410
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../plugins/gtkui/trkproperties.c:399 ../plugins/gtkui/trkproperties.c:411
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Wert"
 
-#: ../plugins/gtkui/trkproperties.c:573
+#: ../plugins/gtkui/trkproperties.c:594
 msgid "Writing tags..."
 msgstr "Speichere Tags..."
 
-#: ../plugins/gtkui/trkproperties.c:600
+#: ../plugins/gtkui/trkproperties.c:621
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/gtkui/trkproperties.c:612
+#: ../plugins/gtkui/trkproperties.c:633
 msgid "Field names must not start with : or _"
 msgstr "Feldnamen dürfen nicht mit : oder _ beginnen"
 
-#: ../plugins/gtkui/trkproperties.c:613 ../plugins/gtkui/trkproperties.c:647
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
 msgid "Cannot add field"
 msgstr "Kann Feld nicht hinzufügen"
 
-#: ../plugins/gtkui/trkproperties.c:646
+#: ../plugins/gtkui/trkproperties.c:667
 msgid "Field with such name already exists, please try different name."
 msgstr ""
 "Ein Feld mit diesem Namen existiert bereits, bitte einen anderen Name wählen."
 
 # Soll das Fenster wirklich geschlossen werden?
-#: ../plugins/gtkui/trkproperties.c:671
+#: ../plugins/gtkui/trkproperties.c:692
 msgid "Really remove selected field?"
 msgstr "Möchten Sie das Fenster wirklich schließen?"
 
-#: ../plugins/gtkui/trkproperties.c:713
+#: ../plugins/gtkui/trkproperties.c:734
 msgid "Add field"
 msgstr "Feld hinzufügen"
 
-#: ../plugins/gtkui/trkproperties.c:716
+#: ../plugins/gtkui/trkproperties.c:737
 msgid "Remove field"
 msgstr "Feld entfernen"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Benutzung: deadbeef [Optionen] [Datei(en)]\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help oder -h Hilfe (diese Meldung) anzeigen und beenden\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Player beenden\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Versionsinformationen anzeigen und beenden\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Wiedergabe starten\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Wiedergabe beenden\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Wiedergabe pausieren\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid " --toggle-pause Toggle pause\n"
 msgstr " --toggle-pause Wiedergabe umschalten (Play/Pause)\n"
 
-#: ../main.c:99
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+" --play-pause Wiedergabe starten falls angehalten, sonst pausieren\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Nächster Titel in der Wiedergabeliste\n"
 
-#: ../main.c:100
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Vorheriger Titel in der Wiedergabeliste\n"
 
-#: ../main.c:101
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Zufälliger Titel in der Wiedergabeliste\n"
 
-#: ../main.c:102
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 " --queue Datei(en) an bestehende Wiedergabeliste anhängen\n"
 
-#: ../main.c:103
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 " --nowplaying FMT Formatierten Tracknamen auf Standardausgabe schreiben\n"
 
-#: ../main.c:104
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1109,7 +1148,7 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:107
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1118,15 +1157,22 @@
 " z.B.: --nowplaying \"%%a - %%t\" sollte \"Artist - "
 "Titel\" ausgeben\n"
 
-#: ../playlist.c:397 ../playlist.c:2484
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Standard"
 
-#: ../playlist.c:3645
+#: ../playlist.c:3664
 msgid "Yes"
 msgstr "Ja"
 
-#: ../playlist.c:3645
+#: ../playlist.c:3664
 msgid "No"
 msgstr "Nein"
 
@@ -1138,7 +1184,7 @@
 "2.3 (Empfohlen)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:14
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1146,7 +1192,7 @@
 "Aufsteigend\n"
 "Absteigend"
 
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1156,7 +1202,7 @@
 "Track\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1166,7 +1212,7 @@
 "Album\n"
 "Title\n"
 "Duration\n"
-"Track No\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1182,7 +1228,7 @@
 "Band / Album-Künstler\n"
 "Benutzerdefiniert"
 
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1191,6 +1237,7 @@
 "Rechts"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmap-Datei nicht gefunden: %s"
@@ -1224,7 +1271,7 @@
 msgid "Release device while stopped"
 msgstr "Gerät bei angehaltener Wiedergabe freigeben"
 
-#: ../translation/extra.c:8 ../translation/extra.c:50
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Bevorzugte Puffergröße"
 
@@ -1258,192 +1305,473 @@
 msgid "Device file"
 msgstr "Ausgabegerät"
 
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
 #. Album Artwork plugin
-#: ../translation/extra.c:19
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Cache-Aktualisierungsperiode (Stunden)"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Aus eingebetteten Tags lesen"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Aus lokalem Verzeichnis lesen"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Maske für lokale Cover-Dateien"
 
-#: ../translation/extra.c:23
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Von Last.fm holen"
 
-#: ../translation/extra.c:24
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Von albumart.org holen"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:26
 msgid "Scale artwork towards longer side"
 msgstr "Artwork zu längerer Seite skalieren"
 
 #. Audio CD player
-#: ../translation/extra.c:27
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "CDDB/FreeDB verwenden"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "CD-Text gegenüber CDDB vorziehen"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB-URL (z.B. 'freedb.org')"
 
-#: ../translation/extra.c:30
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "CDDB-Port (z.B. '888')"
 
-#: ../translation/extra.c:31
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "CDDB-Protokoll gegenüber HTTP vorziehen"
 
-#: ../translation/extra.c:32
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Unterstützung von NRG-Abbilddateien einschalten"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:34
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Resampling-Qualität (0..2, höher ist besser)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:36
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Maximale Song-Länge (in Minuten)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:38
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Entfernen von Dateien vom Datenträger bestätigen lassen"
 
-#: ../translation/extra.c:39
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Sensitivität des Volumenreglers im Systemleisten-Icon"
 
-#: ../translation/extra.c:40
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Benutzerdefiniertes Systemleisten-Icon"
 
-#: ../translation/extra.c:41
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "gtk_init mit --sync ausführen (Debug-Modus)"
 
-#: ../translation/extra.c:42
+#: ../translation/extra.c:43
 msgid "Add separators between plugin context menu items"
 msgstr "Kontextmenü-Einträge von verschiedenen Plugins trennen"
 
 #. OSD Notify plugin
-#: ../translation/extra.c:44
+#: ../translation/extra.c:45
 msgid "Notification title format"
 msgstr "Titel der Benachrichtigung"
 
-#: ../translation/extra.c:45
+#: ../translation/extra.c:46
 msgid "Notification content format"
 msgstr "Inhalt der Benachrichtigung"
 
-#: ../translation/extra.c:46
+#: ../translation/extra.c:47
 msgid "Show album art"
 msgstr "Album Artwork anzeigen"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:48
 msgid "Album art size (px)"
 msgstr "Größe des Album Artworks (Pixel)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:49
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio Server"
 
-#: ../translation/extra.c:51
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Samplerate"
 
 #. SHN player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Relativer Pfad der Suchtabelle"
 
-#: ../translation/extra.c:54
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Absoluter Pfad der Suchtabelle"
 
-#: ../translation/extra.c:55
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Audio-Bytes vertauschen (umschalten, falls nur Rauschen zu hören ist)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:57
+#: ../translation/extra.c:58
 msgid "Enable HVSC Songlength DB"
 msgstr "HVSC Songlängen-Datenbank aktivieren"
 
-#: ../translation/extra.c:58
+#: ../translation/extra.c:59
 msgid "Songlengths.txt (from HVSC)"
 msgstr "Pfad zur songlengths.txt (von HVSC)"
 
-#: ../translation/extra.c:59
+#: ../translation/extra.c:60
 msgid "Bits per sample (8 or 16)"
 msgstr "Bits pro Sample (8 oder 16)"
 
-#: ../translation/extra.c:60
+#: ../translation/extra.c:61
 msgid "Default song length (sec)"
 msgstr "Standard-Songlänge (Sekunden)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:62
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Timidity++ Konfigurationsdatei"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Titel"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Interpret"
 
-#: ../translation/extra.c:70
-msgid "Track Number"
-msgstr "Track-Nummer"
-
-#: ../translation/extra.c:71
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Gesamtanzahl Tracks"
 
-#: ../translation/extra.c:72
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Genre"
 
-#: ../translation/extra.c:73
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Verfasser"
 
-#: ../translation/extra.c:74
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Disk-Nummer"
 
-#: ../translation/extra.c:75
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../translation/extra.c:76
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Encoder / Anbieter"
 
-#. FFmpeg deocder plugin
 #: ../translation/extra.c:79
+msgid "Location"
+msgstr "Ort"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Subtrack-Index"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tag-Typ"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Eingebettetes Cusheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
 msgid "File Extensions (separate with ';')"
 msgstr "Dateiendungen (trennen mit ';')"
 
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Konvertieren"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Samplerate"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Qualität / Algorithmus"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Automatische Samplerate (überschreibt die Ziel-Samplerate)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Die Datei existiert bereits. Überschreiben?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Converter: Warnung"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Bitte einen Encoder auswählen"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Converter: Fehler"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Konvertiere..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Verzeichnis wählen..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Fehler beim Speichern des Encoder-Profil"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Bitte Zugriffsrechte auf das Verzeichnis prüfen, einen anderen Titel wählen "
+"oder freien Platz auf der Festplatte schaffen"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+"Ein Profil mit diesem Namen existiert bereits. Bitte einen anderen Titel "
+"wählen."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Fehler"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Neuen Encoder hinzufügen"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Encoder bearbeiten"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Profil entfernen"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Diese Aktion wird das gewählte Profil löschen. Sind Sie sicher?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Encoder"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Plugin in DSP-Kette einfügen"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Fehler beim Speichern des DSP-Profils"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Neues DSP-Profil"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "DSP-Profil bearbeiten"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP-Profile"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Zielverzeichnis:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Dateiname:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Erweiterung (z.B. .mp3) wird automatisch angehängt.\n"
+"Feld leer lassen um Standardwert zu verwenden (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Encoder:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP-Profil:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Thread-Anzahl:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Ausgabe-Sampleformat:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Format der Eingangsdatei verwenden"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Falls Datei bereits existiert:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Nachfragen"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Verzeichnis-Struktur beibehalten, starten mit:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Profil laden"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Neuer Encoder"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Endung der Zieldatei:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Z.B. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Kommandozeile:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Beispiel: lame - %o\n"
+"%i für Eingabedatei, %o für Zieldatei, - für stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - Name der Zieldatei\n"
+"%i - Name der temporären Eingabedatei"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Methode:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Temporäre Datei"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Tags schreiben"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP-Profileditor"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Neues DSP-Profil"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Wiedergabeliste speichern unter"
+
 #~ msgid "HVSC path"
 #~ msgstr "HVSC Pfad"

deadbeef-0.5.1.tar.bz2/po/el.po -> deadbeef-0.5.2.tar.bz2/po/el.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2011-04-18 08:17+0200\n"
 "Last-Translator: George <forfolias@gmail.com>\n"
 "Language-Team: Greek\n"
@@ -20,154 +20,176 @@
 "X-Poedit-Language: Greek\n"
 "X-Poedit-Country: GREECE\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Υποστηριζόμενοι τύποι ήχου"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Άλλα αρχεία (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Άνοιγμα αρχείου..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Προσθήκη αρχείου στη λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Προσθήκη φακέλου στη λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Να ακολουθούνται οι συμβολικοί δεσμοί"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Αποτυχία κατά την ανάγνωση του αρχείου βοήθειας"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Αποτυχία κατά τη φόρτωση του αρχείου βοήθειας"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Περί DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF τώρα αναπαράγει"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Επεξεργασία λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Τίτλος:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Μετονομασία λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Αφαίρεση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Προσθήκη νέας λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Αποθήκευση ρύθμισης DeaDBeeF EQ"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Αρχεία ρύθμισης DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Φόρτωση ρύθμισης DeaDBeeF EQ"
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Ρυθμίσεις DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Εισαγωγή ρυθμίσεων Foobar2000 EQ..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Ρυθμίσεις Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Φόρτωση ρύθμισης"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Εισαγωγή ρύθμισης Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Ενεργό"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Όλα μηδέν"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Μηδέν προενίσχυση"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Μηδέν ζώνες"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Αποθήκευση ρύθμισης"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Φόρτωση ρύθμισης"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Εισαγωγή ρύθμισης Foobar2000"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 μέρα %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d μέρες %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Διακοπή | %d κομμάτια | %s συνολικός χρόνος αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Μονοφωνικό"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Παύση |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -175,681 +197,736 @@
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d κομμάτια | %s συνολικός "
 "χρόνος αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Αποθήκευση λίστας αναπαραγωγής ως"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Αρχεία λίστας αναπαραγωγής DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Φόρτωση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Άλλα αρχεία (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Νέα λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Νέα λίστα αναπαραγωγής (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Άνοιγμα αρχείου"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Προσθήκη αρχείου"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Προσθήκη φακέλου"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Προσθήκη τοποθεσίας"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Νέα λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Φόρτωση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Αποθήκευση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Αποθήκευση λίστας αναπαραγωγής ως"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Καθαρισμός"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Αποεπιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Αναστροφή επιλογής"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Επιλεγμένο"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Περικοπή"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Τίτλος"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Αριθμός αρχείου"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Άλμπουμ"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Καλλιτέχνης"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Αυτοσχέδιο"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Ρυθμίσεις"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Μπάρα κατάστασης"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Τίτλοι στύλων"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Καρτέλες"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ισοσταθμιστής"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Σειρά"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Γραμμικά"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Ανακατεμένα"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Ανακατεμένα"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Τυχαία"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Επανάληψη"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Επανάληψη όλων"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Επανάληψη κομματιού"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Χωρίς επανάληψη"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Η κύληση ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Ο δείκτης ποντικιού ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Διακοπή μετά το τρέχον"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Περί"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Διακοπή"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Αναπαραγωγή τυχαίου"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Περί"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Προσθήκη αρχείων"
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Ακύρωση"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Ιδιότητες κομματιού"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΉ: η εγγραφή ετικετών είναι ακόμα υπό ανάπτυξη.\n"
-"Κρατήστε αντίγραφα ασφαλείας πριν τη χρήση."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Εφαρμογή"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "Επεξεργασία στήλης"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Τίτλος:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Εισαγωγή νέου τίτλου για τη στήλη"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Τύπος"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Αριθμός αρχείου"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Σχέδιο άλπουμ"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Καλλιτέχνης - Άλμπουμ"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Καλλιτέχνης"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Άλμπουμ"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Τίτλος"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Διάρκεια"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Κομμάτι"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "Αριθμός κομματιού"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Συγκρότημα / Καλλιτέχνης άλμπουμ"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Αυτοσχέδιο"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Στοίχιση:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Αριστερά"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Δεξιά"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Μορφή μετατροπής (ξεκινούν με %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and,\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Παράδειγμα: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Πρόσθετο εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Συσκευή εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Να επιτρέπεται η δυναμική ρύθμιση της δειγματοληψίας"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Ποιότητα μετατροπής samplerate:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Λειτουργία Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Ανενεργό"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Κομμάτι"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Κορυφή κλίμακας Replaygain"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Λειτουργία Replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Προσθήκη αρχείων από την γραμμή εντολών (ή το διαχειριστή αρχείων) σε αυτή "
 "τη λίστα αναπαραγωγής:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Συνέχεια προηγούμενης συνεδρίας στην εκκίνηση"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Ρύθμιση"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Ελαχιστοποίηση στο πλαίσιο συστήματος στο κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Το μεσαίο πλήκτρο του ποντικιού να κλείνει τη λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Απόκρυψη εικονιδίου στο πλαίσιο συστήματος"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Χρήση έντονης γραμματοσειράς κομμάτι που αναπαράγεται"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Απόκρυψη του μενού \"Διαγραφή από το δίσκο\""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Τίτλος παραθύρου κατά την αναπαραγωγή:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Τίτος παραθύρου κατά τη διακοπή:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Γραφική Διεπαφή"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Παράκαμψη"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Προσκήνιο"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Παρασκήνιο"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Χρώματα μπάρας μετατόπισης/ήχου"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Μέση"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Φωτεινό"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Σκοτεινό"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Βάση"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Κείμενο"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Χρώματα στο χώρο καρτελών"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Παράκαμψη (χάνει το GTK treeview θέμα, αλλά επιταχύνει την απόδοση)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Ζυγή σειρά"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Μονή σειρά"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Κείμενο"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Επιλεγμένη σειρά"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Επιλεγμένο κείμενο"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Δείκτης ποντικιού"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Χρώματα λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Ενεργοποίηση Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Διεύθυνση Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Πόρτα Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Τύπος Proxy:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Όνομα χρήστη Proxy:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Κωδικός Proxy:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Ομαδοποίηση κατά"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Μορφή:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Επιλεγμένο"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Πρόσθετα"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Συγγραφέας ετικετών"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Εγγραφή ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Εγγραφή ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Εγγραφή APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Αφαίρεση ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Αφαίρεση ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Αφαίρεση APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Έκδοση ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Προτείνεται)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 κωδικοποίηση χαρακτήρων (προεπιλογή είναι iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Εγγραφή ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Συγγραφέας ετικετών"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Περιγραφή:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Συγγραφέας:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Ιστοσελίδα:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Πρόσθετα"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "Επεξεργασία λίστας αναπαραγωγής"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Ομαδοποίηση κατά"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format μετατροπής (ξεκινούν με %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and,\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Παράδειγμα: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Καλλιτέχνης / Άλμπουμ"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Αριθμός κομματιού"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Τίτλος / Καλλιτέχνης κομματιού"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Διάρκεια"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Διαγραφή αρχείων από το δίσκο"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -858,195 +935,222 @@
 "(Αυτό το παράθυρο μπορεί να απενεργοποιηθεί από τις ρυθμίσεις του πρόσθετου "
 "GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Προσθήκη στην ουρά αναπαραγωγής"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Αφαίρεση από την ουρά αναπαραγωγής"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Επαναφόρτωση μεταδεδομένων"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Αφαίρεση από τον δίσκο"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Προσθήκη στήλης"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Επεξεργασία στήλη"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Αφαίρεση στήλης"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Ομαδοποίηση κατά"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Κανένα"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Καλλιτέχνης/Ημερομηνία/Άλμπουμ"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Άνοιγμα αρχείου..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Εγκατάσταση %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Ρύθμιση"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Προεπιλεγμένη συσκευή ήχου"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Συντομεύσεις πληκτρολογίου"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Θέση"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Συνδυασμός πλήκτρων"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Πρόσθετο εξόδου ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Προσθήκη αρχείων"
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Αρχικοποίηση..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Έχετε τροποποιήσει στοιχεία του κομματιού."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Είστε σίγουροι πως θέλετε να κλείσετε το παράθυρο;"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Τύπος ετικέτας"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Ενσωματωμένα Cuesheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ναί"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Όχι"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Κωδικοποιητής"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Πλήκτρο"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Τιμή"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF τώρα αναπαράγει"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Είστε σίγουροι πως θέλετε να κλείσετε το παράθυρο;"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Προσθήκη αρχείου"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Αφαίρεση"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Χρήση: deadbeef [επιλογές] [αρχεία]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Επιλογές:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help ή -h Εμφάνιση κειμένου βοήθειας και έξοδος\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr "--quit Έξοδος\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr "--version Εμφάνιση πληροφοριών έκδοσης και έξοδος\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr "--play Εκκίνηση αναπαραγωγής\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr "--stop Διακοπή αναπαραγωγής\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr "--pause Παύση αναπαραγωγής\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr "--next Επόμενο τραγούδι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr "--prev Προηγούμενο τραγούδι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr "--random Τυχαίο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr "--queue Προσάρτηση αρχείου στην υπάρχουσα λίστα αναπαραγωγής\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr "--nowplaying FMT Εμφάνιση μορφοποιημένου ονόματος κομματιού\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1057,18 +1161,33 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "π.χ.: --nowplaying \"%%a - %%t\" θα εμφανίσει \"artist - title\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ναί"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Όχι"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1076,7 +1195,13 @@
 "2.3 (Προτείνεται)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1086,17 +1211,18 @@
 "Κομμάτι\n"
 "Άλμπουμ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1112,7 +1238,7 @@
 "Καλλιτέχνης Μπάντας / Άλμπουμ\n"
 "Προσαρμοσμένο"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1121,80 +1247,678 @@
 "Δεξιά"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Δε βρέθηκε το αρχείο pixmap: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Δεν ήταν δυνατή η χρήση αρκετής μνήμης για το input buffering"
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: δε βρέθηκε το αρχείο ρυθμίσεων του freepats. Παρακαλώ εγκαταστήστε "
+"το πακέτο timidity-freepats, ή καθορίστε τη διαδρομή του freepats.cfg στις "
+"επιλογές του πρόσθετου."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Προσθήκη CD ήχου"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "Τίτος παραθύρου κατά τη διακοπή:"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Ενεργοποίηση Proxy Server"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF τώρα αναπαράγει"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Όνομα χρήστη Proxy:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Κωδικός Proxy:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Διαγραφή αρχείων από το δίσκο"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Σχέδιο άλπουμ"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Αριθμός κομματιού"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Τίτλος / Καλλιτέχνης κομματιού"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Αριθμός αρχείου"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Προσθήκη τοποθεσίας"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Τύπος ετικέτας"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Ενσωματωμένα Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Κωδικοποιητής"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Σφάλμα ανάγνωσης πρώτης σελίδας του Ogg bitstream."
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Σφάλμα ανάγνωσης κεφαλίδας αρχικού πακέτου."
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
 msgstr ""
-"Δεν μπόρεσε να καταληφθεί αρκετή μνήμη για την καταγραφή νέου σειριακού "
-"αριθμού stream."
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Η είσοδος είναι περικομμένη ή άδεια."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Η είσοδος δεν είναι μια ροή δεδομένων Ogg"
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Το Ogg bitstream δεν περιέχει δεδομένα Vorbis"
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "EOF πριν την αναγνώριση της ροής."
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
 msgstr ""
-"Η ροή δεδομένων Ogg δεν περιέχει κάποιον υποστηριζόμενο τύπο δεδομένων."
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Αλλοιωμένη δευτερεύουσα κεφαλίδα."
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF πριν το τέλος της ροής Vorbis."
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Επιλογή όλων"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Χαμένα ή αλλοιωμένα δεδομένα, συνέχεια..."
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"Σφάλμα κατά την εγγραφή της ροής στην έξοδο. Η ροή εξόδου μπορεί να είναι "
-"κατεστραμμένη ή ελλιπής."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Επεξεργασία στήλη"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Συσκευή εξόδου:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Πρόσθετο εξόδου:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Αποθήκευση ρύθμισης"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Παράκαμψη"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Φόρτωση ρύθμισης"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Πρόσθετο εξόδου:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"wildmidi: δε βρέθηκε το αρχείο ρυθμίσεων του freepats. Παρακαλώ εγκαταστήστε "
-"το πακέτο timidity-freepats, ή καθορίστε τη διαδρομή του freepats.cfg στις "
-"επιλογές του πρόσθετου."
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Προσθήκη CD ήχου"
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Εγγραφή APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Εγγραφή ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Εγγραφή ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Συγγραφέας ετικετών"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Αποθήκευση λίστας αναπαραγωγής ως"
+
+#~ msgid "_Abort"
+#~ msgstr "_Ακύρωση"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "ΠΡΟΕΙΔΟΠΟΙΗΣΉ: η εγγραφή ετικετών είναι ακόμα υπό ανάπτυξη.\n"
+#~ "Κρατήστε αντίγραφα ασφαλείας πριν τη χρήση."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "Επεξεργασία στήλης"
+
+#~ msgid "Length"
+#~ msgstr "Διάρκεια"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Μορφή μετατροπής (ξεκινούν με %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and,\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Παράδειγμα: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Να επιτρέπεται η δυναμική ρύθμιση της δειγματοληψίας"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Ποιότητα μετατροπής samplerate:"
+
+#~ msgid "Description:"
+#~ msgstr "Περιγραφή:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Συγγραφέας:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Ιστοσελίδα:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "Επεξεργασία λίστας αναπαραγωγής"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format μετατροπής (ξεκινούν με %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and,\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Παράδειγμα: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Εγκατάσταση %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Πρόσθετο εξόδου ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Δεν ήταν δυνατή η χρήση αρκετής μνήμης για το input buffering"
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Σφάλμα ανάγνωσης πρώτης σελίδας του Ogg bitstream."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Σφάλμα ανάγνωσης κεφαλίδας αρχικού πακέτου."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Δεν μπόρεσε να καταληφθεί αρκετή μνήμη για την καταγραφή νέου σειριακού "
+#~ "αριθμού stream."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Η είσοδος είναι περικομμένη ή άδεια."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Η είσοδος δεν είναι μια ροή δεδομένων Ogg"
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Το Ogg bitstream δεν περιέχει δεδομένα Vorbis"
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF πριν την αναγνώριση της ροής."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr ""
+#~ "Η ροή δεδομένων Ogg δεν περιέχει κάποιον υποστηριζόμενο τύπο δεδομένων."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Αλλοιωμένη δευτερεύουσα κεφαλίδα."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF πριν το τέλος της ροής Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Χαμένα ή αλλοιωμένα δεδομένα, συνέχεια..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Σφάλμα κατά την εγγραφή της ροής στην έξοδο. Η ροή εξόδου μπορεί να είναι "
+#~ "κατεστραμμένη ή ελλιπής."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Ήχος (προχ.)"

deadbeef-0.5.1.tar.bz2/po/en_GB.po -> deadbeef-0.5.2.tar.bz2/po/en_GB.po Changed

@@ -1,845 +1,914 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 0xDeadBeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-19 04:29+0000\n"
-"PO-Revision-Date: 2010-07-06 17:16+01\n"
-"Last-Translator: Steve (Yorvyk) Cook <yorvik.ubunto@googlemail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-25 00:29+0200\n"
+"Last-Translator: Steve <yorvik.ubunto@gmail.com>\n"
 "Language-Team: English (United Kingdom) <yorvik.ubunto@gmail.com>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 "X-Poedit-Language: English en_GB\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: UNITED KINGDOM\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Supported sound formats"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "All files (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Open file(s)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Add file(s) to playlist..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Add folder(s) to playlist..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Follow symlinks"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Failed while reading help file"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Failed to load help file"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Help"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "About DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF Translators"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Edit playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Title:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Rename Playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Remove Playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Add New Playlist"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Save DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Load DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Import Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Save Preset"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Load Preset"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Import Foobar2000 Preset"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Enable"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Zero All"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Zero Preamp"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Zero Bands"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Save Preset"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Load Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Presets"
 
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Import Foobar2000 Preset"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 day %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d days %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stopped | %d tracks | %s total playtime"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Paused | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Save Playlist As"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF playlist files (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Load Playlist"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Other files (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "New Playlist"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "New Playlist (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_File"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Open file(s)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Add file(s)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Add folder(s)"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Add location"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "New playlist"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Load playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Save playlist"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Save playlist as"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Select all"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Deselect all"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Invert selection"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Selection"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Remove"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Sort By"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Title"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Track number"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Date"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Custom"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_View"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Status bar"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Column headers"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equaliser"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Order"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Shuffle tracks"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Shuffle albums"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Random"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Looping"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Loop All"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Loop Single Song"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Don’t Loop"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Scroll follows playback"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Cursor follows playback"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Stop after current"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Jump to current track"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Help"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_About"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Translators"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Search"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Play"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Previous"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Next"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Play Random"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "About"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Quit"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Adding files..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Abort"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Track Properties"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Settings"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Apply"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Close"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Properties"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Title:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Enter new column title here"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "File number"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Item Index"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Playing"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Album Art"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artist"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Title"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Duration"
 
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Length"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Track Number"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Track"
-
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Band / Album Artist"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Custom"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Alignment:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Left"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Right"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Output plugin:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Output device:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Always convert 8 bit audio to 16 bit"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Sound"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Allow dynamic sample-rate switching"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Sample-rate conversion quality:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Replay-gain mode:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Disable"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Track"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Replay-gain peak scale"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Replay-gain preamp:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Global preamp:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Add files from command line (or file manager) to this playlist:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Resume previous session on startup"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Don't add from archives when adding folders"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configure"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP Chain Preset"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Load"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Close minimises to tray"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Middle mouse button closes playlist"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Hide system tray icon"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Use bold font for currently playing track"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Hide \"Delete from disk\" in context menu"
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Auto-name playlists when adding a single folder"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Interface refresh rate (times per second):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Titlebar text while playing:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Titlebar text while stopped:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI Plugin (changing requires restart):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Override"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Foreground"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Background"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Seek-bar/Volume-bar colours"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Middle"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Light"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Dark"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Text"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Tab strip colours"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Override (loses GTK tree-view theming, but speeds up rendering)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Even row"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Odd row"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Selected row"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Selected text"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Playlist colours"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Colours"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Enable Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Proxy Server Address:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Proxy Server Port:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Proxy Type:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Proxy User-name:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Proxy Password:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Network"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Version: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Group By"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Sort by..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Format"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Ascending"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Descending"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Select DSP Plugin"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Tag Writer Settings"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Write ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Write ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Write APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Strip ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Strip ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Strip APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recommended)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 character encoding (default is iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Write ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Tag writer"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Description:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Author(s):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Website:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Configure"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Group By"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Track No."
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Title / Track Artist"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Duration"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Delete files from disk"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -847,195 +916,219 @@
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Warning"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Add to playback queue"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Remove from playback queue"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Reload metadata"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Remove from disk"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Add column"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Edit column"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Remove column"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Group by"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "None"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artist/Date/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Open file..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Setup %s"
+msgid "Configure %s"
+msgstr "Configure %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Default Audio Device"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Add"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Global Hot-keys"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Key combination"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA output plugin"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Adding files..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Initialising..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "You’ve modified data for this track."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Really close the window?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tag Type(s)"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Embedded Cue-sheet"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Multiple values] "
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Yes"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "No"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
-
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Key short-cuts"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Value"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF now playing"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Writing tags..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Name:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Field names must not start with : or _"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Cannot add field"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Field with such name already exists, please try different name."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Really remove selected field?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Add field"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Remove field"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Usage: deadbeef [options] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Print help (this message) and exit\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Quit player\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Print version info and exit\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Start playback\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Stop playback\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pause playback\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Toggle pause\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Start playback if stopped, toggle pause otherwise\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Next song in playlist\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Previous song in playlist\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Random song in playlist\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Append file(s) to existing playlist\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Print formatted track name to stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1046,16 +1139,36 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+
+#: ../main.c:110
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " for more info, see http://sourceforge.net/apps/mediawi"
+"ki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Default"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Yes"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "No"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1063,7 +1176,15 @@
 "2.3 (Recommended)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Ascending\n"
+"Descending"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1073,33 +1194,25 @@
 "Track\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"File number\n"
-"Playing\n"
-"Album Art\n"
-"Artist - Album\n"
-"Artist\n"
-"Album\n"
-"Title\n"
-"Length\n"
-"Track\n"
-"Band / Album Artist\n"
-"Custom"
+"Item Index\n"
+"PlayingAlbum ArtArtist - AlbumArtistAlbumTitleDurationTrack NumberBand / "
+"Album ArtistCustom"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1108,69 +1221,655 @@
 "Right"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Couldn’t find pixmap file: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Couldn’t get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Add Audio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Lookup on Last.fm"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Use ALSA resampling"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Release device while stopped"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Preferred buffer size"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Preferred period size"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Enable scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Disable now playing"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Username"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Password"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Device file"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "OSS4 sample rate bug workaround"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Cache update period (hr)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "Fetch from embedded tags"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "Fetch from local folder"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "Local cover file mask"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Fetch from last.fm"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Fetch from albumart.org"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Scale artwork towards longer side"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "Use CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "Prefer CD-Text over CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "CDDB url (e.g. 'freedb.org')"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "CDDB port number (e.g. '888')"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "Prefer CDDB protocol over HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "Enable NRG image support"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "Re-sampling quality (0..2, higher is better)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "Maximum song length (in minutes)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Ask for confirmation to delete files from disk"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "Status icon volume control sensitivity"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "Custom status icon"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "Run gtk_init with --sync (debug mode)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Add separators between plugin context menu items"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Notification title format"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Notification content format"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Show album art"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Album art size (px)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "PulseAudio server"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "Sample rate"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "Relative seek table path"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "Absolute seek table path"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Swap audio bytes (toggle if all you hear is static)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Enable HVSC Songlength DB"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (from HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bits per sample (8 or 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Default song length (sec)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bank configuration file"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Track Title"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Artist"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Error reading first page of Ogg bitstream."
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Total Tracks"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Error reading initial header packet."
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Genre"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Couldn’t get enough memory to register new stream serial number."
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Composer"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Input truncated or empty."
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Disc Number"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Input is not an Ogg bit-stream."
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Comment"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg bit-stream does not contain Vorbis data."
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "Encoder / Vendor"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "EOF before recognised stream."
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Location"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg bit-stream does not contain a supported data-type."
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Sub-track Index"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Corrupt secondary header."
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tag Type(s)"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF before end of Vorbis headers."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Embedded Cue-sheet"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Corrupt or missing data, continuing..."
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
 
-#: ../plugins/vorbis/vcedit.c:874
-msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "Error writing stream to output. Output stream may be corrupted or truncated."
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "File Extensions (separate with ';')"
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Convert"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Target sample rate"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Quality / Algorithm"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Automatic sample rate (overrides Target sample rate)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "The file already exists. Overwrite?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Converter warning"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Please select encoder"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Converter error"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Converting..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Select folder..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Failed to save encoder preset"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Check preset folder permissions, try to pick a different title, or free up "
+"some disk space"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Preset with the same name already exists. Pick another title."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Error"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Add new encoder"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Edit encoder"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Remove preset"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "This action will delete the selected preset. Are you sure?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Encoders"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Add plugin to DSP chain"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Failed to save DSP preset"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "New DSP Preset"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Edit DSP Preset"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP Presets"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Output folder:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Output file name:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"File extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for the default (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Encoder:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP preset:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Number of threads:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Output sample format:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Keep source format"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit signed integer"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bit signed integer"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bit signed integer"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bit signed integer"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "When file exists:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Prompt"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Preserve folder structure, starting from:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Edit Encoder Preset"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Untitled Encoder"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Output file extension:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "E.g. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Command line:"
+
+#: ../plugins/converter/interface.c:436
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - output file name\n"
+"%i - temporary input file name"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Method:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Temporary file"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Tag writer"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP Preset Editor"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Untitled DSP Preset"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Save playlist as"
+
+#~ msgid "_Abort"
+#~ msgstr "_Abort"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Length"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Allow dynamic sample-rate switching"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Sample-rate conversion quality:"
+
+#~ msgid "Description:"
+#~ msgstr "Description:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Author(s):"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Website:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Setup %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA output plugin"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Couldn’t get enough memory for input buffering."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Error reading first page of Ogg bitstream."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Error reading initial header packet."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "Couldn’t get enough memory to register new stream serial number."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Input truncated or empty."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Input is not an Ogg bit-stream."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg bit-stream does not contain Vorbis data."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF before recognised stream."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg bit-stream does not contain a supported data-type."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Corrupt secondary header."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF before end of Vorbis headers."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Corrupt or missing data, continuing..."
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Add Audio CD"
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Sound (adv.)"

deadbeef-0.5.2.tar.bz2/po/eo.po Added

@@ -0,0 +1,1724 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-09-25 17:37+0200\n"
+"Last-Translator: Kristjan <kristjan.schmidt@googlemail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
+msgstr "Aliaj dosieroj (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Malfermi dosiero(j)n..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Aldoni dosiero(j)n al ludlisto..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Aldoni dosierujo(j)n al ludlisto..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Eraro dum legado de la helpdosiero"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Eraro dum ŝargado de la helpdosiero"
+
+#: ../plugins/gtkui/callbacks.c:736
+#, fuzzy
+msgid "help.txt"
+msgstr "helpo.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Helpo"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Pri DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Ŝanĝoprotokolo de DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Tradukintoj de DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Redakti la ludliston"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Alinomi la ludliston"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Forigi la ludliston"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Aldoni novan ludliston"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Aliaj dosieroj (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr ""
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr ""
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr ""
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.1.tar.bz2/po/es.po -> deadbeef-0.5.2.tar.bz2/po/es.po Changed

@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: DeaDBeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-24 04:36+0000\n"
-"PO-Revision-Date: 2011-02-15 12:59+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-09 03:04+0200\n"
 "Last-Translator: Hugo <sysadmin@cips.cu>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -21,1004 +21,900 @@
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formatos de audio admitidos"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Otros archivos (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Todos los archivos (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Abrir archivo(s)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Añadir archivo(s) a la lista de reproducción..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Añadir carpeta(s) a la lista de reproducción..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Seguir enlace simbólico"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Error al leer el archivo de ayuda"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Error al cargar el archivo de ayuda"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "ayuda.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Acerca de DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Cambios en DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Traductores de DeaDBeeF"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Editar lista de reproducción"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Título:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Renombrar lista de reproducción"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Quitar lista de reproducción"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Guardar Ajustes del EQ de DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Cargar Ajustes del EQ de DeaDBeef..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importar Ajustes del EQ de Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Ajustes de EQ de Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Guardar ajustes"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Cargar ajustes"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importar ajustes de Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Activar"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Restablecer todo"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Restablecer preamp"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Restablecer bandas"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Guardar ajustes"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Cargar ajustes"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importar ajustes de Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Preajustes"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 día y %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d días y %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Detenido | %d pistas | Tiempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pausado | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tiempo total: %s"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tiempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Guardar lista de reproducción como..."
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Listas de reproducción de DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Cargar lista de reproducción"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Otros archivos (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nueva lista de reproducción (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Abrir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Añadir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Añadir carpeta(s)"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Añadir dirección"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Cargar lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Guardar lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Guardar lista de reproducción como..."
-
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Limpiar"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Deseleccionar todo"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Invertir selección"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Ordenar por"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Número de la pista"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Álbum"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Fecha"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personalizado"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Cabeceras de columnas"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Pestañas"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Orden"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineal"
 
-#: ../plugins/gtkui/interface.c:336
-#: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Barajar"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Barajar pistas"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Barajar álbumes"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Aleatorio"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Repetir"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Repetir todo"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Repetir una canción"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "No repetir"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Desplazar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Seleccionar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Detener al terminar la pista actual"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Saltar a la pista actual"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Cambios"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Traductores"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Aleatorio"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Acerca de"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Salir"
 
-#: ../plugins/gtkui/interface.c:1045
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Añadiendo archivos..."
-
-#: ../plugins/gtkui/interface.c:1089
-#: ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Abortar"
-
-#: ../plugins/gtkui/interface.c:1189
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propiedades de la Pista"
 
-#: ../plugins/gtkui/interface.c:1235
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Preferencias"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1256
-#: ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../plugins/gtkui/interface.c:1260
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1306
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1391
-#: ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1406
-#: ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Título:"
-
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Introduzca el título de la columna"
 
-#: ../plugins/gtkui/interface.c:1422
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Índice del elemento"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Reproduciendo"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Portada"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Álbum"
-
-#: ../plugins/gtkui/interface.c:1436
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Título"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Duración"
 
-#: ../plugins/gtkui/interface.c:1438
-#: ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Pista"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Número de la pista"
 
-#: ../plugins/gtkui/interface.c:1439
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Banda / Artista"
 
-#: ../plugins/gtkui/interface.c:1440
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Izquierda"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Derecha"
 
-#: ../plugins/gtkui/interface.c:1472
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversiones de formato (empezar con %):\n"
-"a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
-"n: Número de pista, N: Pistas totales,\n"
-"l: Duración, y: Año, g: Género, c: Comentario,\n"
-"r: Copyright, f: Nombre de archivo, T: Etiquetas\n"
-"Ejemplo: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501
-#: ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040
-#: ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1522
-#: ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061
-#: ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../plugins/gtkui/interface.c:1753
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Complemento de salida:"
 
-#: ../plugins/gtkui/interface.c:1766
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositivo de salida:"
 
-#: ../plugins/gtkui/interface.c:1775
-#: ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Sound"
-msgstr "Audio"
-
-#: ../plugins/gtkui/interface.c:1784
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Permitir cambio dinámico de frecuencia"
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Siempre convertir audio de 8 bits a 16 bits"
 
-#: ../plugins/gtkui/interface.c:1792
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Calidad de conversión de frecuencia:"
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "Sonido"
 
-#: ../plugins/gtkui/interface.c:1811
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
-msgstr "Modo replaygain (ajuste de volumen):"
+msgstr "Modo replaygain:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../plugins/gtkui/interface.c:1824
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Pista"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Normalizar con replaygain"
 
-#: ../plugins/gtkui/interface.c:1832
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Preamplificación replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Preamplificación global:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Agregar archivos desde la línea de comandos (o gestor de archivos) a la "
 "lista de reproducción:"
 
-#: ../plugins/gtkui/interface.c:1841
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Reanudar la sesión anterior al inicio"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Al añadir carpetas, no añadir de archivos comprimidos"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reproducción"
 
-#: ../plugins/gtkui/interface.c:1854
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Preajuste de la cadena DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Cargar"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Cerrar minimiza a la bandeja"
 
-#: ../plugins/gtkui/interface.c:1858
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Botón central del ratón cierra la lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:1862
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Esconder icono de la bandeja del sistema"
 
-#: ../plugins/gtkui/interface.c:1866
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Usar negrita para la pista en reproducción"
 
-#: ../plugins/gtkui/interface.c:1870
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Esconder \"Borrar del disco\" del menú contextual"
 
-#: ../plugins/gtkui/interface.c:1878
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Autonombrar listas de reproducción al añadir una carpeta"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Tasa de refresco de la interfaz (veces por segundo):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Texto a mostrar en la barra de título mientras se reproduce:"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Texto a mostrar en la barra de título mientras no se reproduce:"
 
-#: ../plugins/gtkui/interface.c:1902
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Complemento de interfaz gráfica (cambiarlo requiere reiniciar):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
-msgstr "Interfaz"
+msgstr "Interfaz gráfica"
 
-#: ../plugins/gtkui/interface.c:1916
-#: ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
-msgstr "Cambiar"
+msgstr "Anular"
 
-#: ../plugins/gtkui/interface.c:1925
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Frente"
 
-#: ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Fondo"
 
-#: ../plugins/gtkui/interface.c:1951
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Colores de barras de tiempo/volumen"
 
-#: ../plugins/gtkui/interface.c:1969
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Medio"
 
-#: ../plugins/gtkui/interface.c:1976
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:1983
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Oscuro"
 
-#: ../plugins/gtkui/interface.c:2014
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2021
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Texto"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Colores de pestañas"
 
-#: ../plugins/gtkui/interface.c:2030
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Cambiar (ignora el tema GTK, pero acelera el renderizado)"
 
-#: ../plugins/gtkui/interface.c:2039
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Fila par"
 
-#: ../plugins/gtkui/interface.c:2046
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Fila impar"
 
-#: ../plugins/gtkui/interface.c:2065
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2072
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Fila seleccionada"
 
-#: ../plugins/gtkui/interface.c:2091
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Texto Seleccionado"
 
-#: ../plugins/gtkui/interface.c:2104
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2117
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Colores de lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:2121
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Colores"
 
-#: ../plugins/gtkui/interface.c:2130
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Activar Servidor Proxy"
 
-#: ../plugins/gtkui/interface.c:2138
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Dirección:"
 
-#: ../plugins/gtkui/interface.c:2152
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Puerto:"
 
-#: ../plugins/gtkui/interface.c:2166
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:2185
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Usuario:"
 
-#: ../plugins/gtkui/interface.c:2198
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Contraseña:"
 
-#: ../plugins/gtkui/interface.c:2208
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Red"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Versión:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Agrupar Por"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Ordenar por..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Formato"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Seleccionar complemente DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Complemento"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Preferencias del editor de etiquetas"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:2240
-#: ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:2252
-#: ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Recortar ID3v2"
 
-#: ../plugins/gtkui/interface.c:2256
-#: ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Recortar ID3v1"
 
-#: ../plugins/gtkui/interface.c:2260
-#: ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Recortar APEv2"
 
-#: ../plugins/gtkui/interface.c:2268
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recomendada)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificación de ID3v1 (por defecto es iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2388
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Editor de etiquetas"
-
-#: ../plugins/gtkui/interface.c:2419
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Descripción:"
-
-#: ../plugins/gtkui/interface.c:2434
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Autor:"
-
-#: ../plugins/gtkui/interface.c:2449
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2464
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Sitio Web:"
-
-#: ../plugins/gtkui/interface.c:2495
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:2499
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/gtkui/interface.c:2881
-#: ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:3008
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Agrupar Por"
-
-#: ../plugins/gtkui/interface.c:3134
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversiones de formato (empezar con %):\n"
-"a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
-"n: Número de pista, N: Pistas totales,\n"
-"l: Duración, y: Año, g: Género, c: Comentario,\n"
-"r: Copyright, f: Nombre de archivo, T: Etiquetas\n"
-"Ejemplo: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Pista"
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Título / Intérprete"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Duración"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Eliminar archivos del disco"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1026,209 +922,222 @@
 "Perderás los archivos. ¿Deseas continuar?\n"
 "(Éste aviso puede desactivarse en las opciones del plugin GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Añadir a cola de reproducción"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Quitar de cola de reproducción"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Recargar metadatos"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Eliminar archivo del disco"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Añadir columna"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Editar columna"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Quitar columna"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Nada"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artista/Fecha/Álbum"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Abrir archivo..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr "Configurar %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Dispositivo de Audio por Defecto"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Añadir"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Teclas rápidas globales"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Comando"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Combinación de teclas"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "Complemento de salida ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Añadiendo archivos..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Ha modificado los datos de esta pista."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "¿Realmente desea cerrar la ventana?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Ubicación"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Múltiples valores]"
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Índice de la subpista"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Clave"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tipo de Etiqueta(s)"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Hoja Cue incrustada"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Escribiendo etiquetas..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Sí"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "No"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Los nombres de campos no deben comenzar con : o _"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Imposible añadir campo"
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Clave"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Ya existe un campo con ese nombre, por favor utilice otro diferente."
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "¿Realmente desea quitar el campo seleccionado?"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF reproduciendo"
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Añadir campo"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Quitar campo"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Uso: deadbeef [opciones] [archivo(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opciones:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help o -h Mostrar la ayuda (éste mensaje) y salir\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Cerrar reproductor\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Mostar la versión y salir\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Iniciar reproducción\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Parar reproducción\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pausar reproducción\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Alternar pausa\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Iniciar la reproducción si está detenida, pausar en "
+"caso contrario\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Siguiente pista de la lista de reproducción\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Pista anterior de la lista de reproducción \n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Canción aleatoria de la lista de reproducción\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Añadir archivo(s) a la lista de reproducción\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Mostrar nombre de la pista formateado a través de stdout\n"
+msgstr ""
+" --nowplaying FMT Mostrar nombre de la pista formateado a través de "
+"stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1239,17 +1148,36 @@
 " l: Duración, n: Pista, y: Año, c: Comentario,\n"
 " r: Copyright, e: Tiempo restante\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " ej.: --nowplaying \"%%a - %%t\" mostraría \"artista - título\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" ej.: --nowplaying \"%%a - %%t\" mostraría \"artista - "
+"título\"\n"
 
-#: ../playlist.c:377
-#: ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " para más información, vea http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Sí"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "No"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1257,7 +1185,15 @@
 "2.3 (Recomendada)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Ascendente\n"
+"Descendente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1267,7 +1203,7 @@
 "\\Pista\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1276,12 +1212,12 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"ïndice del elemento\n"
+"Índice del elemento\n"
 "Reproduciendo\n"
 "Arte del álbum\n"
 "Artista - Álbum\n"
@@ -1289,11 +1225,11 @@
 "Album\n"
 "Título\n"
 "Duración\n"
-"Pista\n"
+"Número de pista\n"
 "Banda / Artista del álbum\n"
 "Personalizado"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1301,16 +1237,21 @@
 "Izquierda\n"
 "Derecha"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Imposible encontrar el archivo pixmap: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: el archivo de configuración freepats no se puede encontrar. Por favor instale el paquete timidity-freepats o especifique la ruta a freepats.cfg en la configuración del plugin."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: el archivo de configuración freepats no se puede encontrar. Por "
+"favor instale el paquete timidity-freepats o especifique la ruta a freepats."
+"cfg en la configuración del plugin."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1331,8 +1272,7 @@
 msgid "Release device while stopped"
 msgstr "Liberar el dispositivo al detener"
 
-#: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Tamaño preferido del búfer"
 
@@ -1361,167 +1301,554 @@
 msgid "Scrobble URL"
 msgstr "URL de Scrobble"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Dispositivo de archivo"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Solución para error de muestreo de OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Periodo de actualización de la cache (hr)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Obtener de etiquetas incrustadas"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Obtener de carpeta local"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Máscara de archivo para portada local"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Obtener de Last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Obtener de albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Escalar gráfico hacia el lado largo"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Usar CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferir CD-Text sobre CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "url CDDB (ej.: 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Número de puerto CDDB (ej.: '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Preferir protocolo CDDB sobre HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Habilitar soporte a imágenes NRG"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "calidad de remuestreo (0..2, superior es mejor)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Duración máxima de la canción (en minutos)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Pedir confirmación para eliminar archivos del disco"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Sensibilidad del icono de control del volumen"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Icono de estado personalizado"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Ejecutar gtk_init with --sync (modo depuración)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Añadir separadores entre los elementos contextuales de los complementos"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Formato de notificación"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Formato del título de notificación"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Formato del contenido de notificación"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Mostrar arte del álbum"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Tamaño del arte del álbum (px)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Servidor PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Tasa de muetreo"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Ruta de la tabla de búsqueda relativa"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Ruta de la tabla de búsqueda absoluta"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Intercambiar bytes de audio (alternar si lo único que escucha es estática)"
+msgstr ""
+"Intercambiar bytes de audio (alternar si lo único que escucha es estática)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "Habilitar HVSC"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Habilitar BBDD HVSC Songlength"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Ruta HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (de HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bits por muestra (8 o 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Duración predeterminada de la canción (seg.)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Achivo de configuración del banco de Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Título de la pista"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "intérprete"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Fecha"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Número de la pista"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Total de pistas"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Género"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Número del disco"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Codificador / Proveedor"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Copyright"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Índice de la subpista"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tipo de Etiqueta(s)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Hoja Cue incrustada"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Extensiones de archivos (delimitadas por ';' )"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Convertir"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Tasa de muestreo de destino"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Calidad / algoritmo"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Muestreo automático (anula la tasa de muestreo de destino)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "El archivo ya existe. ¿Sobreescribir?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Alerta del convertidor"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Por favor, seleccione el codificador"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Error del convertidor"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Convirtiendo..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Seleccionar carpeta..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Fallo al guardar preajuste del codificador"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Verifique los permisos de la carpeta de preajustes, intente escoger otro "
+"título, o libere algo de espacio en disco"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+"Ya existe un preajuste con el mismo nombre. Intente escoger otro título."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Error"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Añadir nuevo codificador"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Modificar codificador"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Quitar preajuste"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta acción eliminará el preajuste seleccionado. ¿Está seguro?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Añadir complemento a la cadena DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Fallo al guardar preajuste DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Nuevo preajuste DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Modificar preajuste DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Preajustes DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Carpeta de salida:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Nombre del archivo de salida:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"La extensión (p.ej. .mp3) se agregará automáticamente.\n"
+"Deje el campo vacío para el valor predeterminado (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Codificador:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Preajuste DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Número de hilos:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Formato de muestra de salida:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Mantener el formato de origen"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "entero 8 bit con signo"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "entero 16 bit con signo"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "entero 24 bit con signo"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "entero 32 bit con signo"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "flotante 32 bit"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Cuando el archivo exista:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Preguntar"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Preservar la estructura de carpetas, comenzando desde:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Modificar preajuste del codificador"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Codificador sin nombre"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Extensión del archivo de salida:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "P. ej. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Línea de comando:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Ejemplo: lame - %o\n"
+"%i para el archivo de entrada, %o para el archivo de salida, - para stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - nombre del archivo de salida\n"
+"%i - nombre del archivo de entrada temporal"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Método:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Tubería"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Archivo temporal"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Editor de etiquetas"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Editor de preajustes DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Preajuste DSP sin nombre"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Guardar lista de reproducción como..."
+
+#~ msgid "_Abort"
+#~ msgstr "_Abortar"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Duración"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversiones de formato (empezar con %):\n"
+#~ "a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
+#~ "n: Número de pista, N: Pistas totales,\n"
+#~ "l: Duración, y: Año, g: Género, c: Comentario,\n"
+#~ "r: Copyright, f: Nombre de archivo, T: Etiquetas\n"
+#~ "Ejemplo: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Permitir cambio dinámico de frecuencia"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Calidad de conversión de frecuencia:"
+
+#~ msgid "Description:"
+#~ msgstr "Descripción:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Sitio Web:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversiones de formato (empezar con %):\n"
+#~ "a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
+#~ "n: Número de pista, N: Pistas totales,\n"
+#~ "l: Duración, y: Año, g: Género, c: Comentario,\n"
+#~ "r: Copyright, f: Nombre de archivo, T: Etiquetas\n"
+#~ "Ejemplo: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Título / Intérprete"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configurar %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Complemento de salida ALSA"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF reproduciendo"
+
+#~ msgid "HVSC path"
+#~ msgstr "Ruta HVSC"
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"

deadbeef-0.5.2.tar.bz2/po/et.po Added

@@ -0,0 +1,1763 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-22 18:43+0200\n"
+"Last-Translator: Anari <anari.jalakas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Toetatud helivormingud"
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Kõik failid (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Ava fail(e)..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Lisa fail(e) esitusloendisse..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Lisa kaust(ad) esitusloendisse..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Järgi nimeviitasid"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Abifaili lugemine ebaõnnestus"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Abifaili laadimine ebaõnnestus"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Abi"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s teave"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s muudatuste logi"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF tõlkijad"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Muuda esitusloendit"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Tiitel:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Esitusloendi ümbernimetamine"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Esitusloendi eemaldamine"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Esitusloendi lisamine"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Salvesta DeaDBeeF EQ eelhäälestus"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ eelhäälestus failid (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Lae DeaDBeeF EQ eelhäälestus..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ eelhäälestus (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Impordi Foobar2000 EQ eelhäälestus..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ eelhäälestus (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Salvesta eelhäälestus"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Lae eelhäälestus"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Impordi Foobar2000 eelhäälestus"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "Luba"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "Nulli kõik"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "Nulli eelvõimendus"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "Nulli ribad"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Eelhäälestused"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 päev %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d päeva %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "Peatatud | %d lugu | %s kokku mängitud"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "Paus | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d lugu | %s kokku mängitud"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "Salvesta esitusloend kui"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF esitusloendi failid (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "Lae esitusloend"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Muud failid (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "Uus esitusloend"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Uus esitusloend (%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "_Fail"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "_Ava fail(e)"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "Lisa fail(e)"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "Lisa kaust(ad)"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "Lisa asukoht"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "Uus esitusloend"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "Lae esitusloend"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "Salvesta esitusloend"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "_Välju"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "_Redigeerimine"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "_Puhasta"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "Vali kõik"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "Tühista kõik"
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "Pööra valik"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "Valik"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "Eemalda"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr "Kärbi"
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "_Otsi"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Sorteeri"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Tiitel"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Loo number"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Aeg"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Muu"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "Eelistused"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "_Vaade"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "Olekuriba"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "Tulba päised"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "Kaardid"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "Ekvalaiser"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "_Taasesitus"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr "Järjestus"
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "Järjest"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Lugude juhuesitus"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Albumite juhuesitus"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "Juhuslik"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr "Kordamine"
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr "Korda kõiki"
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr "Korda lugu"
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr "Ära korda"
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr "Kerimisriba järgib taasesitust"
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr "Kursor järgib taasesitust"
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr "Peata pärast praegust"
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Hüppa praeguse loo juurde"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "_Abi"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "_Muudatuste logi"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "_Teave"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Tõlkijad"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "Otsi"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "Seiska"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "Esita"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "Peata"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "Eelmine"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "Järgmine"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "Mängi juhuslikult"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "Teave"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "Välju"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "Loo omadused"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Seaded"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "_Rakenda"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "_Sulge"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "Metaandmed"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "Omadused"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "Sisesta siia uue veeru pealkiri"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "Tüüp:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Register"
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "Mängib"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "Albumikujundus"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "Esitaja - Album"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Kestvus"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Loo number"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "Bänd / Albumi esitaja"
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "Formaat:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr "Paigutus:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "Vasakul"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "Paremal"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "_Tühista"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr "Väljund plugin:"
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr "Väljund seade:"
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Alati teisendada 8 bitine heli 16 bitiseks"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "Heli"
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr "Helitugevuse parandus:"
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "Keela"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Lugu"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr "Helitugevuse paranduse piigi väärtus"
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Taasesituse eelvõimendus:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Globaalne eelvõimendus:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Lisa faile käsurealt (või failihaldurist) sellese esitusloendisse:"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr "Jätka käivitamisel eelmist seanssi"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Ära lisa kaustade lisamisel arhiivide sisu"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr "Taasesitus"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Seadistamine"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP eelseadistus"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Lae"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr "Sulgemine minimeerib akna"
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr "Hiire keskmine nupp sulgeb esitusloendi"
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr "Süsteemisalve ikooni peitmine"
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr "Kuva parajasti mängitav pala paksus kirjas"
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "Peida menüüst kirje \"Kustuta kettalt\""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Esitusloendi automaatne nimetamine üksiku kausta lisamisel"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Kasutajaliidese värskendussagedus (korda sekundis):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr "Tiitelriba tekst esitamise ajal:"
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr "Tiitelriba tekst peatamise ajal:"
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Graafiline plugin (muutus nõuab taaskäivitust):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "Graafiline kasutajaliides (GUI)"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr "Eira parameetreid"
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "Esiplaan"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr "Taust"
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr "Heli- ja esitlusliuguri värvid"
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr "Keskel"
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr "Hele"
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr "Tume"
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr "Alus"
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Tekst"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr "Tabeli värv"
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr "Tühista (kaotab GTK puuvaate teema, kuid kiirendab renderdamist)"
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr "Paaris rida"
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr "Paaritu rida"
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "Valitud rida"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "Valitud tekst"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "Kursor"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "Esitusloendi värvid"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "Värvid"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "Puhverserveri lubamine"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "Puhverserveri aadress:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "Puhverserveri port:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "Puhverserveri tüüp:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "Puhverserveri kasutajanimi:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "Puhverserveri parool:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "Võrk"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Versioon: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Autoriõigused"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Pluginad"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grupeerimine"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Sorteerimine..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Formaat"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Kasvav"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Kahanev"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Vali DSP plugin"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Sildikirjutaja seaded"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "Kirjuta ID3v2"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "Kirjuta ID3v1"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "Kirjuta APEv2"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr "ID3v2 eemaldamine"
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr "ID3v1 eemaldamine"
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr "APEv2 eemaldamine"
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "ID3v2 versioon"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Soovitatav)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 märgikodeering (vaikimisi iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "Kirjuta ID3v2.4"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "Esitaja / Album"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Loo number"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "Kustuta failid kettalt"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"Failid lähevad kaduma. Kas soovid jätkata?\n"
+"(Selle teate saab keelata GTKUI plugina seadetes)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "Lisa esitusnimekirja"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "Eemalda esitusnimekirjast"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "Uuestilae metaandmed"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "Eemalda kettalt"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "Lisa veerg"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "Muuda veergu"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "Eemalda veerg"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr "Rühmitamise alus"
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "Mitte ükski"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "Esitaja/Aeg/Album"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "Faili avamine..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr "Konfigureeri %s"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "Vaikimisi audioseade"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "Lisa"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "Globaalsed kiirklahvid"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr "Pesa"
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "Klahvikombinatsioon"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Failide lisamine..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "Algväärtustamine..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "Sa oled selle loo andmeid muutnud."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "Kas soovid akna sulgeda?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Mitu väärtust] "
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Võti"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Väärtus"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Siltide kirjutamine..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Nimi:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Väljanimi ei tohi alata sümboliga : või _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Ei õnnestu välja lisada"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Sellise nimega väli on juba olemas, proovi teist nime."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Kas soovid kindlasti valitud välja kustutada?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Lisa väli"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Eemalda väli"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Kasutamine: deadbeef [valikud] [fail(id)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Valikud:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help või -h Prindib abi (praeguse sõnumi) ja väljub\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Mängijast väljumine\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Väljastab versiooniteabe ja väljub\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Alustab taasesitlust\n"
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Peatab taasesitluse\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Taasesituse paus\n"
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pausi lülitamine\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Kui peatatud siis alustab taasesitlust, muidu lülitab "
+"pausi ümber\n"
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Järgmine lugu esitlusloendist\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Eelmine lugu esitlusloendist\n"
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Juhuslik lugu esitlusloendist\n"
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Lisab faili(e) esitlusloendisse\n"
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Prindib loo andmed etteantud formaadis\n"
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+" FMT %%-syntax: [a]rtist, [t]iitel, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr " näide.: --nowplaying \"%%a - %%t\" peaks väljastama "
+"\"artist - loo nimi\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " lisainfot leiab lehelt http://sourceforge.net/apps/med"
+"iawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Jah"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ei"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (Soovitatav)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Kasvav\n"
+"Kahanev"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"Keela\n"
+"Lugu\n"
+"Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"Indeks\n"
+"Mängimisi\n"
+"Albumikunst\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Tiitel\n"
+"Kestvus\n"
+"Loo Number\n"
+"Bänd / Albumi Artist\n"
+"Muu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"Vasak\n"
+"Parem"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ei leitud pixmap faili: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: freepats konfiguratsioonifaili ei leitud. Palun paigalda timidity-"
+"freepats pakatt, või määra freepats.cfg asukoht plugina seadetes."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Lisa audio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Järgiuurimine Last.fm-ist"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Kasuta ALSA ümberdiskreetimist"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Vabasta seade, kui peatatud"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Eelistatud puhvri suurus"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Eelistatud perioodi suurus"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Luba scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Keela hetkel mängiv"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Parool"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Seadmefail"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "OSS4 diskreetimissageduse vea vältimine"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Vahemälu uuendamise periood (tund)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "Hangi põimitud siltidest"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "Hangi lokaalsest kaustast"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "Lokaalne faili mask"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Hangi Last.fm lehelt"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Hangi albumart.org lehelt"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Albumikunst skaleeritakse pikema külje järgi"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "CDDB/FreeDB kasutamine"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "CD-Teksti eelistamine CDDB ees"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "CDDB aadress (näiteks 'freedb.org')"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "CDDB pordi number (näiteks '888')"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "Eelista CDDB protokolli HTTP-le"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "Võimalda NRG piltide toetus"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "Ümberdiskreetimise kvaliteet (0..2, suurem on parem)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "Maksimaalne loo pikkus (minutites)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Küsi failide kustutamise kohta kinnitust"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "Staatusikooni helitugevuse kontrolli tundlikus"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "Kohandatud staatusikoon"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "Käivita gtk_init koos --sync (debug reziim)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Lisa plugina menüüde vahele eraldajaid"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Teate tiitli formaat"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Teate sisu formaat"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Albumikunsti näitamine"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Albumikunsti suurus (px)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "PulseAudio server"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "Diskreetimissagedus"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "Otsimistabeli relatiivne aadress"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "Otsimistabeli absoluutne aadress"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Audiobittide vahetamine (vali, kui kuuled ühtlast signaali)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Võimalda HVSC lugude pikkuste andmebaas"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (HVSC-st)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bitte sampli kohta (8 või 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Vaikimis loo pikkus (sek.)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ konfiguratsioonifail"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Loo nimi"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Esitaja"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Lugusid kokku"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Žanr"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Helilooja"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Plaadi number"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "Helikodeerija / Tootja"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Asukoht"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Subtrack Indeks"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Sildi tüüp(id)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Põimitud kavaleht"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Koodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Faililaiendid (eralda sümboliga ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Teisenda"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Tulemuse diskreetimissagedus"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Kvaliteet / Algoritm"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+"Automaatne diskreetimissagedus ('Tulemuse diskreetimissagedus' tühistatakse)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Fail on juba olemas. Kas kirjutada see üle?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Konverteri hoiatus"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Palun vali kodeerija"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Konverteerimise viga"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Konvertimine..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Kausta valimine..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Kodeerija eelseadistuse salvestamine ebaõnnestus"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Kontrolli seadistuste kausta õiguseid, proovi valida teistsugune nimi või "
+"vabasta kettapinda"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+"Sama nimega seadistus juba eksisteerib. Vali seadistusele teistsugune nimi."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Viga"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Lisa uus kodeerija"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Muuda kodeerijat"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Eemalda eelseadistus"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "See kustutab valitud seadistuse. Oled sa kindel?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Kodeerijad"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Lisa DSP plugin"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "DSP seadistuse salvestamine ebaõnnestus"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Uus DSP seadistus"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "DSP seadistuse muutmine"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP seadistused"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Väljundkaust:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Väljundfaili nimi:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Faililaiendused (näiteks .mp3) lisatakse automaatselt.\n"
+"Vaikimisi väärtuse jaoks jäta väli tühjaks (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Enkooder:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP seadistus:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Lõimede arv:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Väljundsämpli formaat:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Säilita allika formaat"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Kui fail on olemas:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Küsi"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Kausta struktuuri säilitamine, alates:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Kodeerija seadistuste muutmine"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Ilma nimeta kodeerija"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Väljundfaili laiend:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Näiteks mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Käsurida:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Näide: lame - %o\n"
+"%i sisendfail, %o väljundfail, - stdin jaoks"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - väljundfaili nimi\n"
+"%i - ajutise sisendfaili nimi"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Meetod:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Toru"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Ajutine fail"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Sildi kirjutaja"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP seadistuse redaktor"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Ilma nimeta DSP seadistus"

deadbeef-0.5.1.tar.bz2/po/fa.po -> deadbeef-0.5.2.tar.bz2/po/fa.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-10-18 07:33+0200\n"
 "Last-Translator: Ali <aysabzevar@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,834 +18,910 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "قالب‌های صوتی پشتیبانی شده"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "دیگر پرونده‌ها (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "باز کردن پرونده(ها)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "افزودن پرونده(ها) به لیست پخش..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "افزودن پوشه(ها) به لیست پخش..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "پیروی از پیوند‌های سمبلیک"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "شکست در خواندن فایل کمک"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "شکست در بارگذاری فایل کمک"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "کمک"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "درباره DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "گزارش تغییرات %s DeaDBeeF"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF هم اکنون در حال پخش است"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "ویرایش لیست پخش"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "عنوان:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "تغییر نام لیست پخش"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "حذف لیست پخش"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "افزودن لیست پخش جدید"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "ذخیره اکولایزر از پیش مرتب شده DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "فایل‌های اکولایزر از پیش مرتب شده DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "بارگذاری اکولایزر از پیش مرتب شده DeaDBeeF ..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "اکولایزر از پیش مرتب شده DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "وارد کردن اکولایزر از پیش تنطیم شده Foobar2000 ..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "اکولایزر از پیش تعیین شده Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "بارگذاری از پیش تنظیم شده"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "وارد کردن Foobar2000 از پیش تنظیم شده "
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "فعال"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "صفر کردن همگی"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "صفر کردن پیش تقویت کننده"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "نوارهای صفر"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "ذخیره از پیش تنظیم شده"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "بارگذاری از پیش تنظیم شده"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "وارد کردن Foobar2000 از پیش تنظیم شده "
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "۱ روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "متوقف| %d آهنگ| %s کل زمان پخش"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "تک کاناله"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "استریو"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d کیلو بیت بر ثانیه"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "مکث کرده|"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dهرتز | %d بیت | %s | %d:%02d / %s | %d آهنگ | %s کل زمان پخش"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "ذخیره لیست پخش به صورت"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "فایل‌های لیست پخش DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "بارگذاری لیست پخش"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "دیگر پرونده‌ها (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "لیست پخش جدید"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "لیست پخش جدید (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_ پرونده"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_باز کردن پرونده(ها)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "افزودن پرونده(ها)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "افزودن پوشه(ها)"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "افزودن محل"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "لیست پخش جدید"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "بارگذاری لیست پخش"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "ذخیره لیست پخش"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "ذخیره لیست پخش به صورت"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_ خروج"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_ پاک سازی"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "انتخاب همگی"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "از انتخاب درآوردن همگی"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "انتخاب معکوس"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "انتخاب"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "حذف"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "محصول"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_یافتن"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "عنوان"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "شماره پرونده"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "آلبوم"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "هنرمند"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "شخصی"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "تنظیمات"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_نما"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "نوار وضعیت"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "سرآیندهای ستونی"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "لبه‌ها"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "اکولایزر"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_پخش"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "ترتیب"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "خطی"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "بُر زنی"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "بُر زنی"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "اتفاقی"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "حلقه‌ زنی"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "حلقه زنی همگی"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "حلقه زنی تک آهنگ"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "حلقه‌ نکن"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "پیمایش،پخش را دنبال می‌کند"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "مکان نما پخش را دنبال می‌کند"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "توقف پس از کنونی"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_ کمک"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_تغییرات"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_درباره"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "جستجوی"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "توقف"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "پخش"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "مکث"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "قبلی"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "بعدی"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "پخش اتفاقی"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "درباره"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "خروج"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "افزودن فایل‌ها..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_ ناتمام رها کردن"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "ویژگی آهنگ"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-" اخطار ویژگی برچسب گذاری هنوز در حال توسعه است.\n"
-"پیش از استفاده نسخه پشتیبانی تهیه کنید"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "ـ اعمال"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "ـ بستن"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "فرا داده"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "ویژگی‌ها"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "ویرایش ستون dlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "عنوان:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "ستون عنوان جدید را اینجا وارد کنید"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "نوع:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "شماره پرونده"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "در حال پخش"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "آلبوم هنری"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "هنرمند-آلبوم"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "هنرمند"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "آلبوم"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "عنوان"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "طول"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "مدت زمان"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "آهنگ"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "شماره آهنگ"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "هنرمند آلبوم/گروه"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "شخصی"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "قالب:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "هم‌ترازی:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "چپ"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "راست"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"تبدیل قالب (شروع با %): \n"
-"[a] هنرمند، [t] عنوان، [b] آلبوم، [B]گروه، [C]آهنگ‌ساز\n"
-"[n] شماره آهنگ، [N] کل آهنگ‌ها،\n"
-"[l] مدت زمان، [y] سال، [g] دسته، [c] نظر،\n"
-"[r]حق تالیف،[f] نام پرونده، [T] برچسب‌ها\n"
-"[d] پوشه، [D] پوشه با مسیر \n"
-"مثال: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "ـ لغو"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "ـ قبول"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "افزونه خروجی:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "دستگاه خروجی:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "صوت"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "اجازه به کلیدزنی پویای نرخ نمونه"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "کیفیت تبدیل نرخ نمونه"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "حالت پخش مجدد:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "غیرفعال"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "آهنگ"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "پخش مجدد مقیاس قله"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "حالت پخش مجدد:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "افزودن فایل‌ها از خط فرمان (‌یا مدیر فایل) به این فهرست پخش:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "ادامه نشست قبلی در این آغاز به کار"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "پخش"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "پیکره‌بندی:"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "بستن حداقل شده‌ها برای رفتن به سینی"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "کلید وسط ماوس لیست پخش را می‌بندد"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "مخفی کردن آیکون سینی سیستم"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "استفاده از قلم‌های ضخیم برای آهنگ در حال پخش"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "مخفی کردن متن «حذف از دیسک» از منو"
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "متن نوار عنوان در زمان پخش:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "متن نوار عنوان در زمان توقف:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "رابط گرافیکی کاربر"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "غلبه"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "پیش زمینه"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "پس‌زمینه"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "رنگ‌های نوار پویش/ حجم صدا"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "متوسط"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "روشن"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "تیره"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "پایه"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "متن"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "رنگ‌های نوار لبه"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "غلبه (درختواره GTK ضعیف می‌شود اما سرعت نمایش افزایش می‌یابد)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "ردیف زوج"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "ردیف فرد"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "متن"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "ردیف انتخاب شده"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "متن انتخاب شده"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "مکان‌نما"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "رنگ‌های فهرست پخش"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "فعال سازی خادم پروکسی"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "آدرس سرویس دهنده پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "درگاه سرویس دهنده پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "نوع پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "نام کاربری پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "گذرواژه پروکسی:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "شبکه"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "افزونه‌ها"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "آدرس اینترنتی:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "گروه با"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "قالب:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "انتخاب"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "افزونه‌ها"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "نویسنده برچسب"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "بنویسید ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "بنویسید ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "بنویسید APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 را پاک کنید"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "نسخه ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "۲٫۳ (پیشنهاد شده)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "۲٫۴"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "کدگشایی کاراکتر ID3v1 (پیش‌فرض iso8859-1 است)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "بنویسید ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "نویسنده برچسب"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "شرح:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "نویسنده(گان):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "پست الکترونیکی:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "وب سایت:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "پیکره‌بندی:"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "افزونه‌ها"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "ویرایش فهرست پخشdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "آدرس اینترنتی:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "گروه با"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"تبدیل قالب (شروع با %): \n"
-"[a] هنرمند، [t] عنوان، [b] آلبوم، [B]گروه، [C]آهنگ‌ساز\n"
-"[n] شماره آهنگ، [N] کل آهنگ‌ها،\n"
-"[l] مدت زمان، [y] سال، [g] دسته، [c] نظر،\n"
-"[r]حق تالیف،[f] نام پرونده، [T] برچسب‌ها\n"
-"مثال: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "هنرمند/آلبوم"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "شماره آهنگ"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "عنوان/آهنگ هنرمند"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "مدت زمان"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "حذف فایل‌ها از روی دیسک"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -853,195 +929,222 @@
 "پرونده‌ها از دست خواهند رفت. این چنین شود؟ \n"
 "(این کادر محاوره‌ای می‌تواند در تنظیمات افزونه GTKUI خاموش شود)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "افزودن به صف پخش"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "حذف از صف پخش"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "بارگذاری مجدد ابرداده"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "حذف از دیسک"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "افزودن ستون"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "ویرایش ستون"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "حذف ستون"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "گروه با"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "هیچ"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "هنرمند/تاریخ/آلبوم"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "باز کردن پرونده..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "برپاسازی %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "پیکره‌بندی:"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "دستگاه صوتی پیش‌فرض"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "افزودن"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "کلید‌های داغ عمومی"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "شکاف"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "ترکیب کلیدی"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "افزونه خروجی آلسا"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "افزودن فایل‌ها..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "آماده سازی اولیه..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "شما اطلاعات این آهنگ را تغییر داده‌اید."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "واقعا می‌خواهید پنجره را ببندید؟"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "نوع(های) برچسب"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "برگه راهنمایی توکار"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "بله"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "خیر"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "کدک‌"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "کلید"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "مقدار"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF هم اکنون در حال پخش است"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "واقعا می‌خواهید پنجره را ببندید؟"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "افزودن پرونده(ها)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "حذف"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "استفاده: deadbeef [گزینه‌ها] [پرونده(ها)] \n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "گزینه‌ها: \n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr "--help یا -h کمک(این پیام) را نشان می‌دهد و خارج می‌شود \n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr "--quit از پخش کننده خارج می‌شود \n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr "--version اطلاعات نسخه را نمایش می‌دهد و خارج می‌شود \n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr "--play پخش را آغاز می‌کند\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr "--stop پخش را متوقف می‌کند\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr "--pause پخش را مکث می‌دهد\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr "--next آهنگ بعدی در فهرست پخش\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr "--prev آهنگ قبلی در فهرست پخش\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr "--random آهنگ اتفاقی در فهرست پخش\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr "--queue پیوست کردن پرونده(ها) به فهرست پخش موجود\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr "--nowplaying FMT چاپ نام آهنگ قالب‌بندی شده در خروجی استاندارد\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1052,18 +1155,33 @@
 " [م]دت زمان، شم[ا]ره آهنگ، [س]ال،[ن]ظر،\n"
 " حق[ن]شر،[س]پری شده\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr "مثال: \"%%a - %%t\" باید \"هنرمند-عنوان\" را چاپ کند\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "بله"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "خیر"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1071,7 +1189,13 @@
 "۲٫۳ (توصیه شده)\n"
 "۲٫۴"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1081,17 +1205,18 @@
 "آهنگ\n"
 "آلبوم"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1107,7 +1232,7 @@
 "هنرمند آلبوم/گروه\n"
 "شخصی"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1116,75 +1241,675 @@
 "راست"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "پرونده تصویر بیتی پیدا نشد:%s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "مقدار حافظه کافی برای میانگیری ورودی دریافت نشد."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: فایل پیکره‌بندی freepats پیدا نشد. لطفا بسته timidity-freepats را "
+"نصب کنید یا مسیر freepats.cfg را برای تنظیم افزونه مشخص کنید."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "افزودن دیسک صوتی"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "متن نوار عنوان در زمان توقف:"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "فعال سازی خادم پروکسی"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF هم اکنون در حال پخش است"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "نام کاربری پروکسی:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "گذرواژه پروکسی:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "حذف فایل‌ها از روی دیسک"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "آلبوم هنری"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "شماره آهنگ"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "خطا در خواند صفحه اول از بیت جاری Ogg"
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "عنوان/آهنگ هنرمند"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "خطا در خواندن اولیه بسته سرآیند"
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "مقدار حافظه کافی برای ثبت شماره سریال جریان جدید دریافت نشد."
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "ورودی کوتاه یا خالی است."
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "شماره پرونده"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "ورودی بیت جاری Ogg نیست."
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "بیت جاری Ogg شامل داده Vorbis نیست."
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "رسیدن به پایان پرونده پیش از به رسمیت شناختن جریان."
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "افزودن محل"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "بیت جاری Ogg شامل هیچ نوع داده پشتیبانی شده نیست."
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "سرآیند ثانویه خراب است."
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "نوع(های) برچسب"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "رسیدن به پایان پرونده پیش از پایان سرآیندهای Vorbis."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "برگه راهنمایی توکار"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "خرابی یا از دست دادن داده، ادامه..."
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "کدک‌"
 
-#: ../plugins/vorbis/vcedit.c:874
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "انتخاب همگی"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"خطا در ارسال جریان به خروجی. جریان خروجی ممکن است خراب شده یا کوتاه شده باشد."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "ویرایش ستون"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "دستگاه خروجی:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "افزونه خروجی:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "ذخیره از پیش تنظیم شده"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "غلبه"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "بارگذاری از پیش تنظیم شده"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "افزونه خروجی:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"wildmidi: فایل پیکره‌بندی freepats پیدا نشد. لطفا بسته timidity-freepats را "
-"نصب کنید یا مسیر freepats.cfg را برای تنظیم افزونه مشخص کنید."
 
-#~ msgid "Add Audio CD"
-#~ msgstr "افزودن دیسک صوتی"
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "بنویسید APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "بنویسید ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "بنویسید ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "نویسنده برچسب"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "ذخیره لیست پخش به صورت"
+
+#~ msgid "_Abort"
+#~ msgstr "_ ناتمام رها کردن"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ " اخطار ویژگی برچسب گذاری هنوز در حال توسعه است.\n"
+#~ "پیش از استفاده نسخه پشتیبانی تهیه کنید"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "ویرایش ستون dlg"
+
+#~ msgid "Length"
+#~ msgstr "طول"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "تبدیل قالب (شروع با %): \n"
+#~ "[a] هنرمند، [t] عنوان، [b] آلبوم، [B]گروه، [C]آهنگ‌ساز\n"
+#~ "[n] شماره آهنگ، [N] کل آهنگ‌ها،\n"
+#~ "[l] مدت زمان، [y] سال، [g] دسته، [c] نظر،\n"
+#~ "[r]حق تالیف،[f] نام پرونده، [T] برچسب‌ها\n"
+#~ "[d] پوشه، [D] پوشه با مسیر \n"
+#~ "مثال: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "اجازه به کلیدزنی پویای نرخ نمونه"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "کیفیت تبدیل نرخ نمونه"
+
+#~ msgid "Description:"
+#~ msgstr "شرح:"
+
+#~ msgid "Author(s):"
+#~ msgstr "نویسنده(گان):"
+
+#~ msgid "Email:"
+#~ msgstr "پست الکترونیکی:"
+
+#~ msgid "Website:"
+#~ msgstr "وب سایت:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "ویرایش فهرست پخشdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "تبدیل قالب (شروع با %): \n"
+#~ "[a] هنرمند، [t] عنوان، [b] آلبوم، [B]گروه، [C]آهنگ‌ساز\n"
+#~ "[n] شماره آهنگ، [N] کل آهنگ‌ها،\n"
+#~ "[l] مدت زمان، [y] سال، [g] دسته، [c] نظر،\n"
+#~ "[r]حق تالیف،[f] نام پرونده، [T] برچسب‌ها\n"
+#~ "مثال: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "برپاسازی %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "افزونه خروجی آلسا"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "مقدار حافظه کافی برای میانگیری ورودی دریافت نشد."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "خطا در خواند صفحه اول از بیت جاری Ogg"
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "خطا در خواندن اولیه بسته سرآیند"
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "مقدار حافظه کافی برای ثبت شماره سریال جریان جدید دریافت نشد."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "ورودی کوتاه یا خالی است."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "ورودی بیت جاری Ogg نیست."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "بیت جاری Ogg شامل داده Vorbis نیست."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "رسیدن به پایان پرونده پیش از به رسمیت شناختن جریان."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "بیت جاری Ogg شامل هیچ نوع داده پشتیبانی شده نیست."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "سرآیند ثانویه خراب است."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "رسیدن به پایان پرونده پیش از پایان سرآیندهای Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "خرابی یا از دست دادن داده، ادامه..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "خطا در ارسال جریان به خروجی. جریان خروجی ممکن است خراب شده یا کوتاه شده "
+#~ "باشد."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "صوت( adv.)"

deadbeef-0.5.2.tar.bz2/po/fi.po Added

@@ -0,0 +1,1740 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-03-11 10:13+0200\n"
+"Last-Translator: Juhani <juhaninumminen0@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Tuetut ääniformaatit"
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Kaikki tiedostot (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Avaa tiedosto(ja)..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Lisää tiedosto(ja) soittolistalle..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Lisää kansio(ita) soittolistalle..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Seuraa symbolisia linkkejä"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Virhe ohjetiedostoa avattaessa"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Ohjetiedoston avaaminen epäonnistui"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Ohje"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Tietoja ohjelmasta DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s:n muutosloki"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeFin kääntäjät"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Muokkaa soittolistaa"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Nimi:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Uudelleennimeä soittolista"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Poista soittolista"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Luo uusi soittolista"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Tallenna DeaDBeeF EQ esiasetus"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ esiasetustiedostot (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Lataa DeaDBeeF EQ esiasetus..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ esiasetukset (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Tuo Foobar2000 EQ esiasetus..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ esiasetukset (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Tallenna esiasetus..."
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Lataa esiasetus..."
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Tuo Foobar2000 EQ Esiasetus"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "Kytke päälle"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "Nolla kaikki"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "Nollaa esivahvistin"
+
+# Tällä viitataan selvästikkin niihin muihin liukusäätimiin, jotka muuttavat eri taajuus asteiden vahvistusta
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "Nollaa kanavat"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Esiasetukset"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 päivä %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d päivää %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "Pysäytetty | %d raitaa | kokonaiskesto %s"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d Kb/s "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "Keskeytetty | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bittiä | %s | %d:%02d / %s | %d raitaa | kokonaiskesto %s"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "Tallenna soittolista nimellä"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeef soittolistatiedosto (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "Lataa soittolista"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Muut tiedostot (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "Uusi soittolista"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Uusi soittolista (%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "_Avaa tiedosto(ja)"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "Lisää tiedosto(ja)"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "Lisää hakemisto(ja)"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "Lisää sijainti"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "Uusi soittolista"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "Avaa soittolista"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "Tallenna soittolista"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "_Tyhjennä"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "Valitse kaikki"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "Poista valinta"
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "Käännä valinta"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "Valinta"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "Poista"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "_Etsi"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Lajittele"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Nimi"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Raidan numero"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Albumi"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artisti"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Päivämäärä"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Mukautettu"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "_Näytä"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "Tilapalkki"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "Sarakkeiden otsikot"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "Välilehdet"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "Taajuuskorjain"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "T_oisto"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "Lineaarinen"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Sekoita raitoja"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Sekoita albumeita"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "Satunnainen"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "_Ohje"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "_Muutosloki"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "_Tietoja"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Kääntäjät"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "Etsi"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "Pysäytä"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "Soita"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "Tauko"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "Edellinen"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "Seuraava"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "Toista satunnainen"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "Tietoja"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "Lopeta"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "Raidan ominaisuudet"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Asetukset"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "_Käytä"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "_Sulje"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "Metatiedot"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "Anna uuden rivin otsikko"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "Albumin Kuvitus"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "Artisti - Albumi"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Kesto"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Raidan Numero"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "Tiedostomuoto:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "Vasen"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "Oikea"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "_Peruuta"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Muunna aina 8-bittinen ääni 16-bittiseksi"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Raita"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+"Lisää tiedostoja komentoriviltä (tai tiedostonhallinnasta) tähän "
+"soittolistaan:"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Tee asetukset"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Tallenna esiasetus..."
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Lataa"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr "Pienennä ilmaisinalueelle suljettaessa"
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr "Hiiren keskipainike sulkee soittolistan"
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr "Piilota ilmaisinalueen kuvake"
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr "Käytä lihavoitua kirjasinta soitettavalle raidalle"
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "Piilota \"Poista levyltä\"-kontekstivalinta"
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Nimeä soittolista automaattisesti lisättäessä yksittäinen kansio"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "Käyttöliittymä"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr "Keski"
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr "Kevyt"
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr "Tumma"
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Teksti"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "Valittu rivi"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "Valittu teksti"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "Hiiriosoitin"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "Soittolistojen värit"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "Värit"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "Ota käyttöön välityspalvelin"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "Välityspalvelimen osoite:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "Välityspalvelimen portti:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "Välityspalvelimen tyyppi:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "Välityspalvelimen käyttäjänimi:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "Välityspalvelimen salasana:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "Verkko"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Versio: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Tekijänoikeus"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Liitännäiset"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Tiedostomuoto"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Nouseva"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Laskeva"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Valitse DSP-liitännäinen"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Liitännäinen"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "Kirjoita ID3v2"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "Kirjoita ID3v1"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "Kirjoita APEv2"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "ID3v2 versio"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (suositeltu)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1-merkistökoodaus (oletus: iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "Kirjoita ID3v2.4"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "Artisti / Albumi"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Raita nro"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "Poista tiedostot levyltä"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"Tiedostot menetetään. Jatketaanko?\n"
+"(Tämä valintaikkuna voidaan kytkeä pois päältä GTKUI-liitännäisen "
+"asetuksissa)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "Varoitus"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "Lisää toistojonoon"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "Poista toistojonosta"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "Lataa metatiedot uudelleen"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "Poista levyltä"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "Lisää sarake"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "Muokkaa saraketta"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "Poista sarake"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "Artisti/Pvm/Albumi"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "Avaa tiedosto..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "Oletusäänilaite"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "Lisää"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Lisätään tiedostoja..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "Alustetaan..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "Haluatko varmasti sulkea tämän ikkunan?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Useita arvoja] "
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Avain"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Arvo"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Kirjoitetaan tageja..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Nimi:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Tiedostonimet eivät voi alkaa merkeillä : tai _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Kenttää ei voi lisätä"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Käyttö: deadbeef [valinnat] [tiedosto(t)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Valitsimet:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help tai -h Näytä ohje (tämä viesti) ja poistu\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Näytä versiotiedot ja poistu\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "Oletus"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ei"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (suositeltu)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Nouseva\n"
+"Laskeva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"Vasen\n"
+"Oikea"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Bittikarttatiedostoa ei löydetty: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Lisää ääni-CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Etsi Last.fm-palvelusta"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Käyttäjänimi"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Salasana"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Laitetiedosto"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Hae last.fm -palvelusta"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Hae albumart.org -palvelusta"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "Käytä CDDB/FreeDB:tä"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Raidan otsikko"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Esittäjä"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Raitoja yhteensä"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Tyylilaji"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Säveltäjä"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Levyn numero"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Kommentti"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Sijainti"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Koodekki"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Muunna"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Laatu / algoritmi"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Tiedosto on jo olemassa. Ylikirjoita?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Valitse koodekki"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Muunnetaan..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Valitse kansio..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Virhe"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Poista esiasetus"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Uusi DSP-esiasetus"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Muokkaa DSP-esiasetusta"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP-esiasetukset"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+#, fuzzy
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr "Tiedoston pääte (esim. .mp3) lisätään automaattisesti.\n"
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP-esiasetus:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Kun tiedosto on jo olemassa:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Kysy"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Ylikirjoita"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Lataa esiasetus..."
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Esim. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Komentorivi:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Esimerkki: lame - %o\n"
+"%i on sisääntulotiedosto, %o on ulostulotiedosto, - on stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Tilapäinen tiedosto"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "Ogg Vorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.1.tar.bz2/po/fr.po -> deadbeef-0.5.2.tar.bz2/po/fr.po Changed

@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: deadbeef devel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2010-10-15 21:44+0100\n"
-"Last-Translator: Cilyan Olowen <gaknar@gmail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-05 13:38+0200\n"
+"Last-Translator: Cilyan <gaknar@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -20,1186 +20,1141 @@
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formats audio supportés"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Autres fichiers (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Tous les fichiers (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Ouvrir un (des) fichier(s)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Ajouter un (des) fichier(s) à la liste de lecture..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Ajouter un (des) dossier(s) à la liste de lecture..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Suivre les liens symboliques"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Échec à la lecture du fichier d'aide"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Échec à l'ouverture du fichier d'aide"
 
-#: ../plugins/gtkui/callbacks.c:701
-#: ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Aide"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "À propos de DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Notes de version pour DeaDBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traducteurs de DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Éditer la liste de lecture"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Renommer la liste de lecture"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Supprimer la liste de lecture"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Ajouter une nouvelle liste de lecture"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Enregistrer les paramètres prédéfinis de l'égaliseur DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Paramètres prédéfinis d'égaliseur DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Charger des paramètres prédéfinis pour l'égaliseur DeaDBeeF..."
 
 # Duplicate?
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Paramètres prédéfinis d'égaliseur DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importer des paramètres EQ Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Paramètres d'égaliseur Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Enregistrer"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Charger"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importer des paramètres Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Activer"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Tout à zéro"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Pré-ampli à zéro"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Bandes à zéro"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Enregistrer"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Charger"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importer des paramètres Foobar2000"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 jour %d:%02d:%02d"
 
 # Possible to use ngettext?
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d jours %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Arrêté | %d pistes | %s de temps d'écoute total"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "En pause | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d pistes | %s de temps d'écoute total"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d pistes | %s de temps "
+"d'écoute total"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Sauvegarder la liste de lecture sous"
 
-#: ../plugins/gtkui/gtkui.c:669
-#: ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Fichiers de listes de lecture DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Charger une liste de lecture"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Autres fichiers (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nouvelle liste de lecture (%d)"
 
-#: ../plugins/gtkui/interface.c:138
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../plugins/gtkui/interface.c:145
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Ouvrir un (des) fichier(s)"
 
-#: ../plugins/gtkui/interface.c:161
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Ajouter un (des) fichier(s)"
 
-#: ../plugins/gtkui/interface.c:169
-#: ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Ajouter un (des) dossier(s)"
 
-#: ../plugins/gtkui/interface.c:177
-#: ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Ajouter un emplacement"
 
 # Duplicate?
-#: ../plugins/gtkui/interface.c:186
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nouvelle liste de lecture"
 
 # Duplicate?
-#: ../plugins/gtkui/interface.c:193
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Charger une liste de lecture"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Enregistrer la liste de lecture sous"
-
-#: ../plugins/gtkui/interface.c:210
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../plugins/gtkui/interface.c:221
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "Édit_er"
 
-#: ../plugins/gtkui/interface.c:228
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../plugins/gtkui/interface.c:236
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: ../plugins/gtkui/interface.c:243
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Tout désélectionner"
 
-#: ../plugins/gtkui/interface.c:250
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Sélection"
 
-#: ../plugins/gtkui/interface.c:261
-#: ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../plugins/gtkui/interface.c:269
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Découper"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../plugins/gtkui/interface.c:285
-#: ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titre"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Numéro de fichier"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artiste"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../plugins/gtkui/interface.c:296
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barre d'état"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Entête des colonnes"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Onglets"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Égaliseur"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: ../plugins/gtkui/interface.c:319
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ordre"
 
-#: ../plugins/gtkui/interface.c:326
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linéaire"
 
-#: ../plugins/gtkui/interface.c:332
-#: ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Mélanger"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Mélanger"
 
-#: ../plugins/gtkui/interface.c:338
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../plugins/gtkui/interface.c:344
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Boucler"
 
-#: ../plugins/gtkui/interface.c:351
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Tout répéter"
 
-#: ../plugins/gtkui/interface.c:357
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Répéter une seule piste"
 
-#: ../plugins/gtkui/interface.c:363
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Pas de répétition"
 
-#: ../plugins/gtkui/interface.c:369
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Le défilement suit la lecture"
 
-#: ../plugins/gtkui/interface.c:374
-#: ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "La sélection suit la lecture"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Arrêter après la piste actuelle"
 
-#: ../plugins/gtkui/interface.c:385
-#: ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../plugins/gtkui/interface.c:400
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Notes de version"
 
-#: ../plugins/gtkui/interface.c:422
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "À pr_opos"
 
-#: ../plugins/gtkui/interface.c:801
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../plugins/gtkui/interface.c:876
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:884
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Lire"
 
-#: ../plugins/gtkui/interface.c:892
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:900
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../plugins/gtkui/interface.c:908
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Suivant"
 
-#: ../plugins/gtkui/interface.c:916
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Lecture aléatoire"
 
-#: ../plugins/gtkui/interface.c:925
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "À propos"
 
-#: ../plugins/gtkui/interface.c:938
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../plugins/gtkui/interface.c:1010
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Ajout des fichiers..."
-
-#: ../plugins/gtkui/interface.c:1054
-#: ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Annuler"
-
-#: ../plugins/gtkui/interface.c:1155
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propriétés de la piste"
 
-#: ../plugins/gtkui/interface.c:1179
-#: ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"AVERTISSEMENT : La fonction permettant d'écrire les tags est encore en développement.\n"
-"Faites des copies de sauvegarde avant de l'utiliser."
 
-#: ../plugins/gtkui/interface.c:1206
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: ../plugins/gtkui/interface.c:1227
-#: ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../plugins/gtkui/interface.c:1231
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Métadonnée"
 
-#: ../plugins/gtkui/interface.c:1277
-#: ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propriétés"
 
-# Is it a mistake?
-#: ../plugins/gtkui/interface.c:1363
-#: ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378
-#: ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Titre :"
-
-#: ../plugins/gtkui/interface.c:1386
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Entrez le nom de la nouvelle colonne ici"
 
-#: ../plugins/gtkui/interface.c:1394
-#: ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Type :"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Numéro de fichier"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403
-#: ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Couverture de l'album"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artiste - Album"
 
-#: ../plugins/gtkui/interface.c:1406
-#: ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artiste"
-
-#: ../plugins/gtkui/interface.c:1407
-#: ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408
-#: ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Titre"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Durée"
 
-#: ../plugins/gtkui/interface.c:1410
-#: ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Piste"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "N° piste"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Groupe / Artiste de l'album"
 
-#: ../plugins/gtkui/interface.c:1412
-#: ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: ../plugins/gtkui/interface.c:1418
-#: ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format :"
 
-#: ../plugins/gtkui/interface.c:1433
-#: ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Gauche"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Droite"
 
-#: ../plugins/gtkui/interface.c:1444
-#: ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatage (précédé de %) :\n"
-" [a]rtiste, [t]itre, al[b]um, [B] groupe, [C]ompositeur\n"
-" [n]uméro de piste, [N]ombre total de pistes,\n"
-" [l] durée, [y] année, [g]enre, [c]ommentaire,\n"
-" copy[r]ight, nom de [f]ichier, [T]ags\n"
-"Exemple: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473
-#: ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012
-#: ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "A_nnuler"
 
-#: ../plugins/gtkui/interface.c:1494
-#: ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033
-#: ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Valider"
 
-#: ../plugins/gtkui/interface.c:1725
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Greffon de sortie :"
 
-#: ../plugins/gtkui/interface.c:1738
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Périphérique de sortie :"
 
-#: ../plugins/gtkui/interface.c:1747
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1756
-#: ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Permettre le changement dynamique de fréquence d'échantillonage"
-
-#: ../plugins/gtkui/interface.c:1764
-#: ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Qualité de la fréquence d’échantillonnage à la conversion :"
-
-#: ../plugins/gtkui/interface.c:1783
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Mode du ReplayGain (ajustement du volume) :"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../plugins/gtkui/interface.c:1796
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Piste"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Ajustement des crêtes par ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1804
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Mode du ReplayGain (ajustement du volume) :"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Ajouter des fichiers à cette liste de lecture depuis la ligne de commande (ou le gestionnaire de fichier) :"
+msgstr ""
+"Ajouter des fichiers à cette liste de lecture depuis la ligne de commande "
+"(ou le gestionnaire de fichier) :"
 
-#: ../plugins/gtkui/interface.c:1813
-#: ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Charger la session précédente au démarrage"
 
-#: ../plugins/gtkui/interface.c:1817
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:1826
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configurer"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Enregistrer"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Fermer la fenêtre la réduit dans la zone de notification"
 
-#: ../plugins/gtkui/interface.c:1830
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Le bouton du milieu de la souris ferme la liste de lecture"
 
-#: ../plugins/gtkui/interface.c:1834
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Masquer l'icône de notification"
 
-#: ../plugins/gtkui/interface.c:1838
-#: ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Utiliser une police grasse pour la piste en cours de lecture"
 
-#: ../plugins/gtkui/interface.c:1842
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Masquer l'entrée \"Supprimer du disque\" du menu contextuel"
 
-#: ../plugins/gtkui/interface.c:1850
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Barre de titre en lecture :"
 
-#: ../plugins/gtkui/interface.c:1864
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Barre de titre à l'arrêt :"
 
-#: ../plugins/gtkui/interface.c:1874
-#: ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Interface"
 
-#: ../plugins/gtkui/interface.c:1888
-#: ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Redéfinir"
 
-#: ../plugins/gtkui/interface.c:1897
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Premier plan"
 
-#: ../plugins/gtkui/interface.c:1904
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Arrière-plan"
 
-#: ../plugins/gtkui/interface.c:1923
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Couleurs de la barre de lecture/échelle du volume"
 
-#: ../plugins/gtkui/interface.c:1941
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Fond"
 
-#: ../plugins/gtkui/interface.c:1948
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Clair"
 
-#: ../plugins/gtkui/interface.c:1955
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Sombre"
 
-#: ../plugins/gtkui/interface.c:1986
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:1993
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Texte"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Couleur des onglets"
 
-#: ../plugins/gtkui/interface.c:2002
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Redéfinir (perd le thème des listes GTK, mais accélère le rendu)"
 
-#: ../plugins/gtkui/interface.c:2011
-#: ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Lignes paires"
 
-#: ../plugins/gtkui/interface.c:2018
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Lignes impaires"
 
-#: ../plugins/gtkui/interface.c:2037
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Texte"
-
-#: ../plugins/gtkui/interface.c:2044
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Ligne sélectionnée"
 
-#: ../plugins/gtkui/interface.c:2063
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Texte sélectionné"
 
-#: ../plugins/gtkui/interface.c:2076
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Curseur"
 
-#: ../plugins/gtkui/interface.c:2089
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Couleurs des listes de lecture"
 
-#: ../plugins/gtkui/interface.c:2093
-#: ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../plugins/gtkui/interface.c:2102
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Activer le serveur mandataire"
 
-#: ../plugins/gtkui/interface.c:2110
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresse du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2124
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2138
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Type de serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2157
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nom d'utilisateur sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2170
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Mot de passe sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2180
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Réseau"
 
-#: ../plugins/gtkui/interface.c:2208
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL :"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grouper par"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format :"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Sélection"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Greffons"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Éditeur de tags"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Écrire ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212
-#: ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Écrire ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216
-#: ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Écrire APEv2"
 
-#: ../plugins/gtkui/interface.c:2224
-#: ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Effacer ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228
-#: ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Effacer ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232
-#: ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Effacer APEv2"
 
-#: ../plugins/gtkui/interface.c:2240
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Version ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recommandé)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Encodage des caractères ID3v1 (iso8859-1 par défaut)"
 
-#: ../plugins/gtkui/interface.c:2291
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Écrire ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Éditeur de tags"
-
-#: ../plugins/gtkui/interface.c:2391
-#: ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Description :"
-
-#: ../plugins/gtkui/interface.c:2406
-#: ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Auteur(s) :"
-
-#: ../plugins/gtkui/interface.c:2421
-#: ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Émail :"
-
-#: ../plugins/gtkui/interface.c:2436
-#: ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Site Internet :"
-
-#: ../plugins/gtkui/interface.c:2467
-#: ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Configurer"
-
-#: ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Greffons"
-
-# Is this a mistake?
-#: ../plugins/gtkui/interface.c:2853
-#: ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL :"
-
-#: ../plugins/gtkui/interface.c:3081
-#: ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Grouper par"
-
-#: ../plugins/gtkui/interface.c:3106
-#: ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatage (précédé de %) :\n"
-" [a]rtiste, [t]itre, al[b]um, [B] groupe, [C]ompositeur\n"
-" [n]uméro de piste, [N]ombre total de pistes,\n"
-" [l] durée, [y] année, [g]enre, [c]ommentaire,\n"
-" copy[r]ight, nom de [f]ichier, [T]ags\n"
-"Exemple: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301
-#: ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artiste / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302
-#: ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "N° piste"
 
-#: ../plugins/gtkui/mainplaylist.c:303
-#: ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Titre / Artiste de la piste"
-
-#: ../plugins/gtkui/mainplaylist.c:304
-#: ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Durée"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Supprimer les fichiers du disque"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 "Les fichiers seront perdus. Continuer ?\n"
-"(Cette boîte de dialogue peut être désactivée dans les préférences du greffon GTKUI)"
+"(Cette boîte de dialogue peut être désactivée dans les préférences du "
+"greffon GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:325
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Ajouter à la file d'attente de lecture"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Enlever de la file d'attente de lecture"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Recharger les métadonnées"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Supprimer du disque"
 
-#: ../plugins/gtkui/plcommon.c:719
-#: ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Ajouter une colonne"
 
-#: ../plugins/gtkui/plcommon.c:749
-#: ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Éditer la colonne"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Enlever la colonne"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Grouper par"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artiste/Date/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Ouvrir un fichier..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Configure %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Configurer"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Périphérique audio par défaut"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Raccourcis globaux"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Action"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Combinaison de touches"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464
-#: ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Greffon de sortie ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Ajout des fichiers..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Vous avez modifié des données pour cette piste."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Fermer réellement la fenêtre ?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Type(s) de tags"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet incorporée"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Oui"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Non"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Clé"
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Valeur"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "En cours sur DeaDBeeF"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Fermer réellement la fenêtre ?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Ajouter un (des) fichier(s)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Enlever"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Usage : deadbeef [options] [fichier(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Options :\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help ou -h Affiche l'aide (ce message) et quitte\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Fermer le lecteur\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Affiche les informations de version et quitte\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Démarre la lecture\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Arrête la lecture\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Suspend la lecture\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Musique suivante dans la liste de lecture\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Musique précédente dans la liste de lecture\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Musique aléatoire dans la liste de lecture\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Ajoute le(s) fichier(s) dans la liste existante\n"
+msgstr ""
+" --queue Ajoute le(s) fichier(s) dans la liste existante\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Envoi le nom de la piste format dans stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1207,20 +1162,39 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 " FMT %%-syntaxe : [a]rtiste, [t]itre, al[b]um,\n"
-" [l]ongueur, [n]uméro de piste, [y]année, [c]ommentaire,\n"
+" [l]ongueur, [n]uméro de piste, [y]année, [c]"
+"ommentaire,\n"
 " copy[r]ight, [e]coulé\n"
 
-#: ../main.c:105
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" ex : --nowplaying \"%%a - %%t\" affiche \"artiste - "
+"titre\"\n"
+
+#: ../main.c:110
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " ex : --nowplaying \"%%a - %%t\" affiche \"artiste - titre\"\n"
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
 
-#: ../playlist.c:377
-#: ../playlist.c:2289
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Défaut"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Oui"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Non"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1228,7 +1202,13 @@
 "2.3 (Recommandé)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1238,17 +1218,18 @@
 "Piste\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1264,7 +1245,7 @@
 "Groupe / Artiste de l'album\n"
 "Personnalisé"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1272,74 +1253,683 @@
 "Gauche\n"
 "Droite"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Impossible de trouver le fichier pixmap : %s"
 
-#: ../plugins/vorbis/vcedit.c:129
-#: ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Impossible d'obtenir suffisamment de mémoire pour créer un tampon d'entrée."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi : Fichier de configuration freepats introuvable. Veuillez installer "
+"le paquet timidity-freepats, ou spécifier le chemin vers freepats.conf dans "
+"les préférences du greffon."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Ajouter un CD Audio"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "Barre de titre à l'arrêt :"
 
-#: ../plugins/vorbis/vcedit.c:179
-#: ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Erreur à la lecture de la première page du flux Ogg."
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185
-#: ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Erreur à la lecture du paquet d'entête initial."
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Impossible d'obtenir suffisamment de mémoire pour enregistrer le numéro de série du nouveau flux."
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Activer le serveur mandataire"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Entrée tronquée ou vide."
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "En cours sur DeaDBeeF"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Nom d'utilisateur sur le serveur mandataire :"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Mot de passe sur le serveur mandataire :"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "L'entrée n'est pas un flux Ogg."
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Le flux Ogg ne contient pas de donnée Vorbis."
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Fin de fichier atteinte avant de reconnaître le flux."
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Le flux Ogg ne contient pas un type de donnée reconnu."
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Entête secondaire corrompue."
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Fin de fichier atteinte avant la fin des entêtes Vorbis."
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Donnée corrompue ou manquante, poursuite..."
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
-msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "Erreur à l'écriture du flux vers la sortie. Le flux de sortie peut-être corrompu ou tronqué."
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Supprimer les fichiers du disque"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Couverture de l'album"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "N° piste"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Titre / Artiste de la piste"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Numéro de fichier"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Ajouter un emplacement"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Type(s) de tags"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet incorporée"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Tout sélectionner"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Éditer la colonne"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Enregistrer"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Enregistrer"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Enregistrer"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Enregistrer"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Périphérique de sortie :"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Greffon de sortie :"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Enregistrer"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Redéfinir"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Charger"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Greffon de sortie :"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi : Fichier de configuration freepats introuvable. Veuillez installer le paquet timidity-freepats, ou spécifier le chemin vers freepats.conf dans les préférences du greffon."
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Écrire APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Écrire ID3v1"
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Ajouter un CD Audio"
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Écrire ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Éditeur de tags"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Enregistrer la liste de lecture sous"
+
+#~ msgid "_Abort"
+#~ msgstr "_Annuler"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "AVERTISSEMENT : La fonction permettant d'écrire les tags est "
+#~ "encore en développement.\n"
+#~ "Faites des copies de sauvegarde avant de l'utiliser."
+
+# Is it a mistake?
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Durée"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formatage (précédé de %) :\n"
+#~ " [a]rtiste, [t]itre, al[b]um, [B] groupe, [C]ompositeur\n"
+#~ " [n]uméro de piste, [N]ombre total de pistes,\n"
+#~ " [l] durée, [y] année, [g]enre, [c]ommentaire,\n"
+#~ " copy[r]ight, nom de [f]ichier, [T]ags\n"
+#~ "Exemple: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Permettre le changement dynamique de fréquence d'échantillonage"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Qualité de la fréquence d’échantillonnage à la conversion :"
+
+#~ msgid "Description:"
+#~ msgstr "Description :"
+
+#~ msgid "Author(s):"
+#~ msgstr "Auteur(s) :"
+
+#~ msgid "Email:"
+#~ msgstr "Émail :"
+
+#~ msgid "Website:"
+#~ msgstr "Site Internet :"
+
+# Is this a mistake?
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formatage (précédé de %) :\n"
+#~ " [a]rtiste, [t]itre, al[b]um, [B] groupe, [C]ompositeur\n"
+#~ " [n]uméro de piste, [N]ombre total de pistes,\n"
+#~ " [l] durée, [y] année, [g]enre, [c]ommentaire,\n"
+#~ " copy[r]ight, nom de [f]ichier, [T]ags\n"
+#~ "Exemple: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configure %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Greffon de sortie ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr ""
+#~ "Impossible d'obtenir suffisamment de mémoire pour créer un tampon "
+#~ "d'entrée."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Erreur à la lecture de la première page du flux Ogg."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Erreur à la lecture du paquet d'entête initial."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Impossible d'obtenir suffisamment de mémoire pour enregistrer le numéro "
+#~ "de série du nouveau flux."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Entrée tronquée ou vide."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "L'entrée n'est pas un flux Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Le flux Ogg ne contient pas de donnée Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Fin de fichier atteinte avant de reconnaître le flux."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Le flux Ogg ne contient pas un type de donnée reconnu."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Entête secondaire corrompue."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Fin de fichier atteinte avant la fin des entêtes Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Donnée corrompue ou manquante, poursuite..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Erreur à l'écriture du flux vers la sortie. Le flux de sortie peut-être "
+#~ "corrompu ou tronqué."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Son (Avancé)"

deadbeef-0.5.1.tar.bz2/po/gl.po -> deadbeef-0.5.2.tar.bz2/po/gl.po Changed

@@ -7,1013 +7,913 @@
 msgstr ""
 "Project-Id-Version: lxde.deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 04:36+0000\n"
-"PO-Revision-Date: 2010-10-21 17:58+0100\n"
-"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-24 13:48+0200\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formatos de son admitidos"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Outros ficheiros (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Todos os ficheiros (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Abrir ficheiro(s)"
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Engadir ficheiro(s) á lista de reprodución..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Engadir cartafol(es) á lista de reprodución..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Seguir ligazóns simbólicas"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
-msgstr "Produciuse un erro ao ler o ficheiro de axuda"
+msgstr "Produciuse un fallo ao ler o ficheiro de axuda"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
-msgstr "Produciuse un erro ao cargar o ficheiro de axuda"
+msgstr "Produciuse un fallo ao cargar o ficheiro de axuda"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
-msgstr "help.txt"
+msgstr "axuda.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Axuda"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Cambios en DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores de DeaDBeeF"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Editar a lista de reprodución"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Título:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Renomear a lista de reprodución"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
-msgstr "Quitar a lista de reprodución"
+msgstr "Retirar a lista de reprodución"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Engadir unha nova lista de reprodución"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gardar axustes de ecualización de DeaDBeeF"
+msgstr "Gardar os axustes de ecualización de DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Ficheiros de axustes de ecualización de DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Cargar axustes de ecualización de DeaDBeeF..."
+msgstr "Cargar os axustes de ecualización de DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Axustes de ecualización de DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar axustes de ecualización de Foobar2000..."
+msgstr "Importar os axustes de ecualización de Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Axustes de ecualización de Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Gardar os axustes"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Cargar os axustes"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importar os axustes de Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Activar"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Restabelecer todo"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
-msgstr "Restabelecer preamplificador"
+msgstr "Restabelecer o preamplificador"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
-msgstr "Restabelecer bandas"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gardar axustes"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Cargar axustes"
+msgstr "Restabelecer as bandas"
 
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importar axustes de Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Axustes"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 día %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d días %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Detido | %d pistas | Tempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pausado | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tempo total: %s"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Gardar a lista de reprodución como"
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Ficheiros de listas de reprodución DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
-msgstr "Cargar lista de reprodución"
+msgstr "Cargar a lista de reprodución"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Outros ficheiros (*)"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nova lista de reprodución"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista de reprodución (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Abrir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Engadir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Engadir cartafol(es)"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Engadir localización"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nova lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Cargar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Gardar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Gardar a lista de reprodución como"
-
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Desmarcar todo"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverter a selección"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
-msgstr "Quitar"
+msgstr "Retirar"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Ordenar por"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Número de pista"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Álbum"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Interprete"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Data"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personalizado"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Cabeceiras de columna"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Lapelas"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
-msgstr "Orde"
+msgstr "Orden"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineal"
 
-#: ../plugins/gtkui/interface.c:336
-#: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Barallar"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Barallar pistas"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Barallar álbums"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Ao chou"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Repetir"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Repetir todo"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Repetir unha canción"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Non repetir"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Desprazar á seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Punteiro na seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Deter ao rematar a pista actual"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Ir á pista actual"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Cambios"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Deter"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Reproducir ao chou"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Saír"
 
-#: ../plugins/gtkui/interface.c:1045
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Engadindo ficheiros,,,"
-
-#: ../plugins/gtkui/interface.c:1089
-#: ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Interromper"
-
-#: ../plugins/gtkui/interface.c:1189
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propiedades da pista"
 
-#: ../plugins/gtkui/interface.c:1235
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Configuración"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1256
-#: ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../plugins/gtkui/interface.c:1260
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1306
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1391
-#: ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1406
-#: ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Título:"
-
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Escriba aquí o novo título da columna"
 
-#: ../plugins/gtkui/interface.c:1422
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
-msgstr "Índice"
+msgstr "Índice de elementos"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Reproducindo"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Portada"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
-msgstr "Artista - Álbum"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Álbum"
-
-#: ../plugins/gtkui/interface.c:1436
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Título"
+msgstr "Interprete - Álbum"
 
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Duración"
 
-#: ../plugins/gtkui/interface.c:1438
-#: ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Pista"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Pista numero"
 
-#: ../plugins/gtkui/interface.c:1439
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
-msgstr "Banda / Álbum Artista"
-
-#: ../plugins/gtkui/interface.c:1440
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Personalizado"
+msgstr "Banda / Interprete do álbum"
 
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Aliñamento"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Dereita"
 
-#: ../plugins/gtkui/interface.c:1472
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversións de formato (comezar con %):\n"
-" a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
-" n: Número de pista, N: Pistas totais,\n"
-" l: Duración, y: Ano, g: Xénero, c: Comentario,\n"
-" r: Copyright, f: Nome de ficheiro, F: Ruta absoluta T: Etiquetas\n"
-" d: Directorio, D: Directorio con ruta\n"
-"Exemplo: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501
-#: ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040
-#: ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1522
-#: ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061
-#: ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../plugins/gtkui/interface.c:1753
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Engadido de saída:"
 
-#: ../plugins/gtkui/interface.c:1766
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositivo de saída:"
 
-#: ../plugins/gtkui/interface.c:1775
-#: ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Converter sempre o son de 8 bits a 16 bits"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1784
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Permitir o cambio dinámico de frecuencia"
-
-#: ../plugins/gtkui/interface.c:1792
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Calidade de conversión de frecuencia:"
-
-#: ../plugins/gtkui/interface.c:1811
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Modo de normalización de volume"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../plugins/gtkui/interface.c:1824
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Pista"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Escala de límite de normalización de volume"
 
-#: ../plugins/gtkui/interface.c:1832
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Normalización de volume do preamplificador:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Preamplificación global:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Engadir ficheiros desde a liña de ordes (ou xestor de ficheiros) a esta lista de reprodución:"
+msgstr ""
+"Engadir ficheiros desde a liña de ordes (ou xestor de ficheiros) a esta "
+"lista de reprodución:"
 
-#: ../plugins/gtkui/interface.c:1841
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Continuar a sesión anterior no inicio"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Non engadir desde ficheiros cando se engaden cartafoles"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reprodución"
 
-#: ../plugins/gtkui/interface.c:1854
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Cadeas DSP predefinidas"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Cargar"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Pechar minimizado na área de notificación"
 
-#: ../plugins/gtkui/interface.c:1858
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "O botón do medio do rato pecha a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:1862
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Agochar a icona da área de notificación"
 
-#: ../plugins/gtkui/interface.c:1866
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Usar tipo de letra en negra para a pista en reprodución"
 
-#: ../plugins/gtkui/interface.c:1870
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Agochar o elemento «Eliminar do disco» do menú contextual "
 
-#: ../plugins/gtkui/interface.c:1878
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+"Nomear automaticamente as listas de reprodución ao engadir un só cartafol"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Frecuencia de actualización da interface (veces por segundo):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Texto da barra de título cando se reproduce:"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Texto da barra de título cando está detido:"
 
-#: ../plugins/gtkui/interface.c:1902
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Engadido de interface de usuario (require reiniciar):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
-msgstr "Interface"
+msgstr "Interface de usuario"
 
-#: ../plugins/gtkui/interface.c:1916
-#: ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
-msgstr "Cambiar"
+msgstr "Anular"
 
-#: ../plugins/gtkui/interface.c:1925
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Fronte"
 
-#: ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Fondo"
 
-#: ../plugins/gtkui/interface.c:1951
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Cores das barras de busca/volume"
 
-#: ../plugins/gtkui/interface.c:1969
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Medio"
 
-#: ../plugins/gtkui/interface.c:1976
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:1983
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2014
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2021
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Texto"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Cores das lapelas"
 
-#: ../plugins/gtkui/interface.c:2030
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Cambiar (ignora o tema GTK, pero acelera o renderizado)"
+msgstr "Cambiar (ignora o tema GTK, mais acelera o debuxado)"
 
-#: ../plugins/gtkui/interface.c:2039
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Fila par"
 
-#: ../plugins/gtkui/interface.c:2046
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Fila impar"
 
-#: ../plugins/gtkui/interface.c:2065
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2072
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Fila seleccionada"
 
-#: ../plugins/gtkui/interface.c:2091
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Texto seleccionado"
 
-#: ../plugins/gtkui/interface.c:2104
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
-msgstr "Punteiro"
+msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2117
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Cores da lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:2121
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2130
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
-msgstr "Activar servidor proxy"
+msgstr "Activar o servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2138
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Enderezo do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2152
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Porto do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2166
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2185
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nome de usuario do proxy:"
 
-#: ../plugins/gtkui/interface.c:2198
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Contrasinal do proxy:"
 
-#: ../plugins/gtkui/interface.c:2208
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Versión: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Dereitos de autor"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Engadidos"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Agrupar por"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Ordenar por"
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Formato"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Escolla o engadido DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Engadido"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Configuración do editor de etiquetas"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:2240
-#: ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:2252
-#: ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Eliminar ID3v2"
 
-#: ../plugins/gtkui/interface.c:2256
-#: ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Eliminar ID3v1"
 
-#: ../plugins/gtkui/interface.c:2260
-#: ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Eliminar APEv2"
 
-#: ../plugins/gtkui/interface.c:2268
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (recomendado)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificación de caracteres de ID3v1 (por omisión é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2388
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Editor de etiquetas"
-
-#: ../plugins/gtkui/interface.c:2419
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Descrición:"
-
-#: ../plugins/gtkui/interface.c:2434
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Autor(es)"
-
-#: ../plugins/gtkui/interface.c:2449
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Correo-e:"
-
-#: ../plugins/gtkui/interface.c:2464
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Sitio web:"
-
-#: ../plugins/gtkui/interface.c:2495
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:2499
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Engadidos"
-
-#: ../plugins/gtkui/interface.c:2881
-#: ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:3008
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Agrupar por"
-
-#: ../plugins/gtkui/interface.c:3134
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversións de formato (comezar con %):\n"
-" a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
-" n: Número de pista, N: Pistas totais,\n"
-" l: Duración, y: Ano, g: Xénero, c: Comentario,\n"
-" r: Copyright, f: Nome de ficheiro, T: Etiquetas\n"
-"Exemplo: %a - %t [%l]\""
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
-msgstr "Artista / Álbum"
+msgstr "Interprete / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Pista num."
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Título / Intérprete"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Duración"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Eliminar ficheiros do disco"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1021,209 +921,221 @@
 "Vai perder os ficheiros. Quere continuar?\n"
 "(Este aviso pode desactivarse nas opcións do engadido GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
-msgstr "Advertencia"
+msgstr "Aviso"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
-msgstr "Engadir á cola de reprodución"
+msgstr "Engadir na cola de reprodución"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
-msgstr "Quitar da cola de reprodución"
+msgstr "Retirar da cola de reprodución"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Recargar os metadatos"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
-msgstr "Quitar do disco"
+msgstr "Retirar do disco"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Engadir columna"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Editar columna"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
-msgstr "Quitar columna"
+msgstr "Retirar columna"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
-msgstr "Artista/Data/Álbum"
+msgstr "Interprete/Data/Álbum"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Abrir ficheiro..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format, c-format
+msgid "Configure %s"
 msgstr "Configurar %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Dispositivo de son predeterminado"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Engadir"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Teclas rápidas globais"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
-msgstr "Acción"
+msgstr "Rañura"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Combinación de teclas"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "Complemento de saída ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Engadindo ficheiros,,,"
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
-msgstr "Inicializando..."
+msgstr "Iniciando..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Vostede modificou os datos desta pista."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Ten certeza de que quere pechas esta xanela?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Situación"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Valores múltiples] "
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Índice de subpista"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Tecla"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tipo de etiqueta(s)"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Folla de información incrustada"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Escribindo etiquetas"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Si"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Non"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Os nomes dos campos non deben comezar con «:» ou «_»"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Códec"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Non é posíbel engadir o campo"
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Tecla"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Xa existe un campo con este nome, tente con outro diferente."
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Ten certeza de que quere retirar o campo seleccionado?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Engadir campo"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF reproducindo:"
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Retirar campo"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Uso: deadbeef [opcións] [ficheiro(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opcións:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ou -h Mostrar a axuda (esta mensaxe) e saír\n"
+msgstr " --help ou -h Amosar a axuda (esta mensaxe) e saír\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Pechar o reprodutor\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
-msgstr " --version Mostrar a versión e saír\n"
+msgstr " --version Amosar a versión e saír\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Iniciar a reprodución\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Deter a reprodución\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pausar a reprodución\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Inverter a pausa\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Iniciar a reprodución se se detén, ou pola contra "
+"inverter a pausa\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Seguinte canción da lista de reprodución\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Canción anterior da lista de reprodución\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Canción ao chou da lista de reprodución\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Engadir ficheiro(s) á lista de reprodución existente\n"
+msgstr ""
+" --queue Engadir ficheiro(s) á lista de reprodución existente\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Mostrar o nome da pista formatado por stdout\n"
+msgstr " --nowplaying FMT Amosar o nome da pista formatado por stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1234,17 +1146,35 @@
 " l: Duración, n: Pista, y: Ano, c: Comentario,\n"
 " r: Copyright, e: Tempo restante\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " e.g.: --nowplaying \"%%a - %%t\" mostraría \"artista - \"título\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr " e.g.: --nowplaying «%%a - %%t» amosaría: «interprete - "
+"título»\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " para obter máis información, vexa http://sourceforge.n"
+"et/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:377
-#: ../playlist.c:2289
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Si"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Non"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1252,7 +1182,15 @@
 "2.3 (recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Ascendente\n"
+"Descendente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1262,7 +1200,7 @@
 "Pista\n"
 "Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1271,24 +1209,24 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"Índice\n"
+"Índice de elementos\n"
 "Reproducindo\n"
 "Portada do álbum\n"
-"Artista - Álbum\n"
-"Artista\n"
+"Interprete - Álbum\n"
+"Interprete\n"
 "Álbum\n"
 "Título\n"
 "Duración\n"
-"Pista\n"
-"Banda / Artista do álbum\n"
+"Número de pista\n"
+"Banda / Intreprete do álbum\n"
 "Personalizado"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1296,16 +1234,21 @@
 "Esquerda\n"
 "Dereita"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Non se atopou o ficheiro de imaxe: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: non se atopou o ficheiro de configuración de «freepats». Instale o paquete «timidity-freepats» ou especifique a ruta a «freepats.cfg» na configuración do engadido."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: non se atopou o ficheiro de configuración de «freepats». Instale o "
+"paquete «timidity-freepats» ou especifique a ruta a «freepats.cfg» na "
+"configuración do engadido."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1326,8 +1269,7 @@
 msgid "Release device while stopped"
 msgstr "Liberar o dispositivo cando está detido:"
 
-#: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Tamaño preferido do búfer"
 
@@ -1356,167 +1298,554 @@
 msgid "Scrobble URL"
 msgstr "URL de «Compartir escoitas»"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Ficheiro de dispositivo"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Solución de erros de mostraxe OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Período de actualización (hr)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Obter a partir das etiquetas"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Obter dun cartafol local"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Máscara de portada local"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Obter en Last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Obter en albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Cara máis longa das portadas a escala"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Usar CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferir CD-Text a CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB url (p.ex. «freedb.org»)"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
-msgstr "Número de porto CDDB (p.ex. «888»)"
+msgstr "Número do porto CDDB (p.ex. «888»)"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Preferir o protocolo CDDB ao HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Activar compatibilidade coas imaxes NRG"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Calidade de sobremostraxe (0..2, maior é mellor)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Duración máxima da canción (en minutos)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Pedir confirmación para eliminar ficheiros do disco"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Sensibilidade ao control de volume na icona de estado"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Icona de estado personalizada"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Executar gtk_init com --sync (modo de depuración)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Engadir separadores entre os engadidos nos elementos do menú contextual"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Formato de notificación"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Formato do título de notificación"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Formato do contido de notificación"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Amosar a portada"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Tamaño da portada (px)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Servidor PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Taxa de mostraxe"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Ruta relativa da táboa de referencia"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Ruta absoluta da táboa de referencia"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Intercambio de bytes de son (cambie só se a escoita é estática)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "Activar HVSC"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Activar HVSC Songlength DB"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (para HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bits por mostra (8 ou 16)"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Ruta a HVSC"
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Duración predeterminada da canción (segs.)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Ficheiro de configuración do banco Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Título da pista"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Interprete"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Data"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Pista numero"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Total de pistas"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Xénero"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Número de disco"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Codificador / Provedor"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Dereitos de autor"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Lugar"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Índice de subpista"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tipo de etiqueta(s)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Folla de información incrustada"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Códec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Extensións de ficheiros (separadas por «;»)"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Converter"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Destino da mostraxe"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Calidade / Algoritmo"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Mostraxe automática (sobrescribe o destinos das mostraxes)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Este ficheiro xa existe. Quere sobrescribilo?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Aviso do convertedor"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Escolla o codificador"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Produciuse un erro no convertedor"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Convertendo"
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Seleccionar cartafol"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Produciuse un fallo ao gardar os axustes do codificador"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Comprobe os permisos predeterminados do cartafol, tente escoller outro "
+"título, ou liberar algo de espazo no disco"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Xa existe un axuste con este título. Tente escoller outro título."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Erro"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Engadir un novo codificador"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Editar o codificador"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Retirar o axuste"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta acción elimina o axuste seleccionado. Está vostede seguro?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Engadir un «engadido» á cadea DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Non foi posíbel gardar o axuste DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Novo axuste DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Editar o axuste DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Axustes DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Cartafol de saída:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Nome do ficheiro de saída:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"A extensión (p.ex. mp3) engadirase automaticamente.\n"
+"Deixar o campo baleiro de xeito predeterminado (%a -%t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Codificador"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Axuste DSP"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Número de fíos:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Formato da mostra de saída"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Manter o formato da orixe"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit asinados int"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bit asinados int"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bit asinados int"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bit asinados int"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bit flotantes"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Cando o ficheiro xa existe:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Preguntar"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Sobrescribir"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Preservar a estrutura de cartafoles, a partir de:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Editar os axustes do codificador"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Codificador sen título"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Extensión do ficheiro de saída:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "P.ex. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Liña de ordes:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Exemplo: lame - %o\n"
+"%i para o ficheiro de entrada, %o para o ficheiro de saída, - para a entrada "
+"estándar"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - nome do ficheiro de saída\n"
+"%i - nome do ficheiro temporal de entrada"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Método:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Canalización"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Ficheiro temporal"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Escritor de etiquetas"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Editor de axustes DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Axuste DSP sen título"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Gardar a lista de reprodución como"
+
+#~ msgid "_Abort"
+#~ msgstr "_Interromper"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Duración"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversións de formato (comezar con %):\n"
+#~ " a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
+#~ " n: Número de pista, N: Pistas totais,\n"
+#~ " l: Duración, y: Ano, g: Xénero, c: Comentario,\n"
+#~ " r: Copyright, f: Nome de ficheiro, F: Ruta absoluta T: Etiquetas\n"
+#~ " d: Directorio, D: Directorio con ruta\n"
+#~ "Exemplo: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Permitir o cambio dinámico de frecuencia"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Calidade de conversión de frecuencia:"
+
+#~ msgid "Description:"
+#~ msgstr "Descrición:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor(es)"
+
+#~ msgid "Email:"
+#~ msgstr "Correo-e:"
+
+#~ msgid "Website:"
+#~ msgstr "Sitio web:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversións de formato (comezar con %):\n"
+#~ " a: Artista, t: Título, b: Álbum, B: Banda, C: Compositor\n"
+#~ " n: Número de pista, N: Pistas totais,\n"
+#~ " l: Duración, y: Ano, g: Xénero, c: Comentario,\n"
+#~ " r: Copyright, f: Nome de ficheiro, T: Etiquetas\n"
+#~ "Exemplo: %a - %t [%l]\""
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Título / Intérprete"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configurar %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Complemento de saída ALSA"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF reproducindo:"
+
+#~ msgid "HVSC path"
+#~ msgstr "Ruta a HVSC"
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"
@@ -1524,36 +1853,48 @@
 #~ msgstr ""
 #~ "AVISO: a edición de etiquetas aínda está en desenvolvemento.\n"
 #~ " Faga copias de seguranza antes de usalo."
+
 #~ msgid "Couldn't get enough memory for input buffering."
 #~ msgstr "Non foi posíbel obter memoria abondo para o búfer de entrada."
+
 #~ msgid "Error reading first page of Ogg bitstream."
 #~ msgstr "Produciuse un erro ao ler a primeira páxina do fluxo de bits Ogg."
+
 #~ msgid "Error reading initial header packet."
 #~ msgstr "Produciuse un erro ao ler o paquete de cabeceira inicial."
+
 #~ msgid "Couldn't get enough memory to register new stream serial number."
 #~ msgstr ""
 #~ "Non foi posíbel obter memoria abondo para rexistrar o número de serie dun "
 #~ "novo fluxo."
+
 #~ msgid "Input truncated or empty."
 #~ msgstr "Entrada truncada ou baleira."
+
 #~ msgid "Input is not an Ogg bitstream."
 #~ msgstr "A entrada non é un fluxo de bits Ogg."
+
 #~ msgid "Ogg bitstream does not contain Vorbis data."
 #~ msgstr "O fluxo de bits Ogg non conten datos Vorbis."
+
 #~ msgid "EOF before recognised stream."
 #~ msgstr "Fin de ficheiro antes dun fluxo recoñecido."
+
 #~ msgid "Ogg bitstream does not contain a supported data-type."
 #~ msgstr "O fluxo de bits Ogg non conten un tipo de datos admitido."
+
 #~ msgid "Corrupt secondary header."
 #~ msgstr "Cabeceira secundaria danada."
+
 #~ msgid "EOF before end of Vorbis headers."
 #~ msgstr "Fin de ficheiro antes da fin das cabeceiras Vorbis."
+
 #~ msgid "Corrupt or missing data, continuing..."
 #~ msgstr "Datos danados ou incompletos, continuando..."
+
 #~ msgid ""
 #~ "Error writing stream to output. Output stream may be corrupted or "
 #~ "truncated."
 #~ msgstr ""
 #~ "Produciuse un erro ao escribir o fluxo á saída. O fluxo de saída pode "
 #~ "estar danado ou truncado."
-

deadbeef-0.5.1.tar.bz2/po/he.po -> deadbeef-0.5.2.tar.bz2/po/he.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2011-03-08 14:22+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-16 12:49+0200\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Gezer <sh.yaron@gmail.com>\n"
 "Language: he\n"
@@ -21,154 +21,174 @@
 "X-Poedit-Country: ISRAEL\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "מבני השמע הנתמכים"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "קבצים אחרים (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "כל הקבצים (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "פתיחת קובץ/ים..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "הוספת קובץ/ים לרשימת ההשמעה..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "הוספת תיקייה/ות לרשימת ההשמעה..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "מעקב אחר קישורים סימבוליים"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "אירע כשל במהלך קריאת קובץ העזרה"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "אירע כשל בטעינת קובץ העזרה"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "עזרה"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "על אודות DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "יומן השינויים של DeaDBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "מתרגמי DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "עריכת רשימת ההשמעה"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "כותרת:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "שינוי שם רשימת ההשמעה"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "הסרת רשימת ההשמעה"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "הוספת רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "שמירת תצורת האקוולייזר של DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "קובץ תצורת אקוולייזר של DeaDBeeF ‏(*.ddbeq)"
+msgstr "קובץ תצורת אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "טעינת תצורת אקוולייזר של DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "תצורות אקוולייזר של DeaDBeeF"
+msgstr "תצורות אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "ייבוא קובץ תצורת אקוולייזר של Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "תצורות אקוולייזר של Foobar2000‏ (*.feq)"
+msgstr "תצורות אקוולייזר של Foobar2000‏ (‎*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "שמירת תצורה"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "טעינת תצורה"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "ייבוא תצורה של Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "הפעלה"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "הכל אפס"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "איפוס מגבר קדם"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "איפוס הערוצים"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "שמירת תצורה"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "טעינת תצורה"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "ייבוא תצורה של Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "תצורות"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "יום אחד %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d ימים %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "נעצר | %d רצועות | %s סך כל זמן הנגינה"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "מונו"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "סטריאו"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
-msgstr "| %4d קסל\"ש "
+msgstr "| %4d קסל״ש "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "מושהה |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -176,678 +196,724 @@
 "%s%s %s| %d הרץ | %d סיביות | %s | %d:%02d / %s | %d רצועות | %s סך כל זמן "
 "הנגינה"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "שמירת רשימת ההשמעה בשם"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "קובצי רשימת השמעה של DeaDBeeF‏ (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "טעינת רשימת השמעה"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "קבצים אחרים (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "רשימת השמעה חדשה (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_פתיחת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "הוספת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "הוספת תיקייה/ות"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "הוספת מיקום"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "טעינת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "שמירת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "שמירת רשימת השמעה בשם"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_מחיקה"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "בחירת הכל"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "ביטול בחירת הכול"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "הפיכת הבחירה"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "בחירה"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "הסרה"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "חיתוך"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_חיפוש"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "סידור לפי"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "כותרת"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "מספר הרצועה"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "אלבום"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "אומן"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "תאריך"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "מותאם אישית"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "שורת מצב"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "כותרות העמודות"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "לשוניות"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "אקוולייזר"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "ה_שמעה"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "סדר"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "קווי"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "ערבול"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "ערבול בין הרצועות"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "ערבול בין האלבומים"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "אקראי"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "נגינה בלולאה"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "לולאה על הכול"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "לולאה על שיר בודד"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "ללא לולאה"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "הגלילה עוקבת אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "הסמן עוקב אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "עצירה לאחר הנוכחי"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "מעבר לרצועה הנוכחית"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "ע_זרה"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "יומן _שינויים"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "מ_תרגמים"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "עצירה"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "נגינה"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "השהיה"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "הבא"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "נגינה אקראית"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "על אודות"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "מתבצעת הוספת קבצים..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_ביטול"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "מאפייני הרצועה"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"אזהרה: תכונת כתיבת התגיות נמצאת עדיין בפיתוח.\n"
-"יש ליצור עותקי גיבוי בטרם השימוש."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "הגדרות"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "ה_חלה"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_סגירה"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "נתוני על"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "כותרת:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "יש להזין את הכותרת החדשה כאן"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "מספר הקובץ"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "אינדקס הפריט"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "מתנגן"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "עטיפת האלבום"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "אומן – אלבום"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "אומן"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "אלבום"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "כותרת"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "משך"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "רצועה"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "רצועה מספר"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "להקה / אומן האלבום"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "מותאם אישית"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "מבנה:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "יישור:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "שמאל"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "ימין"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"המרות בעיצוב (מתחילות ב־%):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks\n"
-" [l]ength, [y]ear, [g]enre, [c]omment\n"
-" copy[r]ight, [f]ilename, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"דוגמה: %a‏ - %t‏ [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_אישור"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "תוסף פלט:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "התקן הפלט:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "תמיד להמיר שמע של 8 סיביות ל־16 סיביות"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "שמע"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "הפעלת החלפת קצב דגימה דינמי"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "איכות החלפת קצב הדגימה:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "מצב הגברת נגינה חוזרת:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "לא פעיל"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "רצועה"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "מידת הגברת הנגינה החוזרת"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "הגברת נגינה חוזרת:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "הגברת נגינה כללית:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "הוספת קבצים משורת הפקודה (או ממנהל הקבצים) לרשימת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "המשך ההפעלה הקודמת עם התחלת התכנית"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "אין להוסיף מארכיונים בעת הוספת תיקיות"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "השמעה"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "הגדרה"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "תצורת שרשרת DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_טעינה"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "סגירה ממזערת לאזור המערכת"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "לחצן אמצעי סוגר את רשימת ההשמעה"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "הסתרת הסמל באזור הדיווחים"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "שימוש בגופן מודגש עבור הרצועה המתנגנת כעת"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "הסתרת פריט ההקשר \"מחיקה מהכונן\""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "מתן שם אוטומטית לרשימות השמעה בעת הוספת תיקייה בודדת"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "קצב רענון המנשק (פעמים בשנייה):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "טקסט הכותרת בעת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "טקסט הכותרת בעת עצירה:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "תוסף מנשק משתמש (שינויים דורשים הפעלה מחדש):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "מנשק משתמש"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "דריסה"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "קידמה"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "רקע"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "צבעי פס גלילת ההשמעה/פס עוצמת השמע"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "בינוני"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "בהיר"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "כהה"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "בסיסי"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "טקסט"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "צבעי ראשי הלשוניות"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "דריסה (רכיבי העיצוב של ה־GTK יאבדו אך העיבוד יהיה מהיר יותר)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "שורה זוגית"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "שורה אי־זוגית"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "טקסט"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "שורה נבחרת"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "טקסט שנבחר"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "סמן"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "צבעי רשימת ההשמעה"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "צבעים"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "הפעלת שרת מתווך"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "כתובת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "פתחת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "סוג שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "שם המשתמש במתווך:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "הססמה במתווך:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "רשת"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "גרסה:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "זכויות יוצרים"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "תוספים"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "כתובת:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "קיבוץ לפי"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "סידור לפי..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "מבנה"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "סדר עולה"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "סדר יורד"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "בחירת תוסף DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "תוסף"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "הגדרות כותב התגיות"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "כתיבת ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "כתיבת ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "כתיבת APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "הסרת ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "הסרת ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "הסרת APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "גרסת ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (מומלץ)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "קידוד התווים של ID3v1 (ברירת המחדל היא iso8859-1)"
+msgstr "קידוד התווים של ID3v1 (בררת המחדל היא iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "כתיבת ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "כותב תגיות"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "תיאור:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "מחבר/ים:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "דוא\"ל:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "אתר:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "הגדרה"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "תוספים"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "כתובת:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "קיבוץ לפי"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"המרות בעיצוב (מתחילות ב־%):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, [N]"
-"totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, [f]"
-"ilename, [T]agsדוגמה: %a‏ - %t‏ [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "אומן / אלבום"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "רצועה מספר"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "אמן הרצועה / כותרת"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "משך"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "מחיקת הקובץ מהכונן"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -855,195 +921,220 @@
 "הקבצים יאבדו. להמשיך?\n"
 "(ניתן לכבות תיבת דו־שיח זו בהגדרות התוסף GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "הוספה לתור ההשמעה"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "הסרה מתור ההשמעה"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "טעינת נתוני העל מחדש"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "הסרה מהכונן"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "הוספת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "עריכת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "הסרת עמודה"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "קיבוץ לפי"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "ללא"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "אומן/תאריך/אלבום"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "פתיחת קובץ..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr "הגדרת %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "התקן השמע כברירת מחדל"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "הוספה"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "מקשי קיצור גלובליים"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "חריץ"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "צירוף מקשים"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "תוסף הפלט ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "מתבצעת הוספת קבצים..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "בהפעלה..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "השתנו נתונים ברצועה זו."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "האם באמת לסגור את החלון?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "סוג/י התגים"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[ערכים מרובים]"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "רשימת Cue מוטמעת"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "כן"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "לא"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "קודק"
-
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "מפתח"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "ערך"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF מנגן כעת"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "התגיות נכתבות..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "שם:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "שמות השדות לא יכולים להתחיל בתווים : או _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "לא ניתן להוסיף שדה"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "שדה בשם זה כבר קיים, נא לנסות שם אחר."
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "האם אכן להסיר את השדה הנבחר?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "הוספת שדה"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "הסרת שדה"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Usage: deadbeef [options] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Print help (this message) and exit\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Quit player\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Print version info and exit\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Start playback\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Stop playback\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pause playback\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Toggle pause\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Next song in playlist\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Previous song in playlist\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Random song in playlist\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Append file(s) to existing playlist\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Print formatted track name to stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1054,7 +1145,7 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1063,11 +1154,28 @@
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
-msgstr "ברירת מחדל"
+msgstr "בררת מחדל"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "כן"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "לא"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1075,33 +1183,51 @@
 "2.3 (מומלץ)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"סדר עולה\n"
+"סדר יורד"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 "נטרול\n"
-"רצועהאלבום"
+"רצועה\n"
+"אלבום"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"מספר הקובץ\n"
-"מתנגןעטיפת האלבוםאמן - אלבוםאמןאלבוםכותרתמשךרצועהלהקה / אמן האלבוםמותאם אישית"
-
-#: ../plugins/gtkui/deadbeef.glade.h:71
+"אינדקס הפריט\n"
+"מתנגן\n"
+"עטיפת האלבום\n"
+"אמן - אלבום\n"
+"אמן\n"
+"אלבום\n"
+"כותרת\n"
+"משך\n"
+"מס׳ הרצועה\n"
+"להקה / אמן האלבום\n"
+"מותאם אישית"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1110,74 +1236,691 @@
 "ימין"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "לא ניתן למצוא את קובץ ה־pixmap:‏ %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "לא ניתן לקבל מספיק זיכרון לצורך אגירת הקלט."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: קובץ התצורה של freepats. נא להתקין את החבילהtimidity-freepats, או "
+"לציין את הנתיב אל freepats.cfg בהגדרות התוסף."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "הוספת תקליטור שמע"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "חיפוש ב־Last.fm"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "שימוש בדגימה חוזרת של ALSA"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "שחרור ההתקן בעת עצירה"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "גודל האוגר המועדף"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "משך הזמן המועדף"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "הפעלת Scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "נטרול „מתנגן כעת“"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "שם משתמש"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "ססמה"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "הכתובת של Scrobble"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "קובץ ההתקן"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "מעקף לתקלת קצב הדגימה ב־OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "ההפרש בין מועדי עדכון המטמון (שעות)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "קבלה מתגיות מובנות"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "קבלה מתיקייה מקומית"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "מסכת קבצים של עטיפות מקומיות"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "קבלה מ־Last.fm"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "קבלה מ־albumart.org"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "מתיחת העטיפה לעבר הצד הארוך יותר"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "שימוש ב־CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "העדפת CD-Text על פני CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "כתובת ה־CDDB (לדוגמה: 'freedb.org')"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "מס׳ הפתחה של ה־CDDB (לדוגמה: '888')"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "העדפת הפרוטוקול CDDB על פני HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "הפעלת תמיכה בתמונות NRG"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "איכות הדגימה החוזרת (0..2, גבוה יותר - איכותי יותר)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "אורך השיר המרבי (בדקות)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "בקשת אישור למחיקת קבצים מהכונן"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "רגישות בקרת העצמה דרך סמל המצב"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "סמל מצב מותאם אישית"
+
+# אם המחרוזת הזאת מופיעה במסוף והתבלבלתי נא להעתיק את המחרוזת המקורית לתרגום
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "הפעלת gtk_init עם הפרמטר ‎--sync (מצב ניפוי שגיאות)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "הוספת הפרדה בין פריטי תפריט ההקשר של התוסף"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "מבנה כותרת ההתרעה"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "מבנה תוכן ההתרעה"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "הצגת עטיפת האלבום"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "גודל עטיפת האלבום (פיקסלים)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "שרת PulseAudio"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "קצב דגימה"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "נתיב טבלת חיפוש יחסי"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "נתיב טבלת חיפוש מוחלט"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "החלפת בתים של שמע (יש להחליף מצב אם שומעים רעש סטטי)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "הפעלת מסד נתונים של אורך שירים - HVSC"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (מהשירות HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "סיביות לדגימה (8 או 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "אורך שיר כברירת מחדל (שניות)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "קובץ מאגר התצורה של Timidity++‎"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "כותרת הרצועה"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "מבצע/ת"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "סך כל הרצועות"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "סגנון"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "מלחין/ה"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "דיסק מספר"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "הערה"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "קידוד / יצור"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "מיקום"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "אינדקס תת־הרצועה"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "סוג/י התגים"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "רשימת Cue מוטמעת"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "קודק"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "ארעה שגיאה בעת קריאת העמוד הראשון של תזרים הסיביות מסוג Ogg."
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "סיומות קבצים (יש להפריד ב־';')"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "ארעה שגיאה בקריאת מנת הכותרת ההתחלתית."
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "המרה"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "לא ניתן לקבל מספיק זיכרון כדי לרשום את המספר הסידורי של התזרים החדש."
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "קצב דגימת היעד"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "הקלט קטוע או ריק."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "איכות / אלגוריתם"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "הקלט אינו תזרים סיביות מסוג Ogg."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "קצב דגימה אוטומטי (דורס את קצב דגימת היעד)"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "תזרים הסיביות מסוג Ogg אין מכיל נתוני Vorbis."
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "הקובץ כבר קיים. האם לשכתב?"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "EOF לפני תזרים מוכר."
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "אזהרה מהממיר"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "תזרים הסיביות מסוג Ogg אינו מכיל טיפוס נתונים נתמך."
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "נא לבחור מצפין"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "כותרת משנית פגומה."
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "שגיאת ממיר"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF (סוף הקובץ) בטרם סוף כותרות ה־Vorbis."
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "בהמרה..."
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "נתונים פגומים או חסרים, ממשיך..."
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "בחירת תיקייה..."
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "אירע כשל בשמירת ערכת ההצפנה"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "ארעה שגיאה בכתיבת התזרים לפלט. תזרים הפלט פגום או קטוע."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"נא לבדוק את הרשאות תיקיית התצורות, יש לנסות לבחור בכותרת אחרת או לפנות קצת "
+"מקום בכונן"
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "תצורה באותו השם כבר קיימת. נא לנסות לבחור בשם אחר."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "הוספת מצפין חדש"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "עריכת מצפין"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "הסרת תצורה"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "הפעולה תמחק את התצורה הנבחרת. האם לעשות זאת?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "מצפינים"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "הוספת התוסף לשרשרת ה־DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "שמירת תצורת ה־DSP נכשלה"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "תצורת DSP חדשה"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "עריכת תצורת DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "תצורות DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "תיקיית הפלט:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "שם קובץ הפלט:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"סיומות (לדוגמה: .mp3) יתווספו אוטומטית.\n"
+"יש להשאיר את השדה ריק לקבלת שם בררת המחדל ‎(%a - %t)‎."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "מצפין:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "תצורת DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "מספר התהליכים:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "מבנה דגימת הפלט:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "שמירה על מבנה המקור"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "מספר שלם עם סימן ב־8 סיביות"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "מספר שלם עם סימן ב־16 סיביות"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "מספר שלם עם סימן ב־24 סיביות"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "מספר שלם עם סימן ב־32 סיביות"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "מספר עם נקודה צפה ב־32 סיביות"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "כאשר הקובץ קיים:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "הצגת בקשה"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "שכתוב"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "שמירת מבנה התיקיות, החל מ־:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "עריכת תצורת המצפין"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "מצפין ללא שם"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "סיומת קובץ הפלט:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "לדוגמה: mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "שורת הפקודה:"
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"wildmidi: קובץ התצורה של freepats. נא להתקין את החבילהtimidity-freepats, או "
-"לציין את הנתיב אל freepats.cfg בהגדרות התוסף."
+"לדוגמה: lame - %o\n"
+"%i לציון קובץ קלט, %o לציון קובץ קלט, - עבור הקלט מ־stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - שם קובץ הפלט\n"
+"%i - השם הזמני לקובץ הקלט"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "שיטה:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "שרשור"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "קובץ זמני"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "כותב תגיות"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "ערוך תצורות DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "תצורת DSP ללא שם"
+
+#~ msgid "Save playlist as"
+#~ msgstr "שמירת רשימת השמעה בשם"
+
+#, fuzzy
+#~ msgid "Shuffle"
+#~ msgstr "ערבול בין הרצועות"
+
+#~ msgid "_Abort"
+#~ msgstr "_ביטול"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "אזהרה: תכונת כתיבת התגיות נמצאת עדיין בפיתוח.\n"
+#~ "יש ליצור עותקי גיבוי בטרם השימוש."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#, fuzzy
+#~ msgid "File number"
+#~ msgstr "תקליטור מס׳"
+
+#~ msgid "Length"
+#~ msgstr "משך"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "המרות בעיצוב (מתחילות ב־%):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment\n"
+#~ " copy[r]ight, [f]ilename, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "דוגמה: %a‏ - %t‏ [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "הפעלת החלפת קצב דגימה דינמי"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "איכות החלפת קצב הדגימה:"
+
+#~ msgid "Description:"
+#~ msgstr "תיאור:"
+
+#~ msgid "Author(s):"
+#~ msgstr "מחבר/ים:"
 
-#~ msgid "Add Audio CD"
-#~ msgstr "הוספת תקליטור שמע"
+#~ msgid "Email:"
+#~ msgstr "דוא\"ל:"
+
+#~ msgid "Website:"
+#~ msgstr "אתר:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "המרות בעיצוב (מתחילות ב־%):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, [N]"
+#~ "totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, [f]"
+#~ "ilename, [T]agsדוגמה: %a‏ - %t‏ [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "הגדרת %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "תוסף הפלט ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "לא ניתן לקבל מספיק זיכרון לצורך אגירת הקלט."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "ארעה שגיאה בעת קריאת העמוד הראשון של תזרים הסיביות מסוג Ogg."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "ארעה שגיאה בקריאת מנת הכותרת ההתחלתית."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "לא ניתן לקבל מספיק זיכרון כדי לרשום את המספר הסידורי של התזרים החדש."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "הקלט קטוע או ריק."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "הקלט אינו תזרים סיביות מסוג Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "תזרים הסיביות מסוג Ogg אין מכיל נתוני Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF לפני תזרים מוכר."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "תזרים הסיביות מסוג Ogg אינו מכיל טיפוס נתונים נתמך."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "כותרת משנית פגומה."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF (סוף הקובץ) בטרם סוף כותרות ה־Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "נתונים פגומים או חסרים, ממשיך..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr "ארעה שגיאה בכתיבת התזרים לפלט. תזרים הפלט פגום או קטוע."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "שמע (מתקדם)"
+
+#~ msgid ""
+#~ "Keep source format\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+#~ msgstr ""
+#~ "שמירה על מבנה המקור\n"
+#~ "מספר שלם עם סימן ב־8 סיביות\n"
+#~ "מספר שלם עם סימן ב־16 סיביות\n"
+#~ "מספר שלם עם סימן ב־24 סיביות\n"
+#~ "מספר שלם עם סימן ב־32 סיביות\n"
+#~ "מספר עם נקודה צפה ב־32 סיביות"
+
+#~ msgid ""
+#~ "Pipe\n"
+#~ "Temporary file"
+#~ msgstr ""
+#~ "שרשור\n"
+#~ "קובץ זמני"
+
+#~ msgid ""
+#~ "Prompt\n"
+#~ "Overwrite"
+#~ msgstr ""
+#~ "הצגת בקשה\n"
+#~ "שכתוב"

deadbeef-0.5.1.tar.bz2/po/hr.po -> deadbeef-0.5.2.tar.bz2/po/hr.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2011-02-23 01:22+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-20 15:45+0200\n"
 "Last-Translator: zvacet <ikoli@yahoo.com>\n"
 "Language-Team: Croatian <>\n"
 "Language: hr\n"
@@ -19,154 +19,174 @@
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Podržani zvučni formati"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Ostale datoteke (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Sve datoteke (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Otvori datoteku(e)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Dodaj datoteku(e) na listu izvođenja..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Dodaj mapu(e) na listu izvođenja..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Slijedi simboličke poveznice"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Neuspjeh tijekom čitanja datoteke pomoći"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Neuspjeh u učitavanju datoteke pomoći"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr ""
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF prevoditelji"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Uredi listu izvođenja"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Preimenuj listu izvođenja"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Ukloni listu izvođenja"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Dodaj novu listu izvođenja"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Spremi unaprijed postavljeno"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Učitaj unaprijed postavljeno"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Omogući"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Nula sve"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Spremi unaprijed postavljeno"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Učitaj unaprijed postavljeno"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Unaprijed postavljeno"
 
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
-msgstr ""
+msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
-msgstr ""
+msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zustavljeno | %d zapisi| %s ukupno vrijeme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
-msgstr ""
+msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pauzirano | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
@@ -174,667 +194,726 @@
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d zapisi | %s ukupno vrijeme "
 "sviranja"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Spremi listu izvođenja kao"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF datoteke liste izvođenja (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Učitaj listu izvođenja"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Ostale datoteke (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nova lista izvođenja"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista izvođenja (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Otvori datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Dodaj datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Dodaj mapu(e)"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Dodaj lokaciju"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nova lista izvođenja"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Učitaj listu izvođenja"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Spremi listu izvođenja"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Spremi listu izvođenja kao"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Iskjluči"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Odaberi sve"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Poništi odabrano"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Obrnuti odabir"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Odabir"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Nađi"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Posloži po"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Naslov"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Broj zapisa"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Umjetnik"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Prolagođeno"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Svojstva"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Statusna traka"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Zaglavlja stupaca"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Kartice"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ujednačivač"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Redoslijed"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linearni"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Nasumično"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Klizač slijedi reprodukciju"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Pokazivač slijedi reprodukciju"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Stop nakon trenutne"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Skoči na trenutni zapis"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_O programu"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Traži"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Sviraj"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Slijedeće"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Sviraj nasumično"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Isključi"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Dodavanje datoteka..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Prekini"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Svojstva zapisa"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Postavke"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Primjeni"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Svojstva"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Naslov:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Unesi naziv novog stupca"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Broj datoteke"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Svira"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
-msgstr ""
+msgstr "Album Umjetnik"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Umjetnik _ album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Umjetnik"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Naslov"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Dužina"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Zapis"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Grupa / album umjetnik"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Prolagođeno"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Lijevo"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Izlazni priključak:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Izlazni uređaj:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Uvijek pretvori 8 bit audio u 16 bit"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Onemogući"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Zapis"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Dodaj datoteke iz naredbanog retka (ili upravljača datotekama) na uvu listu "
 "izvođenja:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Konfiguriraj"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Učitaj"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Srednje dugme miša zatvara listu izvođenja"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
-msgstr ""
+msgstr "Koristi podebljani font za zapis koji trenutno svira"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Tekst naslovne trake dok svira:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Tekst naslovne trake kad je zaustavljeno:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Grafičko sučelje"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Pozadina"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Srednje"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Svijetlo"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Tamno"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Tekst"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Odabrani red"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Odabrani tekst"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Pokazivač"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Boje liste izvođenja"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Boje"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Omogući proxy poslužitelj"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresa proxy poslužitelja:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
-msgstr ""
+msgstr "Port proxy poslužitelja:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
-msgstr ""
+msgstr "Vrsta proxy-a:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Proxy korisničko ime:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Proxy lozinka:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Mreža"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Verzija: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Autorska prava"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Priključci"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grupiraj po"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Poredaj po..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Format"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Odaberi DSP priključak"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Priključak"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Piši ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Piši ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Piši APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 verzija"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (preporučeno)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Autor(i):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Web stranica:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Konfiguriraj"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Priključci"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Grupiraj po"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Umjetnik / album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Naslov/ zapis umjetnik"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Trajanje"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Izbriši datoteke sa diska"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -842,195 +921,219 @@
 "Datoteke će biti izgubljene. Nastavi?\n"
 "(Ovaj dijalog može biti iskjlučen u GTKUI postavkama prikjlučaka)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Ukloni sa diska"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Dodaj stupac"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Uredi stupac"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Ukloni stupac"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Grupiraj po"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Umjetnik/datum/album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Otvori datoteku..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Postavi %s"
+msgid "Configure %s"
+msgstr "Konfiguriraj %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Zadani audio uređaj"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr ""
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA izlazni priključak"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Dodavanje datoteka..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Stvarno zatvoriti prozor?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Da"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Ne"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Vrijednost"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Ime:"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Imena polja ne smiju započinjati sa : ili _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Ne mogu dodati polje"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Polje sa tim imenom već postoji,molim pokušajte s drugim imenom."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Stvarno ukloniti odabrana polje?"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF sada svira"
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Dodaj polje"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Ukloni polje"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opcije:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Ispisuje pomoć (ova poruka) i izlazi\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Isključi svirač\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Ispis info verzije i izlaz\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Početak reprodukcije\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Zaustavlja reprodukciju\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Zaustavlja reprodukciju\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Slijedaća pjesma na listi izvođenja\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Prethodna pjesma na listi izvođenja\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random nasumična pjesma na listi izvođenja\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1038,19 +1141,35 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
-msgstr " e.g.: sada svira \"%%a - %%t\" treba ispisati \"umjetnik "
-"- naslov\"\n"
+msgstr ""
+" e.g.: sada svira \"%%a - %%t\" treba ispisati "
+"\"umjetnik - naslov\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Zadano"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1058,29 +1177,46 @@
 "2.3 (preporučeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
+"Indeks stavke\n"
+"Svira\n"
+"Album Umjet\n"
+"Umjetnik-Album\n"
+"Umjetnik\n"
+"Album\n"
+"Naslov\n"
+"Trajanje\n"
+"Broj zapisa\n"
+"Grupa / Album Umjetnik\n"
+"Prilagođeno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1089,72 +1225,552 @@
 "Desno"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Dodaj audio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Oslobodi uređaj kada se zaustavi"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Onemogući sada svira"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Lozinka"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pitaj za potvrdu za brisanje datoteka sa diska"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Naslov zapisa"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Izvođač"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Ukupno zapisa"
+
+#: ../translation/extra.c:73
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:74
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Broj diska"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Komentar"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Lokacija"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Proširenja datoteke (odvojeno pomoću ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Pretvori"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Odaberi mapu..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Greška"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Ukloni unaprijed postavljeno"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP unaprijed postavljeno"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Izlazna mapa:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Ime izlazne datoteke:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP unaprijed postavljeno:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Proširenje izlazne datoteke:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Naredbeni redak:"
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Metoda:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Privremena datoteka"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Dodaj audio CD"
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Spremi listu izvođenja kao"
+
+#~ msgid "_Abort"
+#~ msgstr "_Prekini"
+
+#~ msgid "Length"
+#~ msgstr "Dužina"
+
+#~ msgid "Description:"
+#~ msgstr "Opis:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor(i):"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Web stranica:"
+
+#~ msgid "Setup %s"
+#~ msgstr "Postavi %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA izlazni priključak"
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Zvuk (nap)"

deadbeef-0.5.1.tar.bz2/po/hu.po -> deadbeef-0.5.2.tar.bz2/po/hu.po Changed

@@ -7,1008 +7,923 @@
 msgstr ""
 "Project-Id-Version: deadbeef 0.4.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-31 21:57+0100\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-11-10 19:45+0100\n"
 "Last-Translator: Peter Polonkai <polesz@nedudu.hu>\n"
 "Language-Team: ned <polesz@nedudu.hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Támogatott hang formátumok"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Egyéb fájlok (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Fájl(ok) megnyitása..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Fájl(ok) hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Könyvtár(ak) hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Szimlinkek követése"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Súgó fájl olvasása sikertelen"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Súgó fájl betöltése sikertelen"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1099
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Súgó"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s névjegye"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Változás napló"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF Fordítók"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Lejátszólista szerkesztése"
 
-#: ../plugins/gtkui/ddbtabstrip.c:675
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Cím:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Lejátszólista átnevezése"
 
-#: ../plugins/gtkui/ddbtabstrip.c:679
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Lejátszólista törlése"
 
-#: ../plugins/gtkui/ddbtabstrip.c:683
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Új lejátszólista hozzáadása"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "DeaDBeeF EQ Hangszín mentése"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ hangszín fájlok (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "DeaDBeeF EQ Hangszín betöltése..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ hangszínek (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Foobar2000 EQ Hangszín importálása..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ hangszínek (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Hangszín betöltés"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 Hangszín betöltése"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Engedélyezve"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Mind nulla"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Preamp nulla"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Sávok nulla"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Hangszín mentés"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Hangszín betöltés"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 Hangszín betöltése"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Megállítva | %d sáv | %s teljes lejátszási idő"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Monó"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Szünet |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sáv | %s teljes lejátszási idő"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sáv | %s teljes lejátszási "
+"idő"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Lejátszólista mentése másként"
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeadBeeF lejátszólista fájlok (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/gtkui.c:865
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Egyéb fájlok (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Új lejátszólista"
 
-#: ../plugins/gtkui/gtkui.c:868
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Új lejátszólista (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Fájl(ok) megnyitása"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Fájl(ok) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Könyvtár(ak) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2973
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Hely hozzáadása"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Új lejátszólista"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Lejátszólista mentése másként"
-
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Törlés"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Mind kiválaszt"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Minden kiválasztást megszüntet"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Kiválasztás megfordítása"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Választás"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Vágás"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Keresés"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1707
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Cím"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Sáv száma"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Előadó"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Dátum"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Egyéb"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Státusz sor"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Oszlop fejlécek"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Fülek"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Hangszínszabályzó"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Lejátszás"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Sorrend"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineáris"
 
-#: ../plugins/gtkui/interface.c:336
-#: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Kevert"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Kevert"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Véletlenszerű"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Ismétlés"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Mind ismétlése"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Egyedi dal ismétlése"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Nincs ismétlés"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "A lapozás követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "A kurzor követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Az aktuális szám után megállít"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Ugrás az aktuális számra"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Változás napló"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "Fordí_tók"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Keresés"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Megállítás"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Előző"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Következő"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Véletlenszerű lejátszás"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Névjegy"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../plugins/gtkui/interface.c:1041
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Fájlok hzzáadása..."
-
-#: ../plugins/gtkui/interface.c:1163
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Sáv Tulajdonságok"
 
-#: ../plugins/gtkui/interface.c:1209
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
-#: ../plugins/gtkui/interface.c:1230
-#: ../plugins/gtkui/interface.c:1276
-#: ../plugins/gtkui/interface.c:2501
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Bezár"
 
-#: ../plugins/gtkui/interface.c:1234
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: ../plugins/gtkui/interface.c:1280
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: ../plugins/gtkui/interface.c:1365
-#: ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1380
-#: ../plugins/gtkui/interface.c:2873
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Cím:"
-
-#: ../plugins/gtkui/interface.c:1388
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Adja meg a fejléc új címét"
 
-#: ../plugins/gtkui/interface.c:1396
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Típus"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Elem index"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1405
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:1406
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Album kép"
 
-#: ../plugins/gtkui/interface.c:1407
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Előadó - Album"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1408
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Előadó"
-
-#: ../plugins/gtkui/interface.c:1409
-#: ../plugins/gtkui/interface.c:1797
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1410
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Cím"
-
-#: ../plugins/gtkui/interface.c:1411
-msgid "Length"
-msgstr "Hossz"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Időtartam"
 
-#: ../plugins/gtkui/interface.c:1412
-#: ../plugins/gtkui/interface.c:1796
-msgid "Track"
-msgstr "Sáv"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Sáv száma"
 
-#: ../plugins/gtkui/interface.c:1413
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Zenekar / Album előadó"
 
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Egyéb"
-
-#: ../plugins/gtkui/interface.c:1420
-#: ../plugins/gtkui/interface.c:3100
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formátum"
 
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Igazítás"
 
-#: ../plugins/gtkui/interface.c:1443
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Balra"
 
-#: ../plugins/gtkui/interface.c:1444
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Jobbra"
 
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formátum konverziók (kezdő %):\n"
-" [a]előadó, [t]cím, al[b]um, [B]zenekar, [C]szerző\n"
-" [n]sávszáma, [N]összessáv,\n"
-" [l]hossz, [y]év, [g]műfaj, [c]megjegyzés,\n"
-" copy[r]ight, [f]ájlnév, [F]Teljesútvonal, [T]címkék\n"
-" [d]könyvtár,[D]KönyvtárÚtvonallal\n"
-"Példa: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1475
-#: ../plugins/gtkui/interface.c:2904
-#: ../plugins/gtkui/interface.c:3016
-#: ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Mégsem"
 
-#: ../plugins/gtkui/interface.c:1496
-#: ../plugins/gtkui/interface.c:2925
-#: ../plugins/gtkui/interface.c:3037
-#: ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1728
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Kimeneti bővítmény:"
 
-#: ../plugins/gtkui/interface.c:1741
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Kimeneti eszköz:"
 
-#: ../plugins/gtkui/interface.c:1750
-#: ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Hang"
 
-#: ../plugins/gtkui/interface.c:1759
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Engedi a dinamikus mintavételt kapcsolás közben"
-
-#: ../plugins/gtkui/interface.c:1767
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Mintavételi átalakítási minőség:"
-
-#: ../plugins/gtkui/interface.c:1786
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Újrajátszási mód:"
 
-#: ../plugins/gtkui/interface.c:1795
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Letiltva"
 
-#: ../plugins/gtkui/interface.c:1799
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Sáv"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Újrajátszási csúcs skála"
 
-#: ../plugins/gtkui/interface.c:1807
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Újrajátszási mód:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Fájlok hozzáadása parancssorból (vagy fájl kezelőből) a lejátszólistához"
+msgstr ""
+"Fájlok hozzáadása parancssorból (vagy fájl kezelőből) a lejátszólistához"
 
-#: ../plugins/gtkui/interface.c:1816
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Előző állapot helyreállítása indításkor"
 
-#: ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:1829
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Beállítás"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Bezáráskor a tálcára kerül"
 
-#: ../plugins/gtkui/interface.c:1833
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Középső egérgomb zárja be a lejátszólistát"
 
-#: ../plugins/gtkui/interface.c:1837
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Rendszertálca ikon elrejtése"
 
-#: ../plugins/gtkui/interface.c:1841
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Kövér betűtípus használata a most játszott számnál"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Elrejti a \"Törlés a lemezről\" menü elemet"
 
-#: ../plugins/gtkui/interface.c:1853
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Címsáv szöveg szám lejátszásakor:"
 
-#: ../plugins/gtkui/interface.c:1867
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Címsáv szöveg ha nincs lejátszás:"
 
-#: ../plugins/gtkui/interface.c:1877
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Felhasználói felület"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Felülírás"
 
-#: ../plugins/gtkui/interface.c:1901
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Előtér"
 
-#: ../plugins/gtkui/interface.c:1908
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Háttér"
 
-#: ../plugins/gtkui/interface.c:1927
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Idősáv/Hangerő színek"
 
-#: ../plugins/gtkui/interface.c:1945
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Közép"
 
-#: ../plugins/gtkui/interface.c:1952
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Világos"
 
-#: ../plugins/gtkui/interface.c:1959
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Sötét"
 
-#: ../plugins/gtkui/interface.c:1990
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Alap"
 
-#: ../plugins/gtkui/interface.c:1997
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Szöveg"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Fülek színe"
 
-#: ../plugins/gtkui/interface.c:2006
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Felülírás (elveszti a GTK treeview témát, de gyorsul a rajzolás sebessége)"
+msgstr ""
+"Felülírás (elveszti a GTK treeview témát, de gyorsul a rajzolás sebessége)"
 
-#: ../plugins/gtkui/interface.c:2015
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Páros sor"
 
-#: ../plugins/gtkui/interface.c:2022
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Páratlan sor"
 
-#: ../plugins/gtkui/interface.c:2041
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Szöveg"
-
-#: ../plugins/gtkui/interface.c:2048
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Kiválasztott sor"
 
-#: ../plugins/gtkui/interface.c:2067
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Kiválasztott szöveg"
 
-#: ../plugins/gtkui/interface.c:2080
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../plugins/gtkui/interface.c:2093
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Lejátszólista színek"
 
-#: ../plugins/gtkui/interface.c:2097
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Színek"
 
-#: ../plugins/gtkui/interface.c:2106
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Proxy szerver engedélyezése"
 
-#: ../plugins/gtkui/interface.c:2114
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Proxy szerver cím:"
 
-#: ../plugins/gtkui/interface.c:2128
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Proxy szerver port:"
 
-#: ../plugins/gtkui/interface.c:2142
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Proxy típusa:"
 
-#: ../plugins/gtkui/interface.c:2161
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Proxy felhasználónév:"
 
-#: ../plugins/gtkui/interface.c:2174
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Proxy jelszó:"
 
-#: ../plugins/gtkui/interface.c:2184
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../plugins/gtkui/interface.c:2212
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Szerzői jog"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Bővítmények"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Csoport"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Formátum"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Választás"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Bővítmények"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Címke író"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "ID3v2 írása"
 
-#: ../plugins/gtkui/interface.c:2216
-#: ../plugins/gtkui/interface.c:2343
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "ID3v1 írása"
 
-#: ../plugins/gtkui/interface.c:2220
-#: ../plugins/gtkui/interface.c:2299
-#: ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 írása"
 
-#: ../plugins/gtkui/interface.c:2228
-#: ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 vágása"
 
-#: ../plugins/gtkui/interface.c:2232
-#: ../plugins/gtkui/interface.c:2355
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 vágása"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/interface.c:2311
-#: ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 vágása"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 verzió"
 
-#: ../plugins/gtkui/interface.c:2251
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Ajánlott)"
 
-#: ../plugins/gtkui/interface.c:2252
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2258
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v2 karakter kódolás (alapértelmezés iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 írása"
 
-#: ../plugins/gtkui/interface.c:2364
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Címke író"
-
-#: ../plugins/gtkui/interface.c:2395
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Leírás:"
-
-#: ../plugins/gtkui/interface.c:2410
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Szerző(k):"
-
-#: ../plugins/gtkui/interface.c:2425
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2440
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Honlap:"
-
-#: ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Beállítás"
-
-#: ../plugins/gtkui/interface.c:2475
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Bővítmények"
-
-#: ../plugins/gtkui/interface.c:2857
-#: ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2984
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3085
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Csoport"
-
-#: ../plugins/gtkui/interface.c:3110
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formátum konverziók (kezdő %):\n"
-" [a]előadó, [t]cím, al[b]um, [B]zenekar, [C]szerző\n"
-" [n]sávszáma, [N]összessáv,\n"
-" [l]hossz, [y]év, [g]műfaj, [c]megjegyzés,\n"
-" copy[r]ight, [f]ájlnév, [T]címkék\n"
-"Példa: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Előadó / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Sáv száma"
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Cím / Sáv előadó"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Időtartam"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Fájlok törlése a lemezről"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1016,209 +931,222 @@
 "A fájlok el fognak veszni. Folytatja?\n"
 "(Ez a párbeszédablak kikapcsolható a GTKUI bővítmény beállításaiban)"
 
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Figyelemeztetés"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Hozzáadás a lejátszási sorhoz"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Törlés a lejátszási sorból"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Metaadat újratöltése"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Törlés a lemezről"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Oszlop hozzáadása"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Oszlop szerkesztése"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Öszlop törlése"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Csoport"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Nincs"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Előadó/Dátum/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Fájl megnyitása..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Beállítás %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Beállítás"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Alapértelmezett Audio Eszköz"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Hozzáadés"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Globális billentyű kombinációk"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Hely"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Billentyű kombináció"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA kimeneti bővítmény"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Fájlok hzzáadása..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inicializálás..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Már módosított adatokat ezen a számon."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Valóban bezárja az ablakot?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Hely"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Alsáv Index"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Billentyű"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Címke típus(ok)"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Érték"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Beépített Cue támogatás"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Igen"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nem"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Kodek"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Billentyű"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Érték"
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Valóban bezárja az ablakot?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Fájl(ok) hozzáadása"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF most szól"
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Eltávolítás"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Használat: deadbeef [opciók] [fájl(ok)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opciók:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help vagy -h Súgó megjelenítése (ez az üzenet) és kilépt\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Kilépés a lejátszóból\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Verzió információ megjelenítése és kilépés\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Lejátszás indítása\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Lejátszás megállítása\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Lejátszás szüneteltetése\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Ugrás a következő számra a lejátszólistában\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Ugrás az előző számra a lejátszólistában\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Véletlenszerű szám a lejátszólistáról\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Fájl(ok) hozzáadása a létező lejátszólistához\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Szám nevének formázott kiírása az stdout-ra\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1229,17 +1157,35 @@
 " [l]hossz, [n]sávszáma, [y]év, [c]megjegyzés,\n"
 " copy[r]ight, [e]ltelt idő\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " pl.: --nowplaying \"%%a - %%t\" kiírása kerül \"előadó - cím\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" pl.: --nowplaying \"%%a - %%t\" kiírása kerül \"előadó "
+"- cím\"\n"
 
-#: ../playlist.c:378
-#: ../playlist.c:2295
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Igen"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nem"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1247,7 +1193,13 @@
 "2.3 (Ajánlott)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1257,7 +1209,8 @@
 "Sáv\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1266,8 +1219,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1283,7 +1236,7 @@
 "Zenekar / Album Előadó\n"
 "Egyéb"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1291,16 +1244,21 @@
 "Balra\n"
 "Jobbra"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nem található a képfájl: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: freepats konfig fájl nem található. Kérem telepítse a timidity-freepats csomagot vagy adja meg a freepats.cfg útvonalát a bővítmény beállításaiban."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: freepats konfig fájl nem található. Kérem telepítse a timidity-"
+"freepats csomagot vagy adja meg a freepats.cfg útvonalát a bővítmény "
+"beállításaiban."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1321,8 +1279,7 @@
 msgid "Release device while stopped"
 msgstr "Eszköz felszabadítása amíg megállított a lejátszás"
 
-#: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Preferált puffer méret"
 
@@ -1351,165 +1308,561 @@
 msgid "Scrobble URL"
 msgstr "Scrobble URL"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Átmeneti tár frissítési periódus (óra)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Beágyazott címkék olvasása"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Olvasás helyi könyvtárból"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Helyi borító fájl maszk"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Olvasás a last.fm-ről"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Olvasás az albumart.org-ról"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "CDDB/FreeDB használata"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Előnyben részesíti a CD-Text olvasást a CDDB szerverről"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB url (pl. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "CDDB port száma (pl. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "CDDB protokoll HTTP felett előnyben részesítése"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "NRG képfájl támogatás engedélyezése"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Újramintavételezés minősége (0..2, a nagyobb a jobb)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Maximális szám hossz (percben)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Fájlok lemezről való törlésekor megerősítést kér"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Az állapot ikon hangerőszabályzóként viselkedik"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Egyedi státuszikon"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "gtk_init futtatása --sync kapcsolóval (hibakereső mód)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
+#: ../translation/extra.c:45
+#, fuzzy
+msgid "Notification title format"
 msgstr "Értesítési formátum"
 
+#: ../translation/extra.c:46
+#, fuzzy
+msgid "Notification content format"
+msgstr "Értesítési formátum"
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Album kép"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio szerver"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Mintavétel"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Relatív keresési útvonal"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Abszolút keresési útvonal"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Audio bájtok cseréje (váltás ha minden amit hallasz statikus)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
+#: ../translation/extra.c:58
+#, fuzzy
+msgid "Enable HVSC Songlength DB"
 msgstr "HVSC engedélyezése"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "HVSC útvonal"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+#, fuzzy
+msgid "Default song length (sec)"
+msgstr "Maximális szám hossz (percben)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Timidity++ bank konfigurációs állomány"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Sáv címe"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Előadó"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Dátum"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Sáv száma"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Összes sáv"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Műfaj"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Lemez száma"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Kódoló / Eladó"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Szerzői jog"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Hely"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Alsáv Index"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Címke típus(ok)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Beépített Cue támogatás"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+#, fuzzy
+msgid "Target Samplerate"
+msgstr "Mintavétel"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Mind kiválaszt"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Oszlop szerkesztése"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Hangszín mentés"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Kimeneti eszköz:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Kimeneti bővítmény:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Hangszín mentés"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Hangszín betöltés"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Kimeneti bővítmény:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "APEv2 írása"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "ID3v1 írása"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "ID3v2 írása"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Címke író"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
 
+#~ msgid "Save playlist as"
+#~ msgstr "Lejátszólista mentése másként"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Hossz"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formátum konverziók (kezdő %):\n"
+#~ " [a]előadó, [t]cím, al[b]um, [B]zenekar, [C]szerző\n"
+#~ " [n]sávszáma, [N]összessáv,\n"
+#~ " [l]hossz, [y]év, [g]műfaj, [c]megjegyzés,\n"
+#~ " copy[r]ight, [f]ájlnév, [F]Teljesútvonal, [T]címkék\n"
+#~ " [d]könyvtár,[D]KönyvtárÚtvonallal\n"
+#~ "Példa: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Engedi a dinamikus mintavételt kapcsolás közben"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Mintavételi átalakítási minőség:"
+
+#~ msgid "Description:"
+#~ msgstr "Leírás:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Szerző(k):"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Honlap:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formátum konverziók (kezdő %):\n"
+#~ " [a]előadó, [t]cím, al[b]um, [B]zenekar, [C]szerző\n"
+#~ " [n]sávszáma, [N]összessáv,\n"
+#~ " [l]hossz, [y]év, [g]műfaj, [c]megjegyzés,\n"
+#~ " copy[r]ight, [f]ájlnév, [T]címkék\n"
+#~ "Példa: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Cím / Sáv előadó"
+
+#~ msgid "Setup %s"
+#~ msgstr "Beállítás %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA kimeneti bővítmény"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF most szól"
+
+#~ msgid "HVSC path"
+#~ msgstr "HVSC útvonal"

deadbeef-0.5.1.tar.bz2/po/id.po -> deadbeef-0.5.2.tar.bz2/po/id.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: deadbeef master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2011-03-14 10:56+0200\n"
 "Last-Translator: Rahman Yusri Aftian <aftian@yahoo.com>\n"
 "Language-Team: Indonesian Translation Team <id@li.org>\n"
@@ -18,1025 +18,1133 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Format suara yang didukung"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Berkas lain (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Buka berkas..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Tambahkan berkas ke daftar putar..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Tambahkan folder ke daftar putar..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Ikuti symlink"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Gagal saat membaca berkas bantuan"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Gagal memuat berkas bantuan"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Tentang DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "ChangeLog DeaDBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Sunting daftar putar"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Judul:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Ubah Nama Daftar Putar"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Hapus Daftar Putar"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Tambah Daftar Putar Baru"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Simpan Preset EQ DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Memuat DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Impor Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Memuat Preset"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Impor Foobar2000 Preset"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Aktifkan"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Nolkan Semua"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Nolkan Preamp"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Zero Bands"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Simpan Preset"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Memuat Preset"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Impor Foobar2000 Preset"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 hari %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d hari %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Berhenti | %d trek | %s waktu putar total"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Jeda | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d trek | %s waktu putar total"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Simpan Daftar Putar Sebagai"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF playlist files (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Muat Daftar Putar"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Berkas lain (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Daftar Putar Baru"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Daftar Putar Baru (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Buka berkas"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Tambah berkas"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Tambah folder"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Tambah lokasi"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Daftar putar baru"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Muat daftar putar"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Simpan daftar putar"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Simpan daftar putar sebagai"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Bersihkan"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Pilih semua"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Pilih tak satupun"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Balik pilihan"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Pilihan"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Buang"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Cari"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Judul"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Nomor berkas"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artis"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Ubahan"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Tilik"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Bilah status"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Header kolom"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Tab"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Putar"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Urutan"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linier"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Kocok"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Kocok"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Acak"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Perulangan"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Ulang Semua"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Ulang Satu Lagu"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Tidak ulang"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Gulir berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Kursor berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Berhenti setelah ini"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Cari"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Putar"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Jeda"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Putar Acak"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Tentang"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Menambah berkas..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "Gugurk_an"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Properti Trek"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "Ter_apkan"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Properti"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Judul:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Masukkan judul kolom baru disini"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Jenis:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Nomor berkas"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Memutar"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Album Seni"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artis - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artis"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Judul"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Panjang"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Durasi"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Trek"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "No Trek"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Band / Artis Album"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Ubahan"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Perataan:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Kiri"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Kanan"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, "
-"[N]totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, "
-"[f]ilename, [F]ullPathname, [T]ags, [d]irectory, "
-"[D]irectoryWithPathExample: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Keluaran plugin:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Perangkat keluaran:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Sound"
-msgstr "Suara"
-
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr ""
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "Suara"
 
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Matikan"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Trek"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "_Putar"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+#, fuzzy
+msgid "Configure"
+msgstr "Konfigurasi"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Latar depan"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Latar belakang"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Tengah"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Terang"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Gelap"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Teks"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Baris genap"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Baris ganjil"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Teks"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Baris yang dipilih"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Teks yang dipilih"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Warna daftar putar"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Aktifkan Server Proksi"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Alamat Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Jenis Proksi:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nama Pengguna Proksi:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Sandi Proksi:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Jaringan"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+#, fuzzy
+msgid "Plugins"
+msgstr "Pengaya"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Kelompokkan Berdasarkan"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Pilihan"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Pengaya"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Tulis ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Tulis ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Tulis APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versi ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Tulis ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Keterangan:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Pengarang:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Surel:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Situs web:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-#, fuzzy
-msgid "Configure"
-msgstr "Konfigurasi"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-#, fuzzy
-msgid "Plugins"
-msgstr "Pengaya"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Kelompokkan Berdasarkan"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artis / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "No Trek"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Durasi"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Hapus berkas dari disk"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Tambahkan ke antrian daftar putar"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Hapus dari antrian putar"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Muat ulang metadata"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Hapus dari disk"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Tambah kolom"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Sunting kolom"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Hapus kolom"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Kelompokkan berdasarkan"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Tak ada"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artis/Tanggal/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Buka berkas..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, fuzzy, c-format
-msgid "Setup %s"
-msgstr "Setup"
+msgid "Configure %s"
+msgstr "Konfigurasi"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Perangkat Suara Bawaan"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Tambah"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 #, fuzzy
 msgid "Global Hotkeys"
 msgstr "Tombol Global"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Kombinasi kunci"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr ""
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Menambah berkas..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Menginisialisasi..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Kunci"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ya"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Nilai"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Tidak"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Kunci"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Nilai"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
 msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Tambah berkas"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Buang"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Cara pakai: deadbeef [opsi] [berkas]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opsi:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Cetak bantuan (pesan ini) dan keluar\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Keluar dari pemutar\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Cetak info versi dan keluar\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Mulai memutar\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Berhenti memutar\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Jeda memutar\n"
 
-#: ../main.c:97
+#: ../main.c:99
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Lagu selanjutnya di daftar putar\n"
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
 
-#: ../main.c:98
+#: ../main.c:100
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Lagu sebelumnya di daftar putar\n"
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
 
-#: ../main.c:99
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Lagu selanjutnya di daftar putar\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Lagu sebelumnya di daftar putar\n"
+
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Acak lagu di daftar main\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 " --queue Tambahkan berkas ke daftar putar yang telah ada\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1044,18 +1152,33 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Bawaan"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ya"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Tidak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1063,29 +1186,35 @@
 "2.3 (Disarankan)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1094,69 +1223,615 @@
 "Kanan"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Tambahkan CD Audio"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Aktifkan Server Proksi"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Nama Pengguna Proksi:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Sandi Proksi:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Hapus berkas dari disk"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Album Seni"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "No Trek"
+
+#: ../translation/extra.c:67
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
+#: ../translation/extra.c:72
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:73
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Masukan terpotong atau kosong."
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Masukan bukan bitstream Ogg."
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Nomor berkas"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Bitstream Ogg tak memuat data Vorbis."
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "EOF sebelum stream yang dikenali."
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Tambah lokasi"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF sebelum akhir header Vorbis."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Data rusak atau hilang, melanjutkan..."
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Pilih semua"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Sunting kolom"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Simpan Preset"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Perangkat keluaran:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Keluaran plugin:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Simpan Preset"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Memuat Preset"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Keluaran plugin:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Tambahkan CD Audio"
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Tulis APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Tulis ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Tulis ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Simpan daftar putar sebagai"
+
+#~ msgid "_Abort"
+#~ msgstr "Gugurk_an"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Panjang"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, [N]"
+#~ "totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, [f]"
+#~ "ilename, [F]ullPathname, [T]ags, [d]irectory, [D]"
+#~ "irectoryWithPathExample: %a - %t [%l]"
+
+#~ msgid "Description:"
+#~ msgstr "Keterangan:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Pengarang:"
+
+#~ msgid "Email:"
+#~ msgstr "Surel:"
+
+#~ msgid "Website:"
+#~ msgstr "Situs web:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#, fuzzy
+#~ msgid "Setup %s"
+#~ msgstr "Setup"
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Masukan terpotong atau kosong."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Masukan bukan bitstream Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Bitstream Ogg tak memuat data Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF sebelum stream yang dikenali."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF sebelum akhir header Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Data rusak atau hilang, melanjutkan..."

deadbeef-0.5.1.tar.bz2/po/it.po -> deadbeef-0.5.2.tar.bz2/po/it.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DeadBeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 04:27+0000\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2011-03-09 17:43+0200\n"
 "Last-Translator: Alessandro <alex@amiran.it>\n"
 "Language-Team: Italian\n"
@@ -20,983 +20,910 @@
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: Italy\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formati audio supportati"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Altri files (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Apri file..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Aggiungi file alla playlist..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Aggiungi cartella/e alla playlist"
 
-#: ../plugins/gtkui/interface.c:179 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "Add Audio CD"
-msgstr "Aggiungi Audio CD"
-
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Segui i link simbolici"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Fallita la lettura del file di aiuto"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Fallito il caricamento del file di aiuto"
 
-#: ../plugins/gtkui/callbacks.c:701
-#: ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "A proposito di DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeadBeeF %s Changelog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeadBeeF sta riproducendo"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Modifica playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Rinonima playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Rimuovi playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Aggiungi nuova playlist"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Salva parametri predefiniti equalizzatore DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeadBeeF EQ preset files (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Carica DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeadBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importa Foobar2000 EQ Preset"
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Salva preset"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Carica preset"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importa Foobar2000 Preset"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Tutto a zero"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Pre-ampl a zero"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Bande a zero"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Salva preset"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Carica preset"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importa Foobar2000 Preset"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 giorno %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d giorni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stop | %d tracce | %s tempo totale"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pausa |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracce | %s tempo totale"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracce | %s tempo totale"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Salva playlist come"
 
-#: ../plugins/gtkui/gtkui.c:669
-#: ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeadBeeF playlist files (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Carica Playlist"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Altri files (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nuova Playlist (%d)"
 
-#: ../plugins/gtkui/interface.c:138
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_File"
 
-#: ../plugins/gtkui/interface.c:145
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Apri file"
 
-#: ../plugins/gtkui/interface.c:161
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Aggiungi file"
 
-#: ../plugins/gtkui/interface.c:169
-#: ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Aggiungi cartella/e"
 
-#: ../plugins/gtkui/interface.c:177
-#: ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Aggiungi locazione"
 
-#: ../plugins/gtkui/interface.c:186
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nuova playlist"
 
-#: ../plugins/gtkui/interface.c:193
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Carica playlist"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Salva playlist"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Salva playlist come"
-
-#: ../plugins/gtkui/interface.c:210
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../plugins/gtkui/interface.c:221
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../plugins/gtkui/interface.c:228
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Pulisci"
 
-#: ../plugins/gtkui/interface.c:236
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: ../plugins/gtkui/interface.c:243
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Deseleziona tutto"
 
-#: ../plugins/gtkui/interface.c:250
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverti selezione"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Selezione"
 
-#: ../plugins/gtkui/interface.c:261
-#: ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../plugins/gtkui/interface.c:269
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Raccolte"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Cerca"
 
-#: ../plugins/gtkui/interface.c:285
-#: ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titolo"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "File numero"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personalizza"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../plugins/gtkui/interface.c:296
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra di stato"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Colonna intestazione"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Schede"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizzatore"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Riproduzione"
 
-#: ../plugins/gtkui/interface.c:319
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ordina"
 
-#: ../plugins/gtkui/interface.c:326
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineare"
 
-#: ../plugins/gtkui/interface.c:332
-#: ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Mescolato"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Mescolato"
 
-#: ../plugins/gtkui/interface.c:338
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Casuale"
 
-#: ../plugins/gtkui/interface.c:344
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Looping"
 
-#: ../plugins/gtkui/interface.c:351
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Loop tutte"
 
-#: ../plugins/gtkui/interface.c:357
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Loop singola canzone"
 
-#: ../plugins/gtkui/interface.c:363
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Non fare il Loop"
 
-#: ../plugins/gtkui/interface.c:369
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Scorri seguente riproduzione"
 
-#: ../plugins/gtkui/interface.c:374
-#: ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "La selezione segue la riproduzione"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Stop finita la canzone"
 
-#: ../plugins/gtkui/interface.c:385
-#: ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../plugins/gtkui/interface.c:400
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Changelog"
 
-#: ../plugins/gtkui/interface.c:422
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_About"
 
-#: ../plugins/gtkui/interface.c:801
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Cerca"
 
-#: ../plugins/gtkui/interface.c:876
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:884
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../plugins/gtkui/interface.c:892
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:900
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../plugins/gtkui/interface.c:908
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Prossima"
 
-#: ../plugins/gtkui/interface.c:916
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Riproduzione casuale"
 
-#: ../plugins/gtkui/interface.c:925
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "About"
 
-#: ../plugins/gtkui/interface.c:938
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Esci"
 
-#: ../plugins/gtkui/interface.c:1010
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Sto aggiungendo i files..."
-
-#: ../plugins/gtkui/interface.c:1054
-#: ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Ferma"
-
-#: ../plugins/gtkui/interface.c:1155
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Proprietà traccia"
 
-#: ../plugins/gtkui/interface.c:1179
-#: ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"ATTENZIONE: la scrittura delle tag è una funzione in sviluppo. \n"
-"Fai un backup prima di usare questa funzione"
 
-#: ../plugins/gtkui/interface.c:1206
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Applica"
 
-#: ../plugins/gtkui/interface.c:1227
-#: ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../plugins/gtkui/interface.c:1231
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277
-#: ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../plugins/gtkui/interface.c:1363
-#: ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378
-#: ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Titolo:"
-
-#: ../plugins/gtkui/interface.c:1386
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Inserisci nuovo titolo colonna qui"
 
-#: ../plugins/gtkui/interface.c:1394
-#: ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "File numero"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403
-#: ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Riproduzione"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Album Art"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artista - Album"
 
-#: ../plugins/gtkui/interface.c:1406
-#: ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:1407
-#: ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408
-#: ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Titolo"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Lunghezza"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Durata"
 
-#: ../plugins/gtkui/interface.c:1410
-#: ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Traccia"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "Traccia N°"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Band / Album Artista"
 
-#: ../plugins/gtkui/interface.c:1412
-#: ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Personalizza"
-
-#: ../plugins/gtkui/interface.c:1418
-#: ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1433
-#: ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Sinistra"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Destra"
 
-#: ../plugins/gtkui/interface.c:1444
-#: ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formati conversione (inzia con %):\n"
-" [a]rtista, [t]itolo, al[b]um, [B]and, [C]ompositore\n"
-" Traccia[n]umero, [N]TracceTotali,\n"
-" [l]unghezza, [y]Anno, [g]enere, [c]ommento,\n"
-" copy[r]ight, [f]NomeFile, [F]NomeCompletoFile, [T]ags,\n"
-" [d]cartella, [D]CartellaConPercorso\n"
-"Example: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473
-#: ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012
-#: ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../plugins/gtkui/interface.c:1494
-#: ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033
-#: ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Plugin d'uscita:"
 
-#: ../plugins/gtkui/interface.c:1738
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositivo d'uscita:"
 
-#: ../plugins/gtkui/interface.c:1747
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Suono"
 
-#: ../plugins/gtkui/interface.c:1756
-#: ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Consenti il cambio dinamico delle frequenze di campionamento"
-
-#: ../plugins/gtkui/interface.c:1764
-#: ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Qualità della conversione della frequenza di campionamento:"
-
-#: ../plugins/gtkui/interface.c:1783
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Modalità ripetizione:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Disabilita"
 
-#: ../plugins/gtkui/interface.c:1796
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Traccia"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Modalità di ReplayGain (volume regolabile)"
 
-#: ../plugins/gtkui/interface.c:1804
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Modalità ripetizione:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Aggiungi files da linea di comando (o file manager) a questa playlist:"
 
-#: ../plugins/gtkui/interface.c:1813
-#: ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Riprendi sessione precedente all'avvio"
 
-#: ../plugins/gtkui/interface.c:1817
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: ../plugins/gtkui/interface.c:1826
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configura"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Salva preset"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Chiudi minimizza nel vassoio di sistema"
 
-#: ../plugins/gtkui/interface.c:1830
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Il pulsante centrale del mouse chiude la playlist"
 
-#: ../plugins/gtkui/interface.c:1834
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Nasconde l'icona nel vassoio di sistema"
 
-#: ../plugins/gtkui/interface.c:1838
-#: ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Usa il grassetto per la canzone in riproduzione"
 
-#: ../plugins/gtkui/interface.c:1842
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Nascondi \"Cancella dal disco\" dal menù contestuale"
 
-#: ../plugins/gtkui/interface.c:1850
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Testo della titlebar mentre riproduce:"
 
-#: ../plugins/gtkui/interface.c:1864
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Testo della titlebar quando fermata:"
 
-#: ../plugins/gtkui/interface.c:1874
-#: ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888
-#: ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Sovrascrivere"
 
-#: ../plugins/gtkui/interface.c:1897
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Primo piano"
 
-#: ../plugins/gtkui/interface.c:1904
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Di fondo"
 
-#: ../plugins/gtkui/interface.c:1923
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Colori della Seekbar/Barra del volume"
 
-#: ../plugins/gtkui/interface.c:1941
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Centrale"
 
-#: ../plugins/gtkui/interface.c:1948
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Chiaro"
 
-#: ../plugins/gtkui/interface.c:1955
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Scuro"
 
-#: ../plugins/gtkui/interface.c:1986
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:1993
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Testo"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Colore delle schede"
 
-#: ../plugins/gtkui/interface.c:2002
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Sovrascrivi (perdita del tema GTK ma rendering più veloce)"
 
-#: ../plugins/gtkui/interface.c:2011
-#: ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Righe pari"
 
-#: ../plugins/gtkui/interface.c:2018
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Righe dispari"
 
-#: ../plugins/gtkui/interface.c:2037
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Testo"
-
-#: ../plugins/gtkui/interface.c:2044
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Riga selezionata"
 
-#: ../plugins/gtkui/interface.c:2063
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Testo selezionato"
 
-#: ../plugins/gtkui/interface.c:2076
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Cursore"
 
-#: ../plugins/gtkui/interface.c:2089
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Colori della playlist"
 
-#: ../plugins/gtkui/interface.c:2093
-#: ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Colori"
 
-#: ../plugins/gtkui/interface.c:2102
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Abilita il server proxy"
 
-#: ../plugins/gtkui/interface.c:2110
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Indirizzo del server proxy:"
 
-#: ../plugins/gtkui/interface.c:2124
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Porta del server proxy:"
 
-#: ../plugins/gtkui/interface.c:2138
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tipo proxy:"
 
-#: ../plugins/gtkui/interface.c:2157
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nome utente del proxy:"
 
-#: ../plugins/gtkui/interface.c:2170
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Password del proxy"
 
-#: ../plugins/gtkui/interface.c:2180
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Rete"
 
-#: ../plugins/gtkui/interface.c:2208
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Raggruppamento"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Formato:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Selezione"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Scrivi etichetta"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Scrivi ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212
-#: ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Scrivi ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216
-#: ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Scrivi APEv2"
 
-#: ../plugins/gtkui/interface.c:2224
-#: ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Strip ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228
-#: ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Strip ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232
-#: ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Strip APEv2"
 
-#: ../plugins/gtkui/interface.c:2240
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versione ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (raccomandato)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254
-#: ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 codifica caratteri (predefinito iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Scrivi ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Scrivi etichetta"
-
-#: ../plugins/gtkui/interface.c:2391
-#: ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: ../plugins/gtkui/interface.c:2406
-#: ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Autore(i):"
-
-#: ../plugins/gtkui/interface.c:2421
-#: ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "E-Mail:"
-
-#: ../plugins/gtkui/interface.c:2436
-#: ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Sito internet:"
-
-#: ../plugins/gtkui/interface.c:2467
-#: ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Configura"
-
-#: ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/gtkui/interface.c:2853
-#: ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "Modificaplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081
-#: ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Raggruppamento"
-
-#: ../plugins/gtkui/interface.c:3106
-#: ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formati di conversione (iniza con %):\n"
-" [a]rtista, [t]itolo, al[b]um, [B]and, [C]ompositore\n"
-" traccia[n]umero, [N]TracceTotali,\n"
-" [l]unghezza, [y]anno, [g]enere, [c]ommento,\n"
-" copy[r]ight, [f]NomeFile, [T]Etichetta\n"
-"Esempio: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301
-#: ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artista / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302
-#: ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Traccia N°"
 
-#: ../plugins/gtkui/mainplaylist.c:303
-#: ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Titolo / Traccia Artista"
-
-#: ../plugins/gtkui/mainplaylist.c:304
-#: ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Durata"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Cancella files dal disco"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1004,201 +931,223 @@
 "I files andranno persi. Procedere?\n"
 " (Questo dialogo può essere spento in Opzioni plugin --> GTKUI"
 
-#: ../plugins/gtkui/plcommon.c:325
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Aggiungi alla coda di riproduzione"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Rimuovi dalla coda di riproduzione"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Ricarica metadati"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Rimuovi dal disco"
 
-#: ../plugins/gtkui/plcommon.c:719
-#: ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Aggiungi colonna"
 
-#: ../plugins/gtkui/plcommon.c:749
-#: ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Modifica colonna"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Rimuovi colonna"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Raggruppamento"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Nessuno"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Apri file..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Configura %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Configura"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Dispositivo audio predefinito"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Scorciatoie da tastiera globali"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Combinazioni di tasti"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464
-#: ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Plugin d'uscita ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Sto aggiungendo i files..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inizializzazione..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Hai modificato i dati per questa traccia."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Vuoi davvero chiudere la finestra?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tipo(i) di etichetta(e)"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet incorporato"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Sì"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "No"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Tasti"
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Valore"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeadBeeF sta riproducendo"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Vuoi davvero chiudere la finestra?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Aggiungi file"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Rimuovi"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Uso: deadbeef [opzioni] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opzioni:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Stampa l'aiuto ed esce\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Esce dal player\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Stampa la versione ed esce\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Inizia la riproduzione\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Ferma la riproduzione\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pausa nella riproduzione\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Canzone successiva nella playlist\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Canzone precedente nella playlist\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Canzone casuale nella playlist\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Aggiunge file(s) ad una playlist esistente\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Stampa il nome della traccia formattato in stdout\n"
+msgstr ""
+" --nowplaying FMT Stampa il nome della traccia formattato in stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1209,17 +1158,35 @@
 " [l]unghezza, traccia[n]umero, [y]anno, [c]ommento,\n"
 " copy[r]ight, [e]trascorso\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " es: --nowplaying \"%%a - %%t\" dovrebbe stampare \"artista - titolo\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" es: --nowplaying \"%%a - %%t\" dovrebbe stampare "
+"\"artista - titolo\"\n"
 
-#: ../playlist.c:377
-#: ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Sì"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "No"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1227,7 +1194,13 @@
 "2.3 (raccomandato)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1237,17 +1210,18 @@
 "Traccia\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1263,7 +1237,7 @@
 "Band / Album Artista\n"
 "Personalizzato"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1271,68 +1245,677 @@
 "Sinistra\n"
 "Destra"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "File pixmap non trovato: %s"
 
-#: ../plugins/vorbis/vcedit.c:129
-#: ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Impossibile ottenere memoria sufficiente per il buffering d'ingresso"
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: file di configurazione freepats non trovato. Per favore install "
+"timidy-freepats o specifica un percorso a freepats.cfg nella sezione "
+"Impostazione Plugins."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Aggiungi Audio CD"
 
-#: ../plugins/vorbis/vcedit.c:179
-#: ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Errore nella lettura della prima pagina del bitstream Ogg."
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185
-#: ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Errore durante la lettura inziale dei pacchetti di testa."
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Impossibile ottenere abbastanza memoria per registrare il numero di serie del nuovo flusso"
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "Testo della titlebar quando fermata:"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Il file immesso è troncato o vuoto."
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Il file immesso non è un bitstream Ogg."
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Abilita il server proxy"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Il file Ogg non contiene dati Vorbis."
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeadBeeF sta riproducendo"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Fine del file prima di aver riconosciuto lo stream."
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Nome utente del proxy:"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Il flusso Ogg non contiene un tipo di dati riconosciuto."
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Password del proxy"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Header secondario corrotto"
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Fine del file raggiunta prima della fine dell'intestazione Vorbis."
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Dati persi o corrotti, continuo..."
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
-msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "Errore di scrittura del file di uscita. Il flusso di uscita potrebbe essere danneggiato o troncato."
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Cancella files dal disco"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Album Art"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Traccia N°"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Titolo / Traccia Artista"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "File numero"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Aggiungi locazione"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tipo(i) di etichetta(e)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet incorporato"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Seleziona tutto"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Modifica colonna"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Salva preset"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Salva preset"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Salva preset"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Salva preset"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Dispositivo d'uscita:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Plugin d'uscita:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Salva preset"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Sovrascrivere"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Carica preset"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Plugin d'uscita:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: file di configurazione freepats non trovato. Per favore install timidy-freepats o specifica un percorso a freepats.cfg nella sezione Impostazione Plugins."
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Scrivi APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Scrivi ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Scrivi ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Scrivi etichetta"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Salva playlist come"
+
+#~ msgid "_Abort"
+#~ msgstr "_Ferma"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "ATTENZIONE: la scrittura delle tag è una funzione in sviluppo. \n"
+#~ "Fai un backup prima di usare questa funzione"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Lunghezza"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formati conversione (inzia con %):\n"
+#~ " [a]rtista, [t]itolo, al[b]um, [B]and, [C]ompositore\n"
+#~ " Traccia[n]umero, [N]TracceTotali,\n"
+#~ " [l]unghezza, [y]Anno, [g]enere, [c]ommento,\n"
+#~ " copy[r]ight, [f]NomeFile, [F]NomeCompletoFile, [T]ags,\n"
+#~ " [d]cartella, [D]CartellaConPercorso\n"
+#~ "Example: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Consenti il cambio dinamico delle frequenze di campionamento"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Qualità della conversione della frequenza di campionamento:"
+
+#~ msgid "Description:"
+#~ msgstr "Descrizione:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autore(i):"
+
+#~ msgid "Email:"
+#~ msgstr "E-Mail:"
+
+#~ msgid "Website:"
+#~ msgstr "Sito internet:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "Modificaplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formati di conversione (iniza con %):\n"
+#~ " [a]rtista, [t]itolo, al[b]um, [B]and, [C]ompositore\n"
+#~ " traccia[n]umero, [N]TracceTotali,\n"
+#~ " [l]unghezza, [y]anno, [g]enere, [c]ommento,\n"
+#~ " copy[r]ight, [f]NomeFile, [T]Etichetta\n"
+#~ "Esempio: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configura %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Plugin d'uscita ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr ""
+#~ "Impossibile ottenere memoria sufficiente per il buffering d'ingresso"
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Errore nella lettura della prima pagina del bitstream Ogg."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Errore durante la lettura inziale dei pacchetti di testa."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Impossibile ottenere abbastanza memoria per registrare il numero di serie "
+#~ "del nuovo flusso"
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Il file immesso è troncato o vuoto."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Il file immesso non è un bitstream Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Il file Ogg non contiene dati Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Fine del file prima di aver riconosciuto lo stream."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Il flusso Ogg non contiene un tipo di dati riconosciuto."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Header secondario corrotto"
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Fine del file raggiunta prima della fine dell'intestazione Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Dati persi o corrotti, continuo..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Errore di scrittura del file di uscita. Il flusso di uscita potrebbe "
+#~ "essere danneggiato o troncato."

deadbeef-0.5.1.tar.bz2/po/ja.po -> deadbeef-0.5.2.tar.bz2/po/ja.po Changed

@@ -8,794 +8,870 @@
 msgstr ""
 "Project-Id-Version: deadbeef devel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-07 18:38+0900\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-06-29 17:37+0900\n"
 "Last-Translator: Hironao Komatsu <hironao@users.sourceforge.net>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\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"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "サポートされている音声フォーマット"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "他のファイル (*)"
+#, fuzzy
+#~ msgid "All files (*)"
+#~ msgstr "他のファイル (*)"
 
-#: ../plugins/gtkui/callbacks.c:117
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "ファイルを開く..."
 
-#: ../plugins/gtkui/callbacks.c:150
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "ファイルをプレイリストに追加..."
 
-#: ../plugins/gtkui/callbacks.c:182
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "フォルダをプレイリストに追加..."
 
-#: ../plugins/gtkui/callbacks.c:640
+#~ msgid "Follow symlinks"
+#~ msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "ヘルプファイルの読み込み中に失敗しました"
 
-#: ../plugins/gtkui/callbacks.c:650
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "ヘルプファイルの読み込みに失敗しました"
 
-#: ../plugins/gtkui/callbacks.c:664 ../plugins/gtkui/interface.c:1105
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#~ msgid "help.txt"
+#~ msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../plugins/gtkui/callbacks.c:674
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s について"
 
-#: ../plugins/gtkui/callbacks.c:685
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s の更新履歴"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#, fuzzy, c-format
+#~ msgid "DeaDBeeF Translators"
+#~ msgstr "DeaDBeeF は現在演奏中です"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "プレイリストの編集"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "タイトル:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "プレイリストの名前変更"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "プレイリストの削除"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "プレイリストの新規追加"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "DeaDBeeF イコライザ設定の保存"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "DeaDBeeF イコライザ設定を読み込む..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Foobar2000 イコライザ設定をインポート..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 イコライザ設定 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "イコライザ設定を保存"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "イコライザ設定の読み込み"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 イコライザ設定をインポート"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "有効にする"
 
-#: ../plugins/gtkui/eq.c:299
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "すべてゼロに"
 
-#: ../plugins/gtkui/eq.c:306
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "プリアンプをゼロに"
 
-#: ../plugins/gtkui/eq.c:313
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "バンドをゼロに"
 
-#: ../plugins/gtkui/eq.c:320
-msgid "Save Preset"
-msgstr "イコライザ設定を保存"
+#, fuzzy
+#~ msgid "Presets"
+#~ msgstr "イコライザ設定を保存"
 
-#: ../plugins/gtkui/eq.c:327
-msgid "Load Preset"
-msgstr "イコライザ設定の読み込み"
-
-#: ../plugins/gtkui/eq.c:334
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 イコライザ設定をインポート"
-
-#: ../plugins/gtkui/gtkui.c:128
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 日 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:131
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d 日 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:140
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "停止 | %d トラック | %s 合計演奏時間"
 
-#: ../plugins/gtkui/gtkui.c:150
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:150
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:176
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "ポーズ | "
 
-#: ../plugins/gtkui/gtkui.c:177
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d トラック | %s 合計演奏時間"
 
-#: ../plugins/gtkui/gtkui.c:533
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "名前をつけてプレイリストを保存"
 
-#: ../plugins/gtkui/gtkui.c:542 ../plugins/gtkui/gtkui.c:603
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF プレイリストファイル (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:596
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "プレイリストをロード"
 
-#: ../plugins/gtkui/gtkui.c:741
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "他のファイル (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "新規プレイリスト"
 
-#: ../plugins/gtkui/gtkui.c:744
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新規プレイリスト (%d)"
 
-#: ../plugins/gtkui/interface.c:140 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../plugins/gtkui/interface.c:147 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "ファイルを開く(_O)"
 
-#: ../plugins/gtkui/interface.c:163 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "ファイルを追加"
 
-#: ../plugins/gtkui/interface.c:171 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "フォルダを追加"
 
-#: ../plugins/gtkui/interface.c:179 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "Add Audio CD"
-msgstr "音楽 CD を追加"
-
-#: ../plugins/gtkui/interface.c:187 ../plugins/gtkui/interface.c:2870
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "場所を追加"
 
-#: ../plugins/gtkui/interface.c:196 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "新規プレイリスト"
 
-#: ../plugins/gtkui/interface.c:203 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "プレイリストをロード"
 
-#: ../plugins/gtkui/interface.c:207 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "プレイリストを保存"
 
-#: ../plugins/gtkui/interface.c:211 ../plugins/gtkui/deadbeef.glade.h:100
-msgid "Save playlist as"
-msgstr "名前をつけてプレイリストを保存"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../plugins/gtkui/interface.c:231 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../plugins/gtkui/interface.c:238 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: ../plugins/gtkui/interface.c:246 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "すべて選択"
 
-#: ../plugins/gtkui/interface.c:253 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "すべて選択解除"
 
-#: ../plugins/gtkui/interface.c:260 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "選択の反転"
 
-#: ../plugins/gtkui/interface.c:264 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "選択"
 
-#: ../plugins/gtkui/interface.c:271 ../plugins/gtkui/plcommon.c:387
-#: ../plugins/gtkui/prefwin.c:272 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "取り除く"
 
-#: ../plugins/gtkui/interface.c:279 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "選択以外を取り除く"
 
-#: ../plugins/gtkui/interface.c:283 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "検索(_F)"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1706
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#~ msgid "Sort By"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "タイトル"
+
+#, fuzzy
+#~ msgid "Track number"
+#~ msgstr "ファイル番号"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "アルバム"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "アーティスト"
+
+#~ msgid "Date"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "カスタム"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "ステータスバー"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "カラムのヘッダ"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "タブ"
 
-#: ../plugins/gtkui/interface.c:318 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "イコライザ"
 
-#: ../plugins/gtkui/interface.c:322 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: ../plugins/gtkui/interface.c:329 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "演奏順"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "順に"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Shuffle"
-msgstr "シャッフル"
+#, fuzzy
+#~ msgid "Shuffle tracks"
+#~ msgstr "シャッフル"
+
+#, fuzzy
+#~ msgid "Shuffle albums"
+#~ msgstr "シャッフル"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "ランダム"
 
-#: ../plugins/gtkui/interface.c:354 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "ループ"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "全体をループ"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "一つの曲をループ"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "ループしない"
 
-#: ../plugins/gtkui/interface.c:379 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "再生に従ってスクロール"
 
-#: ../plugins/gtkui/interface.c:384 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "再生に従ってカーソルを移動"
 
-#: ../plugins/gtkui/interface.c:388 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "現在の再生の終了後に停止"
 
-#: ../plugins/gtkui/interface.c:395 ../plugins/gtkui/interface.c:402
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#~ msgid "Jump to current track"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../plugins/gtkui/interface.c:410 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "更新履歴(_C)"
 
-#: ../plugins/gtkui/interface.c:432 ../plugins/gtkui/deadbeef.glade.h:131
+#~ msgid "_GPLv2"
+#~ msgstr ""
+
+#~ msgid "_LGPLv2.1"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "情報(_A)"
 
-#: ../plugins/gtkui/interface.c:816 ../plugins/gtkui/deadbeef.glade.h:102
+#, fuzzy
+#~ msgid "_Translators"
+#~ msgstr "DeaDBeeF は現在演奏中です"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "検索"
 
-#: ../plugins/gtkui/interface.c:891 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:899 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:907 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "ポーズ"
 
-#: ../plugins/gtkui/interface.c:915 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "前へ"
 
-#: ../plugins/gtkui/interface.c:923 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "次へ"
 
-#: ../plugins/gtkui/interface.c:931 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "ランダムに再生"
 
-#: ../plugins/gtkui/interface.c:940 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "情報"
 
-#: ../plugins/gtkui/interface.c:953 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "終了"
 
-#: ../plugins/gtkui/interface.c:1025 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "ファイルの追加..."
-
-#: ../plugins/gtkui/interface.c:1069 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "_Abort"
-msgstr "中止(_A)"
-
-#: ../plugins/gtkui/interface.c:1170 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "トラックのプロパティ"
 
-#: ../plugins/gtkui/interface.c:1194 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"警告: タグの書き出し機能はまだ開発段階です。\n"
-"使用前にバックアップを作成してください。"
+#~ msgid "Settings"
+#~ msgstr ""
 
-#: ../plugins/gtkui/interface.c:1221 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: ../plugins/gtkui/interface.c:1242 ../plugins/gtkui/interface.c:1288
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../plugins/gtkui/interface.c:1246 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: ../plugins/gtkui/interface.c:1292 ../plugins/gtkui/plcommon.c:402
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1393 ../plugins/gtkui/interface.c:2770
-#: ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Title:"
-msgstr "タイトル:"
-
-#: ../plugins/gtkui/interface.c:1401 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "新規カラムのタイトルをここに入力します"
 
-#: ../plugins/gtkui/interface.c:1409 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "形式:"
 
-#: ../plugins/gtkui/interface.c:1417
-msgid "File number"
-msgstr "ファイル番号"
+#~ msgid "Item Index"
+#~ msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/mainplaylist.c:297
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:1419
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: ../plugins/gtkui/interface.c:1420
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "アーティスト - アルバム"
 
-#: ../plugins/gtkui/interface.c:1421 ../plugins/gtkui/plcommon.c:774
-msgid "Artist"
-msgstr "アーティスト"
-
-#: ../plugins/gtkui/interface.c:1422 ../plugins/gtkui/interface.c:1795
-msgid "Album"
-msgstr "アルバム"
-
-#: ../plugins/gtkui/interface.c:1423 ../plugins/gtkui/prefwin.c:488
-msgid "Title"
-msgstr "タイトル"
-
-#: ../plugins/gtkui/interface.c:1424
-msgid "Length"
-msgstr "長さ"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "演奏時間"
 
-#: ../plugins/gtkui/interface.c:1425 ../plugins/gtkui/interface.c:1794
-msgid "Track"
-msgstr "トラック"
+#, fuzzy
+#~ msgid "Track Number"
+#~ msgstr "トラック番号"
 
-#: ../plugins/gtkui/interface.c:1426
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "バンド / アルバムのアーティスト"
 
-#: ../plugins/gtkui/interface.c:1427 ../plugins/gtkui/plcommon.c:778
-msgid "Custom"
-msgstr "カスタム"
-
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "書式:"
 
-#: ../plugins/gtkui/interface.c:1448 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "配置:"
 
-#: ../plugins/gtkui/interface.c:1456
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1457
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1459 ../plugins/gtkui/interface.c:3007
-#: ../plugins/gtkui/deadbeef.glade.h:47
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"書式変換 (% に続けて):\n"
-" アーティスト[a], タイトル[t], アルバム[b], バンド[B], 作曲[C]\n"
-" トラック番号[n], トラック数[N],\n"
-" 長さ[l], 年[y], ジャンル[g], コメント[c],\n"
-" 著作権[r], ファイル名[f], タグ[T]\n"
-"例: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1488 ../plugins/gtkui/interface.c:2801
-#: ../plugins/gtkui/interface.c:2913 ../plugins/gtkui/interface.c:3036
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../plugins/gtkui/interface.c:1509 ../plugins/gtkui/interface.c:2822
-#: ../plugins/gtkui/interface.c:2934 ../plugins/gtkui/interface.c:3057
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../plugins/gtkui/interface.c:1726 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "出力プラグイン:"
 
-#: ../plugins/gtkui/interface.c:1739 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "出力デバイス:"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:109
+#~ msgid "Always convert 8 bit audio to 16 bit"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "音声"
 
-#: ../plugins/gtkui/interface.c:1757 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "動的なサンプルレートの切り替えを許す"
-
-#: ../plugins/gtkui/interface.c:1765 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Samplerate conversion quality:"
-msgstr "サンプルレート変換の品質:"
-
-#: ../plugins/gtkui/interface.c:1784 ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "リプレイゲインのモード:"
 
-#: ../plugins/gtkui/interface.c:1793
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "無効"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "トラック"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "リプレイゲインのピークを調整する"
 
-#: ../plugins/gtkui/interface.c:1801 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Sound (adv.)"
-msgstr "音声 (高度)"
+#~ msgid "-12 dB"
+#~ msgstr ""
+
+#~ msgid "+12 dB"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Replaygain preamp:"
+#~ msgstr "リプレイゲインのモード:"
+
+#, fuzzy
+#~ msgid "Global preamp:"
+#~ msgstr "リプレイゲインのモード:"
+
+#~ msgid "Add files from command line (or file manager) to this playlist:"
+#~ msgstr ""
+
+#~ msgid "Resume previous session on startup"
+#~ msgstr ""
+
+#~ msgid "Don't add from archives when adding folders"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Playback"
+#~ msgstr "再生(_P)"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "設定"
+
+#, fuzzy
+#~ msgid "DSP Chain Preset"
+#~ msgstr "イコライザ設定を保存"
+
+#~ msgid "_Load"
+#~ msgstr ""
+
+#~ msgid "DSP"
+#~ msgstr ""
 
-#: ../plugins/gtkui/interface.c:1810 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "ウィンドウを閉じたときシステムトレイに格納"
 
-#: ../plugins/gtkui/interface.c:1814 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "マウスの中クリックでプレイリストを閉じる"
 
-#: ../plugins/gtkui/interface.c:1827 ../plugins/gtkui/interface.c:1871
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#~ msgid "Hide system tray icon"
+#~ msgstr ""
+
+#~ msgid "Use bold font for currently playing track"
+#~ msgstr ""
+
+#~ msgid "Hide \"Delete from disk\" context menu item"
+#~ msgstr ""
+
+#~ msgid "Auto-name playlists when adding a single folder"
+#~ msgstr ""
+
+#~ msgid "Interface refresh rate (times per second):"
+#~ msgstr ""
+
+#~ msgid "Titlebar text while playing:"
+#~ msgstr ""
+
+#~ msgid "Titlebar text while stopped:"
+#~ msgstr ""
+
+#~ msgid "GUI Plugin (changing requires restart):"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "GUI"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "デフォルトを上書きする"
 
-#: ../plugins/gtkui/interface.c:1836 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "前景色"
 
-#: ../plugins/gtkui/interface.c:1843 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "背景色"
 
-#: ../plugins/gtkui/interface.c:1862 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "シークバーと音量バーの色"
 
-#: ../plugins/gtkui/interface.c:1880 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "中間色"
 
-#: ../plugins/gtkui/interface.c:1887 ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "明色"
 
-#: ../plugins/gtkui/interface.c:1894 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "暗色"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "基底色"
 
-#: ../plugins/gtkui/interface.c:1932 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "文字色"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "タブの色"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "デフォルトを上書きする (GTKテーマが不適用になりますが描画が高速化します)"
 
-#: ../plugins/gtkui/interface.c:1950 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "偶数行"
 
-#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "奇数行"
 
-#: ../plugins/gtkui/interface.c:1976 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Text"
-msgstr "文字色"
-
-#: ../plugins/gtkui/interface.c:1983 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "選択の行"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "選択の文字色"
 
-#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "カーソル"
 
-#: ../plugins/gtkui/interface.c:2028 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "プレイリストの色"
 
-#: ../plugins/gtkui/interface.c:2032 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "GUI"
-msgstr "GUI"
+#~ msgid "Colors"
+#~ msgstr ""
 
-#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "プロクシサーバを有効にする"
 
-#: ../plugins/gtkui/interface.c:2049 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "プロクシサーバのアドレス:"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "プロクシサーバのポート番号:"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "プロクシの形式:"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "プロクシのユーザ名:"
 
-#: ../plugins/gtkui/interface.c:2109 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "プロクシのパスワード:"
 
-#: ../plugins/gtkui/interface.c:2119 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../plugins/gtkui/interface.c:2147 ../plugins/gtkui/deadbeef.glade.h:128
+#~ msgid "Version: "
+#~ msgstr ""
+
+#~ msgid "Copyright"
+#~ msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "グループ化"
+
+#~ msgid "Sort by..."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Format"
+#~ msgstr "書式:"
+
+#~ msgid "Ascending"
+#~ msgstr ""
+
+#~ msgid "Descending"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Select DSP Plugin"
+#~ msgstr "選択"
+
+#, fuzzy
+#~ msgid "Plugin"
+#~ msgstr "プラグイン"
+
+#, fuzzy
+#~ msgid "Tag Writer Settings"
+#~ msgstr "タグ書き出し"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "ID3v2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/interface.c:2278
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "ID3v1 の書き出し"
 
-#: ../plugins/gtkui/interface.c:2155 ../plugins/gtkui/interface.c:2234
-#: ../plugins/gtkui/interface.c:2274 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:2163 ../plugins/gtkui/interface.c:2242
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 の除去"
 
-#: ../plugins/gtkui/interface.c:2167 ../plugins/gtkui/interface.c:2290
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 の除去"
 
-#: ../plugins/gtkui/interface.c:2171 ../plugins/gtkui/interface.c:2246
-#: ../plugins/gtkui/interface.c:2286 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 の除去"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 のバージョン"
 
-#: ../plugins/gtkui/interface.c:2186
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (推奨)"
 
-#: ../plugins/gtkui/interface.c:2187
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2193 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 の文字エンコーディング (デフォルトは iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 の書き出し"
 
-#: ../plugins/gtkui/interface.c:2299 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Tag writer"
-msgstr "タグ書き出し"
-
-#: ../plugins/gtkui/interface.c:2330 ../plugins/gtkui/deadbeef.glade.h:23
-msgid "Description:"
-msgstr "説明:"
-
-#: ../plugins/gtkui/interface.c:2345 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "作者:"
-
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2375 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Website:"
-msgstr "Webサイト:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "Configure"
-msgstr "設定"
-
-#: ../plugins/gtkui/interface.c:2410 ../plugins/gtkui/deadbeef.glade.h:84
-msgid "Plugins"
-msgstr "プラグイン"
-
-#: ../plugins/gtkui/interface.c:2754 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2881 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:2982 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Group By"
-msgstr "グループ化"
-
-#: ../plugins/gtkui/mainplaylist.c:298 ../plugins/gtkui/search.c:433
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "アーティスト / アルバム"
 
-#: ../plugins/gtkui/mainplaylist.c:299 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "トラック番号"
 
-#: ../plugins/gtkui/mainplaylist.c:300 ../plugins/gtkui/search.c:435
-msgid "Title / Track Artist"
-msgstr "タイトル / トラックのアーティスト"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:436
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "演奏時間"
-
-#: ../plugins/gtkui/plcommon.c:316
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "ファイルをディスクから削除"
 
-#: ../plugins/gtkui/plcommon.c:317
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -803,191 +879,210 @@
 "ファイルは失われます。続けますか？\n"
 "(このダイアログは GTKUI プラグインの設定で無効にできます)"
 
-#: ../plugins/gtkui/plcommon.c:318 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/plcommon.c:363
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "再生キューへ追加"
 
-#: ../plugins/gtkui/plcommon.c:368
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "再生キューから削除"
 
-#: ../plugins/gtkui/plcommon.c:376
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "メタデータを再読み込み"
 
-#: ../plugins/gtkui/plcommon.c:392
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "ディスクから削除"
 
-#: ../plugins/gtkui/plcommon.c:616 ../plugins/gtkui/plcommon.c:741
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "カラムの追加"
 
-#: ../plugins/gtkui/plcommon.c:646 ../plugins/gtkui/plcommon.c:745
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "カラムの編集"
 
-#: ../plugins/gtkui/plcommon.c:749
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "カラムの削除"
 
-#: ../plugins/gtkui/plcommon.c:759
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "グループ化"
 
-#: ../plugins/gtkui/plcommon.c:766
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "なし"
 
-#: ../plugins/gtkui/plcommon.c:770
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "アーティスト/日付/アルバム"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "ファイルを開く..."
 
-#: ../plugins/gtkui/pluginconf.c:139
-#, c-format
-msgid "Setup %s"
-msgstr "%s の設定"
+#, fuzzy, c-format
+#~ msgid "Configure %s"
+#~ msgstr "設定"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "デフォルトの音声デバイス"
 
-#: ../plugins/gtkui/prefwin.c:267
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "追加"
 
-#: ../plugins/gtkui/prefwin.c:277
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "グローバルホットキー"
 
-#: ../plugins/gtkui/prefwin.c:332
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "スロット"
 
-#: ../plugins/gtkui/prefwin.c:333
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "キーの組み合わせ"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:379 ../plugins/gtkui/prefwin.c:569
-#: ../plugins.c:833
-msgid "ALSA output plugin"
-msgstr "ALSA 出力プラグイン"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "ファイルの追加..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "初期化中..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "あなたはこのトラックのデータを変更しました。"
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "本当にウィンドウを閉じますか？"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "タグの形式"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "埋め込みCUEシート"
+#~ msgid "[Multiple values] "
+#~ msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "はい"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "いいえ"
-
-#: ../plugins/gtkui/trkproperties.c:248 ../plugins/gtkui/trkproperties.c:260
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "キー"
 
-#: ../plugins/gtkui/trkproperties.c:249 ../plugins/gtkui/trkproperties.c:261
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "値"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF は現在演奏中です"
+#~ msgid "Writing tags..."
+#~ msgstr ""
+
+#~ msgid "Name:"
+#~ msgstr ""
 
-#: ../main.c:84
+#~ msgid "Field names must not start with : or _"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Cannot add field"
+#~ msgstr "ファイルを追加"
+
+#~ msgid "Field with such name already exists, please try different name."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Really remove selected field?"
+#~ msgstr "本当にウィンドウを閉じますか？"
+
+#, fuzzy
+#~ msgid "Add field"
+#~ msgstr "ファイルを追加"
+
+#, fuzzy
+#~ msgid "Remove field"
+#~ msgstr "取り除く"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "使い方: deadbeef [オプション] [ファイル...]\n"
 
-#: ../main.c:85
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "オプション:\n"
 
-#: ../main.c:86
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h ヘルプ (このメッセージ) を表示して終了\n"
 
-#: ../main.c:87
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit プレイヤを終了する\n"
 
-#: ../main.c:88
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version バージョン情報を表示して終了\n"
 
-#: ../main.c:89
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play 再生を開始する\n"
 
-#: ../main.c:90
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop 再生を停止する\n"
 
-#: ../main.c:91
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause ポーズする\n"
 
-#: ../main.c:92
+#, c-format
+#~ msgid " --toggle-pause Toggle pause\n"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ " --play-pause Start playback if stopped, toggle pause otherwise\n"
+#~ msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next プレイリストの次の曲へ\n"
 
-#: ../main.c:93
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev プレイリストの前の曲へ\n"
 
-#: ../main.c:94
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random プレイリストからランダムに選んだ曲へ\n"
 
-#: ../main.c:95
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue ファイルを既存のプレイリストに追加する\n"
 
-#: ../main.c:96
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying 書式 書式化されたトラック名を stdout に書き出します\n"
 
-#: ../main.c:97
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -999,7 +1094,7 @@
 " 長さ[l], トラック番号[n], 年[y], コメント[c],\n"
 " 著作権[r], 経過時間[e]\n"
 
-#: ../main.c:100
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1008,11 +1103,25 @@
 " 例: --nowplaying \"%%a - %%t\" は \"アーティスト - タイ"
 "トル\" と表示します\n"
 
-#: ../playlist.c:369 ../playlist.c:2212
+#, c-format
+#~ msgid ""
+#~ " for more info, see http://sourceforge.net/apps/"
+#~ "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+#~ msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "はい"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "いいえ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1020,7 +1129,12 @@
 "2.3 (推奨)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#~ msgid ""
+#~ "Ascending\n"
+#~ "Descending"
+#~ msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1030,33 +1144,33 @@
 "トラック\n"
 "アルバム"
 
-#: ../plugins/gtkui/deadbeef.glade.h:34
-msgid ""
-"File number\n"
-"Playing\n"
-"Album Art\n"
-"Artist - Album\n"
-"Artist\n"
-"Album\n"
-"Title\n"
-"Length\n"
-"Track\n"
-"Band / Album Artist\n"
-"Custom"
-msgstr ""
-"ファイル番号\n"
-"演奏中\n"
-"アルバムアート\n"
-"アーティスト - アルバム\n"
-"アーティスト\n"
-"アルバム\n"
-"タイトル\n"
-"長さ\n"
-"トラック\n"
-"バンド / アルバムのアーティスト\n"
-"カスタム"
-
-#: ../plugins/gtkui/deadbeef.glade.h:60
+#, fuzzy
+#~ msgid ""
+#~ "Item Index\n"
+#~ "Playing\n"
+#~ "Album Art\n"
+#~ "Artist - Album\n"
+#~ "Artist\n"
+#~ "Album\n"
+#~ "Title\n"
+#~ "Duration\n"
+#~ "Track Number\n"
+#~ "Band / Album Artist\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "ファイル番号\n"
+#~ "演奏中\n"
+#~ "アルバムアート\n"
+#~ "アーティスト - アルバム\n"
+#~ "アーティスト\n"
+#~ "アルバム\n"
+#~ "タイトル\n"
+#~ "長さ\n"
+#~ "トラック\n"
+#~ "バンド / アルバムのアーティスト\n"
+#~ "カスタム"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1065,61 +1179,571 @@
 "右"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmap ファイルが見つかりません: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "入力バッファに必要なメモリが確保できません。"
+#, c-format
+#~ msgid ""
+#~ "wildmidi: freepats config file not found. Please install timidity-freepats "
+#~ "package, or specify path to freepats.cfg in the plugin settings."
+#~ msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "音楽 CD を追加"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Ogg ビットストリームの最初のページの読み込みにエラー。"
+#~ msgid "Lookup on Last.fm"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "最初のヘッダのパケットの読み込みにエラー。"
+#~ msgid "Use ALSA resampling"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "新規ストリームのシリアル番号の登録に必要なメモリが確保できません。"
+#~ msgid "Release device while stopped"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "入力は欠損しているか空です。"
+#~ msgid "Preferred buffer size"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "入力は Ogg ビットストリームではありません。"
+#~ msgid "Preferred period size"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg ビットストリーム中に Vorbis データがありません。"
+#, fuzzy
+#~ msgid "Enable scrobbler"
+#~ msgstr "プロクシサーバを有効にする"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "認識できるストリームの前に EOF があります。"
+#, fuzzy
+#~ msgid "Disable nowplaying"
+#~ msgstr "DeaDBeeF は現在演奏中です"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg ビットストリーム中に対応したデータ型がありません。"
+#, fuzzy
+#~ msgid "Username"
+#~ msgstr "プロクシのユーザ名:"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "第2ヘッダが破損しています。"
+#, fuzzy
+#~ msgid "Password"
+#~ msgstr "プロクシのパスワード:"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Vorbis ヘッダの終わりの前に EOF があります。"
+#~ msgid "Scrobble URL"
+#~ msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "データは破損または失われています。続行..."
+#, fuzzy
+#~ msgid "Device file"
+#~ msgstr "取り除く"
 
-#: ../plugins/vorbis/vcedit.c:874
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"ストリームの書き出し時にエラー。出力ストリームは破損もしくは欠損している可能"
-"性があります。"
+#~ msgid "OSS4 samplerate bug workaround"
+#~ msgstr ""
+
+#~ msgid "Cache update period (hr)"
+#~ msgstr ""
+
+#~ msgid "Fetch from embedded tags"
+#~ msgstr ""
+
+#~ msgid "Fetch from local folder"
+#~ msgstr ""
+
+#~ msgid "Local cover file mask"
+#~ msgstr ""
+
+#~ msgid "Fetch from last.fm"
+#~ msgstr ""
+
+#~ msgid "Fetch from albumart.org"
+#~ msgstr ""
+
+#~ msgid "Scale artwork towards longer side"
+#~ msgstr ""
+
+#~ msgid "Use CDDB/FreeDB"
+#~ msgstr ""
+
+#~ msgid "Prefer CD-Text over CDDB"
+#~ msgstr ""
+
+#~ msgid "CDDB url (e.g. 'freedb.org')"
+#~ msgstr ""
+
+#~ msgid "CDDB port number (e.g. '888')"
+#~ msgstr ""
+
+#~ msgid "Prefer CDDB protocol over HTTP"
+#~ msgstr ""
+
+#~ msgid "Enable NRG image support"
+#~ msgstr ""
+
+#~ msgid "Resampling quality (0..2, higher is better)"
+#~ msgstr ""
+
+#~ msgid "Max song length (in minutes)"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Ask confirmation to delete files from disk"
+#~ msgstr "ファイルをディスクから削除"
+
+#~ msgid "Status icon volume control sensitivity"
+#~ msgstr ""
+
+#~ msgid "Custom status icon"
+#~ msgstr ""
+
+#~ msgid "Run gtk_init with --sync (debug mode)"
+#~ msgstr ""
+
+#~ msgid "Add separators between plugin context menu items"
+#~ msgstr ""
+
+#~ msgid "Notification title format"
+#~ msgstr ""
+
+#~ msgid "Notification content format"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Show album art"
+#~ msgstr "アルバムアート"
+
+#~ msgid "Album art size (px)"
+#~ msgstr ""
+
+#~ msgid "PulseAudio server"
+#~ msgstr ""
+
+#~ msgid "Samplerate"
+#~ msgstr ""
+
+#~ msgid "Relative seek table path"
+#~ msgstr ""
+
+#~ msgid "Absolute seek table path"
+#~ msgstr ""
+
+#~ msgid "Swap audio bytes (toggle if all you hear is static)"
+#~ msgstr ""
+
+#~ msgid "Enable HVSC Songlength DB"
+#~ msgstr ""
+
+#~ msgid "Songlengths.txt (from HVSC)"
+#~ msgstr ""
+
+#~ msgid "Bits per sample (8 or 16)"
+#~ msgstr ""
+
+#~ msgid "Default song length (sec)"
+#~ msgstr ""
+
+#~ msgid "Timidity++ bank configuration file"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Track Title"
+#~ msgstr "トラック番号"
+
+#~ msgid "Performer"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Total Tracks"
+#~ msgstr "タイトル / トラックのアーティスト"
+
+#~ msgid "Genre"
+#~ msgstr ""
+
+#~ msgid "Composer"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Disc Number"
+#~ msgstr "ファイル番号"
+
+#~ msgid "Comment"
+#~ msgstr ""
+
+#~ msgid "Encoder / Vendor"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Location"
+#~ msgstr "場所を追加"
+
+#~ msgid "Subtrack Index"
+#~ msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "タグの形式"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "埋め込みCUEシート"
+
+#~ msgid "Codec"
+#~ msgstr ""
+
+#~ msgid "File Extensions (separate with ';')"
+#~ msgstr ""
+
+#~ msgid "Convert"
+#~ msgstr ""
+
+#~ msgid "Target Samplerate"
+#~ msgstr ""
+
+#~ msgid "Quality / Algorythm"
+#~ msgstr ""
+
+#~ msgid "Automatic Samplerate (overrides Target Samplerate)"
+#~ msgstr ""
+
+#~ msgid "The file already exists. Overwrite?"
+#~ msgstr ""
+
+#~ msgid "Converter warning"
+#~ msgstr ""
+
+#~ msgid "Please select encoder"
+#~ msgstr ""
+
+#~ msgid "Converter error"
+#~ msgstr ""
+
+#~ msgid "Converting..."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Select folder..."
+#~ msgstr "すべて選択"
+
+#, fuzzy
+#~ msgid "Failed to save encoder preset"
+#~ msgstr "イコライザ設定の読み込み"
+
+#~ msgid ""
+#~ "Check preset folder permissions, try to pick different title, or free up "
+#~ "some disk space"
+#~ msgstr ""
+
+#~ msgid "Preset with the same name already exists. Try to pick another title."
+#~ msgstr ""
+
+#~ msgid "Error"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Add new encoder"
+#~ msgstr "カラムの編集"
+
+#, fuzzy
+#~ msgid "Edit encoder"
+#~ msgstr "カラムの編集"
+
+#, fuzzy
+#~ msgid "Remove preset"
+#~ msgstr "イコライザ設定を保存"
+
+#~ msgid "This action will delete the selected preset. Are you sure?"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoders"
+#~ msgstr "カラムの編集"
+
+#~ msgid "Add plugin to DSP chain"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Failed to save DSP preset"
+#~ msgstr "イコライザ設定を保存"
+
+#, fuzzy
+#~ msgid "New DSP Preset"
+#~ msgstr "イコライザ設定を保存"
+
+#, fuzzy
+#~ msgid "Edit DSP Preset"
+#~ msgstr "イコライザ設定を保存"
+
+#, fuzzy
+#~ msgid "DSP Presets"
+#~ msgstr "イコライザ設定を保存"
+
+#, fuzzy
+#~ msgid "Output folder:"
+#~ msgstr "出力デバイス:"
+
+#, fuzzy
+#~ msgid "Output file name:"
+#~ msgstr "出力プラグイン:"
+
+#~ msgid ""
+#~ "Extension (e.g. .mp3) will be appended automatically.\n"
+#~ "Leave the field empty for default (%a - %t)."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Encoder:"
+#~ msgstr "カラムの編集"
+
+#, fuzzy
+#~ msgid "DSP preset:"
+#~ msgstr "イコライザ設定を保存"
+
+#~ msgid "Number of threads:"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Output sample format:"
+#~ msgstr "出力プラグイン:"
+
+#~ msgid "Keep source format"
+#~ msgstr ""
+
+#~ msgid "8 bit signed int"
+#~ msgstr ""
+
+#~ msgid "16 bit signed int"
+#~ msgstr ""
+
+#~ msgid "24 bit signed int"
+#~ msgstr ""
+
+#~ msgid "32 bit signed int"
+#~ msgstr ""
+
+#~ msgid "32 bit float"
+#~ msgstr ""
+
+#~ msgid "When file exists:"
+#~ msgstr ""
+
+#~ msgid "Prompt"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Overwrite"
+#~ msgstr "デフォルトを上書きする"
+
+#~ msgid "Preserve folder structure, starting from:"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Edit Encoder Preset"
+#~ msgstr "イコライザ設定の読み込み"
+
+#, fuzzy
+#~ msgid "Untitled Encoder"
+#~ msgstr "カラムの編集"
+
+#, fuzzy
+#~ msgid "Output file extension:"
+#~ msgstr "出力プラグイン:"
+
+#~ msgid "E.g. mp3"
+#~ msgstr ""
+
+#~ msgid "Command line:"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Example: lame - %o\n"
+#~ "%i for input file, %o for output file, - for stdin"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "%o - output file name\n"
+#~ "%i - temporary input file name"
+#~ msgstr ""
+
+#~ msgid "Method:"
+#~ msgstr ""
+
+#~ msgid "Pipe"
+#~ msgstr ""
+
+#~ msgid "Temporary file"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "APEv2"
+#~ msgstr "APEv2 の書き出し"
+
+#, fuzzy
+#~ msgid "ID3v1"
+#~ msgstr "ID3v1 の書き出し"
+
+#~ msgid "OggVorbis"
+#~ msgstr ""
+
+#~ msgid "FLAC"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "ID3v2"
+#~ msgstr "ID3v2 の書き出し"
+
+#, fuzzy
+#~ msgid "Tag writer"
+#~ msgstr "タグ書き出し"
+
+#, fuzzy
+#~ msgid "DSP Preset Editor"
+#~ msgstr "イコライザ設定を保存"
+
+#, fuzzy
+#~ msgid "Untitled DSP Preset"
+#~ msgstr "イコライザ設定を保存"
+
+#~ msgid "Save playlist as"
+#~ msgstr "名前をつけてプレイリストを保存"
+
+#~ msgid "Shuffle"
+#~ msgstr "シャッフル"
+
+#~ msgid "_Abort"
+#~ msgstr "中止(_A)"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "警告: タグの書き出し機能はまだ開発段階です。\n"
+#~ "使用前にバックアップを作成してください。"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "File number"
+#~ msgstr "ファイル番号"
+
+#~ msgid "Length"
+#~ msgstr "長さ"
+
+#, no-c-format
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "書式変換 (% に続けて):\n"
+#~ " アーティスト[a], タイトル[t], アルバム[b], バンド[B], 作曲[C]\n"
+#~ " トラック番号[n], トラック数[N],\n"
+#~ " 長さ[l], 年[y], ジャンル[g], コメント[c],\n"
+#~ " 著作権[r], ファイル名[f], タグ[T]\n"
+#~ "例: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "動的なサンプルレートの切り替えを許す"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "サンプルレート変換の品質:"
+
+#~ msgid "Sound (adv.)"
+#~ msgstr "音声 (高度)"
+
+#~ msgid "Tag writer"
+#~ msgstr "タグ書き出し"
+
+#~ msgid "Description:"
+#~ msgstr "説明:"
+
+#~ msgid "Author(s):"
+#~ msgstr "作者:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Webサイト:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "タイトル / トラックのアーティスト"
+
+#, c-format
+#~ msgid "Setup %s"
+#~ msgstr "%s の設定"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA 出力プラグイン"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF は現在演奏中です"
+
+#~ msgid ""
+#~ "File number\n"
+#~ "Playing\n"
+#~ "Album Art\n"
+#~ "Artist - Album\n"
+#~ "Artist\n"
+#~ "Album\n"
+#~ "Title\n"
+#~ "Length\n"
+#~ "Track\n"
+#~ "Band / Album Artist\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "ファイル番号\n"
+#~ "演奏中\n"
+#~ "アルバムアート\n"
+#~ "アーティスト - アルバム\n"
+#~ "アーティスト\n"
+#~ "アルバム\n"
+#~ "タイトル\n"
+#~ "長さ\n"
+#~ "トラック\n"
+#~ "バンド / アルバムのアーティスト\n"
+#~ "カスタム"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "入力バッファに必要なメモリが確保できません。"
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Ogg ビットストリームの最初のページの読み込みにエラー。"
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "最初のヘッダのパケットの読み込みにエラー。"
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "新規ストリームのシリアル番号の登録に必要なメモリが確保できません。"
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "入力は欠損しているか空です。"
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "入力は Ogg ビットストリームではありません。"
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg ビットストリーム中に Vorbis データがありません。"
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "認識できるストリームの前に EOF があります。"
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg ビットストリーム中に対応したデータ型がありません。"
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "第2ヘッダが破損しています。"
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Vorbis ヘッダの終わりの前に EOF があります。"
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "データは破損または失われています。続行..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr "ストリームの書き出し時にエラー。出力ストリームは破損もしくは欠損している可能性があります。"

deadbeef-0.5.1.tar.bz2/po/kk.po -> deadbeef-0.5.2.tar.bz2/po/kk.po Changed

@@ -2,867 +2,1083 @@
 # Copyright (C) 2010 HZ
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-31 04:37+0000\n"
-"PO-Revision-Date: 2010-06-24 12:09+0600\n"
-"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-26 12:59+0200\n"
+"Last-Translator: sotrud_nik <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Қолдауы бар дыбыс пішімдері"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Басқа файлдар (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Барлық файлдар (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Файлд(дар)ды ашу..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Файл(дар)ды ойнату тізіміне қосу..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Бума(лар)ды ойнату тізіміне қосу..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Жарлықтардың соңынан жүру"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Көмек файлын оқу сәтсіз"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Көмек файлын жүктеу сәтсіз"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737
+#: ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Көмек"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeeF %s туралы"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s өзгерістері"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF аудармашылары"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755
+#: ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Ойнату тізімін түзету"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758
+#: ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922
+#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Атауы:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Ойнату тізімінің атын ауыстыру"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Ойнату тізімін өшіру"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "DeaDBeeF EQ баптауын сақтау"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ баптау файлдары (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "DeaDBeeF EQ баптауын жүктеу..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ баптаулары (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Foobar2000 EQ баптауын импорттау..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ баптаулары (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Баптауды сақтау"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Баптауды жүктеу"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 EQ баптауын импорттау"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
-msgstr "Қосу"
+msgstr "Іске қосу"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Барлығын нөлдеу"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Алдын-ала күшейтуді нөлдеу"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Жиіліктерді нөлдеу"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Баптауды сақтау"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Баптауды жүктеу"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 EQ баптауын импорттау"
+#: ../plugins/gtkui/eq.c:387
+#: ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Сақталған баптаулар"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 күн %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d күн %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Тоқтатылған | %d трек | %s жалпы уақыты"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбит/с "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Аялдатылған | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d трек | %s жалпы уақыты"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Ойнату тізімін қалайша сақтау"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF ойнату тізім файлдары (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Ойнату тізімін жүктеу"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Басқа файлдар (*)"
+
+#: ../plugins/gtkui/gtkui.c:926
+#: ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Жаңа ойнату тізімі (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150
+#: ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157
+#: ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "Ф_айл(дар)ды ашу"
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173
+#: ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Файл(дар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181
+#: ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Бума(лар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189
+#: ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Орналасуы бойынша қосу"
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198
+#: ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205
+#: ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Ойнату тізімін жүктеу"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209
+#: ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Ойнату тізімін сақтау"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Ойнату тізімін қалайша сақтау"
-
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218
+#: ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236
+#: ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "Та_зарту"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Барлығын таңдау"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251
+#: ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Таңдауды алып тастау"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258
+#: ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Таңдауды терістеу"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262
+#: ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Таңдалған"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269
+#: ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323
+#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Өшіру"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277
+#: ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Одан басқасын өшіру"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281
+#: ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "Ізд_еу"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288
+#: ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Қалайша сұрыптау"
+
+#: ../plugins/gtkui/interface.c:295
+#: ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318
+#: ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790
+#: ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Атауы"
+
+#: ../plugins/gtkui/interface.c:299
+#: ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Трек нөмірі"
+
+#: ../plugins/gtkui/interface.c:303
+#: ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875
+#: ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Альбом"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307
+#: ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Әртіс"
+
+#: ../plugins/gtkui/interface.c:311
+#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Күні"
+
+#: ../plugins/gtkui/interface.c:315
+#: ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017
+#: ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Таңдауыңызша"
+
+#: ../plugins/gtkui/interface.c:324
+#: ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328
+#: ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Түрі"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335
+#: ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Қалып-күй жолағы"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339
+#: ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Бағандар аттары"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343
+#: ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Беттер"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347
+#: ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351
+#: ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "О_йнату"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358
+#: ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Реті"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365
+#: ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Қалыпты"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Араластыру"
+#: ../plugins/gtkui/interface.c:370
+#: ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Тректерді араластыру"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:375
+#: ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Альбомдарды араластыру"
+
+#: ../plugins/gtkui/interface.c:380
+#: ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386
+#: ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Қайталау"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Барлығын қайталау"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Бір тректі қайталау"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403
+#: ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Қайталамау"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409
+#: ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Ағымдағы трек атын айналдыру"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414
+#: ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Ағымдағы тректі ерекшелеу"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418
+#: ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Ағымдағысынан кейін тоқтату"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430
+#: ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Ағымдағы трекке өту"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437
+#: ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Көмек"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452
+#: ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "Өз_герістер"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465
+#: ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474
+#: ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "О_сы туралы"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482
+#: ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "Ау_дармашылар"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898
+#: ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Іздеу"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973
+#: ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Тоқтату"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981
+#: ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Ойнату"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989
+#: ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Аялдату"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997
+#: ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005
+#: ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Келесі"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Кездейсоқты ойнату"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022
+#: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Осы туралы"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035
+#: ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Шығу"
 
-#: ../plugins/gtkui/interface.c:1045 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Файлдарды қосу..."
-
-#: ../plugins/gtkui/interface.c:1089 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "Ү_зу"
-
-#: ../plugins/gtkui/interface.c:1189 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225
+#: ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Трек қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1235 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270
+#: ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Баптаулар"
+
+#: ../plugins/gtkui/interface.c:1296
+#: ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "Іс_ке асыру"
 
-#: ../plugins/gtkui/interface.c:1256 ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317
+#: ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Жабу"
 
-#: ../plugins/gtkui/interface.c:1260 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321
+#: ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Метаақпарат"
 
-#: ../plugins/gtkui/interface.c:1306 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367
+#: ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1391 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Атауы:"
-
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494
+#: ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Жаңа баған атауын осында енгіңіз"
 
-#: ../plugins/gtkui/interface.c:1422 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502
+#: ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Түрі:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Реттік нөмірі"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511
+#: ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Ойналуда"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Альбом суреті"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Әртіс - Альбом"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Әртіс"
-
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Альбом"
-
-#: ../plugins/gtkui/interface.c:1436 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Атауы"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517
+#: ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Ұзақтығы"
 
-#: ../plugins/gtkui/interface.c:1438 ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Трек"
+#: ../plugins/gtkui/interface.c:1518
+#: ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Трек нөмірі"
 
-#: ../plugins/gtkui/interface.c:1439 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519
+#: ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Топ / Альбом әртісі"
 
-#: ../plugins/gtkui/interface.c:1440 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Таңдауыңызша"
-
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526
+#: ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Пішімі:"
 
-#: ../plugins/gtkui/interface.c:1461 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551
+#: ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Туралауы:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Сол жақ"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Оң жақ"
 
-#: ../plugins/gtkui/interface.c:1472 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Түрлендіру пішімі (басталуы - %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Мысалы: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501 ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040 ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583
+#: ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065
+#: ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../plugins/gtkui/interface.c:1522 ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061 ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604
+#: ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086
+#: ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1753 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Шығыс плагин:"
 
-#: ../plugins/gtkui/interface.c:1766 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838
+#: ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Шығыс құрылғы:"
 
-#: ../plugins/gtkui/interface.c:1775 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847
+#: ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "8 биттік аудионы әрқашан 16 биттіке түрлендіру"
+
+#: ../plugins/gtkui/interface.c:1851
+#: ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Дыбыс"
 
-#: ../plugins/gtkui/interface.c:1784 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Дискреттеу жиілігін түрлендіруге рұқсат ету"
-
-#: ../plugins/gtkui/interface.c:1792 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Интерполяция алгоритмі:"
-
-#: ../plugins/gtkui/interface.c:1811 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864
+#: ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Дыбыс қаттылығын авто түзету:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Сөндірулі"
 
-#: ../plugins/gtkui/interface.c:1824 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Трек"
+
+#: ../plugins/gtkui/interface.c:1877
+#: ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Пиктік мәнін қолдану"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892
+#: ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 дБ"
+
+#: ../plugins/gtkui/interface.c:1902
+#: ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 дБ"
+
+#: ../plugins/gtkui/interface.c:1906
+#: ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Дыбыс қаттылығын автотүзетудің алдын-ала күшейтілуі:"
+
+#: ../plugins/gtkui/interface.c:1913
+#: ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Дыбыс қаттылығын жалпы алдын-ала күшейту:"
+
+#: ../plugins/gtkui/interface.c:1944
+#: ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Бұл ойнату тізіміне файлдарды командалық жолдан (не файлдар басқарушысынан) қосу:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953
+#: ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Қосылғанда, соңғы сессияны жалғастыру"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957
+#: ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Бумаларды қосқан кезде архивтерден қоспау"
+
+#: ../plugins/gtkui/interface.c:1961
+#: ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Ойнату үрдісі"
 
-#: ../plugins/gtkui/interface.c:1854 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982
+#: ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Баптау"
+
+#: ../plugins/gtkui/interface.c:2017
+#: ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP тізбегінің баптауы"
+
+#: ../plugins/gtkui/interface.c:2029
+#: ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "Жү_ктеу"
+
+#: ../plugins/gtkui/interface.c:2033
+#: ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Жабу орнына трейге орналастыру"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046
+#: ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Тышқан орта батырмасы ойнату тізімін жабады"
 
-#: ../plugins/gtkui/interface.c:1862 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050
+#: ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Жүйелік сөре таңбашасын жасыру"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054
+#: ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Ағымдағы ойнатылып тұрған трек үшін жуан қаріпті қолдану"
 
-#: ../plugins/gtkui/interface.c:1870 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058
+#: ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "\"Қатты дисктен өшіру\" нұсқасын контекст мәзірінде көрсетпеу"
 
-#: ../plugins/gtkui/interface.c:1878 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062
+#: ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Бірлік буманы қосқан кезде ойнату тізімін автоатау"
+
+#: ../plugins/gtkui/interface.c:2070
+#: ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Интерфейсті жаңарту жиілігі (секундына рет)"
+
+#: ../plugins/gtkui/interface.c:2084
+#: ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Ойнатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Тоқтатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112
+#: ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI плагині (ауыстырылса, қайта қосу керек):"
+
+#: ../plugins/gtkui/interface.c:2120
+#: ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1916 ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135
+#: ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Алмастыру"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144
+#: ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Алдыңғы көрінісі"
 
-#: ../plugins/gtkui/interface.c:1932 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151
+#: ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170
+#: ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Үрдіс/дыбыс жолақтарының түстері"
 
-#: ../plugins/gtkui/interface.c:1969 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188
+#: ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Ортасы"
 
-#: ../plugins/gtkui/interface.c:1976 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Ашық түсті"
 
-#: ../plugins/gtkui/interface.c:1983 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202
+#: ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Күңгірт"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233
+#: ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Негізгі"
 
-#: ../plugins/gtkui/interface.c:2021 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240
+#: ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Мәтін"
+
+#: ../plugins/gtkui/interface.c:2253
+#: ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Беттер"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Алмастыру (GTK темасының баптаулары жоғалады, бірақ жылдамдығы артады)"
 
-#: ../plugins/gtkui/interface.c:2039 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271
+#: ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Жұп жол"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278
+#: ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Тақ жол"
 
-#: ../plugins/gtkui/interface.c:2065 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Мәтін"
-
-#: ../plugins/gtkui/interface.c:2072 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304
+#: ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Ерекшеленген жол"
 
-#: ../plugins/gtkui/interface.c:2091 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323
+#: ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Ерекшеленген мәтін"
 
-#: ../plugins/gtkui/interface.c:2104 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336
+#: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349
+#: ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Ойнату тізім түстері"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353
+#: ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Түстер"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362
+#: ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Прокси серверді іске қосу"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Прокси сервер адресі:"
 
-#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Прокси сервер порты:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398
+#: ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Прокси түрі:"
 
-#: ../plugins/gtkui/interface.c:2185 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417
+#: ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Прокси пайдаланушысы:"
 
-#: ../plugins/gtkui/interface.c:2198 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430
+#: ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Прокси паролі:"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440
+#: ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Желі"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471
+#: ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Нұсқасы:"
+
+#: ../plugins/gtkui/interface.c:2535
+#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../plugins/gtkui/interface.c:2545
+#: ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Плагиндер"
+
+#: ../plugins/gtkui/interface.c:3033
+#: ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135
+#: ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Қалайша топтау"
+
+#: ../plugins/gtkui/interface.c:3259
+#: ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Қалайша сұрыптау..."
+
+#: ../plugins/gtkui/interface.c:3275
+#: ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Пішімі"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Өсу ретімен"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Кему ретімен"
+
+#: ../plugins/gtkui/interface.c:3359
+#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "DSP плагинін таңдау"
+
+#: ../plugins/gtkui/interface.c:3375
+#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016
+#: ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Плагин"
+
+#: ../plugins/gtkui/interface.c:3461
+#: ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Тег жазушысы баптаулары"
+
+#: ../plugins/gtkui/interface.c:3492
+#: ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "ID3v2 жазу"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496
+#: ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "ID3v1 жазу"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500
+#: ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619
+#: ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 жазу"
 
-#: ../plugins/gtkui/interface.c:2252 ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508
+#: ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:2256 ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512
+#: ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 алып тастау"
 
-#: ../plugins/gtkui/interface.c:2260 ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516
+#: ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:2268 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524
+#: ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 нұсқасы"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Ұсынылады)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538
+#: ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 таңбалар кодалауы (бастапқысы iso8859-1)"
+msgstr "ID3v1 таңбалар кодталуы (бастапқысы iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 жазу"
 
-#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Тег жазушысы"
-
-#: ../plugins/gtkui/interface.c:2419 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Анықтамасы:"
-
-#: ../plugins/gtkui/interface.c:2434 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Автор(лар)ы:"
-
-#: ../plugins/gtkui/interface.c:2449 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2464 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Веб сайт:"
-
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Баптау"
-
-#: ../plugins/gtkui/interface.c:2499 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Плагиндер"
-
-#: ../plugins/gtkui/interface.c:2881 ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:3008 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Қалайша топтау"
-
-#: ../plugins/gtkui/interface.c:3134 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Түрлендіру пішімі (басталуы - %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Мысалы: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Әртіс / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317
+#: ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Трек №"
 
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Атауы / Трек әртісі"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Ұзақтығы"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Файлдарды дисктен өшіру"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -870,203 +1086,226 @@
 "Файлдар жоғалады. Жалғастырамыз ба?\n"
 "(Бұл сұхбат терезесін GTKUI плагин баптауларында сөндіруге болады)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340
+#: ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693
+#: ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Ескерту"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Ойнату кезегіне қосу"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Ойнату кезегінен өшіру"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Метаақпаратты қайта жүктеп алу"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Дискіден өшіру"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855
+#: ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Бағанды қосу"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885
+#: ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Бағанды түзету"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Бағанды өшіру"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Қалайша топтау"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Әртіс/Күні/Альбом"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Файлды ашу..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "%s баптаулары"
+msgid "Configure %s"
+msgstr "%s баптау"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Негізгі дыбыс құрылғысы"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318
+#: ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Қосу"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Ыстық пернелер"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Слот"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Пернелер комбинациясы"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA шығыс плагині"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Файлдарды қосу..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Іске қосылуда..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Осы трек үшін сіз ақпаратты түзеттіңіз."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Терезені шынымен жабу керек пе?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Орналасуы"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Бірнеше мәндер] "
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Ішкі жолшықтың аты"
+#: ../plugins/gtkui/trkproperties.c:407
+#: ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Кілт"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Тег түр(лер)і"
+#: ../plugins/gtkui/trkproperties.c:408
+#: ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Мәні"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Құрамындағы cue файлы"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Тегтерді жазу..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ия"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Аты:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Жоқ"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Өріс атауы : не _ таңбаларынан басталмауы тиіс"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Кодек"
+#: ../plugins/gtkui/trkproperties.c:634
+#: ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Өрісті қосу мүмкін емес"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Кілт"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Ондай атымен өріс бар болып тұр, басқа атауын көрсетіңіз."
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Мәні"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Таңдалған өрісті шынымен жабу керек пе?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Өрісті қосу"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF қазір ойнауда"
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Өрісті өшіру"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Қолданылуы: deadbeef [опциялар] [файл(дар)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Опциялары:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help не -h Көмек ақпаратын (осы) шығару мен шығу\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Плеерді жабу\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Нұсқа ақпаратын шығару мен шығу\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Ойнатуды бастау\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Ойнатуды тоқтату\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Ойнатуды аялдату\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Паузаны ауыстыру\n"
+
+#: ../main.c:100
+#, c-format
+msgid " --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Тоқтатылған болса, ойнату, болмаса, паузаны ауыстыру\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Ойнату тізіміндегі келесі трек\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Ойнату тізіміндегі алдыңғы трек\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Ойнату тізіміндегі кездейсоқ трек\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Файл(дар)ды бар ойнату тізіміне қосу\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying ПШМ Шығысқа пішімделген трек атын шығару\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1077,16 +1316,30 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
 msgstr " мыс.: --nowplaying \"%%a - %%t\" экранға \"artist - title\" шығаруы тиіс\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid " for more info, see http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " көбірек білу үшін, http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting қараңыз\n"
+
+#: ../playlist.c:454
+#: ../playlist.c:2398
 msgid "Default"
 msgstr "Бастапқы"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Иә"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Жоқ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1094,7 +1347,15 @@
 "2.3 (Ұсынылады)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Өсу ретімен\n"
+"Кему ретімен"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1104,7 +1365,7 @@
 "Трек\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1113,8 +1374,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1125,12 +1386,12 @@
 "Әртіс\n"
 "Альбом\n"
 "Атауы\n"
-"Ұзындығы\n"
-"Трек\n"
-"Топ / Альбом орындаушысы\n"
+"Ұзақтығы\n"
+"Трек нөмірі\n"
+"Топ / Альбом әртісі\n"
 "Таңдауыңызша"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1138,7 +1399,10 @@
 "Сол жақ\n"
 "Оң жақ"
 
-#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90
+#: ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90
+#: ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Сурет файлын табу мүмкін емес: %s"
@@ -1167,7 +1431,8 @@
 msgid "Release device while stopped"
 msgstr "Тоқтатылған кезде дыбыс құрылғысын босату"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8
+#: ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Таңдамалы буфер өлшемі"
 
@@ -1196,167 +1461,558 @@
 msgid "Scrobble URL"
 msgstr "Скробблинг сілтемесі"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Құрылғы файлы"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "OSS4 үшін дискреттеу жиілігінің қатесіне түзету"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Кэш жаңарту мерзімі (сағ)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Кеңейтілген тегтерден алу"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Жергілікті бумадан алу"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Жергілікті мұқаба үшін файл маскасы"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "last.fm сайтынан алу"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "albumart.org сайтынан алу"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Альбом мұқабасын ұзын жағы бойынша масштабтау"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "CDDB/FreeDB қолдану"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "CDDB алдында CD-Text таңдау"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB сілтемесі (мыс. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "CDDB порт нөмірі (мыс. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "HTTP алдында CDDB хаттамасын таңдау"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "NRG бейнелер қолдауын іске қосу"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Қайта дискретизация сапасы (0..2, жоғарырақ - жақсырақ)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Тректің макс. ұзындығы (мин)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Файлдарды дисктен өшіру алдында растауды сұрау"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Жүйелік сөредегі таңбашаның дыбыс өзгерту сезімділігі"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Таңдауыңызша жүйелік сөредегі таңбаша"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "gtk_init --sync қосып, жөнелту (жөндеу режимі)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Контекст мәзірі элементтері арасына ажыратқышты қосу"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Хабарлама пішімі"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Хабарлама атауының пішімі"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Хабарлама құрамасының пішімі"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Альбом суретін көрсету"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Альбом суретінің өлшемі (пикс)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio сервері"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Дискреттеу жиілігі"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Іздеу кестесінің салыстырмалы жолы"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Іздеу кестесінің абсолюттік жолы"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Аудио байттар орнын ауыстыру"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "HVSC іске қосу"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlength DB іске қосу"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "HVSC жолы"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (HVSC-дан)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Разрядтылығы (8 не 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Тректің үнсіз келісім б/ша ұзындығы (сек)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Timidity++ банкінің баптау файлы"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Трек атауы"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Орындайтын"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Күні"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Трек нөмірі"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Жалпы трек саны"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Диск нөмірі"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Комментарий"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
-msgstr "Кодер / Сатушы"
+msgstr "Кодтауыш / Шығарушы"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Copyright"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Орналасуы"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Ішкі жолшықтың аты"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Тег түр(лер)і"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Құрамындағы cue файлы"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Кодек"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Файл кеңейтулері (';' ажыратылады)"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Түрлендіру"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Мақсаттың дискреттеу жиілігі"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Сапасы / Алгоритмі"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Дискреттеудің автожиілігі (дискреттеу жиілігін қайта анықтайды)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Файл бар болып тұр. Оны үстінен жазу керек пе?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Түрлендіруші ескертуі"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Кодтауышты таңдаңыз"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Түрлендіруші қатесі"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Түрлендіру..."
+
+#: ../plugins/converter/convgui.c:394
+#: ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Буманы тандаңыз..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Кодтауыштың баптауын сақтау сәтсіз"
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Check preset folder permissions, try to pick different title, or free up some disk space"
+msgstr ""
+"Баптау сақталатын бума рұқсаттарын тексеріңіз, басқа атауды таңдаңыз не "
+"біршама диск кеңістігін босатыңыз."
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Ондай атымен баптау бар болып тұр. Басқа атын көрсетіңіз."
+
+#: ../plugins/converter/convgui.c:638
+#: ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Қате"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Жаңа кодтауышты қосу"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Кодтауышты түзету"
+
+#: ../plugins/converter/convgui.c:756
+#: ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Баптауды өшіру"
+
+#: ../plugins/converter/convgui.c:758
+#: ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Бұл әрекет нәтижесінде таңдалған баптау өшіріледі. Осыны қалайсыз ба?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Кодтауыштар"
+
+#: ../plugins/converter/convgui.c:838
+#: ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Плагинді DSP тізбегіне қосу"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "DSP баптауын сақтау сәтсіз"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Жаңа DSP баптауы"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "DSP баптауын түзету"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP баптаулары"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Шығыс бумасы:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Шығыс файл аты:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Кеңейтуі (мыс. .mp3) автоқосылады.\n"
+"Үнсіз келісім үшін бос қалдырыңыз (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Кодтауыш:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP баптауы:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Ағымдар саны:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Сэмплдердің шығыс пішімі:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Бастапқы пішімді қалдыру"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 биттік қалқымалы"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Файл бар болса:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Сұрау"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Үстінен жазу"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Бумалар құрылысын сақтау, бастап:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Кодтауыш баптауын түзету"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Атауысыз кодтауыш"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Шығыс файлдың кеңейтуі:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Мыс. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Командалық жол:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Мысалы: lame - %o\n"
+"%i кіріс файлы, %o шығыс файлы үшін, - stdin үшін"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - шығыс файлы аты\n"
+"%i - уақытша кіріс файлының аты"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Тәсіл:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Уақытша файл"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Тег жазушысы"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP баптау түзетушісі"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Атаусыз DSP баптауы"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Ойнату тізімін қалайша сақтау"
+
+#~ msgid "_Abort"
+#~ msgstr "Ү_зу"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Ұзақтығы"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Түрлендіру пішімі (басталуы - %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Мысалы: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Дискреттеу жиілігін түрлендіруге рұқсат ету"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Интерполяция алгоритмі:"
+
+#~ msgid "Description:"
+#~ msgstr "Анықтамасы:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Автор(лар)ы:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Веб сайт:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Түрлендіру пішімі (басталуы - %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Мысалы: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Атауы / Трек әртісі"
+
+#~ msgid "Setup %s"
+#~ msgstr "%s баптаулары"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA шығыс плагині"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF қазір ойнауда"
+
+#~ msgid "HVSC path"
+#~ msgstr "HVSC жолы"
 
 #~ msgid "about.txt"
 #~ msgstr "about.txt"
@@ -1383,7 +2039,9 @@
 #~ msgstr "Бастапқы тақырыптама дестесін оқу қатесі."
 
 #~ msgid "Couldn't get enough memory to register new stream serial number."
-#~ msgstr "Жаңа ағымның сериялық нөмірін тіркеу үшін керек жады мөлшерін алу мүмкін емес."
+#~ msgstr ""
+#~ "Жаңа ағымның сериялық нөмірін тіркеу үшін керек жады мөлшерін алу мүмкін "
+#~ "емес."
 
 #~ msgid "Input truncated or empty."
 #~ msgstr "Кіріс қиылған не бос болып тұр."
@@ -1409,8 +2067,12 @@
 #~ msgid "Corrupt or missing data, continuing..."
 #~ msgstr "Ақпарат зақымдалған не мүлдем жоқ, жалғастыру..."
 
-#~ msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-#~ msgstr "Шығысқа ағымды жазу қатесі. Шығыс ағымы зақымдалған не қиылған болуы мүмкін."
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Шығысқа ағымды жазу қатесі. Шығыс ағымы зақымдалған не қиылған болуы "
+#~ "мүмкін."
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"

deadbeef-0.5.1.tar.bz2/po/km.po -> deadbeef-0.5.2.tar.bz2/po/km.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-09-03 07:11+0200\n"
 "Last-Translator: SatyaN <satyathavy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,1013 +18,1124 @@
 "Plural-Forms: nplurals=1; plural=0 ;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "ដំណើរការជាមួយប្រពន័្ធសំលេង"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "ឯកសារផ្សេងទៀត (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "បើកឯកសារ..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "បន្ថែមឯកសារក្នុងបញ្ជីរ..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "មានកំហុសពេលកំពុងអានឯកសារជំនួយ"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "មានកំហុសពេលផ្ទុកឯកសារជំនួយ"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "ជំនួយ"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "អំពី DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF ផ្លាស់ប្តួរកំណត់ហេតុ"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "កែសំរួលបញ្ជីរ"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "ចំណងជើង"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "ប្តូរឈ្មោះបញ្ជីរ"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "លុបបញ្ជីរ"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "បន្ថែមបញ្ជីរថ្មី"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "រក្សា DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "ផ្ទុក DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "បញ្ចូល Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "ផ្ទុកកំណត់ជាមុន"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "បញ្ចូល Foobar2000 EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "អនុញ្ញាត"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "សូន្យទាំងអស់"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "គ្មានប្រដាប់បំពងសំលេង"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "គ្មានក្រុមតន្ត្រី"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "រក្សាទុកកំណត់ជាមុន"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "ផ្ទុកកំណត់ជាមុន"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "បញ្ចូល Foobar2000 EQ Preset..."
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "ម៉ូណូ"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "ស្តេរេអូ"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "ផ្អាក"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "រក្សាបញ្ជីរជា"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "ផ្ទុកបញ្ជីរ"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "ឯកសារផ្សេងទៀត (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "បង្កើតបញ្ជីរថ្មី"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "ទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "បើកទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "បញ្ចួលទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "បង្កើតថត"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "បង្កើតទីតាំង"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "បញ្ជីរថ្មី"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "ផ្ទុកបញ្ជីរ"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "រក្សាទុកបញ្ជីរ"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "រក្សាទុកបញ្ជីរជា"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "ចាកចេញ"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "កែសំរួល"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "ជម្រះ"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "ជ្រើសទាំងអស់"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "ដោះជម្រើសទាំងអស់"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "ដាក់បញ្ច្រាសជម្រើស"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "ជម្រើស"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "យកចេញ"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "ច្រឹប"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "សែ្វងរក"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "ចំណងជើង"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "លេខឯកសារ"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "អ៉ាល់បុ៑ម"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "អ្នកនិពន្ធ"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "ផ្ទាល់ខ្លួន"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "ចំណង់ចំណូលចិត្ត"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "មើល"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "របាស្ថានភាព"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "ក្បាលជួរឈរ"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "ផ្ទាំង"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "ធ្វើអោយស្មើគ្នា"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "ចាក់សារថ្មី"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "លំដាប់"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "លីនេអែ៑រ"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "ចៃដន្យ"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "ការរង្វិលជុំ"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "រង្វិលជុំទាំងអស់"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "រង្វិលជុំមួយបទម្តង"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "កុំរង្វិលជុំ"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "រមូរចាក់សារថ្មី"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "បញ្ចប់បន្ទាប់ពីបច្ចុប្បន្ន"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "ជំនួយ"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "ផ្លាស់ប្តួរកំណត់ហេតុ"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "អំពី"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "ឈប់"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "ចាក់"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "ផ្អាក"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "មុន"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "បន្ទាប់"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "ចាក់ចែដន្យ"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "អំពី"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "លះបង់"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "កំពុងផ្ទុកទិន្នន៍យ"
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "បោះបង់"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "ដានលក្ខណះសម្បត្តិ"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "អនុវត្ត"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "បិទ"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "មេតាទិន្នន៍យ"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "លក្ខណះសម្បត្តិ"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "ចំណងជើង"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "ប្រភេទ"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "លេខឯកសារ"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "កំពុងលេង"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "តាក់តែងអ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "អ្នកនិពន្ធ"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "អ៉ាល់បុ៑ម"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "ចំណងជើង"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "ថេរវេលា"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "ដាន"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "ក្រុម/ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "ផ្ទាល់ខ្លួន"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "ទ្រង់ទ្រាយ"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "តម្រឹម"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "ឆ្វេង"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "ស្តាំ"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "យល់ព្រម"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "ទិន្នផលកម្មវីធីជំនួយ"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "សំលេង"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Replaygain mode:"
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "ដាន"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1792
-msgid "Disable"
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
-msgid "Replaygain peak scale"
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "ចាក់សារថ្មី"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Write ID3v2"
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Write ID3v1"
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Write APEv2"
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Strip ID3v2"
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Strip ID3v1"
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Strip APEv2"
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
-msgid "ID3v2 version"
-msgstr ""
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "ទ្រង់ទ្រាយ"
 
-#: ../plugins/gtkui/interface.c:2247
-msgid "2.3 (Recommended)"
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2248
-msgid "2.4"
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "ជម្រើស"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Write ID3v2.4"
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr ""
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr ""
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "កំពុងផ្ទុកទិន្នន៍យ"
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
 msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "បញ្ចួលទិន្នន៍យ"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "យកចេញ"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1032,115 +1143,612 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
 msgstr ""
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "បង្កើតអូឌីយូសីឌី"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "តាក់តែងអ៉ាល់បុ៑ម"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:52
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "ចំណងជើង"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "លេខឯកសារ"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "បង្កើតទីតាំង"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "ជ្រើសទាំងអស់"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "ទិន្នផលកម្មវីធីជំនួយ"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "ទិន្នផលកម្មវីធីជំនួយ"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "រក្សាទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "ផ្ទុកកំណត់ជាមុន"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "ទិន្នផលកម្មវីធីជំនួយ"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "បង្កើតអូឌីយូសីឌី"
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "រក្សាទុកបញ្ជីរជា"
+
+#~ msgid "_Abort"
+#~ msgstr "បោះបង់"
+
+#~ msgid "Length"
+#~ msgstr "ថេរវេលា"

deadbeef-0.5.1.tar.bz2/po/lg.po -> deadbeef-0.5.2.tar.bz2/po/lg.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 0.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2011-03-09 19:44+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-09 15:01+0200\n"
 "Last-Translator: kizito <kbirabwa@yahoo.co.uk>\n"
 "Language-Team: LANGUAGE <kbirabwa@yahoo.co.uk>\n"
 "Language: lg\n"
@@ -18,850 +18,911 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Ebika bya fayiro ez'ebiwulirizibwa puloguramu z'etegeera"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Fayiro endala (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Fayiro zonna (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Bikkula fayiro..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Olukalala lw'enyimba lw'ongereko fayiro..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Olukalala lw'enyimba lwongereko (ma)terekero..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Bikkula n'ebituukibwako na nyunzi"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Wazewo kiremya mu kusoma fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Nnemedwa okubikkula fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Nyamba"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Okwanjula DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Olukalala lw'enyukakyuka eziri mu DeadBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Abaavvuunula DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Kyusa mu lukalala lw'enyimba"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Mutwe:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Kyusa erinnya ly'olukalala lw'enyimba"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Gyawo olukalala lw'ennyimba"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Kolawo olukalala lw'enyimba olupya"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "kaza koppi y'enteekateeka y'obwangufu bw'amaloboozi ag'omu DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr ""
 "Fayiro z'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Soma fayiro y'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF..."
+msgstr ""
+"Soma fayiro y'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr ""
 "Fayiro z'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr ""
 "Nona fayiro y'enteekateeka z'obwangufu bw'amalaboozi ey'ekika kya "
 "Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr ""
-"fayiro z'enteekateeka z'obwangufu bw'amaloboozi ez'ekika kya Foobar2000 "
-"(*.feq)"
+"fayiro z'enteekateeka z'obwangufu bw'amaloboozi ez'ekika kya Foobar2000 (*."
+"feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Soma koppi y'ebiteekateekedwa"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Nona koppi y'ebiteekateekedwa ey'ekika kya Foobar2000"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Zuukusa"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Byonna bidde ku zero"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Ekikangalazaddoboozi ekisooka kisse ku zero"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Amaloboozi gonna gadde ku zero"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Tereka koppi y'ebiteekateekedwa"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Soma koppi y'ebiteekateekedwa"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Nona koppi y'ebiteekateekedwa ey'ekika kya Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Koppi ez'ebiteekateekedwa ezaaterekebwa"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "Lunaku 1 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "Nnaku %d %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Eyimirizidwa | Ntambi %d | Awamu zimala %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Siteriyo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| kb %4d bs "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Luyimirizidwamu | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s%s| Hz %d | bbiti %d | %s | %d:%02d /%s | ntambi %d | Awamu zimala %s"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Kolawo koppi y'olukalala eyitibwe"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Nkalalala z'enyimba ez'omu DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Soma olukalalala lw'enyimba"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Fayiro endala (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Kolawo olukalalala olupya"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Lukalalala olupya (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Fayiro"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Bikkula fayiro"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Teekako fayiro"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Teekako (ma)terekero"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Teekako obusangiro"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Kolwo olukalala olupya"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Soma olukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Kaza olukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Kolayo koppi y'olukalala"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Mala"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Kyusa"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Bisiimulewo"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Londa byonna"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Ta byonna"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Vuunika okulonda"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Ebirondedwa"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Bigyewo"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Bisagalewo byokka"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Zuula"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Sengekera ku"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Erinnya"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Namba y'olutambi"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Alubamu"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Muluyimba"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Ennaku"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Bye weteekateekedde"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Enteekateeka"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Endabika"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Olubaawo olulaga ebifa ku biwulirizibwa"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Mitwe ku nkumbo"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Obukonda"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ekiteekateeka entabula y'amaloboozi"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Eby'em_puliriza"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ensengeka"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Ku ziva kumukumu"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "Kuzivunga"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Vunga ntambi"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Vunga alubamu"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Muwawa"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Eby'okuddiŋana"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Zonna ziddiŋane"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Ddiŋana oluyimba lumu"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Toddiŋana"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Akaseesa kagoberere empuliriza y'enyimba"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Akasonga kagoberere empuliriza y'enyimba"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Luno bwe luggwa yimirira"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Nyamba"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Enkyukakyuka"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Kwanjula"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Abaavvuunula"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Noonya"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Yimirira"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Wuliriza"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Yimirizamu"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Olukulembedde"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Oluddako"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Wuliriza muwawa"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Kwanjula"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Mala"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Nyongerako fayiro..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Biveeko"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Ebikwata ku lutambi"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"KULABULA: obusobozi obw'okuyungako okunnyonyola bukyakolebwako.\n"
-"Bw'oba oyagala okugeza okubukozesa, fayiro sooka okgigyemu koppi "
-"ez'okwerinda."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Enteekateeka"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Bikaze"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Ggala"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Ebinyonyola"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Ebirufaako"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Mutwe:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Wandikawo omutwe g'olukumba"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Kika:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Namba ya fayiro"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Lukalala lw'ebirimu"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Oluliko"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Bifaananyi bya ku alubamu"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Muluyimba - Alubamu"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Muluyimba"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Alubamu"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Erinnya"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Buwanvu bwa lwo"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Obwuwanvu bwa lwo"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Lutambi"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Kibiina / Muluyimba w'alubamu"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Bye weteekateekedde"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Empandika:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Okwekubirira:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Ku kkono"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Ku ddyo"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Ebifuga empandika (bisookerwako ka %):\n"
-" [a] muluyimba, [t] erinnya ly'oluyimba, alu[b]amu, [B] kibiina, [C] "
-"Muwandisi\n"
-" [n]amba y'olutambi, [N] bungi bw'entambi,\n"
-" [l] buwanvu bwa lwo, [y] mwaka, [g] ttuluba lw'oluyimba, [c] ebinnyonyola,\n"
-" [r] eby'obwa nannyini, erinnya lya [f]ayiro, [F] ekkubo mu bujjuvu "
-"erituuka ku fayiro, [T] butuuti,\n"
-" [d] tterekero, [D] tterekero n'ekkubo erirituukako\n"
-"Kya kulabirako: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Sazamu"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Kale"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Puloguramu efulumya ebiwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Ebiwulirizibwa gye bifulumira:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Ebiwulirizibwa ebya bbiti 8 bifuulibwenga bya bbiti 16"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Kwogeza"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Kisoboke okukyusa obwangu bw'okuddiŋana okuloza ebikwatibwa"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Obulongoofu bw'ebifuulidwa:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Gyako"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Lutambi"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Ekigero ky'amaanyi ge'ddoboozi ly'ebiwulirizibwa"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Olukalala lw'ongereko fayiro nga weyambisa kiwandikiro (oba "
 "ekiteekateekafayiro):"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
-msgstr "Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
+msgstr ""
+"Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Eby'empuliriza"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Teekateeka"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 "Ggala kireetera puloguramu okufuuka kafaananyi mu kakuŋaanyizo ka ku lubaawo"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Eppeesa ary'okukasongesebwa erya wakati libikka olukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Kisa akafaananyi ak'omu kakuŋaanyizo ka ku lubaawo"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Ku lukalala oluyimba oluwulirizibwa lulabikire mu nnukuta nziggumivu"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Ekya \"Siimula ku disiki\" kikise"
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Omutwe gw'eddirisa ng'oluyimba luwulirizibwa:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Ebirabikira awakolerwa"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Ssawo enteekateeka eyiyo"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Bwanjo"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Bwaliriro"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Langi eziraga oluyimba we lutuuse/bwangufu bw'eddoboozi"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Langi eyawakkatikati"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Langi entangaavu"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Langi enzirugarivu"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Langi ey'omulamwa"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Bigambo"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Langi ez'oku bukonda"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Ssawo enteekateeka eyiyo (kiva ku lulyo lwa langi olwa sisitemu naye "
 "kyanguya puloguramu okulabika)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Nnyiriri kagabanyizikamubbiri"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Nnyiriri zinantagabanyizikamubbiri"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Bigambo"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Olunyiriri olulondedwa"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Ebigambo ebirondedwa"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Akasonga"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Langi ez'oku lukalala lw'enyimba"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Langi"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Kozesa ekiwereza kimasanganzira"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Endagiriro y'ekiwereza kimasanganzira:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Pooti y'ekiwereza kimasanganzira:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Kika ky'ekiwereza:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Erinnya ery'okukozesa ku kiwereza:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Ekyama eky'oku kiwereza:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Kayungirizi"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Puloguramu enyambi"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Lengera ku:"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Empandika"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Puloguramu enyambi"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Wandika ebya ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Wandika ebya ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Wandika ebya APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Gyamu ebya ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Gyamu ebya ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Gyamu ebya APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Oluwandika lwa ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Tukuwa magezi ga kukozesa luno)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Enkongojja y'ebiwandike eby'omu ID3v1 (iso8859-1 y'eya bulijjo)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Wandika ebya ID32.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Ekiwandika okunnyonyola kw'enyimba"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Okunnyonyola:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Muwandisi (bawandisi):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Enfo ya ku yintaneti:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Teekateeka"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Puloguramu enyambi"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Lengera ku:"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Okutangaaza ku mpandika enfunze (zitandikwa n'akabonero ka %):\n"
-" a: Muluyimba, t: Erinnya ly'oluyimba, b: Kibiina, C: Eyaluwandika\n"
-" n: Namba y'olutambi, N: Obungi bw'entambi,\n"
-" l: Buwanvu bwa lwo, y: Mwaka gwa lwo, g: Kika kya luyimba, c: "
-"Okunnyonyola,\n"
-" r: Ebikugizo by'obwanannyini, f: Linnya lya fayiro, T: Obugambo "
-"obuzuuzisibwa\n"
-"Eky'okulabirako: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Muluyimba / Alubamu"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Erinnya / Muluyimba w'olutambi"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Obwuwanvu bwa lwo"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Siimula fayiro ku disiki"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -869,199 +930,236 @@
 "Fayiro tekijjakusoboka kuzikomyawo. Ŋende mu maaso?\n"
 "(Akaboozi kano osobola okukasirisiza mu nteekateeka z'omu GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Kulabula"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Lwongere ku lukalala lw'ebinaawulirizibwa"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Lugye mu lukalala lw'ebinaawulirizibwa"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Ddamu okusoma ebinnyonyola"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Luggire ddala ku sisitemu"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Yongerako oukumbo"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Kyusa mu lukumbo"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Gyawo olukumbo"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Sengekera ku"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Tosengeka"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Muyimbi/Amafuluma/Alubamu"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Bikkula fayiro..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Teekateeka %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Teekateeka"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Ekyuma ekikola ku biwulirizibwa bulijjo"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Kaza"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Teekateeka amapeesa g'oyinza okukozesa okwanguya mirimu"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Kiragiro"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Ppeesa oba mapeesa"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Puloguramu ekola ku bivaamu eya ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Nyongerako fayiro..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Nteekateeka..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Okyusizza mu data y'olutambi luno."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Eddirisa lino ddala liggalibwewo?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Bika by'okunnyonyola"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Endagiriro y'entegeka y'enyimba ey'omunda"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ye"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nedda"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Puloguramu ekola ku data enkongojje"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Ppeesa"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Ekikongojje"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeefF kati etaddeko"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Eddirisa lino ddala liggalibwewo?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Teekako fayiro"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Bigyewo"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Enkozesa entuufu eri: deadbeef [buwayiro][fayiro]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Obuwayiro:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help oba -h Bw'ossawo kamu ku buno, okoma ku kufuna bino by'osoma\n"
+msgstr ""
+" --help oba -h Bw'ossawo kamu ku buno, okoma ku kufuna bino "
+"by'osoma\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Kano kaleetera puloguramu okumala\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
-msgstr " --version Kano kaleetera puloguramu okukoma ku kukulaga "
+msgstr ""
+" --version Kano kaleetera puloguramu okukoma ku kukulaga "
 "olwandika lwa yo\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Kano kaleetera pulguramu okutandika enyimba\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Kano kaleetera pulguramu okukomya oluyimba\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
-msgstr " --pause Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
+msgstr ""
+" --pause Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
-msgstr " --next Kano kaleetera puloguramu okutandika oluyimba oluddako "
+msgstr ""
+" --next Kano kaleetera puloguramu okutandika oluyimba oluddako "
 "mu lukalala\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
-msgstr " --prev Kano kaleetera puloguramu okutandika olukulembera "
+msgstr ""
+" --prev Kano kaleetera puloguramu okutandika olukulembera "
 "lw'ebadde ko mu lukalala\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
-msgstr " --random Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
+msgstr ""
+" --random Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Kano kaleetera puloguramu okwongera nyimba ku lukalala\n"
+msgstr ""
+" --queue Kano kaleetera puloguramu okwongera nyimba ku "
+"lukalala\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Kano kaleetera puloguramu okuwandikawo erinnya "
+msgstr ""
+" --nowplaying FMT Kano kaleetera puloguramu okuwandikawo erinnya "
 "ly'olutambi\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1075,19 +1173,35 @@
 " r: Ebikugizo by'obwa nannyini, e: Ekitundu ky'oluyimba "
 "ekiwulirizidwako\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
-msgstr " okugeza.: --nowplaying \"%%a - %%t\" kisuubirwa okuvaamu "
-"\"muyibi - linnya lya luyimba\"\n"
+msgstr ""
+" okugeza.: --nowplaying \"%%a - %%t\" kisuubirwa "
+"okuvaamu \"muyibi - linnya lya luyimba\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Olukwatakifo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ye"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nedda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1095,7 +1209,13 @@
 "2.3 (Tukuwa magezi kukozesa luno)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1105,17 +1225,18 @@
 "Lutambi\n"
 "Alubamu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1131,7 +1252,7 @@
 "Kibiina / Muyimbi wa alubamu\n"
 "Ebigambo ebibyo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1140,77 +1261,686 @@
 "Dyo"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Fayiro erimu ekifaananyi embuze: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"widimidi: Sirabye fayiro ey'enteekateeka eza freepats. Sisitemu yo giteekeko "
+"omuganda gwa timidity-freepats, oba gend mu nteekateeka otegeke ekkubo "
+"erigguka ku freepats.cfg."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+#, fuzzy
+msgid "Release device while stopped"
+msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Kozesa ekiwereza kimasanganzira"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeefF kati etaddeko"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Erinnya ery'okukozesa ku kiwereza:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Ekyama eky'oku kiwereza:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Siimula fayiro ku disiki"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Bifaananyi bya ku alubamu"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
 msgstr ""
-"Tekisobose okufuna ekifo mu ggwanika ekimala okukuŋaanyisamu puloguramu "
-"by'ekolako."
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Namba y'olutambi"
+
+#: ../translation/extra.c:67
+msgid "Performer"
 msgstr ""
-"Wazzewo kiremya mu kusoma ekitundu ekisoose okuwerezebwa mu luyiira lwa "
-"bbiti olwa Ogg."
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Wazzewo kiremya mu kusoma ekitole kya data ekikulembera."
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Erinnya / Muluyimba w'olutambi"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:73
+msgid "Genre"
 msgstr ""
-"Tekisobose kufuna kifo mu ggwanika ekimala okwongera ennamba y'obumanyiso "
-"ey'omusulo omupya ku lukalala."
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Ebiyingizibwa bitemdwamu oba tebirimu data."
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Ebiyingizibwa ssi musulo ogw'ekika kya Ogg."
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Namba ya fayiro"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Omusulo gwa Ogg gubulamu ebikwata ku bya Vorbis."
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Fayiro ekomye tennayogera ku musulo gwa bbiti ogutegeerebwa."
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Omusulo gwa Ogg tegulimu data ey'ekika sisitemu gy'etegeera."
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Teekako obusangiro"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Ebikulembera ebizibizi eby'ekitole kya data biriko kiremya."
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Fayiro ekomye tennatuuka ku bikulembera eby'ebya Vorbis."
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Bika by'okunnyonyola"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Nsanze mu ebiriko kiremya oba ebitawera, omulimu gweyongera mu maaso..."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Endagiriro y'entegeka y'enyimba ey'omunda"
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Puloguramu ekola ku data enkongojje"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Londa byonna"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"Wazzewo kiremya mu kutegeka ebigenda mu musulo ogw'ebivaamu. Omusulo "
-"ogw'ebivaamu guyinz'okubaamu ebitali bituufu oba okutemwamu."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Kyusa mu lukumbo"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Ebiwulirizibwa gye bifulumira:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Puloguramu efulumya ebiwulirizibwa:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Tereka koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Ssawo enteekateeka eyiyo"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Soma koppi y'ebiteekateekedwa"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Puloguramu efulumya ebiwulirizibwa:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"widimidi: Sirabye fayiro ey'enteekateeka eza freepats. Sisitemu yo giteekeko "
-"omuganda gwa timidity-freepats, oba gend mu nteekateeka otegeke ekkubo "
-"erigguka ku freepats.cfg."
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Wandika ebya APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Wandika ebya ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Wandika ebya ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Ekiwandika okunnyonyola kw'enyimba"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Kolayo koppi y'olukalala"
+
+#~ msgid "_Abort"
+#~ msgstr "_Biveeko"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "KULABULA: obusobozi obw'okuyungako okunnyonyola bukyakolebwako.\n"
+#~ "Bw'oba oyagala okugeza okubukozesa, fayiro sooka okgigyemu koppi "
+#~ "ez'okwerinda."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Buwanvu bwa lwo"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Ebifuga empandika (bisookerwako ka %):\n"
+#~ " [a] muluyimba, [t] erinnya ly'oluyimba, alu[b]amu, [B] kibiina, [C] "
+#~ "Muwandisi\n"
+#~ " [n]amba y'olutambi, [N] bungi bw'entambi,\n"
+#~ " [l] buwanvu bwa lwo, [y] mwaka, [g] ttuluba lw'oluyimba, [c] "
+#~ "ebinnyonyola,\n"
+#~ " [r] eby'obwa nannyini, erinnya lya [f]ayiro, [F] ekkubo mu bujjuvu "
+#~ "erituuka ku fayiro, [T] butuuti,\n"
+#~ " [d] tterekero, [D] tterekero n'ekkubo erirituukako\n"
+#~ "Kya kulabirako: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Kisoboke okukyusa obwangu bw'okuddiŋana okuloza ebikwatibwa"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Obulongoofu bw'ebifuulidwa:"
+
+#~ msgid "Description:"
+#~ msgstr "Okunnyonyola:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Muwandisi (bawandisi):"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Enfo ya ku yintaneti:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Okutangaaza ku mpandika enfunze (zitandikwa n'akabonero ka %):\n"
+#~ " a: Muluyimba, t: Erinnya ly'oluyimba, b: Kibiina, C: Eyaluwandika\n"
+#~ " n: Namba y'olutambi, N: Obungi bw'entambi,\n"
+#~ " l: Buwanvu bwa lwo, y: Mwaka gwa lwo, g: Kika kya luyimba, c: "
+#~ "Okunnyonyola,\n"
+#~ " r: Ebikugizo by'obwanannyini, f: Linnya lya fayiro, T: Obugambo "
+#~ "obuzuuzisibwa\n"
+#~ "Eky'okulabirako: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Teekateeka %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Puloguramu ekola ku bivaamu eya ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr ""
+#~ "Tekisobose okufuna ekifo mu ggwanika ekimala okukuŋaanyisamu puloguramu "
+#~ "by'ekolako."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr ""
+#~ "Wazzewo kiremya mu kusoma ekitundu ekisoose okuwerezebwa mu luyiira lwa "
+#~ "bbiti olwa Ogg."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Wazzewo kiremya mu kusoma ekitole kya data ekikulembera."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Tekisobose kufuna kifo mu ggwanika ekimala okwongera ennamba y'obumanyiso "
+#~ "ey'omusulo omupya ku lukalala."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Ebiyingizibwa bitemdwamu oba tebirimu data."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Ebiyingizibwa ssi musulo ogw'ekika kya Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Omusulo gwa Ogg gubulamu ebikwata ku bya Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Fayiro ekomye tennayogera ku musulo gwa bbiti ogutegeerebwa."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Omusulo gwa Ogg tegulimu data ey'ekika sisitemu gy'etegeera."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Ebikulembera ebizibizi eby'ekitole kya data biriko kiremya."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Fayiro ekomye tennatuuka ku bikulembera eby'ebya Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr ""
+#~ "Nsanze mu ebiriko kiremya oba ebitawera, omulimu gweyongera mu maaso..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Wazzewo kiremya mu kutegeka ebigenda mu musulo ogw'ebivaamu. Omusulo "
+#~ "ogw'ebivaamu guyinz'okubaamu ebitali bituufu oba okutemwamu."

deadbeef-0.5.2.tar.bz2/po/lt.po Added

@@ -0,0 +1,1723 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-03-05 22:43+0200\n"
+"Last-Translator: Julius <zadintuvas@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: lt\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%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "Priekis"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr ""
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr ""
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr ""
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.2.tar.bz2/po/nb.po Added

@@ -0,0 +1,1726 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2010-12-10 14:09+0200\n"
+"Last-Translator: Sam <wilsonsamm@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Støttede lydformat"
+
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
+msgstr "Andre filer (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Åpne fil(er) ..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Legg til fil(er) i spilleliste ..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Legg til mappe(r) i spilleliste ..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Følg symbolske lenker"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Klarte ikke lese inn veilederfila"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Klarte ikke lese inn veilederfila"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Om DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s - endringslogg"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Rediger spilleliste"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Gi nytt navn til spillelista"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Fjern spillelista"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Legg til spilleliste"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Lagre DeaDBeeF EQ-forhåndstilling"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ-forhåndstillingsfiler (*.ddbeq)"
+
+# har merka denne som fuzzy fordi jeg var litt usikker på orddelingsregelen her.
+#: ../plugins/gtkui/eq.c:182
+#, fuzzy
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Les inn DeaDBeeF EQ-forhåndstilling"
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Andre filer (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr ""
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr ""
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr ""
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Fjern spillelista"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.1.tar.bz2/po/nl.po -> deadbeef-0.5.2.tar.bz2/po/nl.po Changed

@@ -1,1097 +1,1176 @@
-# Deadbeef Audio Player
-# Copyright (C) 2009-2001 Alexey Yakovenko <waker@users.sourceforge.net>
-# This file is distributed under the same license as the Deadbeef package.
-# depaz <depazzz@gmail.com>, 2010.
-# 
+# Dutch translation of the deadbeef package.
+# Copyright (C) the author of the deadbeef package.
+# This file is distributed under the same license as the deadbeef package.
+# Glenn de Groot, 2010.
+# Pjotr, 2011.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-09 04:43+0000\n"
-"PO-Revision-Date: 2011-05-18 14:18+0200\n"
-"Last-Translator: Pjotr <pliniusminor@gmail.com>\n"
-"Language-Team: Spanish\n"
-"Language: nl\n"
+"POT-Creation-Date: 2011-06-12 18:17+0200\n"
+"PO-Revision-Date: 2011-09-08 22:41+0200\n"
+"Last-Translator: Pjotr\n"
+"Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl (Dutch)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:121
 msgid "Supported sound formats"
-msgstr "Ondersteunde bestandstypen voor geluid"
+msgstr "Ondersteunde soorten bestandopmaak voor geluid"
 
-#: ../plugins/gtkui/callbacks.c:108
+#: ../plugins/gtkui/callbacks.c:132 ../plugins/gtkui/gtkui.c:776
 msgid "Other files (*)"
 msgstr "Andere bestanden (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:142
 msgid "Open file(s)..."
 msgstr "Open bestand(en)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:177
 msgid "Add file(s) to playlist..."
-msgstr "Voeg bestand(en) toe aan de afspeellijst..."
+msgstr "Voeg bestand(en) toe aan speellijst..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:218
 msgid "Add folder(s) to playlist..."
-msgstr "Voeg map(pen) toe aan de afspeellijst..."
+msgstr "Voeg map(pen) toe aan speellijst..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:223
 msgid "Follow symlinks"
 msgstr "Volg symbolische koppelingen"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:697
 msgid "Failed while reading help file"
 msgstr "Fout bij het lezen van het hulpbestand"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:707
 msgid "Failed to load help file"
-msgstr "Kon het hulpbestand niet laden"
+msgstr "Kon hulpbestand niet laden"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:722
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:723 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Hulp"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:733
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Over DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:746
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s logboek van wijzigingen"
 
-#: ../plugins/gtkui/callbacks.c:1080
-#, c-format
+#: ../plugins/gtkui/callbacks.c:1091
 #, c-format
 msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Vertalers"
+msgstr "Glenn de Groot\n"
+"Pjotr"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:689 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
-msgstr "Bewerk afspeellijst"
+msgstr "Bewerk speellijst"
+
+#: ../plugins/gtkui/ddbtabstrip.c:692 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2870 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/interface.c:402
+#: ../plugins/converter/converter.glade.h:46
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:748
 msgid "Rename Playlist"
-msgstr "Hernoem Afspeellijst"
+msgstr "Hernoem speellijst"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:752
 msgid "Remove Playlist"
-msgstr "Verwijder Afspeellijst"
+msgstr "Verwijder speellijst"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:756
 msgid "Add New Playlist"
-msgstr "Maak nieuwe afspeellijst"
+msgstr "Maak nieuwe speellijst"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
-msgstr "Bewaar DeaDBeef EQ Preset"
+msgstr "Bewaar DeaDBeef EQ Voorinstelling"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeef EQ preset bestanden (*.ddbeq)"
+msgstr "DeaDBeef EQ voorinstelling-bestanden (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Laden DeaDBeeF EQ Preset..."
+msgstr "Laden DeaDBeeF EQ Voorinstelling..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ Presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ-voorinstellingen (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importeer Foobar2000 EQ Preset..."
+msgstr "Importeer Foobar2000 EQ Voorinstelling.."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ voorinstellingen (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Opslaan voorinstelling"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Laden voorinstelling"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importeer Foobar2000 Voorinstelling"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
-msgstr "Alles Dempen"
+msgstr "Alles op nul"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
-msgstr "Preamp Dempen"
+msgstr "Preamp op nul"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
-msgstr "Bands Dempen"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Opslaan preset"
+msgstr "Banden op nul"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Laden Preset"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importeer Foobar2000 Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:826
+#: ../plugins/converter/converter.glade.h:40
+msgid "Presets"
+msgstr "Voorinstellingen"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dagen %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Gestopt | %d titels | %s totale speeltijd"
+msgstr "Gestopt | %d sporen | %s totale speeltijd"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Gepauzeerd | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d titels | %s totale speeltijd"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sporen | %s totale speeltijd"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:632
 msgid "Save Playlist As"
-msgstr "Afspeellijst opslaan als"
+msgstr "Speellijst opslaan als"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:643
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF afspeellijst bestand (*.dbpl)"
+msgstr "DeaDBeeF speellijstbestanden (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:761
 msgid "Load Playlist"
-msgstr "Afspeellijst laden"
+msgstr "Speellijst laden"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:914 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
-msgstr "Nieuwe afspeellijst"
+msgstr "Nieuwe speellijst"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:917
 #, c-format
 msgid "New Playlist (%d)"
-msgstr "Nieuwe afspeellijst (%d)"
+msgstr "Nieuwe speellijst (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_Open file(s)"
 msgstr "_Open bestand(en)"
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Voeg bestand(en) toe"
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Voeg map(pen) toe"
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:2970
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Voeg locatie toe"
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "New playlist"
-msgstr "Nieuwe afspeellijst"
+msgstr "Nieuwe speellijst"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Load playlist"
-msgstr "Laad afspeellijst"
+msgstr "Laad speellijst"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Save playlist"
-msgstr "Afspeellijst opslaan"
-
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Afspeellijst opslaan als.."
+msgstr "Speellijst opslaan"
 
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Edit"
 msgstr "_Bewerken"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:114
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Deselecteer alles"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selection"
 msgstr "Selectie"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:453
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/converter/interface.c:653
+#: ../plugins/converter/converter.glade.h:43
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
-msgstr "verkleinen"
+msgstr "Bijsnijden"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_Find"
 msgstr "_Zoeken"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Sort By"
+msgstr "Sorteren op"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:315 ../plugins/gtkui/prefwin.c:623
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:630
+#: ../plugins/converter/converter.glade.h:45
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track number"
+msgstr "Spoornummer"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1869 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:998 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artiest"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1002 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Aangepast"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1798
+#: ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_View"
 msgstr "_Beeld"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Status bar"
 msgstr "Statusbalk"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
-msgstr "Kolom headers"
+msgstr "Kolomkoppen"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tabs"
 msgstr "Tabbladen"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Playback"
-msgstr "_Playback"
+msgstr "_Afspelen"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3246
+#: ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Order"
 msgstr "Ordenen"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Linear"
 msgstr "Lineair"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Willekeurig"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle tracks"
+msgstr "Sporen schuffelen"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Shuffle albums"
+msgstr "Albums schuffelen"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Random"
 msgstr "Willekeurig"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Looping"
-msgstr "Herhalen"
+msgstr "Herhalend"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Loop All"
-msgstr "Alles herhalen"
+msgstr "Alles herhalend"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop Single Song"
-msgstr "Nummer herhalen"
+msgstr "Enkel nummer herhalend"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
-msgstr "Niet herhalen"
+msgstr "Niet herhalend"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Scroll follows playback"
-msgstr "Scroll volgt afgespeeld nummer"
+msgstr "Bladeren volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
-msgstr "Cursor volgt afgespeeld nummer"
+msgstr "Aanwijzer volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop after current"
-msgstr "Stop met afspelen na huidig"
+msgstr "Stop na huidig"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:66
 msgid "Jump to current track"
-msgstr "Spring naar huidig muziekstuk"
+msgstr "Spring naar huidige spoor"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_Help"
-msgstr "_Help"
+msgstr "_Hulp"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_ChangeLog"
-msgstr "_ChangeLog"
+msgstr "_Logboek van wijzigingen"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_LGPLv2.1"
 msgstr "LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "_About"
 msgstr "_Over"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Translators"
 msgstr "_Vertalers"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "Next"
 msgstr "Volgende"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play Random"
-msgstr "Willekeurig afspelen "
+msgstr "Willekeurig afspelen"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Over"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../plugins/gtkui/interface.c:1045 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Toevoegen van bestanden..."
-
-#: ../plugins/gtkui/interface.c:1089 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Afbreken"
-
-#: ../plugins/gtkui/interface.c:1189 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Track Properties"
-msgstr "Titel eigenschappen"
+msgstr "Eigenschappen van spoor"
 
-#: ../plugins/gtkui/interface.c:1235 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Settings"
+msgstr "Instellingen"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_Apply"
 msgstr "_Toepassen"
 
-#: ../plugins/gtkui/interface.c:1256 ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../plugins/gtkui/interface.c:1260 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Metadata"
-msgstr "Metadata"
+msgstr "Bijkomende gegevens"
 
-#: ../plugins/gtkui/interface.c:1306 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:603
+#: ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../plugins/gtkui/interface.c:1391 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
-msgstr "Voer een nieuwe column titel in"
+msgstr "Voer hier een nieuwe kolomtitel in"
 
-#: ../plugins/gtkui/interface.c:1422 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Index van elementen"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:312
 msgid "Playing"
 msgstr "Aan het afspelen"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
-msgstr "Albumhoes"
+msgstr "Albumkunst"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artiest - Album"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Artiest"
-
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1436 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Titel"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
-msgstr "Lengte"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Duur"
 
-#: ../plugins/gtkui/interface.c:1438 ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Titel"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Spoornummer"
 
-#: ../plugins/gtkui/interface.c:1439 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
-msgstr "Band / Album Artiest"
-
-#: ../plugins/gtkui/interface.c:1440 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Aangepast"
+msgstr "Groep / Album Artiest"
 
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3098
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
-msgstr "Formaat:"
+msgstr "Opmaaktype:"
 
-#: ../plugins/gtkui/interface.c:1461 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
-msgstr "Uitlijning"
+msgstr "Uitlijning:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Links"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Rechts"
 
-#: ../plugins/gtkui/interface.c:1472 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatteer conversies (begin met %):\n"
-" [a]rtiest, [t]itel, al[b]um, [B]and, [C]omponist\n"
-" titel[n]ummer, [N]totaltracks,\n"
-" [l]engte, [y]jaar, [g]enre, [c]ommentaar,\n"
-" auteurs[r]echt, [b]estandnaam, [T]ags,\n"
-" [d]map, [D]MapMetPad\n"
-"Bijvoorbeeld: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501 ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040 ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2901
+#: ../plugins/gtkui/interface.c:3013 ../plugins/gtkui/interface.c:3139
+#: ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Cancel"
 msgstr "_Annuleer"
 
-#: ../plugins/gtkui/interface.c:1522 ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061 ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2922
+#: ../plugins/gtkui/interface.c:3034 ../plugins/gtkui/interface.c:3160
+#: ../plugins/gtkui/deadbeef.glade.h:161
 msgid "_OK"
-msgstr "_Accepteer"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1753 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1819 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output plugin:"
-msgstr "Output plugin: "
+msgstr "Uitvoerplugin:"
 
-#: ../plugins/gtkui/interface.c:1766 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Output device:"
-msgstr "Output apparaat:"
+msgstr "Uitvoerapparaat:"
 
-#: ../plugins/gtkui/interface.c:1775 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "8-bit-audio altijd omzetten naar 16-bit"
+
+#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../plugins/gtkui/interface.c:1784 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Dynamic samplerate switching toestaan"
-
-#: ../plugins/gtkui/interface.c:1792 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Samplerate conversie kwaliteit:"
-
-#: ../plugins/gtkui/interface.c:1811 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:105
 msgid "Replaygain mode:"
-msgstr "Replaygain mode:"
+msgstr "Replaygain modus:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1867
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../plugins/gtkui/interface.c:1824 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1868
+msgid "Track"
+msgstr "Spoor"
+
+#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain peak scale"
-msgstr "Replaygain piek scale"
+msgstr "Replaygain piek schaal"
+
+#: ../plugins/gtkui/interface.c:1879 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain preamp:"
+msgstr "Replaygain voorversterking:"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1883 ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1893 ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
-"Voeg bestanden toe vanaf de commandoregel (of de bestandbeheerder) aan deze "
-"afspeellijst:"
+"Voeg bestanden toe vanaf de opdrachtregel (of met de bestandbeheerder) aan "
+"deze speellijst:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1910 ../plugins/gtkui/deadbeef.glade.h:108
 msgid "Resume previous session on startup"
 msgstr "Hervat vorige sessie bij opstarten"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1914 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Niet toevoegen vanuit archieven bij het toevoegen van mappen"
+
+#: ../plugins/gtkui/interface.c:1918 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Playback"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:1854 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/interface.c:2471
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:657
+#: ../plugins/converter/converter.glade.h:8
+msgid "Configure"
+msgstr "Configureer"
+
+#: ../plugins/gtkui/interface.c:1974 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP Chain voorinstelling"
+
+#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_Load"
+msgstr "_Laden"
+
+#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:1999 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
-msgstr "Sluiten minimaliseert naar tray"
+msgstr "Sluiten minimaliseert naar systeemvak"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2003 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle mouse button closes playlist"
-msgstr "Middelste muisknop sluit afspeellijst"
+msgstr "Middelste muisknop sluit speellijst"
 
-#: ../plugins/gtkui/interface.c:1862 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2007 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide system tray icon"
 msgstr "Verberg systeemvakpictogram"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "Use bold font for currently playing track"
-msgstr "Gebruik vetgedrukt lettertype voor het thans afspelende muziekstuk"
+msgstr "Gebruik vetgedrukt lettertype voor het thans afspelende spoor"
 
-#: ../plugins/gtkui/interface.c:1870 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:49
 msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Verberg \"Verwijder van schijf\" element in het contekstmenu"
+msgstr "Verberg \"Verwijder van schijf\"-element in het contekstmenu"
 
-#: ../plugins/gtkui/interface.c:1878 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2019 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+"Geef speellijsten automatisch een naam bij het toevoegen van een enkele map"
+
+#: ../plugins/gtkui/interface.c:2027 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "Interface refresh rate (times per second):"
+msgstr "Verversingssnelheid van gebruikersschil (keren per seconde):"
+
+#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:136
 msgid "Titlebar text while playing:"
 msgstr "Titelbalktekst gedurende afspelen:"
 
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while stopped:"
-msgstr "Titelbalktekst wanneer gestopt"
+msgstr "Titelbalktekst wanneer gestopt:"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2069 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI Plugin (wijzigen vereist herstart)"
+
+#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
-msgstr "Interface"
+msgstr "Gebruikersomgeving"
 
-#: ../plugins/gtkui/interface.c:1916 ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2092 ../plugins/gtkui/interface.c:2136
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Override"
 msgstr "Negeer"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2101 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Voorgrond"
 
-#: ../plugins/gtkui/interface.c:1932 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2108 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Achtergrond"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2127 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Seekbar/Volumebar colors"
-msgstr "Kleuren zoekbar/volumebar"
+msgstr "Kleuren zoekbalk/volumebalk"
 
-#: ../plugins/gtkui/interface.c:1969 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2145 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Middle"
 msgstr "Midden"
 
-#: ../plugins/gtkui/interface.c:1976 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:69
 msgid "Light"
 msgstr "Licht"
 
-#: ../plugins/gtkui/interface.c:1983 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Donker"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2190 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
-msgstr "Achtergrond"
+msgstr "Basis"
 
-#: ../plugins/gtkui/interface.c:2021 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/interface.c:2254
+#: ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Text"
+msgstr "Tekst"
+
+#: ../plugins/gtkui/interface.c:2210 ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Tab strip colors"
-msgstr "Tab kleuren"
+msgstr "Tabstrook-kleuren"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2219 ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Negeer (sneller, maar geen GTK boomstructuur grafisch thema)"
+msgstr "Negeer (geen boomstructuurthema, maar snellere weergave)"
 
-#: ../plugins/gtkui/interface.c:2039 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
-msgstr "Even rijen"
+msgstr "Even rij"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2235 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Odd row"
-msgstr "Oneven rijen"
-
-#: ../plugins/gtkui/interface.c:2065 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Tekst"
+msgstr "Oneven rij"
 
-#: ../plugins/gtkui/interface.c:2072 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2261 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Selected row"
 msgstr "Geselecteerde rij"
 
-#: ../plugins/gtkui/interface.c:2091 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2280 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected text"
-msgstr "Geselecteerde text"
+msgstr "Geselecteerde tekst"
 
-#: ../plugins/gtkui/interface.c:2104 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2293 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
-msgstr "Muisaanwijzer"
+msgstr "Aanwijzer"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2306 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playlist colors"
-msgstr "Playlist kleuren"
+msgstr "Speellijst-kleuren"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Kleuren"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Schakel Proxy Server in"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2327 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Server Address:"
-msgstr "Proxy Server Adres:"
+msgstr "Proxy Server adres:"
 
-#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2341 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Port:"
-msgstr "Proxy Server Poort:"
+msgstr "Proxy Server poort:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2355 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Type:"
-msgstr "Proxy type"
+msgstr "Proxy type:"
 
-#: ../plugins/gtkui/interface.c:2185 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Username:"
-msgstr "Proxy Gebruikersnaam:"
+msgstr "Proxy gebruikersnaam:"
 
-#: ../plugins/gtkui/interface.c:2198 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Proxy Password:"
 msgstr "Proxy wachtwoord:"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2397 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Version: "
+msgstr "Versie: "
+
+#: ../plugins/gtkui/interface.c:2492 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Auteursrecht"
+
+#: ../plugins/gtkui/interface.c:2502 ../plugins/gtkui/deadbeef.glade.h:93
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:2981 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3083 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Group By"
+msgstr "Groeperen op"
+
+#: ../plugins/gtkui/interface.c:3207 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort by..."
+msgstr "Sorteren op..."
+
+#: ../plugins/gtkui/interface.c:3223 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Opmaaktype:"
+
+#: ../plugins/gtkui/interface.c:3253
+msgid "Ascending"
+msgstr "Oplopend"
+
+#: ../plugins/gtkui/interface.c:3254
+msgid "Descending"
+msgstr "Aflopend"
+
+#: ../plugins/gtkui/interface.c:3307 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/converter/interface.c:758
+#: ../plugins/converter/converter.glade.h:44
+msgid "Select DSP Plugin"
+msgstr "Selecteer DSP-plugin"
+
+#: ../plugins/gtkui/interface.c:3323 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:774
+#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:38
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/gtkui/interface.c:3409 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tag Writer Settings"
+msgstr "Instellingen van etiketschrijver"
+
+#: ../plugins/gtkui/interface.c:3440 ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v2"
 msgstr "ID3v2 schrijven"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3444 ../plugins/gtkui/interface.c:3571
+#: ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write ID3v1"
 msgstr "ID3v1 schrijven"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3448 ../plugins/gtkui/interface.c:3527
+#: ../plugins/gtkui/interface.c:3567 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Write APEv2"
 msgstr "APEv2 schrijven"
 
-#: ../plugins/gtkui/interface.c:2252 ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/interface.c:3535
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v2"
 msgstr "ID3v2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:2256 ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3460 ../plugins/gtkui/interface.c:3583
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip ID3v1"
 msgstr "ID3v1 verwijderen"
 
-#: ../plugins/gtkui/interface.c:2260 ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3464 ../plugins/gtkui/interface.c:3539
+#: ../plugins/gtkui/interface.c:3579 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Strip APEv2"
 msgstr "APEv2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:2268 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v2 version"
 msgstr "ID3v2 versie"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3479
 msgid "2.3 (Recommended)"
-msgstr "2.3 (Aangeraden)"
+msgstr "2.3 (aangeraden)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3480
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3486 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 karakter codering (default is iso8859-1)"
+msgstr "ID3v1 tekencodering (standaard is iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3523 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 schrijven"
 
-#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Tag schrijver"
-
-#: ../plugins/gtkui/interface.c:2419 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Beschrijving:"
-
-#: ../plugins/gtkui/interface.c:2434 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Auteur:"
-
-#: ../plugins/gtkui/interface.c:2449 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2464 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Website:"
-
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Configureer"
-
-#: ../plugins/gtkui/interface.c:2499 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/gtkui/interface.c:2881 ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:3008 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Grouperen volgens"
-
-#: ../plugins/gtkui/interface.c:3134 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formatteer conversies (begin met %):\n"
-"[a]rtiest, [t]itel, al[b]um, [B]and, [C]omposer\n"
-"titel[n]ummer, [N]totaltracks,\n"
-"[d]uur, [j]aar, [g]enre, [c]ommentaar,\n"
-"copy[r]echt, [b]estandnaam, [T]ags\n"
-"Bijvoorbeeld: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:313 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artiest / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:314 ../plugins/gtkui/search.c:392
 msgid "Track No"
-msgstr "Title nr."
-
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Titel / Titel Artiest"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Speeltijd"
+msgstr "Spoornr."
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:325
 msgid "Delete files from disk"
 msgstr "Verwijder bestanden van schijf"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:326
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Bestanden zullen verloren worden. Doorgaan?\n"
-"(Dit venster kunt u uitschakelen in de GTKUI plugin instellingen)"
+"Bestanden zullen verloren gaan. Doorgaan?\n"
+"(Dit venster kunt u uitschakelen in de GTKUI plugin-instellingen)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:327 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:429
 msgid "Add to playback queue"
-msgstr "Aan de wachtrij toevoegen"
+msgstr "Aan de speelwachtrij toevoegen"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:434
 msgid "Remove from playback queue"
-msgstr "Van wachtrij verwijderen"
+msgstr "Uit speelwachtrij verwijderen"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:442
 msgid "Reload metadata"
-msgstr "Herlaad metadata"
+msgstr "Herlaad bijkomende gegevens"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:461
 msgid "Remove from disk"
 msgstr "Verwijder van schijf"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:840 ../plugins/gtkui/plcommon.c:965
 msgid "Add column"
 msgstr "Kolom toevoegen"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:870 ../plugins/gtkui/plcommon.c:969
 msgid "Edit column"
 msgstr "Kolom bewerken"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:973
 msgid "Remove column"
 msgstr "Kolom verwijderen"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:983
 msgid "Group by"
-msgstr "Grouperen volgens"
+msgstr "Groeperen op"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:990
 msgid "None"
 msgstr "Geen"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:994
 msgid "Artist/Date/Album"
 msgstr "Artiest/Datum/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Open bestand.."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Configuratie %s"
+msgid "Configure %s"
+msgstr "Configureer %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
-msgstr "Standaard Geluids Apparaat"
+msgstr "Standaard geluidapparaat"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:649
+#: ../plugins/converter/converter.glade.h:6
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Globale sneltoetsen"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
-msgstr "Sleuf"
+msgstr "Gleuf"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Toetscombinatie"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA output plugin"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Bestanden aan het toevoegen..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
-msgstr "Initialiseren..."
+msgstr "Aan het initialiseren..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
-msgstr "U heeft data aangepast voor deze track."
+msgstr "U heeft gegevens aangepast voor dit spoor."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
-msgstr "Weet u zeker dat u dit venster wilt sluiten?"
+msgstr "Dit venster echt sluiten?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Locatie"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Meerdere waarden] "
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Subspoor Index"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Toets"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tag type(s)"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Waarde"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Ingebedde cuesheet"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Etiketten aan het schrijven..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ja"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Naam:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nee"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Veldnamen moeten niet beginnen met : of _"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Kan veld niet toevoegen"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Toets"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Veld met deze naam bestaat reeds, probeer a.u.b. andere naam."
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Waarde"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Gekozen veld echt verwijderen?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Voeg veld toe"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF speelt nu af"
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Verwijder veld"
 
-#: ../main.c:89
+#: ../main.c:90
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Gebruik: deadbeef [opties] [bestand(en)]\n"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Options:\n"
 msgstr "Opties:\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr "--help or -h Toont help (deze boodschap) en exit\n"
+msgstr " --help or -h Drukt hulp af (dit bericht) en sluit af\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid " --quit Quit player\n"
-msgstr "--quit Speler afsluiten\n"
+msgstr " --quit Speler afsluiten\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid " --version Print version info and exit\n"
-msgstr "--version Versie info tonenen exit\n"
+msgstr " --version Versie-informatie afdrukken en sluiten\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid " --play Start playback\n"
-msgstr "--play Playback starten\n"
+msgstr " --play Afspelen beginnen\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid " --stop Stop playback\n"
-msgstr "--stop Playback stoppen\n"
+msgstr " --stop Afspelen stoppen\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid " --pause Pause playback\n"
-msgstr "--pause Playback pauzeren\n"
+msgstr " --pause Afspelen pauzeren\n"
 
-#: ../main.c:97
+#: ../main.c:98
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pauze schakelen\n"
+
+#: ../main.c:99
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Begin afspelen indien gestopt, anders pauze schakelen\n"
+
+#: ../main.c:100
 #, c-format
 msgid " --next Next song in playlist\n"
-msgstr "--next Volgend nummer in afspeellijstt\n"
+msgstr " --next Volgend nummer in speellijst\n"
 
-#: ../main.c:98
+#: ../main.c:101
 #, c-format
 msgid " --prev Previous song in playlist\n"
-msgstr "--prev Vorig nummer in afspeellijst\n"
+msgstr " --prev Vorig nummer in speellijst\n"
 
-#: ../main.c:99
+#: ../main.c:102
 #, c-format
 msgid " --random Random song in playlist\n"
-msgstr "--random Willekeurig nummer in afspeellijst\n"
+msgstr " --random Willekeurig nummer in speellijst\n"
 
-#: ../main.c:100
+#: ../main.c:103
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr "--queue Bestand(en) toevoegen aan afspeellijst\n"
+msgstr " --queue Bestand(en) toevoegen aan speellijst\n"
 
-#: ../main.c:101
+#: ../main.c:104
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr "--nowplaying FMT Afdrukken geformatteerde track naam naar stdout\n"
+msgstr " --nowplaying FMT Afdrukken geformatteerde spoornaam naar stdout\n"
 
-#: ../main.c:102
+#: ../main.c:105
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
-"FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
-"[l]ength, track[n]umber, [y]ear, [c]omment,\n"
-"copy[r]ight, [e]lapsed\n"
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+
+#: ../main.c:108
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr "e.g.: --nowplaying \"%%a - %%t\" toont \"artist - title\"\n"
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " voor meer infor, zie http://sourceforge.net/apps/media"
+"wiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../playlist.c:443 ../playlist.c:2609
 msgid "Default"
 msgstr "Standaard"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3858
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3858
+msgid "No"
+msgstr "Nee"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1099,17 +1178,25 @@
 "2.3 (Aangeraden)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Oplopend\n"
+"Aflopend"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 "Zet uit\n"
-"Nummer\n"
+"Spoor\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:55
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1118,24 +1205,24 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
 "Elementen Index\n"
 "Aan het afspelen\n"
-"Album Kunst\n"
+"Albumkunst\n"
 "Artiest - Album\n"
 "Artiest\n"
 "Album\n"
 "Titel\n"
 "Lengte\n"
-"Nummer\n"
+"Spoornummer\n"
 "Groep / Album Artiest\n"
 "Aangepast"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:67
 msgid ""
 "Left\n"
 "Right"
@@ -1144,13 +1231,16 @@
 "Rechts"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
-msgstr "Kon geen pixmap bestand vinden: %s"
+msgstr "Kon geen pixmapbestand vinden: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
 "wildmidi: configuratiebestand voor freepats niet gevonden. Installeer "
 "timidity-freepats-pakket, of specificeer pad naar freepats.cfg in de plugin-"
@@ -1160,7 +1250,7 @@
 #. directly in source code, e.g. scripted plugin configuration strings
 #: ../translation/extra.c:3
 msgid "Add Audio CD"
-msgstr "Voeg Audio CD toe"
+msgstr "Voeg geluid-CD toe"
 
 #: ../translation/extra.c:4
 msgid "Lookup on Last.fm"
@@ -1169,13 +1259,13 @@
 #. ALSA output plugin
 #: ../translation/extra.c:6
 msgid "Use ALSA resampling"
-msgstr "Gebruik ALSA resampling"
+msgstr "Gebruik ALSA-resampling"
 
 #: ../translation/extra.c:7
 msgid "Release device while stopped"
-msgstr "Laat apparaat los wanneer gestopt"
+msgstr "Geef apparaat vrij wanneer gestopt"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Voorkeursomvang van de buffer"
 
@@ -1194,223 +1284,676 @@
 
 #: ../translation/extra.c:13
 msgid "Username"
-msgstr "Gebruikersnaam:"
+msgstr "Gebruikersnaam"
 
 #: ../translation/extra.c:14
 msgid "Password"
-msgstr "Wachtwoord:"
+msgstr "Wachtwoord"
 
 #: ../translation/extra.c:15
 msgid "Scrobble URL"
 msgstr "Scrobble URL"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Apparaatbestand"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Stoplap voor OSS4 samplerate-fout"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Periode voor bijwerken opslag (uur)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Haal op uit ingebedde etiketten"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
-msgstr "Haal op uit ingebedde map"
+msgstr "Haal op uit plaatselijke map"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Plaatselijk masker voor hoesbestand"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Haal op van Last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Haal op van albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Schaal kunstwerk naar langere kant"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Gebruik CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Verkies CD-tekst boven CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB url (bijv. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "CDDB poortnummer (bijv. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Verkies CDDB-protocol boven HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Schakel NRG-afbeeldingsondersteuning in"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Resampling-kwaliteit (0..2, hoger is beter)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Maximale muziekstukduur (in minuten)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Vraag bevestiging voor het verwijderen van bestanden van de schijf"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Statuspictogram voor gevoeligheid van volumeknop"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Aangepast statuspictogram"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Draai gtk_init met --sync (debug-modus)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Voeg scheidingtekens toe tussen contextmenu-onderdelen van plugin"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Bestandtype van melding"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Bestandtype voor meldingstitel"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Bestandtype voor meldingsinhoud"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Toon albumkunst"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Grootte van albumkunst (px)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
-msgstr "PulseAudio server"
+msgstr "PulseAudio-server"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Samplerate"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Relatief pad voor zoektabel"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Absoluut pad voor zoektabel"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Verwissel audio-bytes (schakel om indien u slechts statische ruis hoort"
+msgstr ""
+"Verwissel audio-bytes (schakel om indien u slechts statische ruis hoort)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "HVSC inschakelen"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Schakel HVSC Songlength DB in"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "HVSC-pad"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (vanuit HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bits per sample (8 of 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Standaard-liedduur (sec)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
-msgstr "Configuratiebestand voor Timidity++"
+msgstr "Configuratiebestand voor Timidity++ bank"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
-msgstr "Muziekstuk Titel"
+msgstr "Spoortitel"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Artiest"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Datum"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Muziekstuk Nummer"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
-msgstr "Totaalaantal Muziekstukken"
+msgstr "Totaal aantal sporen"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Genre"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Componist"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
-msgstr "Schijf Nummer"
+msgstr "Schijfnummer"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Commentaar"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Encodeur/Verkoper"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Auteursrecht"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Locatie"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Subspoor-index"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Etiket-type(s)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Ingebedde informatietekst"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Bestandextensies (te scheiden met ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Omzetten"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Doel-samplerate"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Kwaliteit / Algoritme"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Automatische Samplerate (negeert Doel-Samplerate)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Het bestand bestaat al. Overschrijven?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Waarschuwing van omzetter"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Kies a.u.b. een codeerder"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Fout van omzetter"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Bezig met omzetten..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Selecteer map..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Kon codeerder-voorinstelling niet opslaan"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Controleer de maprechten voor voorinstelling, probeer een andere titel te kiezen, "
+"of maak wat schijfruimte vrij"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+"Voorinstelling met dezelfde naam bestaat al. Probeer een andere titel te kiezen."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Fout"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Voeg nieuwe codeerder toe"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Codeerder bewerken"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Verwijder voorinstelling"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Dit zal de geselecteerde voorinstelling verwijderen. Weet u het zeker?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Codeerders"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Voeg plugin toe aan DSP-ketting"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Kon DSP-voorinstelling niet opslaan"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Nieuwe DSP-voorinstelling"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "DSP-voorinstelling bewerken"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP-voorinstellingen"
+
+#: ../plugins/converter/interface.c:97
+#: ../plugins/converter/converter.glade.h:34
+msgid "Output folder:"
+msgstr "Uitvoermap:"
+
+#: ../plugins/converter/interface.c:118
+#: ../plugins/converter/converter.glade.h:33
+msgid "Output file name:"
+msgstr "Naam van uitvoerbestand:"
+
+#: ../plugins/converter/interface.c:129
+#: ../plugins/converter/converter.glade.h:18
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Extensie (bijv. .mp3) zal automatisch worden toegevoegd.\n"
+"Laat het veld leeg voor standaard (%a - %t)."
+
+#: ../plugins/converter/interface.c:142
+#: ../plugins/converter/converter.glade.h:13
+msgid "Encoder:"
+msgstr "Codeerder:"
+
+#: ../plugins/converter/interface.c:166
+#: ../plugins/converter/converter.glade.h:10
+msgid "DSP preset:"
+msgstr "DSP-voorinstelling:"
+
+#: ../plugins/converter/interface.c:189
+#: ../plugins/converter/converter.glade.h:30
+msgid "Number of threads:"
+msgstr "Aantal draadjes:"
+
+#: ../plugins/converter/interface.c:202
+#: ../plugins/converter/converter.glade.h:35
+msgid "Output sample format:"
+msgstr "Bestandtype van uitvoer-voorbeeld:"
+
+#: ../plugins/converter/interface.c:209
+msgid "Keep source format"
+msgstr "Behoud bronbestandtype"
+
+#: ../plugins/converter/interface.c:210
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:211
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:212
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:213
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:214
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:220
+#: ../plugins/converter/converter.glade.h:49
+msgid "When file exists:"
+msgstr "Wanneer het bestand bestaat:"
+
+#: ../plugins/converter/interface.c:227
+msgid "Prompt"
+msgstr "Vraag bevestiging"
+
+#: ../plugins/converter/interface.c:228
+msgid "Overwrite"
+msgstr "Overschrijf"
+
+#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/converter.glade.h:39
+msgid "Preserve folder structure, starting from:"
+msgstr "Behoud mapstructuur, te beginnen op:"
+
+#: ../plugins/converter/interface.c:386
+#: ../plugins/converter/converter.glade.h:12
+msgid "Edit Encoder Preset"
+msgstr "Bewerk voorinstelling van codeerder"
+
+#: ../plugins/converter/interface.c:409
+#: ../plugins/converter/converter.glade.h:48
+msgid "Untitled Encoder"
+msgstr "Naamloze codeerder"
+
+#: ../plugins/converter/interface.c:417
+#: ../plugins/converter/converter.glade.h:32
+msgid "Output file extension:"
+msgstr "Extensie van uitvoerbestand:"
+
+#: ../plugins/converter/interface.c:424
+#: ../plugins/converter/converter.glade.h:11
+msgid "E.g. mp3"
+msgstr "Bijv. mp3"
+
+#: ../plugins/converter/interface.c:432
+#: ../plugins/converter/converter.glade.h:7
+msgid "Command line:"
+msgstr "Opdrachtregel:"
+
+#: ../plugins/converter/interface.c:443
+#: ../plugins/converter/converter.glade.h:15
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Voorbeeld: lame - %o\n"
+"%i voor invoerbestand, %o voor uitvoerbestand, - for stdin"
+
+#: ../plugins/converter/interface.c:453
+#: ../plugins/converter/converter.glade.h:3
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - uitvoerbestandnaaam\n"
+"%i - tijdelijke invoerbestandnaam"
+
+#: ../plugins/converter/interface.c:462
+#: ../plugins/converter/converter.glade.h:29
+msgid "Method:"
+msgstr "Methode:"
+
+#: ../plugins/converter/interface.c:469
+msgid "Pipe"
+msgstr "Pijp"
+
+#: ../plugins/converter/interface.c:470
+msgid "Temporary file"
+msgstr "Tijdelijk bestand"
+
+#: ../plugins/converter/interface.c:487
+#: ../plugins/converter/converter.glade.h:5
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/converter.glade.h:21
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:499
+#: ../plugins/converter/converter.glade.h:31
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:505
+#: ../plugins/converter/converter.glade.h:20
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:517
+#: ../plugins/converter/converter.glade.h:22
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:527
+#: ../plugins/converter/converter.glade.h:1
+msgid "Tag writer"
+msgstr "Etiketschrijver"
+
+#: ../plugins/converter/interface.c:614
+#: ../plugins/converter/converter.glade.h:9
+msgid "DSP Preset Editor"
+msgstr "DSP voorinstellingbewerker"
+
+#: ../plugins/converter/interface.c:637
+#: ../plugins/converter/converter.glade.h:47
+msgid "Untitled DSP Preset"
+msgstr "Naamloze DSP voorinstelling"
+
+#: ../plugins/converter/converter.glade.h:23
+msgid ""
+"Keep source format\n"
+"8 bit signed int\n"
+"16 bit signed int\n"
+"24 bit signed int\n"
+"32 bit signed int\n"
+"32 bit float"
+msgstr ""
+"Behoud bronbestandtype\n"
+"8 bit signed int\n"
+"16 bit signed int\n"
+"24 bit signed int\n"
+"32 bit signed int\n"
+"32 bit float"
+
+#: ../plugins/converter/converter.glade.h:36
+msgid ""
+"Pipe\n"
+"Temporary file"
+msgstr ""
+"Pijp\n"
+"Tijdelijk bestand"
+
+#: ../plugins/converter/converter.glade.h:41
+msgid ""
+"Prompt\n"
+"Overwrite"
+msgstr ""
+"Vraag bevestiging\n"
+"Overschrijven"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Speellijst opslaan als"
+
+#~ msgid "_Abort"
+#~ msgstr "_Afbreken"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Lengte"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Omzettingen van bestandopmaak (begin met %):\n"
+#~ " [a]rtiest, [t]itel, al[b]um, [B]and, [C]omponist\n"
+#~ " spoor[n]ummer, [N]totaltracks,\n"
+#~ " [l]engte, [y]jaar, [g]enre, [c]ommentaar,\n"
+#~ " auteurs[r]echt, [b]estandnaam, [T]ags,\n"
+#~ " [d]map, [D]MapMetPad\n"
+#~ "Bijvoorbeeld: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Dynamische samplerate-wisseling toestaan"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Samplerate-conversiekwaliteit:"
+
+#~ msgid "Description:"
+#~ msgstr "Beschrijving:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Auteur(s):"
+
+#~ msgid "Email:"
+#~ msgstr "E-mail:"
+
+#~ msgid "Website:"
+#~ msgstr "Webstek:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Omzettingen van bestandopmaak (begin met %):\n"
+#~ " [a]rtiest, [t]itel, al[b]um, [B]and, [C]omponist\n"
+#~ " spoor[n]ummer, [N]totaltracks,\n"
+#~ " [d]uur, [j]aar, [g]enre, [c]ommentaar,\n"
+#~ " auteurs[r]echt, [b]estandnaam, [T]ags\n"
+#~ "Bijvoorbeeld: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Titel / Spoor Artiest"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configuratie %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA uitvoer-plugin"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF is nu aan het spelen"
+
+#~ msgid "HVSC path"
+#~ msgstr "HVSC-pad"
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"
 #~ "Make backup copies before using."
 #~ msgstr ""
-#~ "WAARSCHUWING: tag schrijffout is nog steeds in ontwikkeling.\n"
-#~ "Maak backup kopies alvorens gebruik."
+#~ "WAARSCHUWING: schrijffunctie voor etiketten is nog steeds in "
+#~ "ontwikkeling.\n"
+#~ "Maak reservekopieën alvorens te gebruiken."
 
 #~ msgid "Couldn't get enough memory for input buffering."
-#~ msgstr "Kon niet voldoende geheugen krijgen voor input buffer"
+#~ msgstr "Kon niet voldoende geheugen krijgen voor invoerbuffer."
 
 #~ msgid "Error reading first page of Ogg bitstream."
-#~ msgstr "Fout bij het lezen van eerste pagina van Ogg bitstream"
+#~ msgstr "Fout bij het lezen van eerste pagina van Ogg bitstream."
 
 #~ msgid "Error reading initial header packet."
-#~ msgstr "Fout bij lezen initieel header packet"
+#~ msgstr "Fout bij lezen initieel header pakket."
 
 #~ msgid "Couldn't get enough memory to register new stream serial number."
-#~ msgstr "Kon niet voldoende geheugen krijgen voor de registratie van het nieuwe stream serienummer."
+#~ msgstr ""
+#~ "Kon niet voldoende geheugen krijgen voor de registratie van het nieuwe "
+#~ "stream-serienummer."
 
 #~ msgid "Input truncated or empty."
-#~ msgstr "Input leeg of corrupt"
+#~ msgstr "Invoer verminkt of leeg."
 
 #~ msgid "Input is not an Ogg bitstream."
 #~ msgstr "Input is geen Ogg bitstream."
 
 #~ msgid "Ogg bitstream does not contain Vorbis data."
-#~ msgstr "Ogg bitstream bevat geen Vorbis data"
+#~ msgstr "Ogg bitstream bevat geen Vorbis-gegevens."
 
 #~ msgid "EOF before recognised stream."
-#~ msgstr "EOF voor herkenning stream"
+#~ msgstr "EOF voor herkende stream."
 
 #~ msgid "Ogg bitstream does not contain a supported data-type."
-#~ msgstr "Ogg bitstream bevat geen ondersteund data-type."
+#~ msgstr "Ogg bitstream bevat geen ondersteund gegevenstype."
 
 #~ msgid "Corrupt secondary header."
 #~ msgstr "Secundaire header corrupt."
 
 #~ msgid "EOF before end of Vorbis headers."
-#~ msgstr "EOF voor einde van Vorbis headers."
+#~ msgstr "EOF voor einde van Vorbis-headers."
 
 #~ msgid "Corrupt or missing data, continuing..."
-#~ msgstr "Data corrupt of onvolledig, doorgaan..."
+#~ msgstr "Gegevens corrupt of ontbrekend, bezig met doorgaan..."
 
-#~ msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-#~ msgstr "Fout bij schrijven van stream naar output. Output stream is mogelijk corrupt of onvolledig."
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Fout bij schrijven van stream naar uitvoer. Uitvoer-stream is mogelijk "
+#~ "corrupt of verminkt."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Geluid (adv.)"

deadbeef-0.5.1.tar.bz2/po/pl.po -> deadbeef-0.5.2.tar.bz2/po/pl.po Changed

@@ -4,14 +4,14 @@
 # Łukasz Jasiński <alvarus@alvarus.org>, 2010.
 # Grzegorz Gibas <amigib@gmail.com>, 2010.
 # Piotr Sokół <psokol@jabster.pl>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-15 04:41+0000\n"
-"PO-Revision-Date: 2010-12-24 01:28+0200\n"
-"Last-Translator: Artur <mazdac@gmail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-30 01:21+0200\n"
+"Last-Translator: Sam <sam@lodsb.net>\n"
 "Language-Team: Polish Translation Team <>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -21,850 +21,908 @@
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Obsługiwane pliki dźwiękowe"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
 msgstr "Inne pliki (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Wybór katalogu"
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Podążanie za dowiązaniami symbolicznymi"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Nie można odczytać pliku pomocy"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Wystąpił błąd przy wczytywaniu pliku pomocy"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1099
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O programie DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Lista zmian w DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tłumacze"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Edytuj listę odtwarzania"
 
-#: ../plugins/gtkui/ddbtabstrip.c:675
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Zmień nazwę listy odtwarzania"
 
-#: ../plugins/gtkui/ddbtabstrip.c:679
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: ../plugins/gtkui/ddbtabstrip.c:683
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Utwórz listę odtwarzania"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Pliki ustawień korektora Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Wczytaj ustawienia..."
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importuj ustawienia programu Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Włączenie"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Wyzeruj wszystkie"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Wyzeruj Preamp"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Wyzeruj pojedyncze"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
 msgstr "Zapisz ustawienia..."
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Wczytaj ustawienia..."
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importuj ustawienia programu Foobar2000..."
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dzień %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zatrzymano odtwarzanie | %d ścieżek | całkowity czas trwania listy odtwarzania: %s"
+msgstr ""
+"Zatrzymano odtwarzanie | %d ścieżek | całkowity czas trwania listy "
+"odtwarzania: %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kb/s "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Wstrzymano odtwarzanie |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %d Hz | %d bitów | %s | %d:%02d / %s | %d ścieżek | całkowity czas trwania listy odtwarzania: %s"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %d Hz | %d bitów | %s | %d:%02d / %s | %d ścieżek | całkowity czas "
+"trwania listy odtwarzania: %s"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Lista odtwarzania w formacie DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Wybór pliku"
 
-#: ../plugins/gtkui/gtkui.c:865
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Inne pliki (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: ../plugins/gtkui/gtkui.c:868
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nowa lista odtwarzania (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Plik"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Otwórz..."
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Dodaj..."
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Dodaj katalog..."
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2973
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Dodaj położenie..."
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Wczytaj listę odtwarzania..."
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Zapisz listę odtwarzania"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Zapisz listę odtwarzania jako..."
-
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "Wy_czyść"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Zaznacz wszystkie"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Odznacz wszystkie"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Usuń pozostałe"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Znajdź"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1707
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Tytuł"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Numer utworu"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Wykonawca"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Data"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Własny"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Widok"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Pasek stanu"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Nagłówki kolumn"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Karty"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Korektor dźwięku"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Kolejność"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Liniowa"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Losowo"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Losowo"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Losowo"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Powtarzanie"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Wszystkie ścieżki"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Pojedyncza ścieżka"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Brak"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Przewijanie podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Kursor podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Zatrzymaj po zaznaczonym utworze"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Przejdź do bieżącego nagrania"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "Lista zmian"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Tłumacze"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Następny"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Odtwarzaj losowo"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "O programie"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../plugins/gtkui/interface.c:1041 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Dodawanie plików..."
-
-#: ../plugins/gtkui/interface.c:1163 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Właściwości utworu"
 
-#: ../plugins/gtkui/interface.c:1209 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "Z_astosuj"
 
-#: ../plugins/gtkui/interface.c:1230 ../plugins/gtkui/interface.c:1276
-#: ../plugins/gtkui/interface.c:2501 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "Zamknij"
 
-#: ../plugins/gtkui/interface.c:1234 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../plugins/gtkui/interface.c:1280 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Właściwości"
 
-#: ../plugins/gtkui/interface.c:1365 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1380 ../plugins/gtkui/interface.c:2873
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Tytuł:"
-
-#: ../plugins/gtkui/interface.c:1388 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Wpisz nową nazwę kolumny"
 
-#: ../plugins/gtkui/interface.c:1396 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Numer ścieżki"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1405 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:1406
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Okładka albumu"
 
-#: ../plugins/gtkui/interface.c:1407
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Wykonawca - Album"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Wykonawca"
-
-#: ../plugins/gtkui/interface.c:1409 ../plugins/gtkui/interface.c:1797
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Tytuł"
-
-#: ../plugins/gtkui/interface.c:1411
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Długość"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/interface.c:1796
-msgid "Track"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
 msgstr "Numer utworu"
 
-#: ../plugins/gtkui/interface.c:1413 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Wykonawca albumu"
 
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Własny"
-
-#: ../plugins/gtkui/interface.c:1420 ../plugins/gtkui/interface.c:3100
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Wyrównanie:"
 
-#: ../plugins/gtkui/interface.c:1443
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Lewo"
 
-#: ../plugins/gtkui/interface.c:1444
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Prawo"
 
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formaty konwersji (zaczyna się od %):\n"
-" [a]rtysta, [t]ytuł, al[b]um, [B]zespół, [C]kompozytor\n"
-" [n]umer utworu, [N]ogółem wszystkich utworów,\n"
-" [l]długość, [y]rok, [g]atunek, [c]komentarz,\n"
-" p[r]awa autorskie, [f]nazwa pliku, [F]pełna nazwa ścieżki, [T]agi\n"
-" [d]katalog, [D]katalog wraz ze ścieżką\n"
-"Przykład: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1475 ../plugins/gtkui/interface.c:2904
-#: ../plugins/gtkui/interface.c:3016 ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "An_uluj"
 
-#: ../plugins/gtkui/interface.c:1496 ../plugins/gtkui/interface.c:2925
-#: ../plugins/gtkui/interface.c:3037 ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1728 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Wtyczka wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1741 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Urządzenie wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1750 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Zezwolenie na dynamiczną zmianę częstotliwości próbkowania"
-
-#: ../plugins/gtkui/interface.c:1767 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Jakość konwersji częstotliwości próbkowania:"
-
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Tryb Replaygain:"
 
-#: ../plugins/gtkui/interface.c:1795
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../plugins/gtkui/interface.c:1799 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Numer utworu"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Szczyt skali Replaygain"
 
-#: ../plugins/gtkui/interface.c:1807 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Przedwzmacniacz replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Przedwzmacniacz powszechny"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Domyślna lista odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1816 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Wznowienie odtwarzania po uruchomieniu programu"
 
-#: ../plugins/gtkui/interface.c:1820 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:1829 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Konfiguracja"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Zapisz ustawienia... DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Ładuj"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Ukrywanie okna do obszaru powiadamiania zamiast zamykania"
 
-#: ../plugins/gtkui/interface.c:1833 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Zamykanie list odtwarzania środkowym przyciskiem myszy"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Ukrycie ikony obszaru powiadamiania"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Wypisywanie nazwy bieżącego utworu pogrubioną czcionką"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Ukrycie polecenia „Usuń pliki z dysku” w menu podręcznym"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Zawartość paska tytułu podczas odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1867 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Zawartość paska tytułu po zatrzymaniu odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Wtyczka interfejsa graficznego (zmiana potrzebuje uruchomienia ponowia)"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Interfejs użytkownika"
 
 # Grzegorz Gibas
 # amigib@gmail.com
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Własne"
 
-#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Pierwszoplanowy"
 
-#: ../plugins/gtkui/interface.c:1908 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Drugoplanowy"
 
-#: ../plugins/gtkui/interface.c:1927 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Pasek przewijania i głośności"
 
-#: ../plugins/gtkui/interface.c:1945 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Środkowy"
 
-#: ../plugins/gtkui/interface.c:1952 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Jasny"
 
-#: ../plugins/gtkui/interface.c:1959 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Ciemny"
 
-#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Baza"
 
-#: ../plugins/gtkui/interface.c:1997 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Tekst"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Karty"
 
-#: ../plugins/gtkui/interface.c:2006 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Podmień (traci motyw GTK treeview, ale przyspiesza renderowanie)"
 
-#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Parzysty wiersz"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Nieparzysty wiersz"
 
-#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2048 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Zaznaczony wiersz"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Zaznaczony tekst"
 
-#: ../plugins/gtkui/interface.c:2080 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Kursor"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Listy odtwarzania"
 
-#: ../plugins/gtkui/interface.c:2097 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Kolory"
 
-#: ../plugins/gtkui/interface.c:2106 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Serwer pośredniczący"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adres:"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port:"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:2161 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Hasło:"
 
-#: ../plugins/gtkui/interface.c:2184 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Sieć"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Wersja:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grupuj"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Wybieraj wtyczkę DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Wtyczki"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Etykiety"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Zapisywanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2343
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Zapisywanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:2220 ../plugins/gtkui/interface.c:2299
-#: ../plugins/gtkui/interface.c:2339 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Zapisywanie APEv2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Usuwanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2355
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Usuwanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/interface.c:2311
-#: ../plugins/gtkui/interface.c:2351 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Usuwanie APEv2"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Wersja ID3v2"
 
-#: ../plugins/gtkui/interface.c:2251
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (rekomendowana)"
 
-#: ../plugins/gtkui/interface.c:2252
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2258 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kodowanie znaków ID3v1 (domyślnie iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2295 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Zapisywanie ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2364 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Etykiety"
-
-#: ../plugins/gtkui/interface.c:2395 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../plugins/gtkui/interface.c:2410 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Autor:"
-
-#: ../plugins/gtkui/interface.c:2425 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Strona internetowa:"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Konfiguracja"
-
-#: ../plugins/gtkui/interface.c:2475 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Wtyczki"
-
-#: ../plugins/gtkui/interface.c:2857 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2984 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3085 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Grupuj"
-
-#: ../plugins/gtkui/interface.c:3110 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formaty konwersji (zaczyna się od %):\n"
-" [a]rtysta, [t]ytuł, al[b]um, [B]zespół, [C]kompozytor\n"
-" [n]umer utworu, [N]ogółem wszystkich utworów,\n"
-" [l]długość, [y]rok, [g]atunek, [c]komentarz,\n"
-" p[r]awa autorskie, [f]nazwa pliku, [T]agi\n"
-"Przykład: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Wykonawca / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Numer ścieżki"
 
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Tytuł / Wykonawca utworu"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Długość"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Usuń pliki z dysku"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -872,203 +930,227 @@
 "Plik zostaną usunięte. Kontynuować?\n"
 "(To ostrzeżenie może zostać wyłączone w ustawieniach GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Dodaj do kolejki"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Usuń z kolejki"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Wczytaj ponownie metadane"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Usuń z dysku"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Dodaj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Edytuj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Usuń kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Grupowanie"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Brak"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artysta/Data/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Otwórz plik..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Ustawienia wtyczki %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Konfiguracja %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Domyślne urządzenie dźwiękowe"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Kombinacja klawiszy"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Dodawanie plików..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inicjalizowanie..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Dane dla tego utworu zostały zmodyfikowane."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Zamknąć okno?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Dodawanie położenia"
-
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Numer pod-utworu"
-
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Typy etykiet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Wewnętrzny Cuesheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Tak"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nie"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Kodek"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+#, fuzzy
+msgid "[Multiple values] "
+msgstr "[różne opcji]"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Klawisz"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Wartość"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeef teraz odtwarza"
+#: ../plugins/gtkui/trkproperties.c:594
+#, fuzzy
+msgid "Writing tags..."
+msgstr "Pisanie etykiety..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Imię:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+#, fuzzy
+msgid "Field names must not start with : or _"
+msgstr "Nie wolno zacząć z : albo _"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+#, fuzzy
+msgid "Cannot add field"
+msgstr "Nie można dodać teren"
+
+#: ../plugins/gtkui/trkproperties.c:667
+#, fuzzy
+msgid "Field with such name already exists, please try different name."
+msgstr "Teren o takim imieniu już istnieje, prosimy spróbować inną"
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Poważnie chcesz usunąć tego teren?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Dodaj..."
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Usuń"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Użycie: deadbeef [OPCJA...] [PLIK...]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opcje:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help lub -h Wyświetla pomoc (ten tekst) i wychodzi z programu\n"
+msgstr ""
+" --help lub -h Wyświetla pomoc (ten tekst) i wychodzi z programu\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Wychodzi z programu\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Wyświetla wersję programie i wychodzi\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Zaczyna odtwarzanie\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Zatrzymuje odtwarzanie\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Wstrzymuje odtwarzanie\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Następny utwór na liście odtwarzania\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Poprzedni utwór na liście odtwarzania\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Losowy utwór na liście odtwarzania\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Dodaje plik(i) do istniejącej listy odtwarzania\n"
+msgstr ""
+" --queue Dodaje plik(i) do istniejącej listy odtwarzania\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Wysyła sformatowaną nazwę utworu do stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1079,16 +1161,36 @@
 " [d]ługość, [n]umer utworu, [r]ok, [k]omentarz,\n"
 " prawa auto[r]skie, [e]pozostało\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " np.: --nowplaying \"%%a - %%t\" powinno wyświetlić \"artysta - tytuł\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" np.: --nowplaying \"%%a - %%t\" powinno wyświetlić "
+"\"artysta - tytuł\"\n"
 
-#: ../playlist.c:378 ../playlist.c:2302
+#: ../main.c:110
+#, c-format, fuzzy
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr "aby czytać dalej, otwórz http://sourceforge.net/apps/mediawiki/deadbeef/inde"
+"x.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Domyślne"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Tak"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1096,7 +1198,13 @@
 "2.3 (Rekomendowany)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1106,7 +1214,7 @@
 "Utwór\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1115,8 +1223,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1132,7 +1240,7 @@
 "Zespół / Wykonawca albumu\n"
 "Własny"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1141,14 +1249,20 @@
 "Prawo"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można znaleźć pliku pixmapy: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: plik konfiguracyjny freepats nie został znaleziony. Zainstaluj pakiet timidity-freepats lub wskaż właściwą ścieżkę do pliku freepats.cfg w ustawieniach wtyczek."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: plik konfiguracyjny freepats nie został znaleziony. Zainstaluj "
+"pakiet timidity-freepats lub wskaż właściwą ścieżkę do pliku freepats.cfg w "
+"ustawieniach wtyczek."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1169,7 +1283,7 @@
 msgid "Release device while stopped"
 msgstr "Zwolnij urządzenie po zatrzymaniu"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Preferowany rozmiar bufora"
 
@@ -1198,168 +1312,567 @@
 msgid "Scrobble URL"
 msgstr "Adres URL systemu składania informacji:"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Okres aktualizacji pamięci podręcznej (h)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Pozyskiwanie z etykiet"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Pozyskiwanie z lokalnego katalogu"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Wzór plików okładek:"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Pozyskiwanie z serwisu last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Pozyskiwanie z serwisu albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Używanie baz danych CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferowanie danych CD-Text zamiast baz danych CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "Adres URL bazy danych CDDB (np. „freedb.org”)"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Numer portu bazy danych CDDB (np. „888”)"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Preferuj protokół CDDB zamiast HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Obsługa obrazów płyt w formacie NRG"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Jakość przepróbkowywania (0..2, wyższa jest lepsza)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Maksymalna długość utworu (min):"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Wyświetlanie pytania przed fizycznym usunięciem plików"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Czułość kontroli głośności ikony obszaru powiadamiania"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Własna ikona stanu"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Uruchom gtk_init z opcją --sync (tryb odpluskwiania)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
+#: ../translation/extra.c:45
+#, fuzzy
+msgid "Notification title format"
+msgstr "Format powiadomień:"
+
+#: ../translation/extra.c:46
+#, fuzzy
+msgid "Notification content format"
 msgstr "Format powiadomień:"
 
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Okładka albumu"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Serwer PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Częstotliwość próbkowania"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Względna ścieżka tablicy przeskoków"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Bezwzględna ścieżka tablicy przeskoków"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 "Odwróć kolejność bitów audio (przełącz jeśli słyszysz tylko ciągły dźwięk)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
+#: ../translation/extra.c:58
+#, fuzzy
+msgid "Enable HVSC Songlength DB"
 msgstr "Włączenie HVSC"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Położenie HVSC:"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+#, fuzzy
+msgid "Default song length (sec)"
+msgstr "Maksymalna długość utworu (min):"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Plik konfiguracyjny banków Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Tytuł utworu"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Wykonawca"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Data"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Numer utworu"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Ilość utworów"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Gatunek"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Numer płyty"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Program kodujący / Dostawca"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Prawa autorskie"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Dodawanie położenia"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Numer pod-utworu"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Typy etykiet"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Wewnętrzny Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+#, fuzzy
+msgid "Target Samplerate"
+msgstr "Częstotliwość próbkowania"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Zaznacz wszystkie"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Edytuj kolumnę"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Urządzenie wyjścia:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Wtyczka wyjścia:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Zapisz ustawienia..."
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+# Grzegorz Gibas
+# amigib@gmail.com
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Własne"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Wczytaj ustawienia..."
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Wtyczka wyjścia:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Zapisywanie APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Zapisywanie ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Zapisywanie ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Etykiety"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Zapisz listę odtwarzania jako..."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Długość"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formaty konwersji (zaczyna się od %):\n"
+#~ " [a]rtysta, [t]ytuł, al[b]um, [B]zespół, [C]kompozytor\n"
+#~ " [n]umer utworu, [N]ogółem wszystkich utworów,\n"
+#~ " [l]długość, [y]rok, [g]atunek, [c]komentarz,\n"
+#~ " p[r]awa autorskie, [f]nazwa pliku, [F]pełna nazwa ścieżki, [T]agi\n"
+#~ " [d]katalog, [D]katalog wraz ze ścieżką\n"
+#~ "Przykład: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Zezwolenie na dynamiczną zmianę częstotliwości próbkowania"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Jakość konwersji częstotliwości próbkowania:"
+
+#~ msgid "Description:"
+#~ msgstr "Opis:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Strona internetowa:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formaty konwersji (zaczyna się od %):\n"
+#~ " [a]rtysta, [t]ytuł, al[b]um, [B]zespół, [C]kompozytor\n"
+#~ " [n]umer utworu, [N]ogółem wszystkich utworów,\n"
+#~ " [l]długość, [y]rok, [g]atunek, [c]komentarz,\n"
+#~ " p[r]awa autorskie, [f]nazwa pliku, [T]agi\n"
+#~ "Przykład: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Tytuł / Wykonawca utworu"
+
+#~ msgid "Setup %s"
+#~ msgstr "Ustawienia wtyczki %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeef teraz odtwarza"
+
+#~ msgid "HVSC path"
+#~ msgstr "Położenie HVSC:"
 
 #~ msgid "_Abort"
 #~ msgstr "_Anuluj"
@@ -1389,7 +1902,8 @@
 #~ msgstr "Błąd odczytu początkowego pakietu nagłówka"
 
 #~ msgid "Couldn't get enough memory to register new stream serial number."
-#~ msgstr "Zbyt mało pamięci do zarejestrowania numeru seryjnego nowego strumienia."
+#~ msgstr ""
+#~ "Zbyt mało pamięci do zarejestrowania numeru seryjnego nowego strumienia."
 
 #~ msgid "Input truncated or empty."
 #~ msgstr "Wejście obcięte lub puste"
@@ -1415,8 +1929,12 @@
 #~ msgid "Corrupt or missing data, continuing..."
 #~ msgstr "Uszkodzone lub brakujące dane, kontynuacja..."
 
-#~ msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-#~ msgstr "Błąd zapisu strumienia wyjściowego. Strumień wyjściowy może być uszkodzony lub obcięty."
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Błąd zapisu strumienia wyjściowego. Strumień wyjściowy może być "
+#~ "uszkodzony lub obcięty."
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"

deadbeef-0.5.1.tar.bz2/po/pt.po -> deadbeef-0.5.2.tar.bz2/po/pt.po Changed

@@ -1,1251 +1,1313 @@
 # Portuguese translation of deadbeef package
 # Copyright (C) 2010 THE deadbeef'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the deadbeef package.
-# Sérgio Marques <smarquespt@gmail.com>, 2010.
+# Sérgio Marques <smarquespt@gmail.com>, 2010,2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-06 04:37+0000\n"
-"PO-Revision-Date: 2010-10-06 12:05-0000\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-11-24 18:47-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: Portugal\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formatos suportados"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Outros ficheiros (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Todos os ficheiros (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Abrir ficheiro(s)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
-msgstr "Adicionar ficheiro(s) à lista..."
+msgstr "Adicionar ficheiro(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
-msgstr "Adicionar pasta(s) à lista..."
+msgstr "Adicionar pasta(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
-msgstr "Seguir \"symlinks\""
+msgstr "Seguir ligações simbólicas"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
-msgstr "Falha ao ler o ficheiro de ajuda"
+msgstr "Falha ao ler a ajuda"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Falha ao carregar a ajuda"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737
+#: ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
-msgstr "Sobre DeaDBeef %s"
+msgstr "Sobre o DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:705
-msgid "about.txt"
-msgstr "about.txt"
-
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Alterações no DeadBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:718
-msgid "ChangeLog"
-msgstr "Alterações"
-
-#: ../plugins/gtkui/callbacks.c:729
-msgid "COPYING.GPLv2"
-msgstr "COPYING.GPLv2"
-
-#: ../plugins/gtkui/callbacks.c:740
-msgid "COPYING.LGPLv2.1"
-msgstr "COPYING.LGPLv2.1"
-
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores do DeaDBeeF"
 
-#: ../plugins/gtkui/callbacks.c:1082
-msgid "translators.txt"
-msgstr "translators.txt"
-
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755
+#: ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
-msgstr "Editar lista"
+msgstr "Editar lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758
+#: ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922
+#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Título:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
-msgstr "Renomear lista"
+msgstr "Mudar nome da lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
-msgstr "Remover lista"
+msgstr "Remover lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
-msgstr "Adicionar nova lista"
+msgstr "Adicionar nova lista de reprodução"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gravar pré-Ajustes do EQ DeadBeeF"
+msgstr "Gravar pré-ajustes do EQ DeadBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Ficheiros de pré-Ajustes do EQ DeadBeeF(*.ddbeq)"
+msgstr "Pré-ajustes do EQ DeadBeeF(*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Carregar pré-Ajustes do EQ DeadBeeF..."
+msgstr "Carregar pré-ajustes do EQ DeadBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Pré-Ajustes do EQ DeadBeeF (*.ddbeq)"
+msgstr "Pré-ajustes do EQ DeadBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar pré-Ajustes Foobar2000..."
+msgstr "Importar pré-ajustes Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Pré-Ajustes Foobar2000 (*.feq)"
+msgstr "Pré-ajustes Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Gravar pré-ajustes"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Carregar pré-ajustes"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importar pré-ajustes do Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Ativar"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
-msgstr "Tudo a zero"
+msgstr "Nulo"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
-msgstr "\"Zero Preamp\""
+msgstr "Amplificador nulo"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
-msgstr "Bandas a zero"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gravar pré-Ajustes"
+msgstr "Bandas nulas"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Carregar pré-Ajustes"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importar pré-Ajustes do Foobar2000"
+#: ../plugins/gtkui/eq.c:387
+#: ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Pré-ajustes"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dias %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Parado | %d faixas | %s reproduções"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
-msgstr "Pausado | "
+msgstr "Em pausa | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s reproduções"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
-msgstr "Gravar lista como"
+msgstr "Gravar lista de reprodução como"
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Listas DeaDBeeF (*.dbpl)"
+msgstr "Lista de reprodução DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
-msgstr "Carregar lista"
+msgstr "Carregar lista de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Outros ficheiros (*)"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:926
+#: ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
-msgstr "Nova lista"
+msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
-msgstr "Nova lista (%d)"
+msgstr "Nova lista de reprodução (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150
+#: ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157
+#: ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
-msgstr "_Abrir ficheiro(s)"
+msgstr "Abrir ficheir_o(s)"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173
+#: ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Adicionar ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181
+#: ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189
+#: ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198
+#: ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
-msgstr "Nova lista"
+msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205
+#: ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
-msgstr "Carregar lista"
+msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209
+#: ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
-msgstr "Gravar lista"
-
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Gravar lista como"
+msgstr "Gravar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218
+#: ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229
+#: ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236
+#: ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Apagar"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Marcar tudo"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251
+#: ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258
+#: ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262
+#: ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269
+#: ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323
+#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Remover"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277
+#: ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281
+#: ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288
+#: ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Ordenar por"
+
+#: ../plugins/gtkui/interface.c:295
+#: ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318
+#: ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790
+#: ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/gtkui/interface.c:299
+#: ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Número da faixa"
+
+#: ../plugins/gtkui/interface.c:303
+#: ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875
+#: ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Álbum"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307
+#: ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/interface.c:311
+#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Data"
+
+#: ../plugins/gtkui/interface.c:315
+#: ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017
+#: ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Personalizar"
+
+#: ../plugins/gtkui/interface.c:324
+#: ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328
+#: ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335
+#: ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339
+#: ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
-msgstr "Cabeçalhos das colunas"
+msgstr "Cabeçalhos de colunas"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343
+#: ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Separadores"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347
+#: ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351
+#: ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358
+#: ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
-msgstr "Ordem"
+msgstr "Organização"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365
+#: ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:336
+#: ../plugins/gtkui/interface.c:370
+#: ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Desordenar faixas"
+
+#: ../plugins/gtkui/interface.c:375
 #: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Misturar"
+msgid "Shuffle albums"
+msgstr "Desordenar álbuns"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380
+#: ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Aleatório"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386
+#: ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Repetição"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Repetir todas"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398
+#: ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
-msgstr "Repetir música"
+msgstr "Repetir uma música"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403
+#: ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Não repetir"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409
+#: ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Deslocamento segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414
+#: ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418
+#: ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
-msgstr "Parar após a atual"
+msgstr "Parar após a faixa atual"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430
+#: ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Ir para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437
+#: ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452
+#: ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Alterações"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461
+#: ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465
+#: ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474
+#: ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482
+#: ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898
+#: ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Procurar"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973
+#: ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981
+#: ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989
+#: ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997
+#: ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
-msgstr "Anterior "
+msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005
+#: ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Reprodução aleatória"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022
+#: ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035
+#: ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:1045
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Adicionando ficheiros..."
-
-#: ../plugins/gtkui/interface.c:1089
-#: ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Abortar"
-
-#: ../plugins/gtkui/interface.c:1189
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225
+#: ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:1235
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270
+#: ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Definições"
+
+#: ../plugins/gtkui/interface.c:1296
+#: ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1256
-#: ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317
+#: ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
-msgstr "_Fechar"
+msgstr "Fe_char"
 
-#: ../plugins/gtkui/interface.c:1260
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321
+#: ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
-msgstr "Meta-dados"
+msgstr "Detalhes"
 
-#: ../plugins/gtkui/interface.c:1306
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367
+#: ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:1391
-#: ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1406
-#: ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Título:"
-
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494
+#: ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
-msgstr "Indique aqui o novo título da coluna"
+msgstr "Indique o novo título da coluna"
 
-#: ../plugins/gtkui/interface.c:1422
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502
+#: ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
-msgstr "Índice"
+msgstr "Índice de itens"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511
+#: ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
-msgstr "Em reprodução"
+msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Capa do álbum"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Álbum"
-
-#: ../plugins/gtkui/interface.c:1436
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Título"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517
+#: ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Duração"
 
-#: ../plugins/gtkui/interface.c:1438
-#: ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Faixa"
+#: ../plugins/gtkui/interface.c:1518
+#: ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Número da faixa"
 
-#: ../plugins/gtkui/interface.c:1439
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519
+#: ../translation/extra.c:68
 msgid "Band / Album Artist"
-msgstr "Banda/Artista do Álbum"
-
-#: ../plugins/gtkui/interface.c:1440
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Personalizar"
+msgstr "Banda / Artista do álbum"
 
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526
+#: ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1461
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551
+#: ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Direita"
 
-#: ../plugins/gtkui/interface.c:1472
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversão de formatos (iniciam com %):\n"
-" [a]rtista, [t]ítulo, ál[b]um, [B]anda, [C]ompositor\n"
-" [n]úmerodefaixa, [N]totaldefaixas,\n"
-" [l]duração, [y]ano, [g]énero, [c]omentário,\n"
-" di[r]eitosdeautor, nomede[f]icheiro, [F]nomecompletodocaminho,\n"
-" [T]detalhes [d]iretório, [D]iretóriocomcaminho\n"
-"Exemplo: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501
-#: ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040
-#: ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583
+#: ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065
+#: ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1522
-#: ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061
-#: ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604
+#: ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086
+#: ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1753
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825
+#: ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
-msgstr "\"Plug-ins\" de som:"
+msgstr "Sistema de som:"
 
-#: ../plugins/gtkui/interface.c:1766
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838
+#: ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositivo de som:"
 
-#: ../plugins/gtkui/interface.c:1775
-#: ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847
+#: ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Converter, sempre, 8 bits em 16 bits"
+
+#: ../plugins/gtkui/interface.c:1851
+#: ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Som"
 
-#: ../plugins/gtkui/interface.c:1784
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Permitir troca dinâmica da taxa de amostragem"
-
-#: ../plugins/gtkui/interface.c:1792
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Qualidade de conversão:"
-
-#: ../plugins/gtkui/interface.c:1811
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864
+#: ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
-msgstr "Modo de consistência:"
+msgstr "Modo Replay Gain:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Desativar"
 
-#: ../plugins/gtkui/interface.c:1824
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Faixa"
+
+#: ../plugins/gtkui/interface.c:1877
+#: ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
-msgstr "Escala de consistência"
+msgstr "Escala Replay Gain"
 
-#: ../plugins/gtkui/interface.c:1832
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892
+#: ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902
+#: ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906
+#: ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Amplificador Replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913
+#: ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Amplificador:"
+
+#: ../plugins/gtkui/interface.c:1944
+#: ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Adicionar ficheiros via linha de comandos (ou gestor de ficheiros) para esta lista:"
+msgstr "Adicionar ficheiros via linha de comandos (ou gestor de ficheiros) para esta lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:1841
+#: ../plugins/gtkui/interface.c:1953
 #: ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Ao iniciar, retomar a sessão anterior"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957
+#: ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Não adicionar arquivos, ao adicionar pastas"
+
+#: ../plugins/gtkui/interface.c:1961
+#: ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1854
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982
+#: ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/gtkui/interface.c:2017
+#: ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Cadeia de pré-ajustes DSP"
+
+#: ../plugins/gtkui/interface.c:2029
+#: ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "Carr_egar"
+
+#: ../plugins/gtkui/interface.c:2033
+#: ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
-msgstr "Fechar minimiza para área de notificação"
+msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:1858
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046
+#: ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
-msgstr "Botão central do rato fecha a lista"
+msgstr "Botão central do rato fecha a lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:1862
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050
+#: ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Ocultar ícone da área de notificação"
 
-#: ../plugins/gtkui/interface.c:1866
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054
+#: ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
-msgstr "Utilizar letra a negrito para a faixa em reprodução"
+msgstr "Utilizar letra a negrito para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:1870
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058
+#: ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
-msgstr "Ocultar item do menu de contexto \"Apagar do disco\""
+msgstr "Ocultar item do menu \"Apagar do disco\""
 
-#: ../plugins/gtkui/interface.c:1878
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062
+#: ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Nome automático das listas de reprodução, ao adicionar uma pasta"
+
+#: ../plugins/gtkui/interface.c:2070
+#: ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Taxa de atualização da interface (vezes por segundo):"
+
+#: ../plugins/gtkui/interface.c:2084
+#: ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
-msgstr "Barra de título se em reprodução:"
+msgstr "Barra de título ao reproduzir:"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098
+#: ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Barra de título se parada:"
 
-#: ../plugins/gtkui/interface.c:1902
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112
+#: ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "\"Plug-in\" de GUI (tem que reiniciar o deadbeef):"
+
+#: ../plugins/gtkui/interface.c:2120
+#: ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1916
-#: ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135
+#: ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Sobrepor"
 
-#: ../plugins/gtkui/interface.c:1925
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144
+#: ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
-msgstr "Plano principal"
+msgstr "Principal"
 
-#: ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151
+#: ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
-msgstr "Segundo plano"
+msgstr "Secundária"
 
-#: ../plugins/gtkui/interface.c:1951
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170
+#: ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
-msgstr "Cores das barras de volume/procura"
+msgstr "Cor das barras de volume/procura"
 
-#: ../plugins/gtkui/interface.c:1969
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188
+#: ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Central"
 
-#: ../plugins/gtkui/interface.c:1976
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195
+#: ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:1983
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202
+#: ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2014
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233
+#: ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2021
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240
+#: ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Texto"
+
+#: ../plugins/gtkui/interface.c:2253
+#: ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Cores do separador"
 
-#: ../plugins/gtkui/interface.c:2030
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262
+#: ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Sobrepor (perde a vista em árvore, mas acelera o processamento)"
 
-#: ../plugins/gtkui/interface.c:2039
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271
+#: ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Linha par"
 
-#: ../plugins/gtkui/interface.c:2046
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278
+#: ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Linha ímpar"
 
-#: ../plugins/gtkui/interface.c:2065
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2072
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304
+#: ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Linha selecionada"
 
-#: ../plugins/gtkui/interface.c:2091
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323
+#: ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Texto selecionado"
 
-#: ../plugins/gtkui/interface.c:2104
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336
+#: ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2117
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349
+#: ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
-msgstr "Cores da lista"
+msgstr "Cores da lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:2121
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353
+#: ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2130
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362
+#: ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Ativar servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2138
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370
+#: ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Endereço do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2152
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384
+#: ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Porta do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2166
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398
+#: ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2185
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417
+#: ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
-msgstr "Utilizador da proxy:"
+msgstr "Utilizador de proxy:"
+
+#: ../plugins/gtkui/interface.c:2430
+#: ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "Senha de proxy:"
+
+#: ../plugins/gtkui/interface.c:2440
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "Rede"
+
+#: ../plugins/gtkui/interface.c:2471
+#: ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Versão:"
+
+#: ../plugins/gtkui/interface.c:2535
+#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Direitos de autor"
+
+#: ../plugins/gtkui/interface.c:2545
+#: ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "\"Plug-ins\""
+
+#: ../plugins/gtkui/interface.c:3033
+#: ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135
+#: ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Agrupar por"
+
+#: ../plugins/gtkui/interface.c:3259
+#: ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Organizar por..."
+
+#: ../plugins/gtkui/interface.c:3275
+#: ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Formato"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../plugins/gtkui/interface.c:3359
+#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Selecione o \"plug-in\" DSP"
 
-#: ../plugins/gtkui/interface.c:2198
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "Proxy Password:"
-msgstr "Senha de proxy:"
+#: ../plugins/gtkui/interface.c:3375
+#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016
+#: ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "\"Plug-in\""
 
-#: ../plugins/gtkui/interface.c:2208
-#: ../plugins/gtkui/deadbeef.glade.h:81
-msgid "Network"
-msgstr "Rede"
+#: ../plugins/gtkui/interface.c:3461
+#: ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Definições do editor de detalhes"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3492
+#: ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
-msgstr "Escrever ID3v2"
+msgstr "Gravar ID3v2"
 
-#: ../plugins/gtkui/interface.c:2240
-#: ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496
+#: ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
-msgstr "Escrever ID3v1"
+msgstr "Gravar ID3v1"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500
+#: ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619
+#: ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
-msgstr "Escrever APEv2"
+msgstr "Gravar APEv2"
 
-#: ../plugins/gtkui/interface.c:2252
-#: ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508
+#: ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Remover ID3v2"
 
-#: ../plugins/gtkui/interface.c:2256
-#: ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512
+#: ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Remover ID3v1"
 
-#: ../plugins/gtkui/interface.c:2260
-#: ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516
+#: ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631
+#: ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Remover APEv2"
 
-#: ../plugins/gtkui/interface.c:2268
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524
+#: ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versão ID3v2"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recomendado)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538
+#: ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificação de caracteres ID3v1 (omissão é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
-msgstr "Escrever ID3v2.4"
-
-#: ../plugins/gtkui/interface.c:2388
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Editor de detalhes"
-
-#: ../plugins/gtkui/interface.c:2419
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Descrição:"
-
-#: ../plugins/gtkui/interface.c:2434
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Autor(s):"
-
-#: ../plugins/gtkui/interface.c:2449
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "\"Email\":"
-
-#: ../plugins/gtkui/interface.c:2464
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Sítio web:"
-
-#: ../plugins/gtkui/interface.c:2495
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:2499
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "\"Plug-ins\""
-
-#: ../plugins/gtkui/interface.c:2881
-#: ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:3008
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Agrupar por"
+msgstr "Gravar ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3134
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Conversão de formatos (iniciam com %):\n"
-" [a]rtista, [t]ítulo, ál[b]um, [B]anda, [C]ompositor\n"
-" [n]úmerodefaixa, [N]totaldefaixas,\n"
-" [l]duração, [y]ano, [g]énero, [c]omentário,\n"
-" di[r]eitosdeautor, nomede[f]icheiro, [T]detalhes\n"
-"Exemplo: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317
+#: ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Faixa n.º"
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Título/Artista da faixa"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Duração"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Apagar ficheiros no disco"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Os ficheiros serão perdidos. Continuar?\n"
-"(Esta janela pode ser desligada nas definições do \"GTKUI\")"
-
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+"Os ficheiros serão eliminados. Continuar?\n"
+"(Esta janela pode ser desligada nas definições da GTKUI)"
+
+#: ../plugins/gtkui/plcommon.c:340
+#: ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693
+#: ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
-msgstr "Colocar na fila da lista"
+msgstr "Juntar à fila de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
-msgstr "Remover da fila da lista"
+msgstr "Remover da fila de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
-msgstr "Atualizar meta-dados"
+msgstr "Recarregar detalhes"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Remover do disco"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855
+#: ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Adicionar coluna"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885
+#: ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Editar coluna"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Remover coluna"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
-msgstr "Nenhum"
+msgstr "Nada"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Álbum"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Abrir ficheiro..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr "Configurar %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
-msgstr "Dispositivo áudio por omissão"
+msgstr "Dispositivo áudio pré-definido"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318
+#: ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Teclas de atalho"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
-msgstr "Ranhura"
+msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
-msgstr "Combinação de teclas"
+msgstr "Combinação"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "\"Plug-in\" alsa"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "A adicionar ficheiros..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
-msgstr "Inicializando..."
+msgstr "A iniciar..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
-msgstr "Modificou os dados desta faixa."
+msgstr "Você modificou os dados desta faixa."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Fechar esta janela?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Local"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Valores múltiplos]"
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Índice de sub-faixa"
+#: ../plugins/gtkui/trkproperties.c:407
+#: ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Tecla"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tipo(s) de detalhes"
+#: ../plugins/gtkui/trkproperties.c:408
+#: ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "\"Cuesheet\" incorporada"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "A escrever detalhes..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Sim"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Não"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Os nomes não podem iniciar com : ou _"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codificador"
+#: ../plugins/gtkui/trkproperties.c:634
+#: ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Incapaz de adicionar o campo"
 
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Tecla"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Já existe um campo com este nome. Tente um nome diferente."
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Remover o campo selecionado?"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF está a reproduzir"
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Adicionar campo"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Remover campo"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Utilização: deadbeef [opções] [ficheiro(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ou -h Imprime a ajuda e sai\n"
+msgstr " --help ou -h Imprime a ajuda (esta mensagem) e sai\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
-msgstr " --quit Sair do DeadBeeF\n"
+msgstr " --quit Sai do DeadBeeF\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
-msgstr " --version Imprime info da versão e sai\n"
+msgstr " --version Imprime informações da versão e sai\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
-msgstr " --play Iniciar reprodução\n"
+msgstr " --play Inicia a reprodução\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
-msgstr " --stop Parar reprodução\n"
+msgstr " --stop Para a reprodução\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
-msgstr " --pause Pausar reprodução\n"
+msgstr " --pause Pausa a reprodução\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Retomar/Pausar\n"
+
+#: ../main.c:100
+#, c-format
+msgid " --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Inicia reprodução se parado, caso contrário coloca em pausa\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Avança uma música\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
-msgstr " --prev Retrocede uma música\n"
+msgstr " --prev Recua uma música\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Música aleatória na lista\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Acrescenta ficheiro(s) à lista existente\n"
+msgstr " --queue Junta ficheiro(s) à lista existente\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Imprime o nome da faixa para \"stdout\"\n"
+msgstr " --nowplaying FMT Grava o nome da faixa para stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1256,17 +1318,30 @@
 " [l]duração, [n]úmerodafaixa, [y]ano, [c]omentário,\n"
 " di[r]eitosdeautor, d[e]corrido\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " ex: --nowplaying \"%%a - %%t\" deve imprimir \"artista - título\"\n"
+msgstr " ex: --nowplaying \"%%a - %%t\" deve gravar \"artista - título\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid " for more info, see http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " para mais informações, consulte http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:377
-#: ../playlist.c:2289
+#: ../playlist.c:454
+#: ../playlist.c:2398
 msgid "Default"
-msgstr "Omissão"
+msgstr "Pré-definição"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Sim"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Não"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1274,17 +1349,25 @@
 "2.3 (Recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Ascendente\n"
+"Descendente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 "Desativar\n"
-"faixa do\n"
-"álbum"
+"Faixa\n"
+"Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1293,12 +1376,12 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"Índice\n"
+"Índice de itens\n"
 "Em reprodução\n"
 "Capa do álbum\n"
 "Artista - álbum\n"
@@ -1307,10 +1390,10 @@
 "Título\n"
 "Duração\n"
 "Faixa\n"
-"Banda/artista do álbum\n"
+"Banda / Artista do álbum\n"
 "Personalizar"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1320,6 +1403,8 @@
 
 #: ../plugins/gtkui/support.c:90
 #: ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90
+#: ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Incapaz de encontrar o ficheiro: %s"
@@ -1327,7 +1412,7 @@
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
 msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: o ficheiro de configuração \"freepats\" não foi encontrado. Por favor, instale o pacote timidity-freepats ou especifique o caminho para freepats.cfg nas definições do \"plug-in\"."
+msgstr "wildmidi: o ficheiro de configuração freepats não foi encontrado. Por favor, instale o pacote timidity-freepats ou especifique o caminho para freepats.cfg nas definições do \"plug-in\"."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1342,20 +1427,20 @@
 #. ALSA output plugin
 #: ../translation/extra.c:6
 msgid "Use ALSA resampling"
-msgstr "Utilizar nova amostragem ALSA"
+msgstr "Utilizar frequência ALSA"
 
 #: ../translation/extra.c:7
 msgid "Release device while stopped"
 msgstr "Libertar dispositivo se parado"
 
 #: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:51
 msgid "Preferred buffer size"
-msgstr "Tamanho do \"buffer\""
+msgstr "Tamanho da memória"
 
 #: ../translation/extra.c:9
 msgid "Preferred period size"
-msgstr "Tamnaho do período"
+msgstr "Tamanho do período"
 
 #. Last.fm plugin
 #: ../translation/extra.c:11
@@ -1368,7 +1453,7 @@
 
 #: ../translation/extra.c:13
 msgid "Username"
-msgstr "Nome de utilizador"
+msgstr "Utilizador"
 
 #: ../translation/extra.c:14
 msgid "Password"
@@ -1376,167 +1461,611 @@
 
 #: ../translation/extra.c:15
 msgid "Scrobble URL"
-msgstr "Memorizar URL"
+msgstr "\"Scrobble\" URL"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
-msgid "Cache update period (hr)"
-msgstr "Período de atualização (hr)"
+msgid "Device file"
+msgstr "Ficheiro"
 
 #: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Resolução para o erro OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Atualização de cache (hr)"
+
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Obter a partir dos detalhes"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
-msgstr "Obter numa pasta local"
+msgstr "Obter numa pasta local"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Máscara de capa local"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Obter na last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Obter no albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Ajustar capa de álbum"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Utilizar CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferir CD-Text a CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "URL CDDB (ex: \"freedb.org\")"
+msgstr "URL CDDB (ex: freedb.org)"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
-msgstr "Porta CDDB (ex: \"888\")"
+msgstr "Porta CDDB (ex: 888)"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Preferir CDDB a HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
-msgstr "Ativar o suporte a imagens NRG"
+msgstr "Ativar suporte a imagens NRG"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
-msgstr "Qualidade de amostragem (0..2, mais alto = melhor)"
+msgstr "Qualidade de frquência (0..2, quanto mais alto, melhor)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Duração máxima de músicas (minutos)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
-msgstr "Solicitar confirmação antes de apagar"
+msgstr "Solicitar confirmação antes de eliminar"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Sensibilidade do ícone de volume na barra de estado"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Ícone de estado personalizado"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Execute gtk_init com --sync (modo \"debug\")"
+msgstr "Execute gtk_init com --sync (modo de depuração)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Adicionar separadores entre os itens do menu de contexto"
 
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Formato da notificação"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Formato do título da notificação"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Formato do texto da notificação"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Mostrar capa do álbum"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Tamanho da capa de álbum (px)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Servidor PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
-msgstr "Taxa de amostra"
+msgstr "Frequência"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Caminho da tabela de pesquisa relativa"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Caminho da tabela de pesquisa absoluta"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Trocar \"bytes\" áudio (troque se apenas ouvir estático)"
+msgstr "Trocar bytes áudio (apenas se ouvir defeitos)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "Ativar HVSC"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Ativar base de dados de duração HVSC"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Caminho HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (de HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bits por frequência (8 ou 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Duração pré-definida das músicas (seg)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Ficheiro de configuração do Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Título da faixa"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Artista"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Data"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Número da faixa"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Total de faixas"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Género"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Número do disco"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Codificador/Fornecedor"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Direitos de autor"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Local"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Índice de subfaixa"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tipo(s) de detalhes"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet incorporada"
 
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codificador"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Extensões (separadas por \";\")"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Converter"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Frequência final"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Qualidade/Algoritmo"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Frequência automática (substitui frequência final)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "O ficheiro já existe. Substituir?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Aviso de conversão"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Por favor, escolha o codificador"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Erro de conversão"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "A converter..."
+
+#: ../plugins/converter/convgui.c:394
+#: ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Selecione a pasta..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Falha ao gravar as definições do codificador"
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Check preset folder permissions, try to pick different title, or free up some disk space"
+msgstr "Verifique as permissões, escolha um nome diferente ou liberte espaço em disco"
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Já existe um pré-ajuste com este nome. Escolha outro nome."
+
+#: ../plugins/converter/convgui.c:638
+#: ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Erro"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Adicionar novo codificador"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Editar codificador"
+
+#: ../plugins/converter/convgui.c:756
+#: ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Remover pré-ajuste"
+
+#: ../plugins/converter/convgui.c:758
+#: ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta ação eliminará o pré-ajuste selecionado. Tem a certeza?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:838
+#: ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Adicionar \"plug-in\" à cadeia DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Falha ao gravar as definições DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Novo pré-ajuste DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Editar pré-ajuste DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Pré-ajustes DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Pasta de destino:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Nome do ficheiro:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"A extensão (ex: mp3) será adicionada automaticamente.\n"
+"Deixe o campo vazio para utilizar (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Codificador:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Pré-ajuste DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Número de processos:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Formato de destino:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Manter formato original"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bits signed int"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bits signed int"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bits signed int"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bits float"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Se o ficheiro existir:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Perguntar"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Substituir"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Manter estrutura da pasta, iniciando em:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Editar definições do codificador"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Codificador sem nome"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Extensão do ficheiro de destino:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Ex. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Linha de comandos:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Exemplo: lame - %o\n"
+"%i para o ficheiro de origem, %o para o ficheiro de destino, - para stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - nome do ficheiro de destino\n"
+"%i - nome do ficheiro temporário"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Método:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Canal"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Ficheiro temporário"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Editor de detalhes"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Editor de DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Pré-ajuste DSP sem nome"
+
+#~ msgid "about.txt"
+#~ msgstr "about.txt"
+
+#, fuzzy
+#~ msgid "ChangeLog"
+#~ msgstr "_Alterações"
+
+#~ msgid "COPYING.GPLv2"
+#~ msgstr "COPYING.GPLv2"
+
+#, fuzzy
+#~ msgid "COPYING.LGPLv2.1"
+#~ msgstr "_LGPLv2.1"
+
+#, fuzzy
+#~ msgid "translators.txt"
+#~ msgstr "_Tradutores"
+
+#, fuzzy
+#~ msgid "Save playlist as"
+#~ msgstr "Gravar lista de reprodução"
+
+#, fuzzy
+#~ msgid "_Abort"
+#~ msgstr "_Sobre"
+
+#, fuzzy
+#~ msgid "editcolumndlg"
+#~ msgstr "Editar coluna"
+
+#, fuzzy
+#~ msgid "Length"
+#~ msgstr "Esquerda"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversão de formatos (iniciam com %):\n"
+#~ "[a]rtista, [t]ítulo, ál[b]um, [B]anda, [C]ompositor\n"
+#~ "[n]úmerodefaixa, [N]totaldefaixas,\n"
+#~ "[l]duração, [y]ano, [g]énero, [c]omentário,\n"
+#~ "di[r]eitosdeautor, nomede[f]icheiro, [F]nomecompletodocaminho,\n"
+#~ "[T]detalhes [d]iretório, [D]iretóriocomcaminho\n"
+#~ "Exemplo: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Permitir troca dinâmica da frequência"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Qualidade de conversão:"
+
+#, fuzzy
+#~ msgid "Description:"
+#~ msgstr "Duração"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor(es):"
+
+#~ msgid "Email:"
+#~ msgstr "Endereço eletrónico:"
+
+#~ msgid "Website:"
+#~ msgstr "Sítio web:"
+
+#, fuzzy
+#~ msgid "editplaylistdlg"
+#~ msgstr "Editar lista de reprodução"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Conversão de formatos (iniciam com %):\n"
+#~ " [a]rtista, [t]ítulo, ál[b]um, [B]anda, [C]ompositor\n"
+#~ " [n]úmerodefaixa, [N]totaldefaixas,\n"
+#~ " [l]duração, [y]ano, [g]énero, [c]omentário,\n"
+#~ " di[r]eitosdeautor, nomede[f]icheiro, [T]detalhes\n"
+#~ "Exemplo: %a - %t [%l]"
+
+#, fuzzy
+#~ msgid "Title / Track Artist"
+#~ msgstr "Total de faixas"
+
+#~ msgid "Setup %s"
+#~ msgstr "Configurar %s"
+
+#, fuzzy
+#~ msgid "ALSA output plugin"
+#~ msgstr "Sistema de som:"
+
+#, fuzzy
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "Desativar em reprodução"
+
+#~ msgid "HVSC path"
+#~ msgstr "Caminho HVSC"
+
+#~ msgid ""
+#~ "Keep source format\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+#~ msgstr ""
+#~ "Manter formato original\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+
+#~ msgid ""
+#~ "Pipe\n"
+#~ "Temporary file"
+#~ msgstr ""
+#~ "Canal\n"
+#~ "Ficheiro temporário"
+
+#~ msgid ""
+#~ "Prompt\n"
+#~ "Overwrite"
+#~ msgstr ""
+#~ "Perguntar\n"
+#~ "Substituição"

deadbeef-0.5.1.tar.bz2/po/pt_BR.po -> deadbeef-0.5.2.tar.bz2/po/pt_BR.po Changed

@@ -8,94 +8,95 @@
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-14 21:06-0300\n"
-"PO-Revision-Date: 2011-05-14 21:06-0300\n"
-"Last-Translator: Sérgio Cipolla <secipolla@gmail.com>\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-06 01:53+0200\n"
+"Last-Translator: Henrique P. <zehrique@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar2.conectiva.com.br>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../plugins/gtkui/callbacks.c:121
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Formatos de áudio suportados"
 
-#: ../plugins/gtkui/callbacks.c:132 ../plugins/gtkui/gtkui.c:772
-msgid "Other files (*)"
-msgstr "Outros arquivos (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Todos os arquivos (*)"
 
-#: ../plugins/gtkui/callbacks.c:142
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Abrir arquivos(s)..."
 
-#: ../plugins/gtkui/callbacks.c:177
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Adicionar arquivos(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/callbacks.c:218
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Adicionar pasta(s) à lista de reprodução..."
 
-#: ../plugins/gtkui/callbacks.c:223
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Seguir ligações simbólicas"
 
-#: ../plugins/gtkui/callbacks.c:697
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Falha ao ler o arquivo de ajuda"
 
-#: ../plugins/gtkui/callbacks.c:707
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Falha ao carregar o arquivo de ajuda"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.pt_BR.txt"
 
-#: ../plugins/gtkui/callbacks.c:723 ../plugins/gtkui/interface.c:1155
-#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/converter/convgui.c:1233
-#: ../plugins/converter/convgui.c:1241
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/callbacks.c:733
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Sobre o DeaDBeef %s"
 
-#: ../plugins/gtkui/callbacks.c:746
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Registro de alterações - DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:1091
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Tradutores do DeaDBeeF"
 
-#: ../plugins/gtkui/ddbtabstrip.c:689 ../plugins/gtkui/trkproperties.c:611
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Editar lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:692 ../plugins/gtkui/interface.c:1486
-#: ../plugins/gtkui/interface.c:2861 ../plugins/gtkui/deadbeef.glade.h:134
-#: ../plugins/converter/interface.c:402
-#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
 msgid "Title:"
 msgstr "Título:"
 
-#: ../plugins/gtkui/ddbtabstrip.c:748
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Renomear lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:752
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução"
 
-#: ../plugins/gtkui/ddbtabstrip.c:756
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Adicionar nova lista de reprodução"
 
@@ -151,8 +152,7 @@
 msgid "Zero Bands"
 msgstr "Bandas a zero"
 
-#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:826
-#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
 msgid "Presets"
 msgstr "Predefinições"
 
@@ -196,32 +196,36 @@
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s tempo total de "
 "reprodução"
 
-#: ../plugins/gtkui/gtkui.c:628
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Salvar lista como"
 
-#: ../plugins/gtkui/gtkui.c:639
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Arquivos de listas do DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:757
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Carregar lista"
 
-#: ../plugins/gtkui/gtkui.c:910 ../plugins/gtkui/fileman.c:40
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Outros arquivos (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/gtkui.c:913
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista (%d)"
 
-#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Abrir arquivos(s)"
 
@@ -233,238 +237,236 @@
 msgid "Add folder(s)"
 msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:2961
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Salvar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:453
-#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:103
-#: ../plugins/converter/interface.c:653
-#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Remover"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Sort By"
 msgstr "Ordenar por"
 
 #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
-#: ../plugins/gtkui/mainplaylist.c:315 ../plugins/gtkui/prefwin.c:620
-#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:133
-#: ../plugins/converter/convgui.c:783 ../plugins/converter/convgui.c:1204
-#: ../plugins/converter/interface.c:630
-#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
 msgid "Title"
 msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Track number"
 msgstr "Número da faixa"
 
 #: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
 #: ../translation/extra.c:69
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
 #: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
-#: ../plugins/gtkui/plcommon.c:998 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
 #: ../translation/extra.c:65
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
 #: ../translation/extra.c:70
 msgid "Date"
 msgstr "Data"
 
 #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
-#: ../plugins/gtkui/plcommon.c:1002 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1797
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Barra de status"
 
-#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Cabeçalhos das colunas"
 
-#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Abas"
 
-#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:39
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3237
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ordem"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linear"
 
-#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "Shuffle tracks"
 msgstr "Embaralhar faixas"
 
-#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Shuffle albums"
 msgstr "Embaralhar álbuns"
 
-#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Aleatória"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Repetição"
 
-#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Repetir tudo"
 
-#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Repetir a música"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Não repetir"
 
-#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Rolagem segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Parar após a atual"
 
-#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Ir para a faixa atual"
 
 #: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "Registro de _alterações"
 
-#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Anterior "
 
-#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Próxima"
 
-#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Reprodução aleatória"
 
@@ -472,41 +474,41 @@
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Settings"
 msgstr "Configuração"
 
-#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Aplicar"
 
 #: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Fechar"
 
-#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadados"
 
-#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:603
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Digite o novo título da coluna aqui"
 
-#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -515,7 +517,7 @@
 msgstr "Índice de itens"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:312
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Em reprodução"
 
@@ -527,7 +529,7 @@
 msgid "Artist - Album"
 msgstr "Artista - Álbum"
 
-#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
 #: ../plugins/gtkui/search.c:394
 msgid "Duration"
 msgstr "Duração"
@@ -540,8 +542,8 @@
 msgid "Band / Album Artist"
 msgstr "Banda / Artista do álbum"
 
-#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3089
-#: ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formato:"
 
@@ -557,356 +559,364 @@
 msgid "Right"
 msgstr "Direita"
 
-#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2892
-#: ../plugins/gtkui/interface.c:3004 ../plugins/gtkui/interface.c:3130
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2913
-#: ../plugins/gtkui/interface.c:3025 ../plugins/gtkui/interface.c:3151
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1818 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Plugin de saída:"
 
-#: ../plugins/gtkui/interface.c:1831 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Dispositivo de saída:"
 
-#: ../plugins/gtkui/interface.c:1840 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Sempre converter áudio de 8 bits para 16 bits"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Som"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Modo de normalização:"
 
-#: ../plugins/gtkui/interface.c:1862
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Desabilitado"
 
-#: ../plugins/gtkui/interface.c:1863
+#: ../plugins/gtkui/interface.c:1874
 msgid "Track"
 msgstr "Faixa"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Ajustar a normalização com o nível de pico"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "Replaygain preamp:"
-msgstr "Pré-amplificação da normalização:"
-
-#: ../plugins/gtkui/interface.c:1878 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1896 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Pré-amplificação da normalização:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Pré-amplificação global:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
-"Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) à esta "
+"Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) a esta "
 "lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:1905 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Continuar a sessão anterior ao iniciar"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:36
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Don't add from archives when adding folders"
 msgstr "Não adicionar de arquivos ao adicionar pastas"
 
-#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1934 ../plugins/gtkui/interface.c:2466
-#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/converter/interface.c:657
-#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:1969 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "DSP Chain Preset"
 msgstr "Predefinição de corrente do DSP"
 
-#: ../plugins/gtkui/interface.c:1981 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "_Load"
 msgstr "_Carregar"
 
-#: ../plugins/gtkui/interface.c:1985 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1994 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:1998 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Botão do meio do mouse fecha a lista"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Ocultar o ícone na área de notificação"
 
-#: ../plugins/gtkui/interface.c:2006 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Usar fonte em negrito para a faixa em reprodução"
 
-#: ../plugins/gtkui/interface.c:2010 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Ocultar item \"Excluir do disco\" do menu de contexto"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Autonomear listas de reprodução ao adicionar uma única pasta"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Interface refresh rate (times per second):"
 msgstr "Taxa de atualização da interface (vezes por segundo):"
 
-#: ../plugins/gtkui/interface.c:2036 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Texto na barra de título durante a reprodução:"
 
-#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Texto na barra de título quando parado:"
 
-#: ../plugins/gtkui/interface.c:2064 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Plugin da interface gráfica (mudança requer reinício):"
 
-#: ../plugins/gtkui/interface.c:2072 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Interface do usuário"
 
-#: ../plugins/gtkui/interface.c:2087 ../plugins/gtkui/interface.c:2131
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Sobrepujar"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Primeiro plano"
 
-#: ../plugins/gtkui/interface.c:2103 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Segundo plano"
 
-#: ../plugins/gtkui/interface.c:2122 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Cores das barras volume/pesquisa"
 
-#: ../plugins/gtkui/interface.c:2140 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Meio"
 
-#: ../plugins/gtkui/interface.c:2147 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Claro"
 
-#: ../plugins/gtkui/interface.c:2154 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Escuro"
 
-#: ../plugins/gtkui/interface.c:2185 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:2192 ../plugins/gtkui/interface.c:2249
-#: ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Text"
 msgstr "Texto"
 
-#: ../plugins/gtkui/interface.c:2205 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Cores do separador"
 
-#: ../plugins/gtkui/interface.c:2214 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Sobrepujar (perde o tema GTK na visão em árvore, mas acelera a renderização)"
 
-#: ../plugins/gtkui/interface.c:2223 ../plugins/gtkui/deadbeef.glade.h:40
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Linha par"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Linha ímpar"
 
-#: ../plugins/gtkui/interface.c:2256 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Linha selecionada"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Texto selecionado"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Cursor"
 
-#: ../plugins/gtkui/interface.c:2301 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Cores da lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:2305 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Cores"
 
-#: ../plugins/gtkui/interface.c:2314 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Habilitar servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2322 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Endereço do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Porta do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2350 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2369 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Nome de usuário do proxy:"
 
-#: ../plugins/gtkui/interface.c:2382 ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Senha do proxy:"
 
-#: ../plugins/gtkui/interface.c:2392 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2423 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Version: "
 msgstr "Versão: "
 
-#: ../plugins/gtkui/interface.c:2487 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:78
 msgid "Copyright"
 msgstr "Direitos autorais"
 
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:2972 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3074 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "Group By"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/interface.c:3198 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Sort by..."
 msgstr "Ordenar por..."
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
 msgid "Format"
 msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3244
+#: ../plugins/gtkui/interface.c:3305
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../plugins/gtkui/interface.c:3245
+#: ../plugins/gtkui/interface.c:3306
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../plugins/gtkui/interface.c:3298 ../plugins/gtkui/deadbeef.glade.h:112
-#: ../plugins/converter/interface.c:758
-#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
 msgid "Select DSP Plugin"
 msgstr "Selecionar plugin do DSP"
 
-#: ../plugins/gtkui/interface.c:3314 ../plugins/gtkui/deadbeef.glade.h:91
-#: ../plugins/converter/convgui.c:1009 ../plugins/converter/interface.c:774
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:38
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:3400 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Tag Writer Settings"
 msgstr "Configuração do editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3431 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Escrever ID3v2"
 
-#: ../plugins/gtkui/interface.c:3435 ../plugins/gtkui/interface.c:3562
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Escrever ID3v1"
 
-#: ../plugins/gtkui/interface.c:3439 ../plugins/gtkui/interface.c:3518
-#: ../plugins/gtkui/interface.c:3558 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Escrever APEv2"
 
-#: ../plugins/gtkui/interface.c:3447 ../plugins/gtkui/interface.c:3526
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Remover ID3v2"
 
-#: ../plugins/gtkui/interface.c:3451 ../plugins/gtkui/interface.c:3574
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Remover ID3v1"
 
-#: ../plugins/gtkui/interface.c:3455 ../plugins/gtkui/interface.c:3530
-#: ../plugins/gtkui/interface.c:3570 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Remover APEv2"
 
-#: ../plugins/gtkui/interface.c:3463 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Versão ID3v2"
 
-#: ../plugins/gtkui/interface.c:3470
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recomendado)"
 
-#: ../plugins/gtkui/interface.c:3471
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3477 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificação de caracteres ID3v1 (padrão é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3514 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Escrever ID3v2.4"
 
-#: ../plugins/gtkui/mainplaylist.c:313 ../plugins/gtkui/search.c:391
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artista / Álbum"
 
-#: ../plugins/gtkui/mainplaylist.c:314 ../plugins/gtkui/search.c:392
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Nº da faixa"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Excluir arquivos do disco"
 
-#: ../plugins/gtkui/plcommon.c:326
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -914,49 +924,49 @@
 "Os arquivos serão perdidos. Continuar?\n"
 "(Este diálogo pode ser desligado nas configurações do plugin GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:327 ../plugins/gtkui/trkproperties.c:162
-#: ../plugins/gtkui/trkproperties.c:686 ../plugins/converter/convgui.c:752
-#: ../plugins/converter/convgui.c:1129
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../plugins/gtkui/plcommon.c:429
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Colocar na fila da lista de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Remover da fila da lista de reprodução"
 
-#: ../plugins/gtkui/plcommon.c:442
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Recarregar metadados"
 
-#: ../plugins/gtkui/plcommon.c:461
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Remover do disco"
 
-#: ../plugins/gtkui/plcommon.c:840 ../plugins/gtkui/plcommon.c:965
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Adicionar coluna"
 
-#: ../plugins/gtkui/plcommon.c:870 ../plugins/gtkui/plcommon.c:969
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Editar coluna"
 
-#: ../plugins/gtkui/plcommon.c:973
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Remover coluna"
 
-#: ../plugins/gtkui/plcommon.c:983
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:990
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Nenhum"
 
-#: ../plugins/gtkui/plcommon.c:994
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artista/Data/Álbum"
 
@@ -973,8 +983,7 @@
 msgid "Default Audio Device"
 msgstr "Dispositivo de áudio padrão"
 
-#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:649
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Adicionar"
 
@@ -1019,118 +1028,118 @@
 msgid "Value"
 msgstr "Valor"
 
-#: ../plugins/gtkui/trkproperties.c:587
+#: ../plugins/gtkui/trkproperties.c:594
 msgid "Writing tags..."
 msgstr "Escrevendo etiquetas..."
 
-#: ../plugins/gtkui/trkproperties.c:614
+#: ../plugins/gtkui/trkproperties.c:621
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../plugins/gtkui/trkproperties.c:626
+#: ../plugins/gtkui/trkproperties.c:633
 msgid "Field names must not start with : or _"
 msgstr "Os nomes dos campos não devem começar com : ou _"
 
-#: ../plugins/gtkui/trkproperties.c:627 ../plugins/gtkui/trkproperties.c:661
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
 msgid "Cannot add field"
 msgstr "Incapaz de adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:660
+#: ../plugins/gtkui/trkproperties.c:667
 msgid "Field with such name already exists, please try different name."
 msgstr "Um campo com esse nome já existe. Por favor, tente outro nome."
 
-#: ../plugins/gtkui/trkproperties.c:685
+#: ../plugins/gtkui/trkproperties.c:692
 msgid "Really remove selected field?"
 msgstr "Deseja realmente remover o campo selecionado?"
 
-#: ../plugins/gtkui/trkproperties.c:727
+#: ../plugins/gtkui/trkproperties.c:734
 msgid "Add field"
 msgstr "Adicionar campo"
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:737
 msgid "Remove field"
 msgstr "Remover campo"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Uso: deadbeef [opções] [arquivo(s)]\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Opções:\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help ou -h Imprime a ajuda (esta mensagem) e sai\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Fecha o DeaDBeeF\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Imprime informações da versão e sai\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Inicia a reprodução\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Para a reprodução\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pausa a reprodução\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid " --toggle-pause Toggle pause\n"
 msgstr " --toggle-pause Pausa/reinicia\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid ""
 " --play-pause Start playback if stopped, toggle pause otherwise\n"
 msgstr ""
 " --play-pause Inicia a reprodução se parado, senão pausa/reinicia\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Próxima música na lista de reprodução\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Música anterior na lista de reprodução\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Música aleatória na lista de reprodução\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 " --queue Acrescenta arquivos(s) à lista de reprodução "
 "existente\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Imprime o nome da faixa para a saída padrão\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1141,7 +1150,7 @@
 " [l]duração, [n]úmero da faixa, [y]ano, [c]omentário,\n"
 " di[r]eitos autorais, tempo d[e]corrido\n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1150,24 +1159,25 @@
 " ex.: --nowplaying \"%%a - %%t\" deve imprimir\n"
 " \"artista - título\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
 msgid ""
 " for more info, see http://sourceforge.net/apps/"
 "mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 msgstr ""
-" para mais informações, veja http://sourceforge.net/"
-"apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+" para mais informações, veja:\n"
+"http://sourceforge.net/apps/mediawiki/deadbeef/index.php?"
+"title=Title_Formatting\n"
 
-#: ../playlist.c:437 ../playlist.c:2601
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Padrão"
 
-#: ../playlist.c:3855
+#: ../playlist.c:3664
 msgid "Yes"
 msgstr "Sim"
 
-#: ../playlist.c:3855
+#: ../playlist.c:3664
 msgid "No"
 msgstr "Não"
 
@@ -1179,7 +1189,7 @@
 "2.3 (Recomendado)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:14
 msgid ""
 "Ascending\n"
 "Descending"
@@ -1187,7 +1197,7 @@
 "Ascendente\n"
 "Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1197,7 +1207,7 @@
 "Faixa\n"
 "Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1223,7 +1233,7 @@
 "Banda / Artista do álbum\n"
 "Personalizar"
 
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1521,6 +1531,10 @@
 msgid "Quality / Algorythm"
 msgstr "Qualidade / Algoritmo"
 
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Taxa de amostragem automática (sobrepuja a taxa de amostragem alvo)"
+
 #: ../plugins/converter/convgui.c:108
 msgid "The file already exists. Overwrite?"
 msgstr "O arquivo já existe. Sobrescrever?"
@@ -1541,15 +1555,15 @@
 msgid "Converting..."
 msgstr "Convertendo..."
 
-#: ../plugins/converter/convgui.c:387 ../plugins/converter/convgui.c:489
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
 msgid "Select folder..."
 msgstr "Selecionar pasta..."
 
-#: ../plugins/converter/convgui.c:628
+#: ../plugins/converter/convgui.c:635
 msgid "Failed to save encoder preset"
 msgstr "Falha ao salvar predefinição do codificador"
 
-#: ../plugins/converter/convgui.c:630 ../plugins/converter/convgui.c:1028
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
 "Check preset folder permissions, try to pick different title, or free up "
 "some disk space"
@@ -1557,68 +1571,64 @@
 "Verifique as permissões da pasta de predefinições, tente com um título "
 "diferente ou libere algum espaço no disco"
 
-#: ../plugins/converter/convgui.c:630 ../plugins/converter/convgui.c:1028
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid "Preset with the same name already exists. Try to pick another title."
 msgstr ""
 "Uma predefinição com o mesmo nome já existe. Tente um título diferente."
 
-#: ../plugins/converter/convgui.c:631 ../plugins/converter/convgui.c:1029
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
 msgid "Error"
 msgstr "Erro"
 
-#: ../plugins/converter/convgui.c:685
+#: ../plugins/converter/convgui.c:692
 msgid "Add new encoder"
 msgstr "Adicionar novo codificador"
 
-#: ../plugins/converter/convgui.c:717
+#: ../plugins/converter/convgui.c:724
 msgid "Edit encoder"
 msgstr "Editar codificador"
 
-#: ../plugins/converter/convgui.c:749 ../plugins/converter/convgui.c:1126
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
 msgid "Remove preset"
 msgstr "Remover predefinição"
 
-#: ../plugins/converter/convgui.c:751 ../plugins/converter/convgui.c:1128
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
 msgid "This action will delete the selected preset. Are you sure?"
 msgstr "Esta ação irá excluir a predefinição selecionada. Tem certeza?"
 
-#: ../plugins/converter/convgui.c:775
+#: ../plugins/converter/convgui.c:782
 msgid "Encoders"
 msgstr "Codificadores"
 
-#: ../plugins/converter/convgui.c:831 ../plugins/gtkui/dspconfig.c:183
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
 msgid "Add plugin to DSP chain"
 msgstr "Adicionar plugin à corrente do DSP"
 
-#: ../plugins/converter/convgui.c:1027
+#: ../plugins/converter/convgui.c:1034
 msgid "Failed to save DSP preset"
 msgstr "Falha ao salvar predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1091
+#: ../plugins/converter/convgui.c:1098
 msgid "New DSP Preset"
 msgstr "Nova predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1176
+#: ../plugins/converter/convgui.c:1183
 msgid "Edit DSP Preset"
 msgstr "Editar predefinição do DSP"
 
-#: ../plugins/converter/convgui.c:1196
+#: ../plugins/converter/convgui.c:1203
 msgid "DSP Presets"
 msgstr "Predefinições do DSP"
 
-#: ../plugins/converter/interface.c:97
-#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:94
 msgid "Output folder:"
 msgstr "Pasta de saída:"
 
-#: ../plugins/converter/interface.c:118
-#: ../plugins/converter/converter.glade.h:33
+#: ../plugins/converter/interface.c:115
 msgid "Output file name:"
 msgstr "Nome do arquivo de saída:"
 
-#: ../plugins/converter/interface.c:129
-#: ../plugins/converter/converter.glade.h:18
-#, no-c-format
+#: ../plugins/converter/interface.c:126
 msgid ""
 "Extension (e.g. .mp3) will be appended automatically.\n"
 "Leave the field empty for default (%a - %t)."
@@ -1626,96 +1636,84 @@
 "A extensão (ex. .mp3) será adicionada automaticamente.\n"
 "Deixe o campo vazio para o padrão (%a - %t)."
 
-#: ../plugins/converter/interface.c:142
-#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:139
 msgid "Encoder:"
 msgstr "Codificador:"
 
-#: ../plugins/converter/interface.c:166
-#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:163
 msgid "DSP preset:"
 msgstr "Predefinição do DSP:"
 
-#: ../plugins/converter/interface.c:189
-#: ../plugins/converter/converter.glade.h:30
+#: ../plugins/converter/interface.c:186
 msgid "Number of threads:"
 msgstr "Número de linhas de execução"
 
-#: ../plugins/converter/interface.c:202
-#: ../plugins/converter/converter.glade.h:35
+#: ../plugins/converter/interface.c:199
 msgid "Output sample format:"
 msgstr "Formato da amostra de saída:"
 
-#: ../plugins/converter/interface.c:209
+#: ../plugins/converter/interface.c:206
 msgid "Keep source format"
 msgstr "Manter o formato original"
 
-#: ../plugins/converter/interface.c:210
+#: ../plugins/converter/interface.c:207
 msgid "8 bit signed int"
 msgstr "Inteiro de 8 bits com sinal"
 
-#: ../plugins/converter/interface.c:211
+#: ../plugins/converter/interface.c:208
 msgid "16 bit signed int"
 msgstr "Inteiro de 16 bits com sinal"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:209
 msgid "24 bit signed int"
 msgstr "Inteiro de 24 bits com sinal"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:210
 msgid "32 bit signed int"
 msgstr "Inteiro de 32 bits com sinal"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:211
 msgid "32 bit float"
 msgstr "32 bits flutuante"
 
-#: ../plugins/converter/interface.c:220
-#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:217
 msgid "When file exists:"
 msgstr "Quando o arquivo existir:"
 
-#: ../plugins/converter/interface.c:227
+#: ../plugins/converter/interface.c:224
 msgid "Prompt"
 msgstr "Perguntar"
 
-#: ../plugins/converter/interface.c:228
+#: ../plugins/converter/interface.c:225
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../plugins/converter/interface.c:230
-#: ../plugins/converter/converter.glade.h:39
+#: ../plugins/converter/interface.c:227
 msgid "Preserve folder structure, starting from:"
 msgstr "Preservar a estrutura da pasta, começando por:"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:379
 msgid "Edit Encoder Preset"
 msgstr "Editar predefinição do codificador"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/interface.c:402
 msgid "Untitled Encoder"
 msgstr "Codificador sem título"
 
-#: ../plugins/converter/interface.c:417
-#: ../plugins/converter/converter.glade.h:32
+#: ../plugins/converter/interface.c:410
 msgid "Output file extension:"
 msgstr "Extensão do arquivo de saída:"
 
-#: ../plugins/converter/interface.c:424
-#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:417
 msgid "E.g. mp3"
 msgstr "Ex. mp3"
 
-#: ../plugins/converter/interface.c:432
-#: ../plugins/converter/converter.glade.h:7
+#: ../plugins/converter/interface.c:425
 msgid "Command line:"
 msgstr "Linha de comando:"
 
-#: ../plugins/converter/interface.c:443
-#: ../plugins/converter/converter.glade.h:15
-#, no-c-format
+#: ../plugins/converter/interface.c:436
+#, c-format
 msgid ""
 "Example: lame - %o\n"
 "%i for input file, %o for output file, - for stdin"
@@ -1724,9 +1722,8 @@
 "%i para arquivo de entrada, %o para arquivo de saída, - para entrada padrão "
 "(stdin)"
 
-#: ../plugins/converter/interface.c:453
-#: ../plugins/converter/converter.glade.h:3
-#, no-c-format
+#: ../plugins/converter/interface.c:446
+#, c-format
 msgid ""
 "%o - output file name\n"
 "%i - temporary input file name"
@@ -1734,90 +1731,78 @@
 "%o - nome do arquivo de saída\n"
 "%i - nome do arquivo de entrada temporário"
 
-#: ../plugins/converter/interface.c:462
-#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:455
 msgid "Method:"
 msgstr "Método:"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:462
 msgid "Pipe"
 msgstr "Pipe"
 
-#: ../plugins/converter/interface.c:470
+#: ../plugins/converter/interface.c:463
 msgid "Temporary file"
 msgstr "Arquivo temporário"
 
-#: ../plugins/converter/interface.c:487
-#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:480
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:493
-#: ../plugins/converter/converter.glade.h:21
+#: ../plugins/converter/interface.c:486
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:499
-#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:492
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:505
-#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:498
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:517
-#: ../plugins/converter/converter.glade.h:22
+#: ../plugins/converter/interface.c:510
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:527
-#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:520
 msgid "Tag writer"
 msgstr "Editor de etiquetas"
 
-#: ../plugins/converter/interface.c:614
-#: ../plugins/converter/converter.glade.h:9
+#: ../plugins/converter/interface.c:606
 msgid "DSP Preset Editor"
 msgstr "Editor de predefinições do DSP"
 
-#: ../plugins/converter/interface.c:637
-#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:629
 msgid "Untitled DSP Preset"
 msgstr "Predefinição do DSP sem título"
 
-#: ../plugins/converter/converter.glade.h:23
-msgid ""
-"Keep source format\n"
-"8 bit signed int\n"
-"16 bit signed int\n"
-"24 bit signed int\n"
-"32 bit signed int\n"
-"32 bit float"
-msgstr ""
-"Manter formato original\n"
-"Inteiro de 8 bits com sinal\n"
-"Inteiro de 16 bits com sinal\n"
-"Inteiro de 24 bits com sinal\n"
-"Inteiro de 32 bits com sinal\n"
-"32 bits flutuante"
-
-#: ../plugins/converter/converter.glade.h:36
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Pipe\n"
-"Arquivo temporário"
+#~ msgid ""
+#~ "Keep source format\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+#~ msgstr ""
+#~ "Manter formato original\n"
+#~ "Inteiro de 8 bits com sinal\n"
+#~ "Inteiro de 16 bits com sinal\n"
+#~ "Inteiro de 24 bits com sinal\n"
+#~ "Inteiro de 32 bits com sinal\n"
+#~ "32 bits flutuante"
 
-#: ../plugins/converter/converter.glade.h:41
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Perguntar\n"
-"Sobrescrever"
+#~ msgid ""
+#~ "Pipe\n"
+#~ "Temporary file"
+#~ msgstr ""
+#~ "Pipe\n"
+#~ "Arquivo temporário"
+
+#~ msgid ""
+#~ "Prompt\n"
+#~ "Overwrite"
+#~ msgstr ""
+#~ "Perguntar\n"
+#~ "Sobrescrever"
 
 #~ msgid "about.txt"
 #~ msgstr "about.txt"

deadbeef-0.5.2.tar.bz2/po/ro.po Added

@@ -0,0 +1,1771 @@
+# Romanian translation for the DeaDBeeF package.
+# Copyright (C) 2012 THE DeaDBeeF'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the DeaDBeeF package.
+# Mișu Moldovan <dumol@xfce.org>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF 0.5.2-beta1\n"
+"Report-Msgid-Bugs-To: diacritice@googlegroups.com\n"
+"POT-Creation-Date: 2012-03-06 10:30+0200\n"
+"PO-Revision-Date: 2012-03-06 17:48+0200\n"
+"Last-Translator: Mișu Moldovan <dumol@xfce.org>\n"
+"Language-Team: Romanian <diacritice@googlegroups.com>\n"
+"Language: ro\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==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2);;\n"
+"X-Generator: Virtaal 0.7.0\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Formate audio suportate"
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Toate fișierele (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Deschideți unul sau mai multe fișiere..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Adăugați fișiere în lista de redare..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Adăugați directoare în lista de redare..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Urmează linkurile simbolice"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Nu s-a putut citi fișierul ce conține ajutorul"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Nu s-a putut încărca fișierul ce conține ajutorul"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/converter/convgui.c:1238
+#: ../plugins/converter/convgui.c:1246
+msgid "Help"
+msgstr "Ajutor"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Despre DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Istoricul modificărilor DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traducători DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:756 ../plugins/gtkui/trkproperties.c:621
+msgid "Edit playlist"
+msgstr "Editare listă de redare"
+
+#: ../plugins/gtkui/ddbtabstrip.c:759 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titlu:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:948
+msgid "Rename Playlist"
+msgstr "Redenumire listă de redare"
+
+#: ../plugins/gtkui/ddbtabstrip.c:955
+msgid "Remove Playlist"
+msgstr "Ștergere listă de redare"
+
+#: ../plugins/gtkui/ddbtabstrip.c:962
+msgid "Add New Playlist"
+msgstr "Adăugare listă de redare"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Salvare presetări DeaDBeeF EQ"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Fișiere cu presetări DeaDBeeF EQ (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Încărcare presetări DeaDBeeF EQ..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Presetări DeaDBeeF EQ (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Import de presetări EQ Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Presetări Foobar2000 EQ (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Salvare presetări"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Încărcare presetări"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Import de presetări Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "Activare"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "Zero tot"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "Zero preamp"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "Zero benzi"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Presetări"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "o zi %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d zile %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "Oprit | %d piese | %s durată totală"
+
+#: ../plugins/gtkui/gtkui.c:162 ../playlist.c:3012
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:162 ../playlist.c:3012
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "Pauză | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d piese | %s durată totală"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "Salvare listă de redare ca"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Fișiere cu liste de redare DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "Încărcare listă de redare"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Alte fișiere (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "Listă de redare nouă"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Listă de redare nouă (%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:1
+msgid "_File"
+msgstr "_Fișier"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:2
+msgid "_Open file(s)"
+msgstr "_Deschidere fișiere"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:3
+msgid "Add file(s)"
+msgstr "Adăugare fișiere"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:4
+msgid "Add folder(s)"
+msgstr "Adăugare directoare"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:5
+msgid "Add location"
+msgstr "Adăugare link"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "New playlist"
+msgstr "Listă de redare nouă"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Load playlist"
+msgstr "Încărcare listă de redare"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Save playlist"
+msgstr "Salvare listă de redare"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:9
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:10
+msgid "_Edit"
+msgstr "_Editare"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "_Clear"
+msgstr "_Golire"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Select all"
+msgstr "Selectare completă"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:13
+msgid "Deselect all"
+msgstr "Deselectare completă"
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:14
+msgid "Invert selection"
+msgstr "Inversare a selecției"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:15
+msgid "Selection"
+msgstr "Selecție"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "Ștergere"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Crop"
+msgstr "Decupare"
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "_Find"
+msgstr "_Căutare"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Sort By"
+msgstr "Sortare după"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/converter/convgui.c:788 ../plugins/converter/convgui.c:1209
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titlu"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Track number"
+msgstr "Numărul piesei"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:24
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Dată"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Custom"
+msgstr "Personalizare..."
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Preferences"
+msgstr "Preferințe"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "_View"
+msgstr "_Vizualizare"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "Status bar"
+msgstr "Bară de stare"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "Column headers"
+msgstr "Titluri pentru coloane"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Tabs"
+msgstr "Taburi"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:31
+msgid "Equalizer"
+msgstr "Egalizator"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "_Playback"
+msgstr "_Redare"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid "Order"
+msgstr "Ordine"
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:34
+msgid "Linear"
+msgstr "Liniară"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:35
+msgid "Shuffle tracks"
+msgstr "Piese amestecate"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Shuffle albums"
+msgstr "Albume amestecate"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Random"
+msgstr "Aleatoare"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Looping"
+msgstr "Repetare"
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Loop All"
+msgstr "Repetare pentru listă"
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Loop Single Song"
+msgstr "Repetare pentru piesa curentă"
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Don't Loop"
+msgstr "Fără repetare"
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Scroll follows playback"
+msgstr "Lista se derulează la redare"
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Cursor follows playback"
+msgstr "Selecția urmează redarea"
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Stop after current"
+msgstr "Oprire după piesa curentă"
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "Jump to current track"
+msgstr "Salt la piesa curentă"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:46
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "_ChangeLog"
+msgstr "_Istoric"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:49
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "_About"
+msgstr "_Despre"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "_Translators"
+msgstr "_Traducători"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "Search"
+msgstr "Căutare"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "Stop"
+msgstr "Stop"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Play"
+msgstr "Redare"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Pause"
+msgstr "Pauză"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:56
+msgid "Previous"
+msgstr "Înapoi"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:57
+msgid "Next"
+msgstr "Înainte"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:58
+msgid "Play Random"
+msgstr "Aleator"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:59
+msgid "About"
+msgstr "Despre"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:60
+msgid "Quit"
+msgstr "Ieșire"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:62
+msgid "Track Properties"
+msgstr "Proprietățile piesei"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:63
+msgid "Settings"
+msgstr "Opțiuni"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:64
+msgid "_Apply"
+msgstr "_Aplică"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:65
+msgid "_Close"
+msgstr "În_chide"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:66
+msgid "Metadata"
+msgstr "Metadate"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Properties"
+msgstr "Proprietăți"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Enter new column title here"
+msgstr "Introduceți aici un nou titlu pentru coloană"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Type:"
+msgstr "Tip:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Index de elemente"
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "În redare"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "Copertă album"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "Artist - Album"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Durată"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Numărul piesei"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "Formație / Album Artist"
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Alignment:"
+msgstr "Aliniere:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "Stânga"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "Dreapta"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid "_Cancel"
+msgstr "_Renunță"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:69
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Output plugin:"
+msgstr "Modul de ieșire audio:"
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Output device:"
+msgstr "Dispozitiv de ieșire audio:"
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Convertire la 16-biți pentru piesele audio de 8-biți"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Sound"
+msgstr "Sunet"
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Replaygain mode:"
+msgstr "Mod ReplayGain:"
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "Dezactivat"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Piesă"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Replaygain peak scale"
+msgstr "Scalare pentru vârfurile ReplayGain"
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:98
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Replaygain preamp:"
+msgstr "Preamplificare ReplayGain"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Global preamp:"
+msgstr "Preamplificare globală:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Fișierele adăugate extern intră în lista de redare:"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Resume previous session on startup"
+msgstr "La pornire se reîncarcă sesiunea precedentă"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Don't add from archives when adding folders"
+msgstr "La adăugarea de directoare nu se adaugă fișiere din arhive"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Playback"
+msgstr "Redare"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:105 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Configurare"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "DSP Chain Preset"
+msgstr "Presetări lanț DSP:"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "_Load"
+msgstr "Înca_rcă"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "DSP"
+msgstr "Procesare"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Close minimizes to tray"
+msgstr "Minimizare în zona de notificare la închiderea ferestrei"
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Middle mouse button closes playlist"
+msgstr "Butonul din mijloc al mausului închide lista de redare"
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Hide system tray icon"
+msgstr "Fără iconiță în zona de notificare"
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Use bold font for currently playing track"
+msgstr "Caractere îngroșate pentru piesa curentă"
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "Fără „Ștergere de pe disc” în meniul contextual"
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:114
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Denumire automată pentru liste la adăugarea unui singur director"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Interface refresh rate (times per second):"
+msgstr "Frecvență de reîmprospătare a interfeței (per secundă):"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Titlebar text while playing:"
+msgstr "Text în bara de titlu la redare:"
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Titlebar text while stopped:"
+msgstr "Text în bara de titlu în pauză:"
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Modul GUI (modificările necesită repornire):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "GUI"
+msgstr "Interfață"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Override"
+msgstr "Suprascriere"
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Foreground"
+msgstr "Prim-plan"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Background"
+msgstr "Fundal"
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Seekbar/Volumebar colors"
+msgstr "Culorile barelor de redare și volum"
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Middle"
+msgstr "Între"
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Light"
+msgstr "Deschis"
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Dark"
+msgstr "Închis"
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Base"
+msgstr "Bază"
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Text"
+msgstr "Text"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Tab strip colors"
+msgstr "Culorile taburilor"
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+"Suprascriere (se pierde tema „treeview” GTK, dar se accelerează randarea)"
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Even row"
+msgstr "Rând par"
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Odd row"
+msgstr "Rând impar"
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Selected row"
+msgstr "Rând selectat"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Selected text"
+msgstr "Text selectat"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:135
+msgid "Cursor"
+msgstr "Selecție"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:136
+msgid "Playlist colors"
+msgstr "Culorile listei de redare"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Colors"
+msgstr "Culori"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Enable Proxy Server"
+msgstr "Activare server proxy"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Proxy Server Address:"
+msgstr "Adresă server proxy:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Proxy Server Port:"
+msgstr "Port server proxy:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Proxy Type:"
+msgstr "Tip proxy:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "Proxy Username:"
+msgstr "Utilizator proxy:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Proxy Password:"
+msgstr "Parolă proxy:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Network"
+msgstr "Rețea"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Version: "
+msgstr "Versiune:"
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Drepturi de autor"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Plugins"
+msgstr "Module"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "Group By"
+msgstr "Grupare după"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "Sort by..."
+msgstr "Sortare după..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:151
+msgid "Format"
+msgstr "Format"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Crescătoare"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Descrescătoare"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Selectare modul DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/converter/convgui.c:1014 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Modul"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "Tag Writer Settings"
+msgstr "Opțiuni pentru scrierea etichetelor"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "Write ID3v2"
+msgstr "Scrie ID3v2"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:158
+msgid "Write ID3v1"
+msgstr "Scrie ID3v1"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:159
+msgid "Write APEv2"
+msgstr "Scrie APEv2"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:160
+msgid "Strip ID3v2"
+msgstr "Șterge ID3v2"
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:161
+msgid "Strip ID3v1"
+msgstr "Șterge ID3v1"
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:162
+msgid "Strip APEv2"
+msgstr "Șterge APEv2"
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "ID3v2 version"
+msgstr "Versiune ID3v2"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (recomandată)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Codare ID3v1 (implicit iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "Write ID3v2.4"
+msgstr "Scrie ID3v2.4"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "Artist / Album"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Nr. piesă"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "Ștergere fișiere de pe disc"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"Fișierele vor fi șterse definitiv. Continuați?\n"
+"(Această interogare poate fi dezactivată în opțiunile modulului GTKUI)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:696 ../plugins/converter/convgui.c:757
+#: ../plugins/converter/convgui.c:1134
+msgid "Warning"
+msgstr "Avertizare"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "Adăugare în coada de redare"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "Ștergere din coada de redare"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "Reîncarcare metadate"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "Ștergere de pe disc"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "Adăugare coloană"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "Editare coloană"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "Ștergere coloană"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr "Grupează după"
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "Fără"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "Artist/Dată/Album"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "Deschide fișier..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr "Configurare %s"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "Dispozitiv audio implicit"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "Adăugare"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "Combinații de taste globale"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr "Slot"
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "Combinație de taste"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Adăugare fișiere..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "Inițializare..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "Ați modificat datele acestei piese."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "Sigur doriți să închideți fereastra?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Valori multiple]"
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Cheie"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Valoare"
+
+#: ../plugins/gtkui/trkproperties.c:597
+msgid "Writing tags..."
+msgstr "Se scriu etichetele..."
+
+#: ../plugins/gtkui/trkproperties.c:624
+msgid "Name:"
+msgstr "Nume:"
+
+#: ../plugins/gtkui/trkproperties.c:636
+msgid "Field names must not start with : or _"
+msgstr "Numele câmpurilor nu pot începe cu : sau _"
+
+#: ../plugins/gtkui/trkproperties.c:637 ../plugins/gtkui/trkproperties.c:671
+msgid "Cannot add field"
+msgstr "Nu s-a putut adăuga câmpul"
+
+#: ../plugins/gtkui/trkproperties.c:670
+msgid "Field with such name already exists, please try different name."
+msgstr "Un câmp cu acest nume există deja, încercați să-l redenumiți."
+
+#: ../plugins/gtkui/trkproperties.c:695
+msgid "Really remove selected field?"
+msgstr "Sigur doriți să ștergeți câmpul selectat?"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Add field"
+msgstr "Adăugare câmp"
+
+#: ../plugins/gtkui/trkproperties.c:740
+msgid "Remove field"
+msgstr "Ștergere câmp"
+
+#: ../main.c:83
+#, c-format
+msgid "Usage: deadbeef [options] [--] [file(s)]\n"
+msgstr "Utilizare: deadbeef [opțiuni] [--] [fișier(e)]\n"
+
+#: ../main.c:84
+#, c-format
+msgid "Options:\n"
+msgstr "Opțiuni:\n"
+
+#: ../main.c:85
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help sau -h Arată acest mesaj de ajutor și ieși\n"
+
+#: ../main.c:86
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Ieșire din player\n"
+
+#: ../main.c:87
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Arată detaliile versiunii și ieși\n"
+
+#: ../main.c:88
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Pornește redarea\n"
+
+#: ../main.c:89
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Oprește redarea\n"
+
+#: ../main.c:90
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pune pauză redării\n"
+
+#: ../main.c:91
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Comută starea de pauză\n"
+
+#: ../main.c:92
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Pornește redarea dacă e cazul sau comută starea de "
+"pauză\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Piesa următoare în lista de redare\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Piesa precedentă în lista de redare\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Piesă aleatoare din lista de redare\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Adaugă fișiere la lista de redare curentă\n"
+
+#: ../main.c:97
+#, c-format
+msgid ""
+" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui MODUL Precizează ce modul GUI să fie utilizat, implicit "
+"\"GTK2\"\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Arată în ieșirea standard numele formatat al piesei\n"
+
+#: ../main.c:99
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+" Sintaxă FMT prefixată cu %%: [a]rtist, [t]itlu, "
+"al[b]um,\n"
+" [l]ungime, [n]umăr piesă, [y] pentru an, [c]omentariu,\n"
+" d[r]epturi de autor, durată r[e]dată\n"
+
+#: ../main.c:102
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr " de ex.: --nowplaying \"%%a - %%t\" va rezulta în \"artist "
+"- titlu\"\n"
+
+#: ../main.c:103
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " pentru mai multe detalii vedeți http://sourceforge.net"
+"/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2403
+msgid "Default"
+msgstr "Implicit"
+
+#: ../playlist.c:3699
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3699
+msgid "No"
+msgstr "Nu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"Index element\n"
+"În redare\n"
+"Copertă album\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Titlu\n"
+"Durată\n"
+"Număr piesă\n"
+"Formație / Artist Album\n"
+"Personalizat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"Stânga\n"
+"Dreapta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:93
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"Dezactivare\n"
+"Piesă\n"
+"Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Ascendent\n"
+"Descendent"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (Recomandat)\n"
+"2.4"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nu s-a putut găsi fișierul pixmap: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: nu s-a găsit fișierul de configurare freepats. Instalați pachetul "
+"timidity-freepats sau specificați calea către freepats.cfg în opțiunile "
+"modulului."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Adăugare CD audio"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Căutare pe Last.fm"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Utilizează reeșantionare ALSA"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Eliberează dispozitivul la oprirea redării"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Mărime preferată pentru memoria tampon"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Mărime preferată pentru perioadă"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Activare Scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Dezactivare „nowplaying”"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Utilizator"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Parolă"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "URL Scrobble"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Fișierul dispozitivului"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Soluție alternativă pentru problema ratei de eșantionare OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Perioadă de actualizare pentru cache (ore)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "Extrage din etichetele încorporate"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "Extrage din directorul local"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "Mască pentru fișierele local cu coperte"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Extrage de la Last.fm"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Extrage de la albumart.org"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Scalează copertele după lungime"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "Utilizează CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferă CD-Text înaintea CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "Server CDDB (de ex. „freedb.org”)"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "Port CDDB (de ex. „888”)"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "Preferă protocolul CDDB înaintea HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "Activează suportul pentru imagini NRG"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "Calitatea reeșantionării (0-2, 2 e calitate maximă)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "Durată maximă pentru o piesă (în minute)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Cere confirmare pentru ștergerea fișierelor de pe disc"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "Prag de control al volumului prin iconița din zona de notificare"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "Iconiță personalizată pentru zona de notificare"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "Execută gtk_init cu --sync (mod de depanare)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Adaugă separatori între elementele modulelor din meniul contextual"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Format pentru titlul notificării"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Format pentru conținutul notificării"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Arată copertele albumelor"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Mărime pentru copertele albumelor (px)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "Server PulseAudio"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "Rată de eșantionare"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "Cale relativă pentru tabelul de căutare"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "Cale absolută pentru tabelul de căutare"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Inversează biții audio (comutați dacă auziți doar zgomot alb)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Activare HVSC Songlength DB"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (din HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Biți per eșantion (8 sau 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Lungime implicită pentru piese (sec)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Fișier de configurare a bancurilor Timidity++"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Titlu piesă"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Interpret"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Număr de piese"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Gen"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Compozitor"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Număr de disc"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Comentariu"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "Codor / Comerciant"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Locație"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Index sub-piesă"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tip(uri) de etichete"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet încorporat"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Extensii de fișiere (separate prin ;)"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Convertire"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Rată de eșantionare țintă"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Calitate / Algoritm"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Rată de eșantionare automată (suprascrie rata țintă)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Fișierul există deja. Doriți să îl suprascrieți?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Avertizare de la convertor"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Selectați un codor"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Eroare de convertire"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "În convertire..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Selectați un director..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Nu s-au putut salva presetările codorului"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1033
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Verificați drepturile pentru directorul cu presetări, alegeți un alt "
+"titlu sau eliberați mai mult spațiu pe disc"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1033
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Există deja o presetare cu acest nume. Alegeți un alt titlu."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1034
+msgid "Error"
+msgstr "Eroare"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Adăugare codor nou"
+
+#: ../plugins/converter/convgui.c:722
+msgid "Edit encoder"
+msgstr "Editare codor"
+
+#: ../plugins/converter/convgui.c:754 ../plugins/converter/convgui.c:1131
+msgid "Remove preset"
+msgstr "Ștergere codor"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Această acțiune va șterge predefiniția selectată. Sigur doriți asta?"
+
+#: ../plugins/converter/convgui.c:780
+msgid "Encoders"
+msgstr "Codoare"
+
+#: ../plugins/converter/convgui.c:836 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Adaugare modul în lanțul DSP"
+
+#: ../plugins/converter/convgui.c:1032
+msgid "Failed to save DSP preset"
+msgstr "Nu s-a putut salva predefiniția DSP"
+
+#: ../plugins/converter/convgui.c:1096
+msgid "New DSP Preset"
+msgstr "Nouă presetare DSP"
+
+#: ../plugins/converter/convgui.c:1181
+msgid "Edit DSP Preset"
+msgstr "Editare presetare DSP"
+
+#: ../plugins/converter/convgui.c:1201
+msgid "DSP Presets"
+msgstr "Presetări DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Director cu rezultate:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Nume fișier rezultat:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Extensia (de ex. .mp3) va fi adăugată automat.\n"
+"Lăsați câmpul gol pentru valoarea implicită (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Codor:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Presetare DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Număr de fire de execuție:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Eșantionarea finală:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Păstrează formatul sursei"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Dacă fișierul există:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Întreabă"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Suprascrie"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Păstrează structura de directoare, începând de la:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Editare presetare codor"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Codor fără nume"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Extensie fișier rezultat:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "De ex. mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Linie de comandă:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Exemplu: lame - %o\n"
+"%i pentru fișierul input, %o pentru fișierul rezultat, - pentru stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - nume fișier rezultat\n"
+"%i - nume fișier temporar de input"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Metodă:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Conector „pipe”"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Fișier temporar"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Scriere de etichete"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Editor de presetări DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Presetare DSP fără nume"

deadbeef-0.5.1.tar.bz2/po/ru.po -> deadbeef-0.5.2.tar.bz2/po/ru.po Changed

@@ -7,94 +7,94 @@
 msgstr ""
 "Project-Id-Version: 0.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-22 12:50+0200\n"
-"PO-Revision-Date: 2011-05-14 19:53+0300\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-12-15 15:34+0200\n"
+"Last-Translator: Max <mpui@tut.by>\n"
 "Language-Team: ru <slpiv@mail.ru>\n"
 "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:121
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Поддерживаемые форматы"
 
-#: ../plugins/gtkui/callbacks.c:132 ../plugins/gtkui/gtkui.c:776
-msgid "Other files (*)"
-msgstr "Другие файлы (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Все файлы (*)"
 
-#: ../plugins/gtkui/callbacks.c:142
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Открыть файл(ы)..."
 
-#: ../plugins/gtkui/callbacks.c:177
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Добавить файл(ы) в плейлист..."
 
-#: ../plugins/gtkui/callbacks.c:218
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Добавить каталог(и) в плейлист..."
 
-#: ../plugins/gtkui/callbacks.c:223
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Следовать символическим ссылкам"
 
-#: ../plugins/gtkui/callbacks.c:697
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Не удалось прочитать файл справки"
 
-#: ../plugins/gtkui/callbacks.c:707
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Не удалось загрузить файл справки"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.ru.txt"
 
-#: ../plugins/gtkui/callbacks.c:723 ../plugins/gtkui/interface.c:1155
-#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/converter/convgui.c:1240
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
 #: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Справка"
 
-#: ../plugins/gtkui/callbacks.c:733
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "О программе DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:746
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Изменения в DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:1091
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Переводчики DeaDBeeF "
 
-#: ../plugins/gtkui/ddbtabstrip.c:689 ../plugins/gtkui/trkproperties.c:618
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Редактировать плейлист"
 
-#: ../plugins/gtkui/ddbtabstrip.c:692 ../plugins/gtkui/interface.c:1486
-#: ../plugins/gtkui/interface.c:2870 ../plugins/gtkui/deadbeef.glade.h:135
-#: ../plugins/converter/interface.c:402
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
 msgid "Title:"
 msgstr "Название:"
 
-#: ../plugins/gtkui/ddbtabstrip.c:748
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Переименовать плейлист"
 
-#: ../plugins/gtkui/ddbtabstrip.c:752
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Удалить плейлист"
 
-#: ../plugins/gtkui/ddbtabstrip.c:756
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Добавить новый плейлист"
 
@@ -150,7 +150,7 @@
 msgid "Zero Bands"
 msgstr "Обнулить частоты"
 
-#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:826
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
 msgid "Presets"
 msgstr "Предустановки"
 
@@ -193,32 +193,36 @@
 msgstr ""
 "%s%s %s| %dГц | %d бит | %s | %d:%02d / %s | %d дорожек | %s общее время"
 
-#: ../plugins/gtkui/gtkui.c:632
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Сохранить плейлист как"
 
-#: ../plugins/gtkui/gtkui.c:643
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Файлы плейлистов DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:761
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Загрузить плейлист"
 
-#: ../plugins/gtkui/gtkui.c:914 ../plugins/gtkui/fileman.c:40
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Другие файлы (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Новый плейлист"
 
-#: ../plugins/gtkui/gtkui.c:917
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новый плейлист (%d)"
 
-#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Открыть файл(ы)"
 
@@ -230,36 +234,36 @@
 msgid "Add folder(s)"
 msgstr "Добавить каталог(и)"
 
-#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:2970
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Добавить расположение"
 
-#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Новый плейлист"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Загрузить плейлист"
 
-#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Сохранить плейлист"
 
-#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:164
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Выход"
 
-#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Очистить"
 
-#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Выделить всё"
 
@@ -267,17 +271,17 @@
 msgid "Deselect all"
 msgstr "Снять выделение"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Обратить выделение"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Выделенное"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:453
-#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:104
-#: ../plugins/converter/interface.c:653
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Удалить"
 
@@ -285,35 +289,35 @@
 msgid "Crop"
 msgstr "Оставить выделенное"
 
-#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Найти"
 
-#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
 msgid "Sort By"
 msgstr "Сортировать по"
 
 #: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
-#: ../plugins/gtkui/mainplaylist.c:315 ../plugins/gtkui/prefwin.c:623
-#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
 #: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
-#: ../plugins/converter/interface.c:630
+#: ../plugins/converter/interface.c:622
 msgid "Title"
 msgstr "Название"
 
-#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
 msgid "Track number"
 msgstr "Номер дорожки"
 
 #: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
-#: ../plugins/gtkui/interface.c:1869 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
 #: ../translation/extra.c:69
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
 #: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
-#: ../plugins/gtkui/plcommon.c:998 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
 #: ../translation/extra.c:65
 msgid "Artist"
 msgstr "Исполнитель"
@@ -324,20 +328,20 @@
 msgstr "Дата"
 
 #: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
-#: ../plugins/gtkui/plcommon.c:1002 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
 msgid "Custom"
 msgstr "Пользовательский"
 
-#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1798
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Вид"
 
-#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Строка состояния"
 
@@ -345,7 +349,7 @@
 msgid "Column headers"
 msgstr "Заголовки столбцов"
 
-#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:131
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Вкладки"
 
@@ -353,40 +357,40 @@
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:163
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Воспр_оизведение"
 
-#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3246
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Порядок"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "По очереди"
 
-#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
 msgid "Shuffle tracks"
 msgstr "Перемешивать дорожки"
 
-#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
 msgid "Shuffle albums"
 msgstr "Перемешивать альбомы"
 
-#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Случайно"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Повторять"
 
-#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Все"
 
-#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Дорожку"
 
@@ -394,7 +398,7 @@
 msgid "Don't Loop"
 msgstr "Не повторять"
 
-#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Прокручивать плейлист автоматически"
 
@@ -402,64 +406,64 @@
 msgid "Cursor follows playback"
 msgstr "Выделять текущую дорожку"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Останавливать после текущей"
 
-#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Перейти на текущую дорожку"
 
 #: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Изменения"
 
-#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_О программе"
 
-#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:165
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Переводчики"
 
-#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Поиск"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Следующая"
 
-#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Играть вразброс"
 
@@ -467,33 +471,33 @@
 msgid "About"
 msgstr "О программе"
 
-#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Выход"
 
-#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Свойства дорожки"
 
-#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Применить"
 
 #: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:603
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Свойства"
 
@@ -501,7 +505,7 @@
 msgid "Enter new column title here"
 msgstr "Введите название нового столбца"
 
-#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Тип:"
 
@@ -510,7 +514,7 @@
 msgstr "Порядковый номер"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:312
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Воспроизводится"
 
@@ -522,7 +526,7 @@
 msgid "Artist - Album"
 msgstr "Исполнитель - Альбом"
 
-#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
 #: ../plugins/gtkui/search.c:394
 msgid "Duration"
 msgstr "Продолжительность"
@@ -535,7 +539,7 @@
 msgid "Band / Album Artist"
 msgstr "Группа / Исполнитель альбома"
 
-#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3098
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
 #: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Формат:"
@@ -552,367 +556,373 @@
 msgid "Right"
 msgstr "По правому краю"
 
-#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2901
-#: ../plugins/gtkui/interface.c:3013 ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2922
-#: ../plugins/gtkui/interface.c:3034 ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1819 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Модуль вывода:"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Устройство вывода:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Всегда преобразовывать 8-битный звук в 16-битный"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Режим автовыравнивания громкости:"
 
-#: ../plugins/gtkui/interface.c:1867
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Отключён"
 
-#: ../plugins/gtkui/interface.c:1868
+#: ../plugins/gtkui/interface.c:1874
 msgid "Track"
 msgstr "Дорожка"
 
-#: ../plugins/gtkui/interface.c:1871 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Использовать пиковое значение"
 
-#: ../plugins/gtkui/interface.c:1879 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "Replaygain preamp:"
-msgstr "Предусиление автовыравнивания громкости:"
-
-#: ../plugins/gtkui/interface.c:1883 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1893 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Предусиление автовыравнивания громкости:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Общее предусиление громкости:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Добавлять файлы из командной строки\n"
 "(или файлового менеджера) в этот плейлист:"
 
-#: ../plugins/gtkui/interface.c:1910 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Восстанавливать предыдущую сессию при запуске"
 
-#: ../plugins/gtkui/interface.c:1914 ../plugins/gtkui/deadbeef.glade.h:37
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
 msgid "Don't add from archives when adding folders"
 msgstr "Не добавлять из архивов при добавлении каталогов"
 
-#: ../plugins/gtkui/interface.c:1918 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:657
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
 msgid "Configure"
 msgstr "Настроить"
 
-#: ../plugins/gtkui/interface.c:1974 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
 msgid "DSP Chain Preset"
 msgstr "Предустановка для цепочки DSP"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
 msgid "_Load"
 msgstr "_Загрузить"
 
-#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1999 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Сворачивать в трей при закрытии"
 
-#: ../plugins/gtkui/interface.c:2003 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Средняя кнопка мыши закрывает плейлист"
 
-#: ../plugins/gtkui/interface.c:2007 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Не показывать значок в трее"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Использовать жирный шрифт для текущей дорожки"
 
-#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Убрать пункт \"Удалить с диска\" из контекстного меню"
 
-#: ../plugins/gtkui/interface.c:2019 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Автоматически именовать плейлисты при добавлении одного каталога"
 
-#: ../plugins/gtkui/interface.c:2027 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
 msgid "Interface refresh rate (times per second):"
 msgstr "Частота обновления интерфейса (раз за секунду):"
 
-#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Текст заголовка при проигрывании:"
 
-#: ../plugins/gtkui/interface.c:2055 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Текст заголовка при остановке:"
 
-#: ../plugins/gtkui/interface.c:2069 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Графический интерфейс (для изменения необходим перезапуск):"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Интерфейс"
 
-#: ../plugins/gtkui/interface.c:2092 ../plugins/gtkui/interface.c:2136
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Заменить"
 
-#: ../plugins/gtkui/interface.c:2101 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Передний план"
 
-#: ../plugins/gtkui/interface.c:2108 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Фон"
 
-#: ../plugins/gtkui/interface.c:2127 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Основные цвета"
 
-#: ../plugins/gtkui/interface.c:2145 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Средний"
 
-#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Светлый"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Тёмный"
 
-#: ../plugins/gtkui/interface.c:2190 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Базовый"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/interface.c:2254
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
 msgid "Text"
 msgstr "Текст"
 
-#: ../plugins/gtkui/interface.c:2210 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Цвета вкладок"
 
-#: ../plugins/gtkui/interface.c:2219 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Заменить (теряются настройки темы GTK , но увеличивается скорость "
 "визуализации)"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr ""
 " Чётная \n"
 " строка"
 
-#: ../plugins/gtkui/interface.c:2235 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr ""
 " Нечётная \n"
 " строка"
 
-#: ../plugins/gtkui/interface.c:2261 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr ""
 " Выделенная \n"
 " строка"
 
-#: ../plugins/gtkui/interface.c:2280 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr ""
 " Выделенный \n"
 " текст"
 
-#: ../plugins/gtkui/interface.c:2293 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2306 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Цвета плейлиста"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Цвета"
 
-#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:38
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Включить прокси-сервер"
 
-#: ../plugins/gtkui/interface.c:2327 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:2341 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Порт:"
 
-#: ../plugins/gtkui/interface.c:2355 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Имя пользователя:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Пароль:"
 
-#: ../plugins/gtkui/interface.c:2397 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Сеть"
 
-#: ../plugins/gtkui/interface.c:2428 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
 msgid "Version: "
 msgstr "Версия:"
 
-#: ../plugins/gtkui/interface.c:2492 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
 #: ../translation/extra.c:78
 msgid "Copyright"
 msgstr "Авторские права"
 
-#: ../plugins/gtkui/interface.c:2502 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
 msgid "Plugins"
 msgstr "Расширения"
 
-#: ../plugins/gtkui/interface.c:2981 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
 msgid "URL:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:3083 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
 msgid "Group By"
 msgstr "Группировать по"
 
-#: ../plugins/gtkui/interface.c:3207 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
 msgid "Sort by..."
 msgstr "Сортировать по..."
 
-#: ../plugins/gtkui/interface.c:3223 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
 msgid "Format"
 msgstr "Формат"
 
-#: ../plugins/gtkui/interface.c:3253
+#: ../plugins/gtkui/interface.c:3305
 msgid "Ascending"
 msgstr "По возрастанию"
 
-#: ../plugins/gtkui/interface.c:3254
+#: ../plugins/gtkui/interface.c:3306
 msgid "Descending"
 msgstr "По убыванию"
 
-#: ../plugins/gtkui/interface.c:3307 ../plugins/gtkui/deadbeef.glade.h:113
-#: ../plugins/converter/interface.c:758
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
 msgid "Select DSP Plugin"
 msgstr "Выберите расширение DSP"
 
-#: ../plugins/gtkui/interface.c:3323 ../plugins/gtkui/deadbeef.glade.h:92
-#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:774
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
 #: ../plugins/gtkui/dspconfig.c:139
 msgid "Plugin"
 msgstr "Расширение"
 
-#: ../plugins/gtkui/interface.c:3409 ../plugins/gtkui/deadbeef.glade.h:132
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
 msgid "Tag Writer Settings"
 msgstr "Настройки редактора тегов"
 
-#: ../plugins/gtkui/interface.c:3440 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Писать ID3v2"
 
-#: ../plugins/gtkui/interface.c:3444 ../plugins/gtkui/interface.c:3571
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Писать ID3v1"
 
-#: ../plugins/gtkui/interface.c:3448 ../plugins/gtkui/interface.c:3527
-#: ../plugins/gtkui/interface.c:3567 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Писать APEv2"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/interface.c:3535
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Вырезать ID3v2"
 
-#: ../plugins/gtkui/interface.c:3460 ../plugins/gtkui/interface.c:3583
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Вырезать ID3v1"
 
-#: ../plugins/gtkui/interface.c:3464 ../plugins/gtkui/interface.c:3539
-#: ../plugins/gtkui/interface.c:3579 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Вырезать APEv2"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Версия ID3v2"
 
-#: ../plugins/gtkui/interface.c:3479
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Рекомендуемая)"
 
-#: ../plugins/gtkui/interface.c:3480
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:3486 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Кодировка ID3v1 (по умолчанию iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3523 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Писать ID3v2.4"
 
-#: ../plugins/gtkui/mainplaylist.c:313 ../plugins/gtkui/search.c:391
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Исполнитель / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:314 ../plugins/gtkui/search.c:392
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "№"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Удалить файлы с жёсткого диска"
 
-#: ../plugins/gtkui/plcommon.c:326
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -920,49 +930,49 @@
 "Файлы будут удалены. Продолжить?\n"
 "(Этот диалог может быть отключён в настройках расширения GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:327 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
 #: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
 #: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../plugins/gtkui/plcommon.c:429
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Добавить в очередь"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Удалить из очереди"
 
-#: ../plugins/gtkui/plcommon.c:442
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Обновить метаданные"
 
-#: ../plugins/gtkui/plcommon.c:461
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Удалить с жёсткого диска"
 
-#: ../plugins/gtkui/plcommon.c:840 ../plugins/gtkui/plcommon.c:965
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Добавить столбец"
 
-#: ../plugins/gtkui/plcommon.c:870 ../plugins/gtkui/plcommon.c:969
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Редактировать столбец"
 
-#: ../plugins/gtkui/plcommon.c:973
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Удалить столбец"
 
-#: ../plugins/gtkui/plcommon.c:983
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Группировать по"
 
-#: ../plugins/gtkui/plcommon.c:990
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Отсутствует"
 
-#: ../plugins/gtkui/plcommon.c:994
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Исполнитель/Дата/Альбом"
 
@@ -979,7 +989,7 @@
 msgid "Default Audio Device"
 msgstr "Аудио устройство по умолчанию"
 
-#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:649
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Добавить"
 
@@ -1056,55 +1066,55 @@
 msgid "Remove field"
 msgstr "Удалить поле"
 
-#: ../main.c:90
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Использование: deadbeef [опции] [файл(ы)]\n"
 
-#: ../main.c:91
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: ../main.c:92
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr ""
 " --help или -h Вывести на экран справку (это сообщение) и выйти\n"
 
-#: ../main.c:93
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Выйти из плеера\n"
 
-#: ../main.c:94
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr ""
 " --version Вывести на экран информацию о версии программы и "
 "выйти\n"
 
-#: ../main.c:95
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Начать воспроизведение\n"
 
-#: ../main.c:96
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Остановить воспроизведение\n"
 
-#: ../main.c:97
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Приостановить воспроизведение\n"
 
-#: ../main.c:98
+#: ../main.c:99
 #, c-format
 msgid " --toggle-pause Toggle pause\n"
 msgstr " --toggle-pause Приостановить воспроизведение\n"
 
-#: ../main.c:99
+#: ../main.c:100
 #, c-format
 msgid ""
 " --play-pause Start playback if stopped, toggle pause otherwise\n"
@@ -1112,33 +1122,33 @@
 " --play-pause Начать воспроизведение если остановлено, в противном "
 "случае - приостановить\n"
 
-#: ../main.c:100
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Следующая дорожка в плейлисте\n"
 
-#: ../main.c:101
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Предыдущая дорожка в плейлисте\n"
 
-#: ../main.c:102
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Воспроизведение случайной дорожки в плейлисте\n"
 
-#: ../main.c:103
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Добавить файл(ы) в существующий плейлист\n"
 
-#: ../main.c:104
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 " --nowplaying FMT Вывести на экран форматированное название дорожки\n"
 
-#: ../main.c:105
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1151,7 +1161,7 @@
 "комментарий,\n"
 " %%r-авторские права, %%e-время, которое прошло \n"
 
-#: ../main.c:108
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1160,7 +1170,7 @@
 " Например: --nowplaying \"%%a - %%t\" должна вывести "
 "на экран \"artist - title\"\n"
 
-#: ../main.c:109
+#: ../main.c:110
 #, c-format
 msgid ""
 " for more info, see http://sourceforge.net/apps/"
@@ -1169,15 +1179,15 @@
 " для дополнительной информации, смотрите http://"
 "sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
 
-#: ../playlist.c:439 ../playlist.c:2605
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Плейлист"
 
-#: ../playlist.c:3854
+#: ../playlist.c:3664
 msgid "Yes"
 msgstr "Да"
 
-#: ../playlist.c:3854
+#: ../playlist.c:3664
 msgid "No"
 msgstr "Нет"
 
@@ -1207,7 +1217,7 @@
 "Дорожка\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1233,7 +1243,7 @@
 "Группа / Исполнитель альбома\n"
 "Разное"
 
-#: ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1533,7 +1543,8 @@
 
 #: ../translation/extra.c:91
 msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Автоматическая частота дискретизации (переопределяет частоту дискретизации)"
+msgstr ""
+"Автоматическая частота дискретизации (переопределяет частоту дискретизации)"
 
 #: ../plugins/converter/convgui.c:108
 msgid "The file already exists. Overwrite?"
@@ -1619,15 +1630,15 @@
 msgid "DSP Presets"
 msgstr "Предустановки DSP"
 
-#: ../plugins/converter/interface.c:97
+#: ../plugins/converter/interface.c:94
 msgid "Output folder:"
 msgstr "Выходной каталог:"
 
-#: ../plugins/converter/interface.c:118
+#: ../plugins/converter/interface.c:115
 msgid "Output file name:"
 msgstr "Имя выходного файла:"
 
-#: ../plugins/converter/interface.c:129
+#: ../plugins/converter/interface.c:126
 msgid ""
 "Extension (e.g. .mp3) will be appended automatically.\n"
 "Leave the field empty for default (%a - %t)."
@@ -1635,83 +1646,83 @@
 "Расширение (например, .mp3) будет добавлено автоматически.\n"
 "Оставьте это поле пустым для использования настроек по умолчанию (%a - %t)."
 
-#: ../plugins/converter/interface.c:142
+#: ../plugins/converter/interface.c:139
 msgid "Encoder:"
 msgstr "Кодировщик:"
 
-#: ../plugins/converter/interface.c:166
+#: ../plugins/converter/interface.c:163
 msgid "DSP preset:"
 msgstr "Предустановка DSP:"
 
-#: ../plugins/converter/interface.c:189
+#: ../plugins/converter/interface.c:186
 msgid "Number of threads:"
 msgstr "Количество потоков:"
 
-#: ../plugins/converter/interface.c:202
+#: ../plugins/converter/interface.c:199
 msgid "Output sample format:"
 msgstr "Выходной формат сэмплов:"
 
-#: ../plugins/converter/interface.c:209
+#: ../plugins/converter/interface.c:206
 msgid "Keep source format"
 msgstr "Оставить исходный формат"
 
-#: ../plugins/converter/interface.c:210
+#: ../plugins/converter/interface.c:207
 msgid "8 bit signed int"
 msgstr "8 бит целочисленный"
 
-#: ../plugins/converter/interface.c:211
+#: ../plugins/converter/interface.c:208
 msgid "16 bit signed int"
 msgstr "16 бит целочисленный"
 
-#: ../plugins/converter/interface.c:212
+#: ../plugins/converter/interface.c:209
 msgid "24 bit signed int"
 msgstr "24 бит целочисленный"
 
-#: ../plugins/converter/interface.c:213
+#: ../plugins/converter/interface.c:210
 msgid "32 bit signed int"
 msgstr "32 бит целочисленный"
 
-#: ../plugins/converter/interface.c:214
+#: ../plugins/converter/interface.c:211
 msgid "32 bit float"
 msgstr "32 бит вещественный"
 
-#: ../plugins/converter/interface.c:220
+#: ../plugins/converter/interface.c:217
 msgid "When file exists:"
 msgstr "Если файл существует:"
 
-#: ../plugins/converter/interface.c:227
+#: ../plugins/converter/interface.c:224
 msgid "Prompt"
 msgstr "Спросить"
 
-#: ../plugins/converter/interface.c:228
+#: ../plugins/converter/interface.c:225
 msgid "Overwrite"
 msgstr "Заменить"
 
-#: ../plugins/converter/interface.c:230
+#: ../plugins/converter/interface.c:227
 msgid "Preserve folder structure, starting from:"
 msgstr "Сохранить структуру папок, начиная с:"
 
-#: ../plugins/converter/interface.c:386
+#: ../plugins/converter/interface.c:379
 msgid "Edit Encoder Preset"
 msgstr "Редактировать предустановки"
 
-#: ../plugins/converter/interface.c:409
+#: ../plugins/converter/interface.c:402
 msgid "Untitled Encoder"
 msgstr "Безымянный кодировщик"
 
-#: ../plugins/converter/interface.c:417
+#: ../plugins/converter/interface.c:410
 msgid "Output file extension:"
 msgstr "Расширение выходного файла:"
 
-#: ../plugins/converter/interface.c:424
+#: ../plugins/converter/interface.c:417
 msgid "E.g. mp3"
 msgstr "Например mp3"
 
-#: ../plugins/converter/interface.c:432
+#: ../plugins/converter/interface.c:425
 msgid "Command line:"
 msgstr "Командная строка"
 
-#: ../plugins/converter/interface.c:443
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
 "Example: lame - %o\n"
@@ -1720,7 +1731,7 @@
 "Пример: lame - %o\n"
 "\"%i\" для входного файла, \"%o\" для выходного файла, \"-\" для stdin"
 
-#: ../plugins/converter/interface.c:453
+#: ../plugins/converter/interface.c:446
 #, c-format
 msgid ""
 "%o - output file name\n"
@@ -1729,47 +1740,47 @@
 "\"%o\" - имя выходного файла\n"
 "\"%i\" - имя временного входного файла"
 
-#: ../plugins/converter/interface.c:462
+#: ../plugins/converter/interface.c:455
 msgid "Method:"
 msgstr "Метод:"
 
-#: ../plugins/converter/interface.c:469
+#: ../plugins/converter/interface.c:462
 msgid "Pipe"
 msgstr "Конвейер"
 
-#: ../plugins/converter/interface.c:470
+#: ../plugins/converter/interface.c:463
 msgid "Temporary file"
 msgstr "Временный файл"
 
-#: ../plugins/converter/interface.c:487
+#: ../plugins/converter/interface.c:480
 msgid "APEv2"
 msgstr "APEv2"
 
-#: ../plugins/converter/interface.c:493
+#: ../plugins/converter/interface.c:486
 msgid "ID3v1"
 msgstr "ID3v1"
 
-#: ../plugins/converter/interface.c:499
+#: ../plugins/converter/interface.c:492
 msgid "OggVorbis"
 msgstr "OggVorbis"
 
-#: ../plugins/converter/interface.c:505
+#: ../plugins/converter/interface.c:498
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../plugins/converter/interface.c:517
+#: ../plugins/converter/interface.c:510
 msgid "ID3v2"
 msgstr "ID3v2"
 
-#: ../plugins/converter/interface.c:527
+#: ../plugins/converter/interface.c:520
 msgid "Tag writer"
 msgstr "Запись тегов"
 
-#: ../plugins/converter/interface.c:614
+#: ../plugins/converter/interface.c:606
 msgid "DSP Preset Editor"
 msgstr "Редактор предустановок DSP"
 
-#: ../plugins/converter/interface.c:637
+#: ../plugins/converter/interface.c:629
 msgid "Untitled DSP Preset"
 msgstr "Безымянная предустановка DSP"

deadbeef-0.5.2.tar.bz2/po/si.po Added

@@ -0,0 +1,1722 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2010-11-29 17:35+0200\n"
+"Last-Translator: danishka <danishka@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: si\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "උදව්"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr ""
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr ""
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr ""
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr ""
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr ""
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr ""
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr ""
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.1.tar.bz2/po/sk.po -> deadbeef-0.5.2.tar.bz2/po/sk.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-07-08 10:21+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -17,835 +17,912 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Podporované formáty zvuku"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Ostatné súbory (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Otvoriť súbor(y)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Pridať súbor(y) do zoznamu stôp..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Pridať priečinok/priečinky do zoznamu stôp..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Zlyhalo čítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Zlyhalo načítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Pomocník"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O aplikácii DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "Záznam zmien DeaDBeeF %s"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF teraz prehráva"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Upraviť zoznam stôp"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Názov:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Premenovať zoznam stôp"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Odstrániť zoznam stôp"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Pridať nový zoznam stôp"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Uložiť predvoľby ekvalizéru DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Predvoľby ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Načítať Predvoľby ekvalizéru DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Predvoľby ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importovať predvoľby ekvalizéru Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Predvoľby ekvalizéru Foobar2000 (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Načítať predvoľby"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importovať predvoľby Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Zapnúť"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Znulovať všetky"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Znulovať predzos"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Znulovať pásma"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Uložiť predvoľby"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Načítať predvoľby"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importovať predvoľby Foobar2000"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 deň %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dní %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zastavené | %d stôp | %s celkový čas"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pozastavené | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d stôp | %s celkový čas"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Uložiť zoznam stôp ako"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Zoznamy stôp DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Načítať zoznam stôp"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Ostatné súbory (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nový zoznam stôp"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nový zoznam stôp (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Otvoriť súbor(y)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Pridať súbor(y)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Pridať priečinok/priečinky"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Pridať umiestnenie"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nový zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Načítať zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Uložiť zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Uložiť zoznam stôp ako"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Vyčistiť"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Vybrať všetky"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Zrušiť výber"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Invertovať výber"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Výber"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Orezať"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Nájsť"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Názov"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Číslo súboru"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Interpret"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Vlastné"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Stavový panel"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Hlavičky stĺpcov"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Karty"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Prehrávanie"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Poradie"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Lineárne"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Zamiešať"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Zamiešať"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Náhodné"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Opakovať"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Opakovať všetky"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Opakovať jedinú stopu"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Neopakovať"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Posúvať podľa prehrávanej stopy"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Kurzor podľa prehrávanej stopy"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Zastaviť po tejto stope"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Záznam zmien"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "O _aplikácii"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Prehrať"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Predošlá"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Ďalšia"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Prehrať náhodnú"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "O aplikácii"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Pridávajú sa súbory..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Zrušiť"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Vlastnosti stopy"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"UPOZORNENIE: zapisovanie značiek je zatiaľ vlastnosť vo vývoji.\n"
-"Urobte si zálohy predtým, než ju budete používať."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Použiť"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Zatvoriť"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Názov:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Sem zadajte názov stĺpca"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Číslo súboru"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Hrá"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Obal albumu"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Interpret - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Interpret"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Názov"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Dĺžka"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Trvanie"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Stopa"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "Č. stopy"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Skupina/interpret"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Vlastné"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Zarovnanie:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, fuzzy, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Konverzia formátu (začína %):\n"
-" [a] interpret, [t] názov, [b] album, [B] skupina, [C] skladateľ\n"
-" [n] číslo stopy, [N] počet stôp,\n"
-" [l] dĺžka, [y] rok, [g] žáner, [c] komentár,\n"
-" [r] autorské práva, [f] názov súboru, [T] značky\n"
-"Príklad: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Výstupný zásuvný modul:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Výstupné zariadenie:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Povoliť dynamické prepínanie vzorkovania"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Kvalita konverzie vzorkovania:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Režim replaygain:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Vypnúť"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Stopa"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Najvyšší replaygain:"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Režim replaygain:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "_Prehrávanie"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Nastaviť"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Zatvorenie minimalizuje do oznamovacej oblasti"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Stredné tlačidlo myši zatvára zoznam stôp"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Rozhranie"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Prekonať"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Popredie"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Pozadie"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Farby lišty pozície a hlasitosti"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Stredné"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Svetlé"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Tmavé"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Základ"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Text"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Farby pruhu kariet"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Prekonať (nepoužije témy vzhľadu stromového zobrazenia GTK, ale urýchli "
 "vykresľovanie)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Párny riadok"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Nepárny riadok"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Vybraný riadok"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Vybraný text"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Kurzor"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Farby zoznamu stôp"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Zapnúť proxy server"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresa proxy servera:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port proxy servera:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Typ proxy:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Používateľ proxy:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Heslo pre proxy:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Sieť"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Zoskupiť podľa"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Formát:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Výber"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Zapisovať značiek"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Zapísať ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Zapísať ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Zapísať APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Odstrániť ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Odstrániť ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Odstrániť APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Verzia ID3v2"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (odporúča sa)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kódovanie znakov ID3v1 (predvolené je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Zapísať ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Zapisovať značiek"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Popis:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Autor(i):"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Webstránka:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Nastaviť"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Zásuvné moduly"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Zoskupiť podľa"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Konverzia formátu (začína %):\n"
-" [a] interpret, [t] názov, [b] album, [B] skupina, [C] skladateľ\n"
-" [n] číslo stopy, [N] počet stôp,\n"
-" [l] dĺžka, [y] rok, [g] žáner, [c] komentár,\n"
-" [r] autorské práva, [f] názov súboru, [T] značky\n"
-"Príklad: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Interpret/album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Č. stopy"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Názov/interpret stopy"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Trvanie"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Zmazať súbory z disku"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -853,196 +930,223 @@
 "Súbory sa stratia. Pokračovať?\n"
 "(Tento dialóg môžete vypnúť v nastaveniach zásuvných modulov GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Pridať do frontu prehrávaných"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Odstrániť z frontu prehrávaných"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Znovu načítať metadáta"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Odstrániť z disku"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Pridať stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Upraviť stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Odstrániť stĺpec"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Zoskupiť podľa"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Žiadne"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Interpret/dátum/album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Otvoriť súbor..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Nastaviť %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Nastaviť"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Predvolené zvukové zariadenie"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Pridať"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Globálne klávesové skratky"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Miesto"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Kombinácia klávesov"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "Výstupný modul ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Pridávajú sa súbory..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inicializuje sa..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Zmenili ste dáta tejto stopy."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Naozaj zatvoriť toto okno?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Typ(y) značiek"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Vložený cue"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Áno"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nie"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Kľúč"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Hodnota"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF teraz prehráva"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Naozaj zatvoriť toto okno?"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Pridať súbor(y)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Odstrániť"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Použitie: deadbeef [možnosti] [súbor(y)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Možnosti:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help alebo -h Vypíše túto správu Pomocníka a skončí\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Ukončí prehrávač\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Vypíše informácie o verzii a skončí\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Začne prehrávanie\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Zastaví prehrávanie\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pozastaví prehrávanie\n"
 
-#: ../main.c:97
+#: ../main.c:99
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Ďalšia stopa v zozname\n"
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
 
-#: ../main.c:98
+#: ../main.c:100
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Predošlá stopa v zozname\n"
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
 
-#: ../main.c:99
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Ďalšia stopa v zozname\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Predošlá stopa v zozname\n"
+
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Náhodná stopa v zozname\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Pridá súbory do existujúceho zoznamu stôp\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 " --nowplaying FMT Vypíše formátovaný názov stopy na štand. výstup\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1053,7 +1157,7 @@
 " [l] dĺžka, [n] č. stopy, [y] rok, [c] komentár,\n"
 " [r] autorské práva, [e] uplynulo\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1062,11 +1166,26 @@
 " napr.: --nowplaying „%%a - %%t“ by malo vypísať "
 "„interpret - názov“\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Áno"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1074,7 +1193,13 @@
 "2.3 (odporúča sa)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1084,17 +1209,18 @@
 "Stopa\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1110,7 +1236,7 @@
 "Skupina/Interpret albumu\n"
 "Vlastné"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1119,74 +1245,673 @@
 "Vpravo"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Nepodarilo sa získať dosť pamäte na bufrovanie vstupu."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Pridať zvukové CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Zapnúť proxy server"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF teraz prehráva"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Používateľ proxy:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Heslo pre proxy:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Zmazať súbory z disku"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Obal albumu"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Č. stopy"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Názov/interpret stopy"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Číslo súboru"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Pridať umiestnenie"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Typ(y) značiek"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Vložený cue"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Chyba pri čítaní prvej stránky bitového toku Ogg."
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Chyba pri čítaní prvého paketu hlavičky."
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Nepodarilo sa získať dosť pamäte na registráciu sériového čísla toku."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Vstup je orezaný alebo prázdny."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Vstup nie je bitový tok Ogg."
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Bitový tok Ogg neobsahuje dáta Vorbis."
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Koniec súboru pred rozpoznaním toku."
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Bitový tok Ogg neobsahuje podporovaný typ dát."
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Poškodená sekundárna hlavička-"
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Koniec súboru pred koncom hlavičiek Vorbis."
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Vybrať všetky"
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Poškodené alebo chýbajúce dáta, pokračuje sa..."
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"Chyba pri zapisovaní toku na výstup. Výstupný tok môže byť poškodený alebo "
-"orezaný."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Upraviť stĺpec"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Výstupné zariadenie:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Výstupný zásuvný modul:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Uložiť predvoľby"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Prekonať"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Načítať predvoľby"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Výstupný zásuvný modul:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Zapísať APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Zapísať ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Pridať zvukové CD"
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Zapísať ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Zapisovať značiek"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Uložiť zoznam stôp ako"
+
+#~ msgid "_Abort"
+#~ msgstr "_Zrušiť"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "UPOZORNENIE: zapisovanie značiek je zatiaľ vlastnosť vo vývoji.\n"
+#~ "Urobte si zálohy predtým, než ju budete používať."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Dĺžka"
+
+#, fuzzy
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Konverzia formátu (začína %):\n"
+#~ " [a] interpret, [t] názov, [b] album, [B] skupina, [C] skladateľ\n"
+#~ " [n] číslo stopy, [N] počet stôp,\n"
+#~ " [l] dĺžka, [y] rok, [g] žáner, [c] komentár,\n"
+#~ " [r] autorské práva, [f] názov súboru, [T] značky\n"
+#~ "Príklad: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Povoliť dynamické prepínanie vzorkovania"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Kvalita konverzie vzorkovania:"
+
+#~ msgid "Description:"
+#~ msgstr "Popis:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor(i):"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Webstránka:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Konverzia formátu (začína %):\n"
+#~ " [a] interpret, [t] názov, [b] album, [B] skupina, [C] skladateľ\n"
+#~ " [n] číslo stopy, [N] počet stôp,\n"
+#~ " [l] dĺžka, [y] rok, [g] žáner, [c] komentár,\n"
+#~ " [r] autorské práva, [f] názov súboru, [T] značky\n"
+#~ "Príklad: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Nastaviť %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Výstupný modul ALSA"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Nepodarilo sa získať dosť pamäte na bufrovanie vstupu."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Chyba pri čítaní prvej stránky bitového toku Ogg."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Chyba pri čítaní prvého paketu hlavičky."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Nepodarilo sa získať dosť pamäte na registráciu sériového čísla toku."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Vstup je orezaný alebo prázdny."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Vstup nie je bitový tok Ogg."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Bitový tok Ogg neobsahuje dáta Vorbis."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Koniec súboru pred rozpoznaním toku."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Bitový tok Ogg neobsahuje podporovaný typ dát."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Poškodená sekundárna hlavička-"
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Koniec súboru pred koncom hlavičiek Vorbis."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Poškodené alebo chýbajúce dáta, pokračuje sa..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Chyba pri zapisovaní toku na výstup. Výstupný tok môže byť poškodený "
+#~ "alebo orezaný."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Zvuk (pokr.)"

deadbeef-0.5.2.tar.bz2/po/sl.po Added

@@ -0,0 +1,1934 @@
+# Slovenian translation of deadbeef.
+# Copyright (C) 2011 - 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the deadbeef package.
+# Klemen Košir <klemen.kosir@gmx.com>, 2011 - 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: deadbeef\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-01-22 22:12+0200\n"
+"Last-Translator: Klemen <klemen.kosir@gmx.com>\n"
+"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
+"n%100==4 ? 3 : 0);;\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "Podprte vrste zvoka"
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Vse datoteke (*.*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "Odpri datoteko ..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "Dodaj datoteko na seznam predvajanja ..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "Dodaj mapo na seznam predvajanja ..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "Sledi simbolnim povezavam"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "Med branjem datoteke pomoči je prišlo do napake"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "Datoteke pomoči ni mogoče naložiti"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737
+#: ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "Pomoč"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O programu DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Dnevnik sprememb programa DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Prevajalci programa DeaDBeeF"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755
+#: ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "Uredi seznam predvajanja"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758
+#: ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922
+#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "Preimenuj seznam predvajanja"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "Odstrani seznam predvajanja"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "Dodaj nov seznam predvajanja"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Shrani predlogo nastavitev uravnalnika DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Predloge nastavitev uravnalnika DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Naloži predlogo nastavitev uravnalnika DeaDBeeF ..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Predloge nastavitev uravnalnika DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Uvozi predlogo nastavitev uravnalnika Foobar2000 ..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Predloge nastavitev uravnalnika Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Shrani predlogo nastavitev"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Naloži predlogo nastavitev"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Uvozi predlogo nastavitev za Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "Omogočeno"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "Ponastavi"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "Ponastavi predojačevalnik"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "Ponastavi pasove"
+
+#: ../plugins/gtkui/eq.c:387
+#: ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Predloge nastavitev"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dan %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dni %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "Zaustavljeno | %d skladb | Skupni čas predvajanja: %s"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "Mono"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "Premor | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr "%s%s %s| %d Hz | %d bitov | %s | %d:%02d / %s | %d skladb | Skupni čas predvajanja: %s"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "Shrani seznam predvajanja kot"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Seznami predvajanja DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "Naloži seznam predvajanja"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Druge datoteke (*.*)"
+
+#: ../plugins/gtkui/gtkui.c:926
+#: ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "Nov seznam predvajanja"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nov seznam predvajanja (%d)"
+
+#: ../plugins/gtkui/interface.c:150
+#: ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../plugins/gtkui/interface.c:157
+#: ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "_Odpri datoteko"
+
+#: ../plugins/gtkui/interface.c:173
+#: ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "Dodaj datoteko"
+
+#: ../plugins/gtkui/interface.c:181
+#: ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "Dodaj mapo"
+
+#: ../plugins/gtkui/interface.c:189
+#: ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "Dodaj mesto"
+
+#: ../plugins/gtkui/interface.c:198
+#: ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "Nov seznam predvajanja"
+
+#: ../plugins/gtkui/interface.c:205
+#: ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "Naloži seznam predvajanja"
+
+#: ../plugins/gtkui/interface.c:209
+#: ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "Shrani seznam predvajanja"
+
+#: ../plugins/gtkui/interface.c:218
+#: ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "_Končaj"
+
+#: ../plugins/gtkui/interface.c:229
+#: ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../plugins/gtkui/interface.c:236
+#: ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "_Počisti"
+
+#: ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "Izberi vse"
+
+#: ../plugins/gtkui/interface.c:251
+#: ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "Prekliči izbor"
+
+#: ../plugins/gtkui/interface.c:258
+#: ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "Obrni izbor"
+
+#: ../plugins/gtkui/interface.c:262
+#: ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "Izbor"
+
+#: ../plugins/gtkui/interface.c:269
+#: ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323
+#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "Odstrani"
+
+#: ../plugins/gtkui/interface.c:277
+#: ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr "Obreži"
+
+#: ../plugins/gtkui/interface.c:281
+#: ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "_Najdi"
+
+#: ../plugins/gtkui/interface.c:288
+#: ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Razvrsti po"
+
+#: ../plugins/gtkui/interface.c:295
+#: ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318
+#: ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790
+#: ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Naslov"
+
+#: ../plugins/gtkui/interface.c:299
+#: ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Številka skladbe"
+
+#: ../plugins/gtkui/interface.c:303
+#: ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875
+#: ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307
+#: ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Izvajalec"
+
+#: ../plugins/gtkui/interface.c:311
+#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/interface.c:315
+#: ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017
+#: ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Po meri"
+
+#: ../plugins/gtkui/interface.c:324
+#: ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "Možnosti"
+
+#: ../plugins/gtkui/interface.c:328
+#: ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../plugins/gtkui/interface.c:335
+#: ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "Vrstica stanja"
+
+#: ../plugins/gtkui/interface.c:339
+#: ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "Glave stolpcev"
+
+#: ../plugins/gtkui/interface.c:343
+#: ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "Zavihki"
+
+#: ../plugins/gtkui/interface.c:347
+#: ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "Uravnalnik"
+
+#: ../plugins/gtkui/interface.c:351
+#: ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "Pre_dvajanje"
+
+#: ../plugins/gtkui/interface.c:358
+#: ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr "Vrstni red"
+
+#: ../plugins/gtkui/interface.c:365
+#: ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "Zaporedno"
+
+#: ../plugins/gtkui/interface.c:370
+#: ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Premešaj skladbe"
+
+#: ../plugins/gtkui/interface.c:375
+#: ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Premešaj albume"
+
+#: ../plugins/gtkui/interface.c:380
+#: ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "Naključno"
+
+#: ../plugins/gtkui/interface.c:386
+#: ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr "Ponavljanje"
+
+#: ../plugins/gtkui/interface.c:393
+#: ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr "Ponavljaj vse skladbe"
+
+#: ../plugins/gtkui/interface.c:398
+#: ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr "Ponavljaj eno skladbo"
+
+#: ../plugins/gtkui/interface.c:403
+#: ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr "Brez ponavljanja"
+
+#: ../plugins/gtkui/interface.c:409
+#: ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr "Drsnik sledi predvajanju"
+
+#: ../plugins/gtkui/interface.c:414
+#: ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr "Kazalnik sledi predvajanju"
+
+#: ../plugins/gtkui/interface.c:418
+#: ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr "Zaustavi po trenutni skladbi"
+
+#: ../plugins/gtkui/interface.c:430
+#: ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "Skoči na trenutno skladbo"
+
+#: ../plugins/gtkui/interface.c:437
+#: ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "Pomo_č"
+
+#: ../plugins/gtkui/interface.c:452
+#: ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "Dnevnik _sprememb"
+
+#: ../plugins/gtkui/interface.c:461
+#: ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465
+#: ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474
+#: ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "_O programu"
+
+#: ../plugins/gtkui/interface.c:482
+#: ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "_Prevajalci"
+
+#: ../plugins/gtkui/interface.c:898
+#: ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "Iskanje"
+
+#: ../plugins/gtkui/interface.c:973
+#: ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "Zaustavi"
+
+#: ../plugins/gtkui/interface.c:981
+#: ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "Predvajaj"
+
+#: ../plugins/gtkui/interface.c:989
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "Premor"
+
+#: ../plugins/gtkui/interface.c:997
+#: ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "Predhodna"
+
+#: ../plugins/gtkui/interface.c:1005
+#: ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "Naslednja"
+
+#: ../plugins/gtkui/interface.c:1013
+#: ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "Predvajaj naključno"
+
+#: ../plugins/gtkui/interface.c:1022
+#: ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "O programu"
+
+#: ../plugins/gtkui/interface.c:1035
+#: ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "Končaj"
+
+#: ../plugins/gtkui/interface.c:1225
+#: ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "Lastnosti skladbe"
+
+#: ../plugins/gtkui/interface.c:1270
+#: ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: ../plugins/gtkui/interface.c:1296
+#: ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "_Uveljavi"
+
+#: ../plugins/gtkui/interface.c:1317
+#: ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../plugins/gtkui/interface.c:1321
+#: ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "Metapodatki"
+
+#: ../plugins/gtkui/interface.c:1367
+#: ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "Lastnosti"
+
+#: ../plugins/gtkui/interface.c:1494
+#: ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "Vnesite ime novega stolpca"
+
+#: ../plugins/gtkui/interface.c:1502
+#: ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "Številka skladbe"
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511
+#: ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "Predvajanje"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "Naslovnica albuma"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "Izvajalec - Album"
+
+#: ../plugins/gtkui/interface.c:1517
+#: ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Trajanje"
+
+#: ../plugins/gtkui/interface.c:1518
+#: ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Št. skladbe"
+
+#: ../plugins/gtkui/interface.c:1519
+#: ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "Skupina / Izvajalec albuma"
+
+#: ../plugins/gtkui/interface.c:1526
+#: ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "Oblika:"
+
+#: ../plugins/gtkui/interface.c:1551
+#: ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr "Poravnava:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "Levo"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "Desno"
+
+#: ../plugins/gtkui/interface.c:1583
+#: ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065
+#: ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#: ../plugins/gtkui/interface.c:1604
+#: ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086
+#: ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "_V redu"
+
+#: ../plugins/gtkui/interface.c:1825
+#: ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr "Izhodni vstavek:"
+
+#: ../plugins/gtkui/interface.c:1838
+#: ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr "Izhodna naprava:"
+
+#: ../plugins/gtkui/interface.c:1847
+#: ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Vedno pretvori 8-bitni zvok v 16-bitnega"
+
+#: ../plugins/gtkui/interface.c:1851
+#: ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "Zvok"
+
+#: ../plugins/gtkui/interface.c:1864
+#: ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr "ReplayGain:"
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "Onemogočeno"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Skladba"
+
+#: ../plugins/gtkui/interface.c:1877
+#: ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr "Prilagajanje vrha ReplayGain"
+
+#: ../plugins/gtkui/interface.c:1892
+#: ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902
+#: ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906
+#: ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Predojačanje ReplayGain:"
+
+#: ../plugins/gtkui/interface.c:1913
+#: ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Splošno predojačanje:"
+
+#: ../plugins/gtkui/interface.c:1944
+#: ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Datoteke privzeto dodaj na ta seznam predvajanja:"
+
+#: ../plugins/gtkui/interface.c:1953
+#: ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr "Ob zagonu nadaljuj prejšnjo sejo"
+
+#: ../plugins/gtkui/interface.c:1957
+#: ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Med dodajanjem map ne dodaj datotek iz arhivov"
+
+#: ../plugins/gtkui/interface.c:1961
+#: ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr "Predvajanje"
+
+#: ../plugins/gtkui/interface.c:1982
+#: ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Nastavitve"
+
+#: ../plugins/gtkui/interface.c:2017
+#: ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Predloga nastavitev verige DSP"
+
+#: ../plugins/gtkui/interface.c:2029
+#: ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Naloži"
+
+#: ../plugins/gtkui/interface.c:2033
+#: ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042
+#: ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr "Ob zaprtju skrči v sistemsko vrstico"
+
+#: ../plugins/gtkui/interface.c:2046
+#: ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr "Srednji miškin gumb zapre seznam predvajanja"
+
+#: ../plugins/gtkui/interface.c:2050
+#: ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr "Skrij ikono sistemske vrstice"
+
+#: ../plugins/gtkui/interface.c:2054
+#: ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr "Uporabi krepko pisavo za trenutno predvajano skladbo"
+
+#: ../plugins/gtkui/interface.c:2058
+#: ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "Skrij možnost »Izbriši z diska«"
+
+#: ../plugins/gtkui/interface.c:2062
+#: ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Samodejno poimenuj seznam prevajanja, ko je dodana le ena mapa"
+
+#: ../plugins/gtkui/interface.c:2070
+#: ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Hitrost osveževanja vmesnika:"
+
+#: ../plugins/gtkui/interface.c:2084
+#: ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr "Besedilo nazivne vrstice med predvajanjem:"
+
+#: ../plugins/gtkui/interface.c:2098
+#: ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr "Besedilo nazivne vrstice, ko je predvajanje zaustavljeno:"
+
+#: ../plugins/gtkui/interface.c:2112
+#: ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Vstavek vmesnika (zahteva ponovni zagon):"
+
+#: ../plugins/gtkui/interface.c:2120
+#: ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "Vmesnik"
+
+#: ../plugins/gtkui/interface.c:2135
+#: ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr "Omogoči"
+
+#: ../plugins/gtkui/interface.c:2144
+#: ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "Barva"
+
+#: ../plugins/gtkui/interface.c:2151
+#: ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr "Ozadje"
+
+#: ../plugins/gtkui/interface.c:2170
+#: ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr "Barva vrstice iskanja/glasnosti"
+
+#: ../plugins/gtkui/interface.c:2188
+#: ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr "Ozadje"
+
+#: ../plugins/gtkui/interface.c:2195
+#: ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr "1. obroba"
+
+#: ../plugins/gtkui/interface.c:2202
+#: ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr "2. obroba"
+
+#: ../plugins/gtkui/interface.c:2233
+#: ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr "Osnova"
+
+#: ../plugins/gtkui/interface.c:2240
+#: ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Besedilo"
+
+#: ../plugins/gtkui/interface.c:2253
+#: ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr "Barva zavihkov"
+
+#: ../plugins/gtkui/interface.c:2262
+#: ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr "Omogoči (prepiše temo GTK+, vendar pospeši izrisovanje)"
+
+#: ../plugins/gtkui/interface.c:2271
+#: ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr "Soda vrstica"
+
+#: ../plugins/gtkui/interface.c:2278
+#: ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr "Liha vrstica"
+
+#: ../plugins/gtkui/interface.c:2304
+#: ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "Izbrana vrstica"
+
+#: ../plugins/gtkui/interface.c:2323
+#: ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "Izbrano besedilo"
+
+#: ../plugins/gtkui/interface.c:2336
+#: ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "Kazalnik"
+
+#: ../plugins/gtkui/interface.c:2349
+#: ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "Barva seznama predvajanja"
+
+#: ../plugins/gtkui/interface.c:2353
+#: ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "Barve"
+
+#: ../plugins/gtkui/interface.c:2362
+#: ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "Omogoči posredniški strežnik"
+
+#: ../plugins/gtkui/interface.c:2370
+#: ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "Naslov:"
+
+#: ../plugins/gtkui/interface.c:2384
+#: ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "Vrata:"
+
+#: ../plugins/gtkui/interface.c:2398
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "Vrsta:"
+
+#: ../plugins/gtkui/interface.c:2417
+#: ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "Uporabniško ime:"
+
+#: ../plugins/gtkui/interface.c:2430
+#: ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "Geslo:"
+
+#: ../plugins/gtkui/interface.c:2440
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "Omrežje"
+
+#: ../plugins/gtkui/interface.c:2471
+#: ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Različica: "
+
+#: ../plugins/gtkui/interface.c:2535
+#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Avtorske pravice"
+
+#: ../plugins/gtkui/interface.c:2545
+#: ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Vstavki"
+
+#: ../plugins/gtkui/interface.c:3033
+#: ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135
+#: ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Združi po"
+
+#: ../plugins/gtkui/interface.c:3259
+#: ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Razvrsti po ..."
+
+#: ../plugins/gtkui/interface.c:3275
+#: ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Oblika"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "Naraščajoče"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "Padajoče"
+
+#: ../plugins/gtkui/interface.c:3359
+#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Izberite vstavek DSP"
+
+#: ../plugins/gtkui/interface.c:3375
+#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016
+#: ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Vstavek"
+
+#: ../plugins/gtkui/interface.c:3461
+#: ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Nastavitve zapisovalnika oznak"
+
+#: ../plugins/gtkui/interface.c:3492
+#: ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "Zapiši ID3v2"
+
+#: ../plugins/gtkui/interface.c:3496
+#: ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "Zapiši ID3v1"
+
+#: ../plugins/gtkui/interface.c:3500
+#: ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619
+#: ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "Zapiši APEv2"
+
+#: ../plugins/gtkui/interface.c:3508
+#: ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr "Odstrani ID3v2"
+
+#: ../plugins/gtkui/interface.c:3512
+#: ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr "Odstrani ID3v1"
+
+#: ../plugins/gtkui/interface.c:3516
+#: ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631
+#: ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr "Odstrani APEv2"
+
+#: ../plugins/gtkui/interface.c:3524
+#: ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "Različica ID3v2"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (priporočeno)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538
+#: ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Kodiranje znakov ID3v1 (privzeto je iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575
+#: ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "Zapiši ID3v2.4"
+
+#: ../plugins/gtkui/mainplaylist.c:316
+#: ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "Izvajalec / Album"
+
+#: ../plugins/gtkui/mainplaylist.c:317
+#: ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "Št. skladbe"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "Izbriši datoteke z diska"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Ali ste prepričani, da želite izbrisati datoteke iz diska?"
+
+#: ../plugins/gtkui/plcommon.c:340
+#: ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693
+#: ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "Dodaj na seznam predvajanja"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "Odstrani s seznama predvajanja"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "Ponovno naloži metapodatke"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "Odstrani z diska"
+
+#: ../plugins/gtkui/plcommon.c:855
+#: ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "Dodaj stolpec"
+
+#: ../plugins/gtkui/plcommon.c:885
+#: ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "Uredi stolpec"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "Odstrani stolpec"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr "Združi po"
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "Ne združi"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "Izvajalec/Datum/Album"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "Odpri datoteko ..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr "%s"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "Privzeta zvočna naprava"
+
+#: ../plugins/gtkui/prefwin.c:318
+#: ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "Bližnjice"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr "Dejanje"
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "Bližnjica"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Dodajanje datotek ..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "Začenjanje ..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "Spremenili ste podatke te skladbe."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "Ali res želite zapreti to okno?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Več vrednosti] "
+
+#: ../plugins/gtkui/trkproperties.c:407
+#: ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Ključ"
+
+#: ../plugins/gtkui/trkproperties.c:408
+#: ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Vrednost"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Zapisovanje oznak ..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Imena polj se ne smejo začeti z »:« ali »_«"
+
+#: ../plugins/gtkui/trkproperties.c:634
+#: ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Polja ni mogoče dodati"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Polje s tem imenom že obstaja."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Ali res želite odstraniti izbrano polje?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Dodaj polje"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Odstrani polje"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Uporaba: deadbeef [možnosti] [datoteka]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Možnosti:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ali -h Izpiše pomoč (to sporočilo).\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Konča predvajalnik.\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Izpiše podatke o različici.\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Začne predvajanje.\n"
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zaustavi predvajanje.\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Prekine predvajanje.\n"
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Začne/prekine predvajanje\n"
+
+#: ../main.c:100
+#, c-format
+msgid " --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Začne predvajanje, če je zaustavljeno, v nasprotnem primeru ga prekine.\n"
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Naslednja skladba s seznama predvajanja.\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Predhodna skladba s seznama predvajanja.\n"
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Naključna skladba s seznama predvajanja.\n"
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Pripne datoteko na seznam predvajanja.\n"
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying OBLIKA Izpiše oblikovano ime trenutno predvajane skladbe.\n"
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+" OBLIKA (začnite z %%): izv[a]jalec, [t] - naslov, al[b]um,\n"
+" [l] - trajanje, [n] - številka skladbe, [y] - leto,\n"
+" [c] - opomba, avto[r]ske pravice, pr[e]tečen čas\n"
+
+#: ../main.c:109
+#, c-format
+msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
+msgstr " npr.: --nowplaying »%%a - %%t« izpiše »izvajalec - naslov«\n"
+
+#: ../main.c:110
+#, c-format
+msgid " for more info, see http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " Za več podatkov si oglejte http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454
+#: ../playlist.c:2398
+msgid "Default"
+msgstr "Privzeto"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (priporočeno)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"Naraščajoče\n"
+"Padajoče"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"Onemogočeno\n"
+"Skladba\n"
+"Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"Številka skladbe\n"
+"Predvajanje\n"
+"Naslovnica albuma\n"
+"Izvajalec - Album\n"
+"Izvajalec\n"
+"Album\n"
+"Naslov\n"
+"Trajanje\n"
+"Številka skladbe\n"
+"Skupina / Izvajalec albuma\n"
+"Po meri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"Levo\n"
+"Desno"
+
+#: ../plugins/gtkui/support.c:90
+#: ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90
+#: ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Večbitne sličice ni mogoče najti: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
+msgstr "wildmidi: Nastavitvene datoteke freepats ni mogoče najti. Prosimo, namestite paket timidity-freepats ali navedite pot to datoteke »freepats.cfg« v nastavitvah vstavkov."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Dodaj zvočni CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "Najdi na Last.fm"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "Uporabi prevzorčenje ALSA"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Sprosti napravo, če je predvajanje zaustavljeno"
+
+#: ../translation/extra.c:8
+#: ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "Prednostna velikost medpomnilnika"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "Prednostna velikost obdobja"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "Omogoči pošiljanje zgodovine predvajanja"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "Onemogoči pošiljanje podatkov o trenutni skladbi"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Geslo"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Naslov URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Datoteka naprave"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Začasna rešitev napake v hitrosti vzorčenja za OSS4"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "Hitrost osveževanja predpomnilnika (v urah)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "Pridobi iz oznak"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "Pridobi iz krajevne mape"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "Maska datotek z naslovnicami"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "Pridobi z Last.fm"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "Pridobi z Albumart.org"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Prilagodi velikost naslovnice daljši stranici"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "Uporabi CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "Uporabi CD-Text namesto CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "Naslov CDDB (npr. »freedb.org«)"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "Številka vrat CDDB (npr. »888«)"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "Uporabi protokol CDDB namesto HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "Omogoči podporo za odtise NRG"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "Kakovost prevzorčenja (0 ... 2, večje je boljše)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "Največja dolžina skladbe (v minutah)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Vprašaj pred brisanjem datotek z diska"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "Občutljivost ikone za nadzor glasnosti"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "Ikona stanja po meri"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "Zaženi gtk_init z možnostjo --sync (način razhroščevanja)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Dodaj ločilnike med predmete vstavkov v vsebinskem meniju"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Oblika naziva obvestila"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Oblika vsebine obvestila"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Pokaži naslovnico albuma"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Velikost naslovnice albuma (v slik. točkah)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "Strežnik PulseAudio"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "Hitrost vzorčenja"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "Relativna pot do razpredelnice iskalnih vrednosti"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "Absolutna pot do razpredelnice iskalnih vrednosti"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Zamenjaj zvočne bajte (izberite, če slišite statiko)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Omogoči podatkovno zbirko dolžin pesmi HVSC"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Bitov na vzorec (8 ali 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Privzeta dolžina skladbe (v sekundah)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Nastavitvena datoteka za Timidity++"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Naslov skladbe"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Izvajalec"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "Število skladb"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Zvrst"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Skladatelj"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Številka diska"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Opomba"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "Kodirnik"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Mesto"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Številka podskladbe"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Vrsta oznake"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Vgrajena predloga podatkov"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Pripone datotek (ločene s »;«)"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Pretvori"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Ciljna hitrost vzorčenja"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Kakovost / Algoritem"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "Samodejna hitrost vzorčenja (prepiše ciljno hitrost vzorčenja)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Datoteka že obstaja. Ali jo želite prepisati?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Opozorilo pretvornika"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Prosimo, izberite kodirnik"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Napaka pretvornika"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Pretvarjanje ..."
+
+#: ../plugins/converter/convgui.c:394
+#: ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Izberite mapo ..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Predloge nastavitev kodirnika ni mogoče shraniti"
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Check preset folder permissions, try to pick different title, or free up some disk space"
+msgstr ""
+"Preverite dovoljenja mape predloge nastavitev, izberite drugo ime ali "
+"sprostite nekaj prostora na disku."
+
+#: ../plugins/converter/convgui.c:637
+#: ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Predloga nastavitev s tem imenom že obstaja."
+
+#: ../plugins/converter/convgui.c:638
+#: ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Napaka"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Dodaj nov kodirnik"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Uredi kodirnik"
+
+#: ../plugins/converter/convgui.c:756
+#: ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Odstrani predlogo nastavitev"
+
+#: ../plugins/converter/convgui.c:758
+#: ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrano predlogo nastavitev?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Kodirniki"
+
+#: ../plugins/converter/convgui.c:838
+#: ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Dodaj vstavek v verigo DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Predloge nastavitev DSP ni mogoče shraniti."
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Nova predloga nastavitev DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Uredi predlogo nastavitev DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Predloge nastavitev DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Izhodna mapa:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Ime izhodne datoteke:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Pripona (npr. mp3) bo pripeta samodejno.\n"
+"Za privzeto vrednost (%a - %t) pustite polje prazno."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Kodirnik:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Predloga nastavitev DSP:"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Število niti:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Oblika izhodnega vzorca:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Ohrani izvirno obliko"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8-bitno predznačeno celo število"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16-bitno predznačeno celo število"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24-bitno predznačeno celo število"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32-bitno predznačeno celo število"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32-bitna plavajoča vejica"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Če datoteka že obstaja:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Vprašaj"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Ohrani zgradbo map, začni z:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Uredi predlogo nastavitev kodirnika"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Neimenovan kodirnik"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Pripona izhodne datoteke:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Na primer: mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Ukazna vrstica:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Zgled: lame - %o\n"
+"%i = vhodna datoteka, %o = izhodna datoteka, - = standardni vhod"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - ime izhodne datoteke\n"
+"%i - začasno ime vhodne datoteke"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Način:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Cevovod"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Začasna datoteka"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "Ogg Vorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Zapisovalnik oznak"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Urejevalnik predlog nastavitev DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Neimenovana predloga nastavitev DSP"

deadbeef-0.5.1.tar.bz2/po/sr.po -> deadbeef-0.5.2.tar.bz2/po/sr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-18 04:40+0000\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-11-18 14:52+0100\n"
 "Last-Translator: Jay A. Fleming <tito.nehru.naser@gmail.com>\n"
 "Language-Team: \n"
@@ -15,1003 +15,918 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Подржане звучне датотеке"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Остале датотеке (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Отвори датотеку(е)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Додај датотеке у листу..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Додај директоријуме у листу..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Прати меке везе (symlinks)"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Неуспело читање датотеке помоћи"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Неуспело отварање датотеке помоћи"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 #, fuzzy
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1099
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s — Дневник измена"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF преводиоци"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Уреди листу"
 
-#: ../plugins/gtkui/ddbtabstrip.c:675
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Наслов:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Преименуј листу"
 
-#: ../plugins/gtkui/ddbtabstrip.c:679
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Уклони листу"
 
-#: ../plugins/gtkui/ddbtabstrip.c:683
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Додај нову листу"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Сачувај подешавања еквилајзера"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Датотеке са подешавањима еквилајзера (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Учитавање подешавања еквилајзера..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Подешавања еквилајзера (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Увоз Foobar2000 подешавања еквилајзера..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Подешавања еквилајзера - Foobar2000(*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Учитај подешавања"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Увоз Foobar2000 подешавања"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Омогући"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "На нулу све"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Претпојачало на нулу"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Подручја на нулу"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Сачувај подешавања"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Учитај подешавања"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Увоз Foobar2000 подешавања"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 дан %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дана %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Заустављено | %d песама | %s укупно време свирања"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d кбпс "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Паузирано | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %d херца | %d бита | %s | %d:%02d / %s | %d песама | %s укупно време свирања"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %d херца | %d бита | %s | %d:%02d / %s | %d песама | %s укупно "
+"време свирања"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Сачувај листу као..."
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Датотека са листом (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Учитај листу"
 
-#: ../plugins/gtkui/gtkui.c:865
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Остале датотеке (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Нова листа"
 
-#: ../plugins/gtkui/gtkui.c:868
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Нова листа (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Отвори датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Додај датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Додај директоријум(е)"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2973
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Додај место"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Нова листа"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Учитај листу"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Сачувај листу"
 
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Сачувај листу као..."
-
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Излаз"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "О_чисти"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Изабери све"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Поништи избор"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Обрни избор"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Избор"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Одсеци"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Тражи"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1707
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Наслов"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Број песме"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Албум"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Извођач"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Датум"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Прилагођено"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Статусна трака"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Колона заглавља"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Листови"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Еквилајзер"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Ре_продукција"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Редослед"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Линијски"
 
-#: ../plugins/gtkui/interface.c:336
-#: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Насумично"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Насумично"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Случајно"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Понављање"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Понови све"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Понављај песму"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Не понављај"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Клизач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Показивач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Заустави после тренутне песме"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Иди на песму која се репродукује"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "Дневник и_змена"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "О прогр_аму"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Преводиоци"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Тражи"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Заустави"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Пусти"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Паузирај"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Претходна"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Наредна"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Пусти насумично"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "О програму"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Излаз"
 
-#: ../plugins/gtkui/interface.c:1041
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Додавање датотека..."
-
-#: ../plugins/gtkui/interface.c:1163
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Особине песме"
 
-#: ../plugins/gtkui/interface.c:1209
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "С_ачувај промене"
 
-#: ../plugins/gtkui/interface.c:1230
-#: ../plugins/gtkui/interface.c:1276
-#: ../plugins/gtkui/interface.c:2501
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../plugins/gtkui/interface.c:1234
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Подаци о песми"
 
-#: ../plugins/gtkui/interface.c:1280
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Особине"
 
-#: ../plugins/gtkui/interface.c:1365
-#: ../plugins/gtkui/deadbeef.glade.h:162
-#, fuzzy
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1380
-#: ../plugins/gtkui/interface.c:2873
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Наслов:"
-
-#: ../plugins/gtkui/interface.c:1388
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Унесите име за нову колону овде"
 
-#: ../plugins/gtkui/interface.c:1396
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1510
 #, fuzzy
 msgid "Item Index"
 msgstr "Индекс нумера"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1405
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Репродукује се"
 
-#: ../plugins/gtkui/interface.c:1406
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Омотнице албума"
 
-#: ../plugins/gtkui/interface.c:1407
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Извођач — Албум"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1408
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Извођач"
-
-#: ../plugins/gtkui/interface.c:1409
-#: ../plugins/gtkui/interface.c:1797
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Албум"
-
-#: ../plugins/gtkui/interface.c:1410
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Наслов"
-
-#: ../plugins/gtkui/interface.c:1411
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Трајање"
 
-#: ../plugins/gtkui/interface.c:1412
-#: ../plugins/gtkui/interface.c:1796
-msgid "Track"
-msgstr "Песма"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Број песме"
 
-#: ../plugins/gtkui/interface.c:1413
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Група / Извођач"
 
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Прилагођено"
-
-#: ../plugins/gtkui/interface.c:1420
-#: ../plugins/gtkui/interface.c:3100
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Поравнање:"
 
-#: ../plugins/gtkui/interface.c:1443
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Лево"
 
-#: ../plugins/gtkui/interface.c:1444
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Десно"
 
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Претварања формата (започните са %):\n"
-" извођ[a]ч, [t]-наслов, [b]-албум, [B]-група,\n"
-" [C]-композитор, [n]-број песме, [N]-укупно песама,\n"
-" [l]-трајање, [y]-година, [g]-жанр, [c]-примедба,\n"
-" [r]-ауторска права, [f]-датотека, [T]-ознке\n"
-"На пример: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1475
-#: ../plugins/gtkui/interface.c:2904
-#: ../plugins/gtkui/interface.c:3016
-#: ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Поништи"
 
-#: ../plugins/gtkui/interface.c:1496
-#: ../plugins/gtkui/interface.c:2925
-#: ../plugins/gtkui/interface.c:3037
-#: ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_У реду"
 
-#: ../plugins/gtkui/interface.c:1728
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Излазни додаци:"
 
-#: ../plugins/gtkui/interface.c:1741
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Излазни уређај"
 
-#: ../plugins/gtkui/interface.c:1750
-#: ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1759
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Дозволи динамичко пребацивање фреквенције узорковања"
-
-#: ../plugins/gtkui/interface.c:1767
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Квалитет претварања фреквенције узорковања"
-
-#: ../plugins/gtkui/interface.c:1786
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Replaygain мод:"
 
-#: ../plugins/gtkui/interface.c:1795
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Онемогући"
 
-#: ../plugins/gtkui/interface.c:1799
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Песма"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Replaygain скала вршних вредности"
 
-#: ../plugins/gtkui/interface.c:1807
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Replaygain мод:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Додај датотеке из линије за наредбе или управника датотека у ову листу:"
+msgstr ""
+"Додај датотеке из линије за наредбе или управника датотека у ову листу:"
 
-#: ../plugins/gtkui/interface.c:1816
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Врати претходну сесију при покретању"
 
-#: ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Репродукција"
 
-#: ../plugins/gtkui/interface.c:1829
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Подеси"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Код клика на затвори смести у обавештајну зону"
 
-#: ../plugins/gtkui/interface.c:1833
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Средње дугме миша затвара листу"
 
-#: ../plugins/gtkui/interface.c:1837
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Не приказуј икону у обавештајној зони"
 
-#: ../plugins/gtkui/interface.c:1841
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Користи задебљан фонт за песму која се репродукује"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Сакриј ставке \"Обриши са диска\" у менију"
 
-#: ../plugins/gtkui/interface.c:1853
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "При репродукцији, испиши на насловној линији: "
 
-#: ../plugins/gtkui/interface.c:1867
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "По заустављеној репродукцији, испиши на насловној линији: "
 
-#: ../plugins/gtkui/interface.c:1877
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Графичке контроле"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Замени подразумевано"
 
-#: ../plugins/gtkui/interface.c:1901
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Боја текста"
 
-#: ../plugins/gtkui/interface.c:1908
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Позадина"
 
-#: ../plugins/gtkui/interface.c:1927
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Траке за премотавање/гласноћу"
 
-#: ../plugins/gtkui/interface.c:1945
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Средње"
 
-#: ../plugins/gtkui/interface.c:1952
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Светло"
 
-#: ../plugins/gtkui/interface.c:1959
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Тамно"
 
-#: ../plugins/gtkui/interface.c:1990
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Основа"
 
-#: ../plugins/gtkui/interface.c:1997
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Текст"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Боје одвајања листова"
 
-#: ../plugins/gtkui/interface.c:2006
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Замени подразумевано (губе се ГТК теме погледа стабла, али се добија бржи приказ)"
+msgstr ""
+"Замени подразумевано (губе се ГТК теме погледа стабла, али се добија бржи "
+"приказ)"
 
-#: ../plugins/gtkui/interface.c:2015
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Паран ред"
 
-#: ../plugins/gtkui/interface.c:2022
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr " Непаран ред"
 
-#: ../plugins/gtkui/interface.c:2041
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2048
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Одабран ред"
 
-#: ../plugins/gtkui/interface.c:2067
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Одабран текст"
 
-#: ../plugins/gtkui/interface.c:2080
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Показивач"
 
-#: ../plugins/gtkui/interface.c:2093
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Боје листе"
 
-#: ../plugins/gtkui/interface.c:2097
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Боје"
 
-#: ../plugins/gtkui/interface.c:2106
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Омогући прокси сервер"
 
-#: ../plugins/gtkui/interface.c:2114
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Адреса прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2128
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Порт прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2142
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Тип проксија:"
 
-#: ../plugins/gtkui/interface.c:2161
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Прокси корисничко име:"
 
-#: ../plugins/gtkui/interface.c:2174
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Прокси лозинка:"
 
-#: ../plugins/gtkui/interface.c:2184
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2212
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Ауторска права"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Додаци"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Групиши по"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Формат:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Избор"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Додаци"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Писач ознака"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Уписуј ID3v2"
 
-#: ../plugins/gtkui/interface.c:2216
-#: ../plugins/gtkui/interface.c:2343
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Уписуј ID3v1"
 
-#: ../plugins/gtkui/interface.c:2220
-#: ../plugins/gtkui/interface.c:2299
-#: ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Уписуј APEv2"
 
-#: ../plugins/gtkui/interface.c:2228
-#: ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Уклони ID3v2"
 
-#: ../plugins/gtkui/interface.c:2232
-#: ../plugins/gtkui/interface.c:2355
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Уклони ID3v1"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/interface.c:2311
-#: ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Уклони APEv2"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 верзија"
 
-#: ../plugins/gtkui/interface.c:2251
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Препоручено)"
 
-#: ../plugins/gtkui/interface.c:2252
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2258
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 кодирање знакова (подразумевано је iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Уписуј ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2364
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Писач ознака"
-
-#: ../plugins/gtkui/interface.c:2395
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Опис:"
-
-#: ../plugins/gtkui/interface.c:2410
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Аутор(и):"
-
-#: ../plugins/gtkui/interface.c:2425
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Е-пошта:"
-
-#: ../plugins/gtkui/interface.c:2440
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Интернет адреса:"
-
-#: ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Подеси"
-
-#: ../plugins/gtkui/interface.c:2475
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Додаци"
-
-#: ../plugins/gtkui/interface.c:2857
-#: ../plugins/gtkui/deadbeef.glade.h:163
-#, fuzzy
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2984
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3085
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Групиши по"
-
-#: ../plugins/gtkui/interface.c:3110
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Претварања формата (започните са %):\n"
-" извођ[a]ч, [t]-наслов, [b]-албум, [B]-група,\n"
-" [C]-композитор, [n]-број песме, [N]-укупно песама,\n"
-" [l]-трајање, [y]-година, [g]-жанр, [c]-примедба,\n"
-" [r]-ауторска права, [f]-датотека, [T]-ознке\n"
-"На пример: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Извођач / Албум"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Број песме"
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Наслов / Извођач песме"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Трајање"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Обриши датотеке са диска"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1019,209 +934,222 @@
 "Дадотеке ће бити обрисане. Да ли сте сигурни?\n"
 "(Овај дијалог може да се искључи у подешавањима додатка GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Додај у заказано"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Уклони из заказаног"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Поново учитај податке о песми"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Уклони са диска"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Додај колону"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Уреди колону"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Уклони колону"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Групиши по"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Поништи груписање"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Извођач/Датум/Албум"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Отвори датотеку..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Подешавање %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Подеси"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Подразумевани звучни уређај"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Додај"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Наредба"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Комбинација тастера"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA излазни додатак"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Додавање датотека..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Иницијализација..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Изменили сте податке за ову песму."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Желите ли заиста да затворите овај прозор?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Додај место"
-
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Тип(ови) ознаке"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Угњеждени Cuesheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Да"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Не"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Кодек"
-
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Кључ"
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Вредност"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "Сада се репродукује"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
 
-#: ../main.c:89
-#, c-format
-msgid "Usage: deadbeef [options] [file(s)]\n"
-msgstr "Употреба: deadbeef [опције] [датотека(е)]\n"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Options:\n"
-msgstr "Опције:\n"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help или -h Прикажи ову помоћ и изађи\n"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Желите ли заиста да затворите овај прозор?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Додај датотеку(е)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Уклони"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Употреба: deadbeef [опције] [датотека(е)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Опције:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help или -h Прикажи ову помоћ и изађи\n"
+
+#: ../main.c:94
+#, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Напусти плејер\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Прикажи инфо о верзији и изађи\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Репродукуј\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Заустави репродукцију\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Паузирај репродукцију\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Наредна песма из листе\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Претходна песма из листе\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Насумично песма из листе\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Додај датотеку(е) у постојећу листу\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Испиши уређено име песме на стд. излаз\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1232,17 +1160,35 @@
 " [l]-трајање, [n]-бр.песме, [y]-година, [c]-примедба,\n"
 " [r]-ауторска права, [e]преостало време\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " Н.пр.: --nowplaying \"%%a - %%t\" ће исписати \"Извођач - Наслов\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" Н.пр.: --nowplaying \"%%a - %%t\" ће исписати "
+"\"Извођач - Наслов\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
 
-#: ../playlist.c:378
-#: ../playlist.c:2302
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Да"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Не"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1250,7 +1196,13 @@
 "2.3 (Препоручено)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1260,7 +1212,8 @@
 "Песма\n"
 "Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1269,8 +1222,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1286,7 +1239,7 @@
 "Група / Извођач\n"
 "Прилагођено"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1294,16 +1247,21 @@
 "Лево\n"
 "Десно"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не могу пронаћи датотеку са битмапираном сликом: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: \"freepats\" датотека са подешавањима није пронађена. Инсталирајте \"timidity-freepats\" програм или подесите путању до датотеке \"freepats.cfg\"."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: \"freepats\" датотека са подешавањима није пронађена. Инсталирајте "
+"\"timidity-freepats\" програм или подесите путању до датотеке \"freepats.cfg"
+"\"."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1324,8 +1282,7 @@
 msgid "Release device while stopped"
 msgstr "Ослободи уређај након завршене репродукције"
 
-#: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Најрадије користи бафер величине"
 
@@ -1354,167 +1311,565 @@
 msgid "Scrobble URL"
 msgstr "Адреса за скроблер"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Период освежавања привремене меморије (часова)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Преузми из уграђених ознака"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Преузми из локалних директоријума"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Име датотека садржи речи"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Преузми са Last.fm страница"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Преузми са albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Користи CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Користи ЦД-текст, ако је доступан"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB адреса (нпр. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Ослушкуј CDDB на порту (нпр. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Најрадије користи CDDB протокол"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Укључи подршку за NRG слике"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Квалитет промене фреквенције узорковања (0..2, више је боље)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Најдуже трајање песме (минута)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Захтевај дозволу за брисање датотека са диска"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Осетљивост контроле гласноће преко иконе стања"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Прилагођена икона стања"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Покрени \"gtk_init\" са \"--sync\" (режим отклањања грешака)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
+#: ../translation/extra.c:45
+#, fuzzy
+msgid "Notification title format"
 msgstr "Облик обавештавања"
 
+#: ../translation/extra.c:46
+#, fuzzy
+msgid "Notification content format"
+msgstr "Облик обавештавања"
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Омотнице албума"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio звучни сервер"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Фреквенција узорковања (Samplerate)"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Релативна путања за претраживање"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Потпуна путања за претраживање"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Замени аудио-бајт редослед (искључити ако не чујете нормалан звук)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
+#: ../translation/extra.c:58
+#, fuzzy
+msgid "Enable HVSC Songlength DB"
 msgstr "Омогући HVSC"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Путања за HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+#, fuzzy
+msgid "Default song length (sec)"
+msgstr "Најдуже трајање песме (минута)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Подешавања за Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Наслов песме"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Извођач"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Датум"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Број песме"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Укупно песмама"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Број диска"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Напомена"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Енкодер / Испоручилац"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Ауторска права"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Додај место"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Тип(ови) ознаке"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Угњеждени Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Кодек"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+#, fuzzy
+msgid "Target Samplerate"
+msgstr "Фреквенција узорковања (Samplerate)"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Изабери све"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Уреди колону"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Излазни уређај"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Излазни додаци:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Сачувај подешавања"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Замени подразумевано"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Учитај подешавања"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Излазни додаци:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Уписуј APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Уписуј ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Уписуј ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Писач ознака"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Сачувај листу као..."
+
+#, fuzzy
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Трајање"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Претварања формата (започните са %):\n"
+#~ " извођ[a]ч, [t]-наслов, [b]-албум, [B]-група,\n"
+#~ " [C]-композитор, [n]-број песме, [N]-укупно песама,\n"
+#~ " [l]-трајање, [y]-година, [g]-жанр, [c]-примедба,\n"
+#~ " [r]-ауторска права, [f]-датотека, [T]-ознке\n"
+#~ "На пример: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Дозволи динамичко пребацивање фреквенције узорковања"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Квалитет претварања фреквенције узорковања"
+
+#~ msgid "Description:"
+#~ msgstr "Опис:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Аутор(и):"
+
+#~ msgid "Email:"
+#~ msgstr "Е-пошта:"
+
+#~ msgid "Website:"
+#~ msgstr "Интернет адреса:"
+
+#, fuzzy
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Претварања формата (започните са %):\n"
+#~ " извођ[a]ч, [t]-наслов, [b]-албум, [B]-група,\n"
+#~ " [C]-композитор, [n]-број песме, [N]-укупно песама,\n"
+#~ " [l]-трајање, [y]-година, [g]-жанр, [c]-примедба,\n"
+#~ " [r]-ауторска права, [f]-датотека, [T]-ознке\n"
+#~ "На пример: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Наслов / Извођач песме"
+
+#~ msgid "Setup %s"
+#~ msgstr "Подешавање %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA излазни додатак"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "Сада се репродукује"
+
+#~ msgid "HVSC path"
+#~ msgstr "Путања за HVSC"
 
 #~ msgid "_Abort"
 #~ msgstr "Одуст_ани"

deadbeef-0.5.1.tar.bz2/po/sr@latin.po -> deadbeef-0.5.2.tar.bz2/po/sr@latin.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-18 04:40+0000\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-11-18 14:52+0100\n"
 "Last-Translator: Jay A. Fleming <tito.nehru.naser@gmail.com>\n"
 "Language-Team: \n"
@@ -15,1003 +15,918 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Podržane zvučne datoteke"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Ostale datoteke (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Otvori datoteku(e)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Dodaj datoteke u listu..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Dodaj direktorijume u listu..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Prati meke veze (symlinks)"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Neuspelo čitanje datoteke pomoći"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Neuspelo otvaranje datoteke pomoći"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 #, fuzzy
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693
-#: ../plugins/gtkui/interface.c:1099
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "O DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s — Dnevnik izmena"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF prevodioci"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Uredi listu"
 
-#: ../plugins/gtkui/ddbtabstrip.c:675
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Preimenuj listu"
 
-#: ../plugins/gtkui/ddbtabstrip.c:679
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Ukloni listu"
 
-#: ../plugins/gtkui/ddbtabstrip.c:683
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Dodaj novu listu"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Sačuvaj podešavanja ekvilajzera"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Datoteke sa podešavanjima ekvilajzera (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Učitavanje podešavanja ekvilajzera..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Podešavanja ekvilajzera (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Uvoz Foobar2000 podešavanja ekvilajzera..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Podešavanja ekvilajzera - Foobar2000(*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Učitaj podešavanja"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Uvoz Foobar2000 podešavanja"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Omogući"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Na nulu sve"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Pretpojačalo na nulu"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Područja na nulu"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Sačuvaj podešavanja"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Učitaj podešavanja"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Uvoz Foobar2000 podešavanja"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Zaustavljeno | %d pesama | %s ukupno vreme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pauzirano | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %d herca | %d bita | %s | %d:%02d / %s | %d pesama | %s ukupno vreme sviranja"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %d herca | %d bita | %s | %d:%02d / %s | %d pesama | %s ukupno "
+"vreme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Sačuvaj listu kao..."
 
-#: ../plugins/gtkui/gtkui.c:670
-#: ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Datoteka sa listom (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Učitaj listu"
 
-#: ../plugins/gtkui/gtkui.c:865
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Ostale datoteke (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/gtkui.c:868
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista (%d)"
 
-#: ../plugins/gtkui/interface.c:142
-#: ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:149
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Otvori datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:165
-#: ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Dodaj datoteku(e)"
 
-#: ../plugins/gtkui/interface.c:173
-#: ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Dodaj direktorijum(e)"
 
-#: ../plugins/gtkui/interface.c:181
-#: ../plugins/gtkui/interface.c:2973
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Dodaj mesto"
 
-#: ../plugins/gtkui/interface.c:190
-#: ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Nova lista"
 
-#: ../plugins/gtkui/interface.c:197
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Učitaj listu"
 
-#: ../plugins/gtkui/interface.c:201
-#: ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Sačuvaj listu"
 
-#: ../plugins/gtkui/interface.c:205
-#: ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Sačuvaj listu kao..."
-
-#: ../plugins/gtkui/interface.c:214
-#: ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../plugins/gtkui/interface.c:225
-#: ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../plugins/gtkui/interface.c:232
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "O_čisti"
 
-#: ../plugins/gtkui/interface.c:240
-#: ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Izaberi sve"
 
-#: ../plugins/gtkui/interface.c:247
-#: ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Poništi izbor"
 
-#: ../plugins/gtkui/interface.c:254
-#: ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Obrni izbor"
 
-#: ../plugins/gtkui/interface.c:258
-#: ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Izbor"
 
-#: ../plugins/gtkui/interface.c:265
-#: ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334
-#: ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../plugins/gtkui/interface.c:273
-#: ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Odseci"
 
-#: ../plugins/gtkui/interface.c:277
-#: ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Traži"
 
-#: ../plugins/gtkui/interface.c:289
-#: ../plugins/gtkui/interface.c:1707
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Naslov"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Broj pesme"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Izvođač"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Prilagođeno"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../plugins/gtkui/interface.c:293
-#: ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "P_regled"
 
-#: ../plugins/gtkui/interface.c:300
-#: ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Statusna traka"
 
-#: ../plugins/gtkui/interface.c:304
-#: ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Kolona zaglavlja"
 
-#: ../plugins/gtkui/interface.c:308
-#: ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Listovi"
 
-#: ../plugins/gtkui/interface.c:312
-#: ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ekvilajzer"
 
-#: ../plugins/gtkui/interface.c:316
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "Re_produkcija"
 
-#: ../plugins/gtkui/interface.c:323
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Redosled"
 
-#: ../plugins/gtkui/interface.c:330
-#: ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linijski"
 
-#: ../plugins/gtkui/interface.c:336
-#: ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Nasumično"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "Nasumično"
 
-#: ../plugins/gtkui/interface.c:342
-#: ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Slučajno"
 
-#: ../plugins/gtkui/interface.c:348
-#: ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Ponavljanje"
 
-#: ../plugins/gtkui/interface.c:355
-#: ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Ponovi sve"
 
-#: ../plugins/gtkui/interface.c:361
-#: ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Ponavljaj pesmu"
 
-#: ../plugins/gtkui/interface.c:367
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Ne ponavljaj"
 
-#: ../plugins/gtkui/interface.c:373
-#: ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Klizač prati reprodukciju pesama"
 
-#: ../plugins/gtkui/interface.c:378
-#: ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Pokazivač prati reprodukciju pesama"
 
-#: ../plugins/gtkui/interface.c:382
-#: ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Zaustavi posle trenutne pesme"
 
-#: ../plugins/gtkui/interface.c:394
-#: ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Idi na pesmu koja se reprodukuje"
 
-#: ../plugins/gtkui/interface.c:401
-#: ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../plugins/gtkui/interface.c:416
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "Dnevnik i_zmena"
 
-#: ../plugins/gtkui/interface.c:425
-#: ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438
-#: ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "O progr_amu"
 
-#: ../plugins/gtkui/interface.c:446
-#: ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Prevodioci"
 
-#: ../plugins/gtkui/interface.c:836
-#: ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Traži"
 
-#: ../plugins/gtkui/interface.c:911
-#: ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../plugins/gtkui/interface.c:919
-#: ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Pusti"
 
-#: ../plugins/gtkui/interface.c:927
-#: ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Pauziraj"
 
-#: ../plugins/gtkui/interface.c:935
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Prethodna"
 
-#: ../plugins/gtkui/interface.c:943
-#: ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Naredna"
 
-#: ../plugins/gtkui/interface.c:951
-#: ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Pusti nasumično"
 
-#: ../plugins/gtkui/interface.c:960
-#: ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:973
-#: ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../plugins/gtkui/interface.c:1041
-#: ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Dodavanje datoteka..."
-
-#: ../plugins/gtkui/interface.c:1163
-#: ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Osobine pesme"
 
-#: ../plugins/gtkui/interface.c:1209
-#: ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "S_ačuvaj promene"
 
-#: ../plugins/gtkui/interface.c:1230
-#: ../plugins/gtkui/interface.c:1276
-#: ../plugins/gtkui/interface.c:2501
-#: ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../plugins/gtkui/interface.c:1234
-#: ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Podaci o pesmi"
 
-#: ../plugins/gtkui/interface.c:1280
-#: ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Osobine"
 
-#: ../plugins/gtkui/interface.c:1365
-#: ../plugins/gtkui/deadbeef.glade.h:162
-#, fuzzy
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1380
-#: ../plugins/gtkui/interface.c:2873
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Naslov:"
-
-#: ../plugins/gtkui/interface.c:1388
-#: ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Unesite ime za novu kolonu ovde"
 
-#: ../plugins/gtkui/interface.c:1396
-#: ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1510
 #, fuzzy
 msgid "Item Index"
 msgstr "Indeks numera"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1405
-#: ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Reprodukuje se"
 
-#: ../plugins/gtkui/interface.c:1406
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Omotnice albuma"
 
-#: ../plugins/gtkui/interface.c:1407
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Izvođač — Album"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1408
-#: ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Izvođač"
-
-#: ../plugins/gtkui/interface.c:1409
-#: ../plugins/gtkui/interface.c:1797
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1410
-#: ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Naslov"
-
-#: ../plugins/gtkui/interface.c:1411
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1412
-#: ../plugins/gtkui/interface.c:1796
-msgid "Track"
-msgstr "Pesma"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Broj pesme"
 
-#: ../plugins/gtkui/interface.c:1413
-#: ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Grupa / Izvođač"
 
-#: ../plugins/gtkui/interface.c:1414
-#: ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Prilagođeno"
-
-#: ../plugins/gtkui/interface.c:1420
-#: ../plugins/gtkui/interface.c:3100
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1435
-#: ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../plugins/gtkui/interface.c:1443
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Levo"
 
-#: ../plugins/gtkui/interface.c:1444
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:1446
-#: ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Pretvaranja formata (započnite sa %):\n"
-" izvođ[a]č, [t]-naslov, [b]-album, [B]-grupa,\n"
-" [C]-kompozitor, [n]-broj pesme, [N]-ukupno pesama,\n"
-" [l]-trajanje, [y]-godina, [g]-žanr, [c]-primedba,\n"
-" [r]-autorska prava, [f]-datoteka, [T]-oznke\n"
-"Na primer: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1475
-#: ../plugins/gtkui/interface.c:2904
-#: ../plugins/gtkui/interface.c:3016
-#: ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Poništi"
 
-#: ../plugins/gtkui/interface.c:1496
-#: ../plugins/gtkui/interface.c:2925
-#: ../plugins/gtkui/interface.c:3037
-#: ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_U redu"
 
-#: ../plugins/gtkui/interface.c:1728
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Izlazni dodaci:"
 
-#: ../plugins/gtkui/interface.c:1741
-#: ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Izlazni uređaj"
 
-#: ../plugins/gtkui/interface.c:1750
-#: ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1759
-#: ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Dozvoli dinamičko prebacivanje frekvencije uzorkovanja"
-
-#: ../plugins/gtkui/interface.c:1767
-#: ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Kvalitet pretvaranja frekvencije uzorkovanja"
-
-#: ../plugins/gtkui/interface.c:1786
-#: ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Replaygain mod:"
 
-#: ../plugins/gtkui/interface.c:1795
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Onemogući"
 
-#: ../plugins/gtkui/interface.c:1799
-#: ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Pesma"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Replaygain skala vršnih vrednosti"
 
-#: ../plugins/gtkui/interface.c:1807
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Replaygain mod:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Dodaj datoteke iz linije za naredbe ili upravnika datoteka u ovu listu:"
+msgstr ""
+"Dodaj datoteke iz linije za naredbe ili upravnika datoteka u ovu listu:"
 
-#: ../plugins/gtkui/interface.c:1816
-#: ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Vrati prethodnu sesiju pri pokretanju"
 
-#: ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Reprodukcija"
 
-#: ../plugins/gtkui/interface.c:1829
-#: ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Podesi"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Kod klika na zatvori smesti u obaveštajnu zonu"
 
-#: ../plugins/gtkui/interface.c:1833
-#: ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Srednje dugme miša zatvara listu"
 
-#: ../plugins/gtkui/interface.c:1837
-#: ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Ne prikazuj ikonu u obaveštajnoj zoni"
 
-#: ../plugins/gtkui/interface.c:1841
-#: ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Koristi zadebljan font za pesmu koja se reprodukuje"
 
-#: ../plugins/gtkui/interface.c:1845
-#: ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Sakrij stavke \"Obriši sa diska\" u meniju"
 
-#: ../plugins/gtkui/interface.c:1853
-#: ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Pri reprodukciji, ispiši na naslovnoj liniji: "
 
-#: ../plugins/gtkui/interface.c:1867
-#: ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Po zaustavljenoj reprodukciji, ispiši na naslovnoj liniji: "
 
-#: ../plugins/gtkui/interface.c:1877
-#: ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "Grafičke kontrole"
 
-#: ../plugins/gtkui/interface.c:1892
-#: ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Zameni podrazumevano"
 
-#: ../plugins/gtkui/interface.c:1901
-#: ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Boja teksta"
 
-#: ../plugins/gtkui/interface.c:1908
-#: ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Pozadina"
 
-#: ../plugins/gtkui/interface.c:1927
-#: ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Trake za premotavanje/glasnoću"
 
-#: ../plugins/gtkui/interface.c:1945
-#: ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Srednje"
 
-#: ../plugins/gtkui/interface.c:1952
-#: ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Svetlo"
 
-#: ../plugins/gtkui/interface.c:1959
-#: ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Tamno"
 
-#: ../plugins/gtkui/interface.c:1990
-#: ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Osnova"
 
-#: ../plugins/gtkui/interface.c:1997
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Tekst"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Boje odvajanja listova"
 
-#: ../plugins/gtkui/interface.c:2006
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Zameni podrazumevano (gube se GTK teme pogleda stabla, ali se dobija brži prikaz)"
+msgstr ""
+"Zameni podrazumevano (gube se GTK teme pogleda stabla, ali se dobija brži "
+"prikaz)"
 
-#: ../plugins/gtkui/interface.c:2015
-#: ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Paran red"
 
-#: ../plugins/gtkui/interface.c:2022
-#: ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr " Neparan red"
 
-#: ../plugins/gtkui/interface.c:2041
-#: ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2048
-#: ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Odabran red"
 
-#: ../plugins/gtkui/interface.c:2067
-#: ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Odabran tekst"
 
-#: ../plugins/gtkui/interface.c:2080
-#: ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Pokazivač"
 
-#: ../plugins/gtkui/interface.c:2093
-#: ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Boje liste"
 
-#: ../plugins/gtkui/interface.c:2097
-#: ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Boje"
 
-#: ../plugins/gtkui/interface.c:2106
-#: ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Omogući proksi server"
 
-#: ../plugins/gtkui/interface.c:2114
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adresa proksi servera:"
 
-#: ../plugins/gtkui/interface.c:2128
-#: ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port proksi servera:"
 
-#: ../plugins/gtkui/interface.c:2142
-#: ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Tip proksija:"
 
-#: ../plugins/gtkui/interface.c:2161
-#: ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Proksi korisničko ime:"
 
-#: ../plugins/gtkui/interface.c:2174
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Proksi lozinka:"
 
-#: ../plugins/gtkui/interface.c:2184
-#: ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Mreža"
 
-#: ../plugins/gtkui/interface.c:2212
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Autorska prava"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Dodaci"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Grupiši po"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Format:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Izbor"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Dodaci"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Pisač oznaka"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Upisuj ID3v2"
 
-#: ../plugins/gtkui/interface.c:2216
-#: ../plugins/gtkui/interface.c:2343
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Upisuj ID3v1"
 
-#: ../plugins/gtkui/interface.c:2220
-#: ../plugins/gtkui/interface.c:2299
-#: ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Upisuj APEv2"
 
-#: ../plugins/gtkui/interface.c:2228
-#: ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Ukloni ID3v2"
 
-#: ../plugins/gtkui/interface.c:2232
-#: ../plugins/gtkui/interface.c:2355
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Ukloni ID3v1"
 
-#: ../plugins/gtkui/interface.c:2236
-#: ../plugins/gtkui/interface.c:2311
-#: ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Ukloni APEv2"
 
-#: ../plugins/gtkui/interface.c:2244
-#: ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 verzija"
 
-#: ../plugins/gtkui/interface.c:2251
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Preporučeno)"
 
-#: ../plugins/gtkui/interface.c:2252
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2258
-#: ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 kodiranje znakova (podrazumevano je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Upisuj ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2364
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Pisač oznaka"
-
-#: ../plugins/gtkui/interface.c:2395
-#: ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../plugins/gtkui/interface.c:2410
-#: ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Autor(i):"
-
-#: ../plugins/gtkui/interface.c:2425
-#: ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "E-pošta:"
-
-#: ../plugins/gtkui/interface.c:2440
-#: ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Internet adresa:"
-
-#: ../plugins/gtkui/interface.c:2471
-#: ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Podesi"
-
-#: ../plugins/gtkui/interface.c:2475
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Dodaci"
-
-#: ../plugins/gtkui/interface.c:2857
-#: ../plugins/gtkui/deadbeef.glade.h:163
-#, fuzzy
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2984
-#: ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3085
-#: ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Grupiši po"
-
-#: ../plugins/gtkui/interface.c:3110
-#: ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Pretvaranja formata (započnite sa %):\n"
-" izvođ[a]č, [t]-naslov, [b]-album, [B]-grupa,\n"
-" [C]-kompozitor, [n]-broj pesme, [N]-ukupno pesama,\n"
-" [l]-trajanje, [y]-godina, [g]-žanr, [c]-primedba,\n"
-" [r]-autorska prava, [f]-datoteka, [T]-oznke\n"
-"Na primer: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306
-#: ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Izvođač / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:307
-#: ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Broj pesme"
 
-#: ../plugins/gtkui/mainplaylist.c:308
-#: ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Naslov / Izvođač pesme"
-
-#: ../plugins/gtkui/mainplaylist.c:309
-#: ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Trajanje"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Obriši datoteke sa diska"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -1019,209 +934,222 @@
 "Dadoteke će biti obrisane. Da li ste sigurni?\n"
 "(Ovaj dijalog može da se isključi u podešavanjima dodatka GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326
-#: ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Dodaj u zakazano"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Ukloni iz zakazanog"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Ponovo učitaj podatke o pesmi"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Ukloni sa diska"
 
-#: ../plugins/gtkui/plcommon.c:720
-#: ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Dodaj kolonu"
 
-#: ../plugins/gtkui/plcommon.c:750
-#: ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Uredi kolonu"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Ukloni kolonu"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Grupiši po"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Poništi grupisanje"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Izvođač/Datum/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Otvori datoteku..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Podešavanje %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Podesi"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Podrazumevani zvučni uređaj"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Opšte prečice"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Naredba"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Kombinacija tastera"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481
-#: ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA izlazni dodatak"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Dodavanje datoteka..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Inicijalizacija..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Izmenili ste podatke za ovu pesmu."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Želite li zaista da zatvorite ovaj prozor?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Dodaj mesto"
-
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tip(ovi) oznake"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Ugnježdeni Cuesheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Da"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Ne"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Kodek"
-
-#: ../plugins/gtkui/trkproperties.c:250
-#: ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/gtkui/trkproperties.c:251
-#: ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Vrednost"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "Sada se reprodukuje"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
 
-#: ../main.c:89
-#, c-format
-msgid "Usage: deadbeef [options] [file(s)]\n"
-msgstr "Upotreba: deadbeef [opcije] [datoteka(e)]\n"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Options:\n"
-msgstr "Opcije:\n"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ili -h Prikaži ovu pomoć i izađi\n"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Želite li zaista da zatvorite ovaj prozor?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Dodaj datoteku(e)"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Ukloni"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "Upotreba: deadbeef [opcije] [datoteka(e)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "Opcije:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ili -h Prikaži ovu pomoć i izađi\n"
+
+#: ../main.c:94
+#, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Napusti plejer\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Prikaži info o verziji i izađi\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Reprodukuj\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Zaustavi reprodukciju\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pauziraj reprodukciju\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Naredna pesma iz liste\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Prethodna pesma iz liste\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Nasumično pesma iz liste\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Dodaj datoteku(e) u postojeću listu\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Ispiši uređeno ime pesme na std. izlaz\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1232,17 +1160,35 @@
 " [l]-trajanje, [n]-br.pesme, [y]-godina, [c]-primedba,\n"
 " [r]-autorska prava, [e]preostalo vreme\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " N.pr.: --nowplaying \"%%a - %%t\" će ispisati \"Izvođač - Naslov\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" N.pr.: --nowplaying \"%%a - %%t\" će ispisati "
+"\"Izvođač - Naslov\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
 
-#: ../playlist.c:378
-#: ../playlist.c:2302
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Da"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1250,7 +1196,13 @@
 "2.3 (Preporučeno)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1260,7 +1212,8 @@
 "Pesma\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1269,8 +1222,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1286,7 +1239,7 @@
 "Grupa / Izvođač\n"
 "Prilagođeno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1294,16 +1247,21 @@
 "Levo\n"
 "Desno"
 
-#: ../plugins/gtkui/support.c:90
-#: ../plugins/gtkui/support.c:114
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: \"freepats\" datoteka sa podešavanjima nije pronađena. Instalirajte \"timidity-freepats\" program ili podesite putanju do datoteke \"freepats.cfg\"."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: \"freepats\" datoteka sa podešavanjima nije pronađena. "
+"Instalirajte \"timidity-freepats\" program ili podesite putanju do datoteke "
+"\"freepats.cfg\"."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1324,8 +1282,7 @@
 msgid "Release device while stopped"
 msgstr "Oslobodi uređaj nakon završene reprodukcije"
 
-#: ../translation/extra.c:8
-#: ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Najradije koristi bafer veličine"
 
@@ -1354,167 +1311,565 @@
 msgid "Scrobble URL"
 msgstr "Adresa za skrobler"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Period osvežavanja privremene memorije (časova)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Preuzmi iz ugrađenih oznaka"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Preuzmi iz lokalnih direktorijuma"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Ime datoteka sadrži reči"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Preuzmi sa Last.fm stranica"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Preuzmi sa albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Koristi CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Koristi CD-tekst, ako je dostupan"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB adresa (npr. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Osluškuj CDDB na portu (npr. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Najradije koristi CDDB protokol"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Uključi podršku za NRG slike"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Kvalitet promene frekvencije uzorkovanja (0..2, više je bolje)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Najduže trajanje pesme (minuta)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Zahtevaj dozvolu za brisanje datoteka sa diska"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Osetljivost kontrole glasnoće preko ikone stanja"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Prilagođena ikona stanja"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Pokreni \"gtk_init\" sa \"--sync\" (režim otklanjanja grešaka)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
+#: ../translation/extra.c:45
+#, fuzzy
+msgid "Notification title format"
 msgstr "Oblik obaveštavanja"
 
+#: ../translation/extra.c:46
+#, fuzzy
+msgid "Notification content format"
+msgstr "Oblik obaveštavanja"
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Omotnice albuma"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio zvučni server"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Frekvencija uzorkovanja (Samplerate)"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Relativna putanja za pretraživanje"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Potpuna putanja za pretraživanje"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Zameni audio-bajt redosled (isključiti ako ne čujete normalan zvuk)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
+#: ../translation/extra.c:58
+#, fuzzy
+msgid "Enable HVSC Songlength DB"
 msgstr "Omogući HVSC"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Putanja za HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+#, fuzzy
+msgid "Default song length (sec)"
+msgstr "Najduže trajanje pesme (minuta)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Podešavanja za Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Naslov pesme"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Izvođač"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Datum"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Broj pesme"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Ukupno pesmama"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Žanr"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Kompozitor"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Broj diska"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Napomena"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Enkoder / Isporučilac"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Autorska prava"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Dodaj mesto"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tip(ovi) oznake"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Ugnježdeni Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Kodek"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+#, fuzzy
+msgid "Target Samplerate"
+msgstr "Frekvencija uzorkovanja (Samplerate)"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Izaberi sve"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Uredi kolonu"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Izlazni uređaj"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Izlazni dodaci:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Sačuvaj podešavanja"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Zameni podrazumevano"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Učitaj podešavanja"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Izlazni dodaci:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Upisuj APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Upisuj ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Upisuj ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Pisač oznaka"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Sačuvaj listu kao..."
+
+#, fuzzy
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Trajanje"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Pretvaranja formata (započnite sa %):\n"
+#~ " izvođ[a]č, [t]-naslov, [b]-album, [B]-grupa,\n"
+#~ " [C]-kompozitor, [n]-broj pesme, [N]-ukupno pesama,\n"
+#~ " [l]-trajanje, [y]-godina, [g]-žanr, [c]-primedba,\n"
+#~ " [r]-autorska prava, [f]-datoteka, [T]-oznke\n"
+#~ "Na primer: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Dozvoli dinamičko prebacivanje frekvencije uzorkovanja"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Kvalitet pretvaranja frekvencije uzorkovanja"
+
+#~ msgid "Description:"
+#~ msgstr "Opis:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Autor(i):"
+
+#~ msgid "Email:"
+#~ msgstr "E-pošta:"
+
+#~ msgid "Website:"
+#~ msgstr "Internet adresa:"
+
+#, fuzzy
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Pretvaranja formata (započnite sa %):\n"
+#~ " izvođ[a]č, [t]-naslov, [b]-album, [B]-grupa,\n"
+#~ " [C]-kompozitor, [n]-broj pesme, [N]-ukupno pesama,\n"
+#~ " [l]-trajanje, [y]-godina, [g]-žanr, [c]-primedba,\n"
+#~ " [r]-autorska prava, [f]-datoteka, [T]-oznke\n"
+#~ "Na primer: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Naslov / Izvođač pesme"
+
+#~ msgid "Setup %s"
+#~ msgstr "Podešavanje %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA izlazni dodatak"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "Sada se reprodukuje"
+
+#~ msgid "HVSC path"
+#~ msgstr "Putanja za HVSC"
 
 #~ msgid "_Abort"
 #~ msgstr "Odust_ani"

deadbeef-0.5.1.tar.bz2/po/sv.po -> deadbeef-0.5.2.tar.bz2/po/sv.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2010-09-28 02:25+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-03-07 14:11+0200\n"
 "Last-Translator: Martin <brother@bsnet.se>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: sv\n"
@@ -18,843 +18,904 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Ljudformat som stöds"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Andra filer (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Alla filer (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Öppna fil(er)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Lägg till fil(er) till spellista..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Lägg till katalog(er) till spellista..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Följ symlänkar"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Misslyckades vid läsning av hjälpfil"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Kunde inte läsa hjälpfil"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Om DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeadBeeF %s Ändrligslogg"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF översättare"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Redigera spellista"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Byt namn på spellista"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Ta bort spellista"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Lägg till ny spellista"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Spara DeaDBeeF:s Equalizer-inställningar"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Filer för DeaDBeeFs equalizer-inställningar (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Läs in equalizer-inställningar för DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeFs equalizer-inställningar (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importera equalizer-inställningar för Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 equalizer-inställningar (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Spara inställningar"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Läs in inställningar"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Importera inställningar från Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Nollställ alla"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Ingen förstärkning"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Nollställ band"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Spara inställningar"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Läs in inställningar"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Importera inställningar från Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Inställningar"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dagar %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Stoppad | %d spår | %s total speltid"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Pausad | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d spår | %s total speltid"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Spara spellista som"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF spellistfil (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Läs in spellista"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Andra filer (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Ny spellista"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Ny spellista (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Öppna fil(er)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Lägg till fil(er)"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Lägg till katalog(er)"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Lägg till plats"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Ny spellista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Läs in spellista"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Spara spellista som"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "R_ensa"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Markera allt"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Avmarkera allt"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Invertera markering"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Beskär"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Sök"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Spårnummer"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Anpassad"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Visa"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Statusrad"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Kolumnhuvuden"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Flikar"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Uppspelning"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Ordning"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Linjär"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "Blanda"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Blanda spår"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Blanda albm"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Slumpa"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Upprepning"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Upprepa alla"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Upprepa ett spår"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Upprepa inte"
 
 # oerhört osäker på vad som egentligen menas här.
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Markering följer uppspelning"
 
 # sjukt svårt att översätta utan kotext.
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Markering följer uppspelning"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Stanna efter nuvarande"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Ändringslogg"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Om"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Sök"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Spela"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Paus"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Nästa"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Spela slumpad"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Om"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Lägger till filer..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Avbryt"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Spåregenskaper"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"VARNING: funktionen för att skriva taggar är fortfarande i "
-"utvecklingsfasen.\n"
-"Gör säkerhetskopior innan den används."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Verkställ"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Stäng"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Ange ny kolumntitel här"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Filnummer"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Spelar"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Albumillustration"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Artist - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Artist"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Titel"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Längd"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Spår"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Spårnummer"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Anpassad"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Vänster"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Höger"
 
-# sanslöst kass uppställning
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formateringskonventioner (börja med %):\n"
-" artist ([a]), titel ([t]), album ([b]), band ([B]), kompositör ([C])\n"
-" spårnummer ([n]), antal spår ([N]),\n"
-" längd ([l]), år ([y]), genre ([g]), kommentar ([c]),\n"
-" upphovsrätt ([r]), filnamn ([f]), komplett sökväg ([F]), taggar ([T])\n"
-" katalog ([d]), katalog med sökväg ([D])\n"
-"Exempel: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Instick för uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Enhet för uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "Tillåt att dynamisk samplingsnivå skiftar"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "Konverteringskvalité för samplingsnivå:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Läge för justering av uppspelningsvolym:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Avaktivera"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Spår"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Övre gräns för justering av uppspelningsvolym"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Läge för justering av förstärkning:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 "Lägg till filer från kommandoraden (eller filhanteraren) till den här "
 "spellistan:"
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Återuppta föregående session vid uppstart"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Uppspelning"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Inställningar"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Inställningar för DSP-kedja"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Stäng minimerar till systembricka"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Klicka med musknappen i mitten för att stänga spellista"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Dölj ikon i systembrickan"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Använd fet stil för spåret som spelas"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Göm menyvalet \"radera från disk\""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Text i titelraden vid uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Text u titelraden utan uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Överbrygga"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Förgrund"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Bakgrund"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Färg på sök-/volym-fält"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Mitten"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Ljus"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Mörk"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Bas"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Text"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Färg för flikrad"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 "Överbrygga (GTK-baserat tema för trädvy försvinner men renderingen går "
 "fortare)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Jämn rad"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Ojämn rad"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Markerad rad"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Markerad text"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Markör"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Spellistans färger"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Färger"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Aktivera proxyserver"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Adress för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Port för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Proxytyp:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Användarnamn för proxy:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Lösenord för proxy:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Instick"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Gruppera efter"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Format"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Välj DSP-instick"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Instick"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Inställningar för tagg-skrivare"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Skriv ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Skriv ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Skriv APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Rensa ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Rensa ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Rensa APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Rekomenderad)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 teckenkodning (iso8859-1 är standard)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Skriv ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "Tagg-skrivare"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Författare:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "E-post:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Webbplats:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Inställningar"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "Instick"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Gruppera efter"
-
-# sanslöst kass uppställning
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Formateringsregler (börja med %):\n"
-" artist ([a]), titel ([t]), album ([b]), band ([B]), kompositör ([C])\n"
-" spårnummer ([n]), antal spår ([N]),\n"
-" längd ([l]), år ([y]), genre ([g]), kommentar ([c]),\n"
-" upphovs[r]ätt, [f]ilnamn, taggar ([T])\n"
-"Exempel: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Artist / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Spårnummer"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Titel / Artist för spåret"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Längd"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Radera filer från disk"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -862,197 +923,221 @@
 "Filer kommer att förloras. Fortsätta?\n"
 "(Denna dialogruta kan stängas av i inställningarna för GTKUI-instick)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Varning"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Lägg till i uppspelningskön"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Ta bort från uppspelningskön"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Ladda om metadata"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Ta bort från disk"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Lägg till kolumn"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Redigera kolumn"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Ta bort kolumn"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Gruppera efter"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Ingen"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Artist/Datum/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Öppna fil..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Ställer in %s"
+msgid "Configure %s"
+msgstr "Inställningar för %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Standardljudenhet"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Globala snabbtangenter"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Utrymme"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Tangentkombination"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA-instick för utdata"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Lägger till filer..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Förbereder..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Du har ändrat data för detta spår."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Ska fönstret verkligen stängas?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Tagg-kategori(er)"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Inbäddat körschema"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Ja"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Nej"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Nyckel"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Värde"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF spelar"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Ska fältet verkligen tas bort?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Lägg till fält"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Ta bort fält"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Användning: deadbeef [flaggor] [fil(er)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help eller -h Visa hjälp (detta meddelande) och avsluta\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Stäng spelare\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Skriv ut versionsinformation och avsluta\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Påbörja uppspelning\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Stoppa uppspelning\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pausa uppspelning\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Nästa spår i spellista\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Föregående spår i spellista\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Slumpa spår i spellista\n"
 
 # existing => nuvarande? jag utgår ifrån att man avser listan som är aktiv i spelaren för tillfället.
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Lägg till fil(er) i nuvarande spellista\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Skriv formaterat spårnamn till standard ut\n"
 
 # jag hatar dessa!
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1063,7 +1148,7 @@
 " längd (l), spårnummer (n), år (y), kommentar (c),\n"
 " utgiven av (r), förfluten tid (e)\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1072,11 +1157,26 @@
 " e.x.: --nowplaying \"%%a - %%t\" bör visa \"artist - "
 "titel\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Standard"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Ja"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Nej"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1084,7 +1184,13 @@
 "2.3 (rekomenderad)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1094,17 +1200,18 @@
 "Spår\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1120,7 +1227,7 @@
 "Band / Artist på album\n"
 "Anpassad"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1129,79 +1236,673 @@
 "Höger"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Kunde inte hitta pixmap-fil: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Kunde inte allokera tillräckligt med minne för att buffra inläsning."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: inställningsfilen för freepats hittades inte. Vänligen installera "
+"paketet timidity-freepats eller ange sökväg till freepats.cfg i "
+"inställningarna för instick."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Lägg till ljud-CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Fel vid läsning av första sidan av Ogg-bitströmmen."
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "Frigör enhet vid stopp"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "Fel vid läsning av inledande pakethuvud."
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#: ../translation/extra.c:9
+msgid "Preferred period size"
 msgstr ""
-"Kunde inte allokera tillräckligt med minne för att registrera nytt "
-"serienummer."
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "Inläsning trunkerad eller tom."
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Aktivera proxyserver"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF spelar"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "Användarnamn"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "Källan är inte en Ogg-bitström."
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "Lösenord"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg-bitströmmen innehåller ingen Vorbis-data."
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "Fick EOF innan strömtypen kunde identifieras."
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg-bitströmmen innehåller inte en datatyp som stöds."
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "Trasigt sekundärt huvud."
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "Fick EOF innan Vorbis-huvudet blev komplett."
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "Fråga innan radering av filer från disk"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "Trasig eller saknas data, fortsätter..."
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Albumillustration"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "Spårtitel"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "Artist"
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Titel / Artist för spåret"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "Genre"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "Kompositör"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "Skivnummer"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Plats"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Tagg-kategori(er)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Inbäddat körschema"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Codec"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Välj katalog..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
-"Fel vid skrivning av ström till utkälla. Strömmen kan vara skadad eller "
-"trunkerad."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Redigera kolumn"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Spara inställningar"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Spara inställningar"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Spara inställningar"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Spara inställningar"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Enhet för uppspelning:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Instick för uppspelning:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Spara inställningar"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Överbrygga"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Läs in inställningar"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Instick för uppspelning:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Skriv APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Skriv ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
 msgstr ""
-"wildmidi: inställningsfilen för freepats hittades inte. Vänligen installera "
-"paketet timidity-freepats eller ange sökväg till freepats.cfg i "
-"inställningarna för instick."
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Lägg till ljud-CD"
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Skriv ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Tagg-skrivare"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Spara spellista som"
+
+#~ msgid "_Abort"
+#~ msgstr "_Avbryt"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "VARNING: funktionen för att skriva taggar är fortfarande i "
+#~ "utvecklingsfasen.\n"
+#~ "Gör säkerhetskopior innan den används."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Längd"
+
+# sanslöst kass uppställning
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formateringskonventioner (börja med %):\n"
+#~ " artist ([a]), titel ([t]), album ([b]), band ([B]), kompositör ([C])\n"
+#~ " spårnummer ([n]), antal spår ([N]),\n"
+#~ " längd ([l]), år ([y]), genre ([g]), kommentar ([c]),\n"
+#~ " upphovsrätt ([r]), filnamn ([f]), komplett sökväg ([F]), taggar ([T])\n"
+#~ " katalog ([d]), katalog med sökväg ([D])\n"
+#~ "Exempel: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Tillåt att dynamisk samplingsnivå skiftar"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Konverteringskvalité för samplingsnivå:"
+
+#~ msgid "Description:"
+#~ msgstr "Beskrivning:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Författare:"
+
+#~ msgid "Email:"
+#~ msgstr "E-post:"
+
+#~ msgid "Website:"
+#~ msgstr "Webbplats:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+# sanslöst kass uppställning
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Formateringsregler (börja med %):\n"
+#~ " artist ([a]), titel ([t]), album ([b]), band ([B]), kompositör ([C])\n"
+#~ " spårnummer ([n]), antal spår ([N]),\n"
+#~ " längd ([l]), år ([y]), genre ([g]), kommentar ([c]),\n"
+#~ " upphovs[r]ätt, [f]ilnamn, taggar ([T])\n"
+#~ "Exempel: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Ställer in %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA-instick för utdata"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr ""
+#~ "Kunde inte allokera tillräckligt med minne för att buffra inläsning."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Fel vid läsning av första sidan av Ogg-bitströmmen."
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Fel vid läsning av inledande pakethuvud."
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr ""
+#~ "Kunde inte allokera tillräckligt med minne för att registrera nytt "
+#~ "serienummer."
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "Inläsning trunkerad eller tom."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Källan är inte en Ogg-bitström."
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg-bitströmmen innehåller ingen Vorbis-data."
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "Fick EOF innan strömtypen kunde identifieras."
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg-bitströmmen innehåller inte en datatyp som stöds."
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Trasigt sekundärt huvud."
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "Fick EOF innan Vorbis-huvudet blev komplett."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Trasig eller saknas data, fortsätter..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Fel vid skrivning av ström till utkälla. Strömmen kan vara skadad eller "
+#~ "trunkerad."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Ljud (avancerat)"

deadbeef-0.5.2.tar.bz2/po/te.po Added

@@ -0,0 +1,1832 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-04-25 17:20+0200\n"
+"Last-Translator: PraveenIlla <mail2ipn@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: te\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "సహకారంవున్న శబ్ధపు ఫార్మేట్లు"
+
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
+msgstr "ఇతర ఫైళ్ళు (*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "ఫైళ్ళ(ను) తెరువు..."
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "పాటలజాబితాకు ఫైళ్ళ(ను) జతచేయి..."
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "సంచయా(ల)ను పాటలజాబితాకు జతచేయి..."
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "symlinks అనుసరించు"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "సహాయక ఫైలును చదువుతుండగా విఫలమైంది"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "సహాయక ఫైల్ లోడుచేయుటలో విఫలమైంది"
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "సహాయం"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "డెడ్‌బీఫ్ %s గురించి"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "డెడ్‌బీఫ్ %s మార్పుచిట్టా"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "డెడ్‌బీఫ్ ఇప్పుడు ఆడిస్తున్నది"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "పాటలజాబితాను సవరించు"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "శీర్షిక:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "పాటలజాబితా పేరుమార్చు"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "పాటలజాబితాను తొలగించు"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "కొత్త పాటలజాబితాను జతచేయి"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ ఫైళ్ళు (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ లోడుచేయి..."
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి..."
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ ప్రిసెట్ (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "ప్రిసెట్ లోడుచేయి"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "చేతనపరుచు"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "అన్నీ సున్నాచేయి"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "ప్రిఆంప్ సున్నాచేయి"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "బ్రాండ్లను సున్నాచేయి"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 రోజు %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d రోజులు %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "ఆపివేయబడింది | %d ట్రాక్‌లు | %s మొత్తం ప్లేటైమ్"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "మోనో"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "స్టీరియో"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "నిలిపివేయబడింది | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr "%s%s %s| %dHz | %d బిట్ | %s | %d:%02d / %s | %d ట్రాక్‌లు | %s మొత్తం ప్లేటైమ్"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "పాటలజాబితాను ఇలా దాచు"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "డెడ్‍బీఫ్ పాటలజాబితా ఫైళ్ళు (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "పాటలజాబితాను నింపు"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "ఇతర ఫైళ్ళు (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "కొత్త పాటలజాబితా"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "కొత్త పాటలజాబితా (%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "ఫైల్ (_F)"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "ఫైళ్ళ(ను) తెరువు (_O)"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "ఫైళ్ళ(ను) జతచేయి"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "సంచయా(ల)ను జతచేయి"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "స్థానమును జతచేయి"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "కొత్త పాటలజాబితా"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "పాటలజాబితాను నింపు"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "పాటలజాబితాను దాచు"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "నిష్క్రమించు (_Q)"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "సవరించు(_E)"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "శుభ్రంచేయి (_C)"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "అన్నీ ఎంచుకో"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "ఎంపికను రద్దుచేయి"
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "ఎంపికను తారుమారుచేయి"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "ఎంపిక"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "తొలగించు"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr "కత్తిరించు"
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "కనుగొను (_F)"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "శీర్షిక"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "ఫైల్ సంఖ్య"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "ఆల్బమ్"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "కళాకారుడు"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "ప్రాధాన్యతలు"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "వీక్షణం (_V)"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "స్థితి పట్టీ"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "నిలువువరుస పీఠికలు"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "ట్యాబ్‌లు"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "ఈక్విలైజర్"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "ప్లేబాక్(_P)"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr "క్రమం"
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "ఒకే వరుసలో ఉన్నవి"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "యాదృచ్ఛికం"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
+msgstr "యాదృచ్ఛికం"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "యాదృచ్ఛికం"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr "దీని తరువాత ఆపివేయి"
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "సహాయం (_H)"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "మార్పుచిట్టా (_C)"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "గురించి (_A)"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "వెతుకు"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "ఆపు"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "ప్లే"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "నిలిపివేయి"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "మునుపటి"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "తరువాతి"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "యాదృచ్ఛికంగా ప్లేచేయి"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "గురించి"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "నిష్క్రమించు"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "ట్రాక్ లక్షణాలు"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "అనువర్తించు (_A)"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "మూసివేయి (_C)"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "మెటాడేటా"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "గుణములు"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "కొత్త నిలువువరుస శీర్షికను ఇక్కడ ప్రవేశపెట్టండి"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "రకం:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "ప్లేచేస్తున్నది"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "ఆల్బమ్ చిత్రం"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "కళాకారుడు - ఆల్బమ్"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "నిడివి"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "ట్రాక్ సంఖ్య"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "బ్యాండ్ / ఆల్బమ్ కళాకారుడు"
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "ఫార్మేట్:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr "అనుగుణం:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "ఎడమ"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "కుడి"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "సరే (_O)"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr "అవుట్‌పుట్ ప్లగిన్:"
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr "అవుట్‌పుట్ పరికరం:"
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "ధ్వని"
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "అచేతనంచేయి"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "ట్రాక్"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "ఆదేశ వరుస (లేదా ఫైల్ నిర్వాహకము) నుండి ఫైళ్ళను ఈ పాటలజాబితాకు జతచేయి"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr "ప్రారంభములో మునుపటి కొనసాగిన కాలాన్ని పునఃప్రారంభించు"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr "ప్లేబాక్"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "స్వరూపించు"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "GUI"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr "తిరస్కరించు"
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "ముందుభాగము"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr "నేపథ్యం"
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "పాఠ్యం"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "ఎంచుకున్న అడ్డవరుస"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "ఎంచుకున్న పాఠ్యం"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "కర్సరు"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "పాటలజాబితా రంగులు"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "రంగులు"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "ప్రోక్సీ సేవికను చేతనపరుచు"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "ప్రోక్సీ సేవిక చిరునామా:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "ప్రోక్సీ సేవిక పోర్టు:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "ప్రోక్సీ రకం:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "ప్రోక్సీ వాడుకరిపేరు:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "ప్రోక్సీ సంకేతపదం:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "నెట్‌వర్క్"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "ప్లగిన్‌లు"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "ఫార్మేట్:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "ఎంపిక"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "ప్లగిన్‌లు"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "ట్యాగ్ వ్రైటర్"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "ID3v2 వ్రాయి"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "ID3v1 వ్రాయి"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "APEv2 వ్రాయి"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "ID3v2 వర్షన్"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (సిఫారసుచేయబడింది)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 అక్షరపు ఎన్‌కోడింగ్ (iso8859-1 అనేది అప్రమేయము)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "ID3v2.4 వ్రాయి"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "కళాకారుడు / ఆల్బమ్"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "ట్రాక్ సంఖ్య"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "డిస్కు నుండి ఫైళ్ళను తీసివేయి"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"ఫైళ్ళను కోల్పోతారు. కొనసాగుతారా?\n"
+"(ఈ డైలాగును GTKUI ప్లగిన్ అమరికలలోకి వెళ్ళి ఆపివేయవచ్చు)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "హెచ్చరిక"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "ప్లేబాక్ వరుసకు జతచేయి"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "ప్లేబాక్ వరుస నుండి తొలగించు"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "మెటాడేటాను మళ్ళీ నింపు"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "డిస్కు నుండి తొలగించు"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "నిలువువరుసను జతచేయి"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "నిలువువరుసను సవరించు"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "నిలువువరుసను తొలగించు"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr ""
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "ఏదీకాదు"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "కళాకారుడు/తేదీ/ఆల్బమ్"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "ఫైల్ తెరువు..."
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "స్వరూపించు"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "అప్రమేయ ఆడియా పరికరం"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "జతచేయి"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "సార్వత్రిక హాట్ కీలు"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "కీ కాంబినేషన్"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "ఫైళ్ళను జతచేస్తున్నది..."
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "ఆరంభిస్తున్నది..."
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "ఈ ట్రాక్ డేటాను మీరు సవరించారు."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "నిజంగానే విండో మూసివేయాలా?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "కీ"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "విలువ"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "నిజంగానే విండో మూసివేయాలా?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "ఫైళ్ళ(ను) జతచేయి"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "తొలగించు"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "వాడుక: deadbeef [options] [file(s)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "ఐచ్ఛికాలు:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h సహాయాన్ని ముద్రించు (ఈ సందేశమును) మరియు నిష్క్రమించు\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit ప్లేయర్ నుండి నిష్క్రమిస్తుంది\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version వర్షన్ సమాచారాన్ని ముద్రించి, నిష్క్రమించు\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play ప్లేబాక్ ప్రారంభించు\n"
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop ప్లేబాక్ ఆపుము\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause ప్లేబాక్ నిలిపివేయి\n"
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next పాటలజాబితాలో తదుపరి పాట\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev పాటలజాబితాలో మునుపటి పాట\n"
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random పాటల జాబితాలో యాదృచ్ఛిక పాట\n"
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue ఉన్నటువంటి పాటలజాబితాకు ఫైళ్ళను జతచేయి\n"
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "అప్రమేయం"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "అవును"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "కాదు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (సిఫారసుచేయబడింది)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"అచేతనపరుచు\n"
+"ట్రాక్\n"
+"ఆల్బమ్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"ఫైల్ సంఖ్య\n"
+"ఆడుతున్నది\n"
+"ఆల్బమ్ ముఖచిత్రం\n"
+"కళాకారుడు - ఆల్బమ్\n"
+"కళాకారుడు\n"
+"ఆల్బమ్\n"
+"శీర్షిక\n"
+"పొడవు\n"
+"ట్రాక్\n"
+"బ్యాండ్ / ఆల్బమ్ కళాకారుడు\n"
+"అనురూపితం"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"ఎడమ\n"
+"కుడి"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "ప్రోక్సీ సేవికను చేతనపరుచు"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "డెడ్‌బీఫ్ ఇప్పుడు ఆడిస్తున్నది"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "ప్రోక్సీ వాడుకరిపేరు:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "ప్రోక్సీ సంకేతపదం:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "డిస్కు నుండి ఫైళ్ళను తీసివేయి"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "ఆల్బమ్ చిత్రం"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "ట్రాక్ సంఖ్య"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "శీర్షిక / ట్రాక్ కళాకారుడు"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "ఫైల్ సంఖ్య"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "స్థానమును జతచేయి"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "ట్యాగ్ రకము(లు)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "కొడెక్"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "అన్నీ ఎంచుకో"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "నిలువువరుసను సవరించు"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "అవుట్‌పుట్ పరికరం:"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "అవుట్‌పుట్ ప్లగిన్:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "తిరస్కరించు"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "ప్రిసెట్ లోడుచేయి"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "అవుట్‌పుట్ ప్లగిన్:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "APEv2 వ్రాయి"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "ID3v1 వ్రాయి"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "ID3v2 వ్రాయి"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "ట్యాగ్ వ్రైటర్"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "పాటలజాబితాను ఇలా దాచు"
+
+#~ msgid "_Abort"
+#~ msgstr "మధ్యలోరద్దు (_A)"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "హెచ్చరిక: ట్యాగ్ వ్రాయుట అనే అంశము ఇంకా అభివృద్ధిలోనే ఉన్నది.\n"
+#~ "దీనిని వాడేముందు బ్యాక్అప్ కాపీలను తీసుకోండి."
+
+#~ msgid "Length"
+#~ msgstr "నిడివి"
+
+#~ msgid "Description:"
+#~ msgstr "వివరణ:"
+
+#~ msgid "Author(s):"
+#~ msgstr "మూలకర్త(లు):"
+
+#~ msgid "Email:"
+#~ msgstr "ఇమెయిల్:"
+
+#~ msgid "Website:"
+#~ msgstr "వెబ్‌సైట్:"
+
+#~ msgid "Setup %s"
+#~ msgstr "%s అమర్చు"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA అవుట్‌పుట్ ప్లగిన్"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "ఇన్‌పుట్ బఫరింగ్ కొరకు సరితగిన మెమోరీ పొందలేదు."
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Ogg బిట్‌స్ట్రీమ్ యొక్క మెదట పేజీని చదువుటలో దోషము."
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "ఇన్‌పుట్ Ogg బిట్‌స్ట్రీమ్ కాదు"
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg బిట్‌స్ట్రీమ్ Vorbis డేటాను కలిగిలేదు."
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "పాడైన లేక తప్పిపోయిన డేటా వుండవచ్చు, కొనసాగుతుంది..."

deadbeef-0.5.1.tar.bz2/po/tr.po -> deadbeef-0.5.2.tar.bz2/po/tr.po Changed

@@ -2,862 +2,927 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: LXDE\n"
-"Report-Msgid-Bugs-To: http://sourceforge.net/projects/lxde/support\n"
-"POT-Creation-Date: 2011-11-26 04:39+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2011-01-20 10:41+0000\n"
 "Last-Translator: decent <bahadiroglu33@gmail.com>\n"
 "Language-Team: Turkish <http://forum.ubuntu-tr.net>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Desteklenen ses biçimleri"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Diğer dosyalar (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Dosya(lar) aç..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Çalma listesine dosya(lar) ekle..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Çalma listesine dizin(ler) ekle..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Sembolik bağları izle"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Yardım dosyası okunurken hata oluştu"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Yardım dosyası yüklenirken hata oluştu"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1099
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Yardım"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "DeaDBeef %s Hakkında"
 
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Sürüm Notları"
 
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "DeaDBeeF'i Çevirenler"
 
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Çalma listesini düzenle"
 
-#: ../plugins/gtkui/ddbtabstrip.c:675
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Başlık:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Çalma Listesini Yeniden Adlandır"
 
-#: ../plugins/gtkui/ddbtabstrip.c:679
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Çalma Listesini Sil"
 
-#: ../plugins/gtkui/ddbtabstrip.c:683
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Yeni Çalma Listesi Ekle"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "DeaDBeeF EQ Ayarlarını Kaydet"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF kaydedilmiş EQ dosyaları (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "DeaDBeeF Hazır EQ ayarları yükle..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ hazır ayarlar (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Foobar2000 EQ ayarlarını içe aktar..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ hazır ayarları (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Ayarları Yükle"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 EQ Ayarlarını İçe Aktar"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Etkin"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Tümünü Sıfırla"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Ön Amfiyi Sıfırla"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Bantları Sıfırla"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "Ayarları Kaydet"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Ayarları Yükle"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 EQ Ayarlarını İçe Aktar"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 gün %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d gün %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Durduruldu | %d parça |toplam çalma zamanı: %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Duraklatıldı"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d parça | %s toplam çalma zamanı"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d parça | %s toplam çalma "
+"zamanı"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Çalma Listesini Farklı Kaydet"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF çalma listesi dosyaları (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Çalma Listesi Yükle"
 
-#: ../plugins/gtkui/gtkui.c:865
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Diğer dosyalar (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Yeni Çalma Listesi"
 
-#: ../plugins/gtkui/gtkui.c:868
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Yeni Çalma Listesi (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "Dosy_a(lar) aç"
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Dosya(lar) ekle"
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Dizin(ler) ekle"
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2973
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Konum ekle"
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Yeni çalma listesi"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Çalma listesi yükle"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Çalma listesini kaydet"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Çalma listesini farklı kaydet"
-
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Çıkış"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Tümünü seç"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Tüm seçimleri kaldır"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Seçimi ters çevir"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Seçim"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Kes"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Bul"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1707
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Başlık"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Parça Numarası"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Albüm"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Sanatçı"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Tarih"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Özel"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Durum çubuğu"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Sütun başlıkları"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Sekmeler"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Ekolayzır"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Oynatım"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Sıralama"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Sıralı"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
 msgstr "Karışık"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
+msgstr "Karışık"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Rastgele"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Tekrar"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Tümünü Tekrarla"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Bir Şarkıyı Tekrarla"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Tekrar Yok"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Liste takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "İmleç takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Çalan parçadan sonra dur"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Çalan parçaya git"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Sürüm notları"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "Çe_virenler"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Arama"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Dur"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Çal"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Önceki"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Rastgele Oynatım"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Hakkında"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../plugins/gtkui/interface.c:1041 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Dosyalar ekleniyor..."
-
-#: ../plugins/gtkui/interface.c:1163 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Parça Özellikleri"
 
-#: ../plugins/gtkui/interface.c:1209 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Uygula"
 
-#: ../plugins/gtkui/interface.c:1230 ../plugins/gtkui/interface.c:1276
-#: ../plugins/gtkui/interface.c:2501 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../plugins/gtkui/interface.c:1234 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Üstveri"
 
-#: ../plugins/gtkui/interface.c:1280 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Özellikler"
 
-#: ../plugins/gtkui/interface.c:1365 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editcolumndlg"
-msgstr "sütundlgdüzenle"
-
-#: ../plugins/gtkui/interface.c:1380 ../plugins/gtkui/interface.c:2873
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Başlık:"
-
-#: ../plugins/gtkui/interface.c:1388 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Yeni sütun başlığını giriniz"
 
-#: ../plugins/gtkui/interface.c:1396 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Yaz:"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Öğe İndeksi"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1405 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Çalıyor"
 
-#: ../plugins/gtkui/interface.c:1406
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Albüm Kapağı"
 
-#: ../plugins/gtkui/interface.c:1407
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Sanatçı - Albüm"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Sanatçı"
-
-#: ../plugins/gtkui/interface.c:1409 ../plugins/gtkui/interface.c:1797
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Albüm"
-
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Başlık"
-
-#: ../plugins/gtkui/interface.c:1411
-msgid "Length"
-msgstr "Uzunluk"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Süre"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/interface.c:1796
-msgid "Track"
-msgstr "Parça"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Parça Numarası"
 
-#: ../plugins/gtkui/interface.c:1413 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Bant / Albüm Sanatçısı"
 
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Özel"
-
-#: ../plugins/gtkui/interface.c:1420 ../plugins/gtkui/interface.c:3100
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Biçim:"
 
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Hizalama:"
 
-#: ../plugins/gtkui/interface.c:1443
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Sol"
 
-#: ../plugins/gtkui/interface.c:1444
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Sağ"
 
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Biçim dönüşümleri (% ile başlar ):\n"
-" [s]anatçı, [b]aşlık, al[b]üm, [B]ant, B[e]ste\n"
-" parça[n]umarası, [N]toplamparça,\n"
-" [u]zunluk, [y]ıl, [t]ür, [y]orum,\n"
-" teli[f]hakkı, [d]osyaadı, [T]amDosyaYolu, Eti[k]etler\n"
-" [d]izin, [D]izinKonumu\n"
-"Örnek: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1475 ../plugins/gtkui/interface.c:2904
-#: ../plugins/gtkui/interface.c:3016 ../plugins/gtkui/interface.c:3139
-#: ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../plugins/gtkui/interface.c:1496 ../plugins/gtkui/interface.c:2925
-#: ../plugins/gtkui/interface.c:3037 ../plugins/gtkui/interface.c:3160
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Tamam"
 
-#: ../plugins/gtkui/interface.c:1728 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Çıktı eklentisi"
 
-#: ../plugins/gtkui/interface.c:1741 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Çıktı aygıtı"
 
-#: ../plugins/gtkui/interface.c:1750 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Ses"
 
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Dinamik örnek hızı geçişine izin ver"
-
-#: ../plugins/gtkui/interface.c:1767 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Örnek hızı dönüşüm kalitesi:"
-
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Ses gücü sabitleme kipi:"
 
-#: ../plugins/gtkui/interface.c:1795
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Devre dışı"
 
-#: ../plugins/gtkui/interface.c:1799 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Parça"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Ses gücü sabitleme en yüksek limit"
 
-#: ../plugins/gtkui/interface.c:1807 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Ses gücü sabitleme kipi:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Bu çalma listesine komut satırından (veya dosya yöneticisinden) dosyalar ekle:"
+msgstr ""
+"Bu çalma listesine komut satırından (veya dosya yöneticisinden) dosyalar "
+"ekle:"
 
-#: ../plugins/gtkui/interface.c:1816 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Açılışta önceki oturum ile devam et"
 
-#: ../plugins/gtkui/interface.c:1820 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Oynatım"
 
-#: ../plugins/gtkui/interface.c:1829 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Yapılandırma"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Çıkışta bildirim alanına küçült"
 
-#: ../plugins/gtkui/interface.c:1833 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Orta fare düğmesi çalma listesini kapatır"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Bildirim alanı simgesini gizle"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Çalan parça için kalın yazı biçimi kullan"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Diskten sil girdisini\" sağ tık menüsünde\" gösterme"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Oynatım sırasındaki başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:1867 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Durdurulduğunda başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "GTK Kullanıcı Arayüzü"
 
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1936
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Üstüne bindir"
 
-#: ../plugins/gtkui/interface.c:1901 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Önplan"
 
-#: ../plugins/gtkui/interface.c:1908 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Arkaplan"
 
-#: ../plugins/gtkui/interface.c:1927 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Gezinti-çubuğu/Ses çubuğu renkleri"
 
-#: ../plugins/gtkui/interface.c:1945 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Orta"
 
-#: ../plugins/gtkui/interface.c:1952 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Açık"
 
-#: ../plugins/gtkui/interface.c:1959 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Koyu"
 
-#: ../plugins/gtkui/interface.c:1990 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Temel"
 
-#: ../plugins/gtkui/interface.c:1997 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Metin"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Sekme şerit renkleri"
 
-#: ../plugins/gtkui/interface.c:2006 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Üstüne bindir (GTK tema görünümü kaybolur, fakat çalma hızlanır)"
 
-#: ../plugins/gtkui/interface.c:2015 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Tüm satırlar"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Tek satır"
 
-#: ../plugins/gtkui/interface.c:2041 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Metin"
-
-#: ../plugins/gtkui/interface.c:2048 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Seçili satır"
 
-#: ../plugins/gtkui/interface.c:2067 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Seçili metin"
 
-#: ../plugins/gtkui/interface.c:2080 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "İmleç"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Çalma listesi rengi"
 
-#: ../plugins/gtkui/interface.c:2097 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Renkler"
 
-#: ../plugins/gtkui/interface.c:2106 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Vekil Sunucu Etkin"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Vekil Sunucu Adresleri:"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Vekil Sunucu Portu:"
 
-#: ../plugins/gtkui/interface.c:2142 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Vekil Türü:"
 
-#: ../plugins/gtkui/interface.c:2161 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Vekil Kullanıcı Adı:"
 
-#: ../plugins/gtkui/interface.c:2174 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Vekil Şifresi:"
 
-#: ../plugins/gtkui/interface.c:2184 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Ağ"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Telif hakkı"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Eklentiler"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Gruplandırma Ölçütü"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Biçim:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Seçim"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Eklentiler"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Etiketleyici"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "ID3v2 Yaz"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2343
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "ID3v1 Yaz"
 
-#: ../plugins/gtkui/interface.c:2220 ../plugins/gtkui/interface.c:2299
-#: ../plugins/gtkui/interface.c:2339 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "APEv2 Yaz"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "ID3v2 şeridi"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2355
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "ID3v1 şeridi"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/interface.c:2311
-#: ../plugins/gtkui/interface.c:2351 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "APEv2 şeridi"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 sürümü"
 
-#: ../plugins/gtkui/interface.c:2251
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Önerilen)"
 
-#: ../plugins/gtkui/interface.c:2252
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2258 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 karakter kodlaması (varsayılan iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2295 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 Yaz"
 
-#: ../plugins/gtkui/interface.c:2364 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Etiketleyici"
-
-#: ../plugins/gtkui/interface.c:2395 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Açıklama"
-
-#: ../plugins/gtkui/interface.c:2410 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Yazar(lar):"
-
-#: ../plugins/gtkui/interface.c:2425 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "E-posta:"
-
-#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Web Sitesi:"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Yapılandırma"
-
-#: ../plugins/gtkui/interface.c:2475 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Eklentiler"
-
-#: ../plugins/gtkui/interface.c:2857 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editplaylistdlg"
-msgstr "çalmalistesidlgdüzenle"
-
-#: ../plugins/gtkui/interface.c:2984 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3085 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Gruplandırma Ölçütü"
-
-#: ../plugins/gtkui/interface.c:3110 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Biçim dönüşümleri (% ile başlar):\n"
-" [s]anatçı, [b]aşlık, al[b]üm, [B]ant, B[e]ste\n"
-" parça[n]umarası, [N]toplamparça,\n"
-" [u]zunluk, [y]ıl, [t]ür, y[o]rum,\n"
-" teli[f]hakkı, [d]osyaadı, e[t]iketler\n"
-"Örnek: %a - %t [%l]"
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Sanatçı / Albüm"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Parça No"
 
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Başlık / Parça Sanatçısı"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Süre"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Dosyaları diskten sil"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -865,203 +930,222 @@
 "Dosyayı kaybedeceksiniz. Onaylıyor musunuz?\n"
 "(Bu diyalog GTKUI eklenti ayarlarından kapatılabilir)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Çalma kuyruğuna ekle"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Çalma kuyruğundan kaldır"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Üstveriyi tekrar yükle"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Diskten sil"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Sütun ekle"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Sütunu düzenle"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Sütunu kaldır"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Gruplandırma ölçütü"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Sanatçı/Tarih/Albüm"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Dosya aç..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Kur %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Yapılandırma"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Varsayılan Ses Aygıtı"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Ekle"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Evrensel Kısayollar"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Yuva"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Tuş bileşimi"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "ALSA çıktı eklentisi"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Dosyalar ekleniyor..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Başlatılıyor..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Bu parça için değiştirilmiş veri mevcut."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Pencere gerçekten kapatılsın mı?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Konum"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Altparça İndeksi"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Tuş"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Etiket Tür(leri)"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Değer"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Gömülü Çağrı Sayfası"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Evet"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Hayır"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Çözücü"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Tuş"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Değer"
+#: ../plugins/gtkui/trkproperties.c:692
+#, fuzzy
+msgid "Really remove selected field?"
+msgstr "Pencere gerçekten kapatılsın mı?"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF oynatıyor"
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Dosya(lar) ekle"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Kaldır"
 
-#: ../main.c:89
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Kullanım: deadbeef [seçenekler] [dosya(lar)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Seçenekler:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help veya -h Yardımı yazdır (bu mesajı) ve çık\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Oynatıcıyı kapat\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Sürüm bilgilerini yazdır ve çık\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Oynatımı başlat\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Oynatımı durdur\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Oynatımı duraklat\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Çalma listesinde sonraki parça\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Çalma listesinde önceki parça\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Çalma listesinde rastgele parça\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Çalma listesine parça(lar) ekle\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Değiştirilmiş dosya adını std çıktısına yazdır\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1072,16 +1156,35 @@
 " [u]zunluk, parça[n]umarası, [y]ıl, y[o]rum,\n"
 " teli[f]hakkı, [g]eçmiş\n"
 
-#: ../main.c:105
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" e.g.: --şimdi çalıyor \"%%a - %%t\" yazdırır \"sanatçı "
+"- başlık\"\n"
+
+#: ../main.c:110
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " e.g.: --şimdi çalıyor \"%%a - %%t\" yazdırır \"sanatçı - başlık\"\n"
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
 
-#: ../playlist.c:378 ../playlist.c:2302
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Varsayılan"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Evet"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Hayır"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1089,7 +1192,13 @@
 "2.3 (Tavsiye edilen)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1099,7 +1208,8 @@
 "Parça\n"
 "Albüm"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1108,8 +1218,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1125,7 +1235,7 @@
 "Bant / Albüm Sanatçısı\n"
 "Özel"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1134,14 +1244,20 @@
 "Sağ"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Resim dosyası bulunamıyor: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: freepats yapılandırma dosyası bulunamadı. Lütfen timidity-freepats paketini yükleyin, veya eklenti ayarlarında freepats.cfg dosyasına freepats konumunu belirtin."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: freepats yapılandırma dosyası bulunamadı. Lütfen timidity-freepats "
+"paketini yükleyin, veya eklenti ayarlarında freepats.cfg dosyasına freepats "
+"konumunu belirtin."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1162,7 +1278,7 @@
 msgid "Release device while stopped"
 msgstr "Aygıt durdurulduğunda"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Tercih edilen tampon boyutu"
 
@@ -1191,164 +1307,561 @@
 msgid "Scrobble URL"
 msgstr "Scrobble URL"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Önbellek güncelleştirme döngüsü (saat)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Gömülü etiketlerden getir"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Yerel dizinlerden getir"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Yerel kapak dosya maskesi"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Last.fm'den getir"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "albumart.org'dan getir"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "CDDB/FreeDB kullan"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "CDDB'den CD-Metni tercih et"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB url (örn. 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "CDDB port numarası (örn. '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "HTTP için CDDB protokolünü tercih et"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "NRG kalıp desteği etkin"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Örnekleme kalitesi (0..2, yüksek olan kalitelidir)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "En büyük parça uzunluğu (dakika cinsinden)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Diskten dosya silmek için onay iste"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Ses kontrol simgesi hassasiyet durumu"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Özel durum simgesi"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "--sync ile gtk_init çalıştır (hata ayıklama kipinde)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
+#: ../translation/extra.c:45
+#, fuzzy
+msgid "Notification title format"
 msgstr "Bildirim biçimi"
 
+#: ../translation/extra.c:46
+#, fuzzy
+msgid "Notification content format"
+msgstr "Bildirim biçimi"
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Albüm Kapağı"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "PulseAudio sunucusu"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Örnekleme oranı"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "İlgili tablo arama yolu"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Tam tablo arama yolu"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Ses takas baytları(duyduğunuz bütün geçiş statik ise)"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
+#: ../translation/extra.c:58
+#, fuzzy
+msgid "Enable HVSC Songlength DB"
 msgstr "HVSC etkin"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "HVSC yolu"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+#, fuzzy
+msgid "Default song length (sec)"
+msgstr "En büyük parça uzunluğu (dakika cinsinden)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Timidity + + bank yapılandırma dosyası"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Parça Başlığı"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Sanatçı"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Tarih"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Parça Numarası"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Toplam Parça"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Tür"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Besteci"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Disk Numarası"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Yorum"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Kodlayıcı / Sağlayıcı"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Telif hakkı"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Konum"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Altparça İndeksi"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Etiket Tür(leri)"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Gömülü Çağrı Sayfası"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Çözücü"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+#, fuzzy
+msgid "Target Samplerate"
+msgstr "Örnekleme oranı"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "Tümünü seç"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+#, fuzzy
+msgid "Edit encoder"
+msgstr "Sütunu düzenle"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/converter/interface.c:94
+#, fuzzy
+msgid "Output folder:"
+msgstr "Çıktı aygıtı"
+
+#: ../plugins/converter/interface.c:115
+#, fuzzy
+msgid "Output file name:"
+msgstr "Çıktı eklentisi"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+#, fuzzy
+msgid "Overwrite"
+msgstr "Üstüne bindir"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "Ayarları Yükle"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+#, fuzzy
+msgid "Output file extension:"
+msgstr "Çıktı eklentisi"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "APEv2 Yaz"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "ID3v1 Yaz"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "ID3v2 Yaz"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Etiketleyici"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Çalma listesini farklı kaydet"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "sütundlgdüzenle"
+
+#~ msgid "Length"
+#~ msgstr "Uzunluk"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Biçim dönüşümleri (% ile başlar ):\n"
+#~ " [s]anatçı, [b]aşlık, al[b]üm, [B]ant, B[e]ste\n"
+#~ " parça[n]umarası, [N]toplamparça,\n"
+#~ " [u]zunluk, [y]ıl, [t]ür, [y]orum,\n"
+#~ " teli[f]hakkı, [d]osyaadı, [T]amDosyaYolu, Eti[k]etler\n"
+#~ " [d]izin, [D]izinKonumu\n"
+#~ "Örnek: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Dinamik örnek hızı geçişine izin ver"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Örnek hızı dönüşüm kalitesi:"
+
+#~ msgid "Description:"
+#~ msgstr "Açıklama"
+
+#~ msgid "Author(s):"
+#~ msgstr "Yazar(lar):"
+
+#~ msgid "Email:"
+#~ msgstr "E-posta:"
+
+#~ msgid "Website:"
+#~ msgstr "Web Sitesi:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "çalmalistesidlgdüzenle"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Biçim dönüşümleri (% ile başlar):\n"
+#~ " [s]anatçı, [b]aşlık, al[b]üm, [B]ant, B[e]ste\n"
+#~ " parça[n]umarası, [N]toplamparça,\n"
+#~ " [u]zunluk, [y]ıl, [t]ür, y[o]rum,\n"
+#~ " teli[f]hakkı, [d]osyaadı, e[t]iketler\n"
+#~ "Örnek: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Başlık / Parça Sanatçısı"
+
+#~ msgid "Setup %s"
+#~ msgstr "Kur %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA çıktı eklentisi"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF oynatıyor"
+
+#~ msgid "HVSC path"
+#~ msgstr "HVSC yolu"

deadbeef-0.5.2.tar.bz2/po/ug.po Added

@@ -0,0 +1,1799 @@
+# Uyghur translation for deadbeef.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Gheyret Kenji <gheyret@gmail.com>, 2011.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: deadbeef\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2012-02-07 10:15+0200\n"
+"Last-Translator: Gheyret <gheyret@gmail.com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"Language: ug\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"
+"X-Generator: Pootle 2.0.5\n"
+
+#: ../plugins/gtkui/callbacks.c:123
+msgid "Supported sound formats"
+msgstr "قوللايدىغان ئۈن فورماتلىرى"
+
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "بارلىق ھۆججەتلەر(*)"
+
+#: ../plugins/gtkui/callbacks.c:144
+msgid "Open file(s)..."
+msgstr "ھۆججەت(لەر)نى ئېچىش…"
+
+#: ../plugins/gtkui/callbacks.c:179
+msgid "Add file(s) to playlist..."
+msgstr "ھۆججەت(لەر)نى قويۇش تىزىمىغا قوشۇش…"
+
+#: ../plugins/gtkui/callbacks.c:220
+msgid "Add folder(s) to playlist..."
+msgstr "قىسقۇچ(لار)نى قويۇش تىزىمىغا قوشۇش…"
+
+#: ../plugins/gtkui/callbacks.c:225
+msgid "Follow symlinks"
+msgstr "بەلگە ئۇلىنىشىغا ئەگىشىش"
+
+#: ../plugins/gtkui/callbacks.c:711
+msgid "Failed while reading help file"
+msgstr "ياردەم ھۆججىتىنى ئوقۇۋاتقاندا مەغلۇپ بولدى"
+
+#: ../plugins/gtkui/callbacks.c:721
+msgid "Failed to load help file"
+msgstr "ياردەم ھۆججىتىنى ئوقۇش مەغلۇپ بولدى."
+
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
+msgid "Help"
+msgstr "ياردەم"
+
+#: ../plugins/gtkui/callbacks.c:747
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s ھەققىدە"
+
+#: ../plugins/gtkui/callbacks.c:760
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s نى ئۆزگەرتىش خاتىرىسى"
+
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF تەرجىمانلىرى"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
+msgid "Edit playlist"
+msgstr "قويۇش تىزىمىنى تەھرىرلەش"
+
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "ماۋزۇ:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
+msgid "Rename Playlist"
+msgstr "قويۇش تىزىمىنىڭ ئاتىنى ئۆزگەرتىش"
+
+#: ../plugins/gtkui/ddbtabstrip.c:821
+msgid "Remove Playlist"
+msgstr "قويۇش تىزىمىنى چىقىرىۋېتىش"
+
+#: ../plugins/gtkui/ddbtabstrip.c:828
+msgid "Add New Playlist"
+msgstr "يېڭى قويۇش تىزىمى قوشۇش"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ساقلاش"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەش ھۆججەتلىرى (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:182
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ئوقۇش…"
+
+#: ../plugins/gtkui/eq.c:186
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەشلىرى (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:247
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش…"
+
+#: ../plugins/gtkui/eq.c:251
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشەشلىرى (*.feq)"
+
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "ئالدىن تەڭشەشنى ساقلاش"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "ئالدىن تەڭشەشنى ئوقۇش"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش"
+
+#: ../plugins/gtkui/eq.c:357
+msgid "Enable"
+msgstr "ئىناۋەتلىك"
+
+#: ../plugins/gtkui/eq.c:366
+msgid "Zero All"
+msgstr "ھەممىنى نۆل قىلىش"
+
+#: ../plugins/gtkui/eq.c:373
+msgid "Zero Preamp"
+msgstr "ئالدىن كۈچەيتىشنى نۆل قىلىش"
+
+#: ../plugins/gtkui/eq.c:380
+msgid "Zero Bands"
+msgstr "بەلۋاغلارنى نۆل قىلىش"
+
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "ئالدىن تەڭشەشلەر"
+
+#: ../plugins/gtkui/gtkui.c:137
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 كۈن %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:140
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d كۈن %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:149
+#, c-format
+msgid "Stopped | %d tracks | %s total playtime"
+msgstr "توختىغان | %d نەغمە | %s جەمئىي قويۇش ۋاقتى"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Mono"
+msgstr "يەككە يوللۇق ئاۋاز"
+
+#: ../plugins/gtkui/gtkui.c:162
+msgid "Stereo"
+msgstr "ستېرېئو"
+
+#: ../plugins/gtkui/gtkui.c:187
+#, c-format
+msgid "| %4d kbps "
+msgstr "| %4d kbps "
+
+#: ../plugins/gtkui/gtkui.c:193
+msgid "Paused | "
+msgstr "ۋاقىتلىق توختىدى | "
+
+#: ../plugins/gtkui/gtkui.c:198
+#, c-format
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %d گېرتس | %d بىت | %s | %d:%02d / %s | %d نەغمە | %s جەمئىي قويۇش "
+"ۋاقتى"
+
+#: ../plugins/gtkui/gtkui.c:644
+msgid "Save Playlist As"
+msgstr "قويۇش تىزىمىنى باشقا ئاتتا ساقلاش"
+
+#: ../plugins/gtkui/gtkui.c:655
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF قويۇش تىزىمى ھۆججەتلىرى (*.dbpl)"
+
+#: ../plugins/gtkui/gtkui.c:773
+msgid "Load Playlist"
+msgstr "قويۇش تىزىمىنى ئوقۇش"
+
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "باشقا ھۆججەتلەر(*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
+msgid "New Playlist"
+msgstr "يېڭى قويۇش تىزىمى"
+
+#: ../plugins/gtkui/gtkui.c:929
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "يېڭى قويۇش تىزىمى(%d)"
+
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
+msgid "_File"
+msgstr "ھۆججەت(_F)"
+
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
+msgid "_Open file(s)"
+msgstr "ھۆججەت(لەر)نى ئاچ(_O)"
+
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+msgid "Add file(s)"
+msgstr "ھۆججەت(لەر)نى قوشۇش"
+
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
+msgid "Add folder(s)"
+msgstr "قىسقۇچ(لار)نى قوشۇش"
+
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
+msgid "Add location"
+msgstr "ئورۇن قوشۇش"
+
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
+msgid "New playlist"
+msgstr "يېڭى قويۇش تىزىمى"
+
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
+msgid "Load playlist"
+msgstr "قويۇش تىزىمىنى ئوقۇش"
+
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
+msgid "Save playlist"
+msgstr "قويۇش تىزىمىنى ساقلاش"
+
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
+msgid "_Quit"
+msgstr "چېكىن(_Q)"
+
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
+
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
+msgid "_Clear"
+msgstr "تازىلا(_C)"
+
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
+msgid "Select all"
+msgstr "ھەممىنى تاللا"
+
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
+msgid "Deselect all"
+msgstr "ھەممىنى تاللىما"
+
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
+msgid "Invert selection"
+msgstr "تاللاشنى ئۆرۈ"
+
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
+msgid "Selection"
+msgstr "تاللانما"
+
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
+msgid "Remove"
+msgstr "چىقىرىۋەت"
+
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
+msgid "Crop"
+msgstr "قىرقىش"
+
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
+msgid "_Find"
+msgstr "ئىزدە(_F)"
+
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "تەرتىپى"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "ماۋزۇ"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "ناخشا نومۇرى"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "ئالبوم"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "ئورۇنلىغۇچى"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "چېسلا"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "ئىختىيارى"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
+msgid "Preferences"
+msgstr "مايىللىق"
+
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
+msgid "_View"
+msgstr "كۆرۈنۈش(_V)"
+
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
+msgid "Status bar"
+msgstr "ھالەت بالدىقى"
+
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
+msgid "Column headers"
+msgstr "ئىستون باشلىرى"
+
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
+msgid "Tabs"
+msgstr "بەتكۈچلەر"
+
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
+msgid "Equalizer"
+msgstr "تەڭشىگۈچ"
+
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
+msgid "_Playback"
+msgstr "قوي(_P)"
+
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
+msgid "Order"
+msgstr "تەرتىپلە"
+
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
+msgid "Linear"
+msgstr "سىزىقلىق"
+
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "نەغمىنى تەرتىپسىز قويۇش"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "ئالبومنى تەرتىپسىز قويۇش"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
+msgid "Random"
+msgstr "قالايمىقان"
+
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
+msgid "Looping"
+msgstr "قايتىلاۋاتىدۇ"
+
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
+msgid "Loop All"
+msgstr "ھەممىسىنى قايتىلاش"
+
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
+msgid "Loop Single Song"
+msgstr "بىرلا ناخشىنى قايتىلاش"
+
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
+msgid "Don't Loop"
+msgstr "قايتىلىما"
+
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
+msgid "Scroll follows playback"
+msgstr "سىيرىغۇچ قويۇۋاتقىنىغا ئەگەشسۇن"
+
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
+msgid "Cursor follows playback"
+msgstr "نۇربەلگە قويۇۋاتقىنىغا ئەگەشسۇن"
+
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
+msgid "Stop after current"
+msgstr "ھازىرقىسى تاماملانغاندا توختىتىش"
+
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "نۆۋەتتىكى نەغمىگە سەكرەش"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
+msgid "_Help"
+msgstr "ياردەم(_H)"
+
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
+msgid "_ChangeLog"
+msgstr "ئۆزگىرىش خاتىرىسى(_C)"
+
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
+msgid "_About"
+msgstr "ھەققىدە(_A)"
+
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "تەرجىمانلار(_T)"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
+msgid "Search"
+msgstr "ئىزدە"
+
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
+msgid "Stop"
+msgstr "توختا"
+
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
+msgid "Play"
+msgstr "قوي"
+
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
+msgid "Pause"
+msgstr "ۋاقىتلىق توختا"
+
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
+msgid "Previous"
+msgstr "ئالدىنقى"
+
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
+msgid "Next"
+msgstr "كېيىنكى"
+
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
+msgid "Play Random"
+msgstr "تەرتىپسىز قويۇش"
+
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
+msgid "About"
+msgstr "ھەققىدە"
+
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
+msgid "Quit"
+msgstr "ئاخىرلاشتۇرۇش"
+
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
+msgid "Track Properties"
+msgstr "نەغمە خاسلىقى"
+
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "تەڭشەكلەر"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
+msgid "_Apply"
+msgstr "قوللان(_A)"
+
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
+msgid "_Close"
+msgstr "ياپ(_C)"
+
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
+msgid "Metadata"
+msgstr "مېتا سانلىق-مەلۇماتى"
+
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
+msgid "Properties"
+msgstr "خاسلىق"
+
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
+msgid "Enter new column title here"
+msgstr "يېڭى ئىستون ماۋزۇسىنى بۇ يەرگە كىرگۈزۈڭ"
+
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
+msgid "Type:"
+msgstr "تىپى:"
+
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "تۈر ئىندېكسى"
+
+#. create default set of columns
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
+msgid "Playing"
+msgstr "قويۇۋاتىدۇ"
+
+#: ../plugins/gtkui/interface.c:1512
+msgid "Album Art"
+msgstr "ئالبوم مۇقاۋىسى"
+
+#: ../plugins/gtkui/interface.c:1513
+msgid "Artist - Album"
+msgstr "ئورۇنلىغۇچى - ئالبوم"
+
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "ۋاقتى"
+
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "نەغمە نومۇرى"
+
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
+msgid "Band / Album Artist"
+msgstr "مۇزىكا ئەترىتى / ئالبوم ئورۇنلىغۇچى"
+
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
+msgid "Format:"
+msgstr "پىچىم:"
+
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
+msgid "Alignment:"
+msgstr "توغرىلاش:"
+
+#: ../plugins/gtkui/interface.c:1559
+msgid "Left"
+msgstr "سول"
+
+#: ../plugins/gtkui/interface.c:1560
+msgid "Right"
+msgstr "ئوڭ"
+
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
+msgid "_Cancel"
+msgstr "ئەمەلدىن قالدۇر(_C)"
+
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
+msgid "_OK"
+msgstr "جەزملە(_O)"
+
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
+msgid "Output plugin:"
+msgstr "چىقىرىش قىستۇرمىسى:"
+
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
+msgid "Output device:"
+msgstr "چىقىرىش ئۈسكۈنىسى:"
+
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "8 بىتلىق ئۈننى ھەمىشە 16 بىتلىق ئۈنگە ئايلاندۇرۇش"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
+msgstr "ئاۋاز"
+
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
+msgid "Replaygain mode:"
+msgstr "Replaygain ھالىتى:"
+
+#: ../plugins/gtkui/interface.c:1873
+msgid "Disable"
+msgstr "ئىناۋەتسىز"
+
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "نەغمە"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
+msgid "Replaygain peak scale"
+msgstr "قويۇشنى كۈچەيتىش مىقدارىنىڭ ئەڭ چوڭ قىممىتىنى تەڭشەش"
+
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "قويۇش مىقدارىنى ئالدىن كۈچەيتىش:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "ئومۇمىي ئالدىن كۈچەيتىش:"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+"بۇيرۇق قۇرىدىن(ياكى ھۆججەت باشقۇرغۇدىن) ھۆججەت(لەر)نى بۇ قويۇش تىزىمىغا "
+"قوشۇش:"
+
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
+msgid "Resume previous session on startup"
+msgstr "باشلانغاندا ئالدىنقى ئەڭگىمەنى داۋام قىلسۇن"
+
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "قىسقۇچتىن قوشۇۋاتقاندا ئارخىپتىن قوشما"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
+msgid "Playback"
+msgstr "قويۇش"
+
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "سەپلە"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP زەنجىرىنىڭ ئالدىن تەڭشىشى"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "يۈكلە(_L)"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
+msgid "Close minimizes to tray"
+msgstr "كۆزنەك يېپىلغاندا سىستېما قوندىقىغا كىرسۇن"
+
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
+msgid "Middle mouse button closes playlist"
+msgstr "چاشقىنەك ئوتتۇرا توپچىسى قويۇش تىزىمىنى ياپسۇن "
+
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
+msgid "Hide system tray icon"
+msgstr "سىستېما قونداق سىنبەلگىسىنى يوشۇر"
+
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
+msgid "Use bold font for currently playing track"
+msgstr "نۆۋەتتە قويۇلۇۋاتقان نەغمە ئۈچۈن توم خەت نۇسخىسى ئىشلەت"
+
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
+msgid "Hide \"Delete from disk\" context menu item"
+msgstr "«دىسكىدىن ئۇچۇر» دېگەن مەزمۇن تىزىملىك تۇرىنى يوشۇر"
+
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "يەككە مۇندەرىجە قوشۇلغاندا قويۇش تىزىمىنىڭ ئاتىنى ئاپتوماتىك بەلگىلە"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "كۆرۈنمەيۈزنى يېڭىلاش تېزلىكى(ھەر سېكۇنتتىكى قېتىم سانى)"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
+msgid "Titlebar text while playing:"
+msgstr "قويۇۋاتقان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
+
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
+msgid "Titlebar text while stopped:"
+msgstr "توختىغان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
+
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI قىستۇرمىسى (ئۆزگەرتىلگەندىن كېيىن قايتا باشلاش زۆرۈر):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
+msgid "GUI"
+msgstr "GUI"
+
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
+msgid "Override"
+msgstr "قاپلاش"
+
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
+msgid "Foreground"
+msgstr "ئالدى كۆرۈنۈش"
+
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
+msgid "Background"
+msgstr "تەگلىك"
+
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
+msgid "Seekbar/Volumebar colors"
+msgstr "ئىزدەش بالدىقى/ئاۋاز چوڭلۇقى بالدىقى"
+
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
+msgid "Middle"
+msgstr "ئوتتۇرا"
+
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
+msgid "Light"
+msgstr "ئاق"
+
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
+msgid "Dark"
+msgstr "قارا"
+
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
+msgid "Base"
+msgstr "ئاساسى"
+
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "تېكىست"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
+msgid "Tab strip colors"
+msgstr "بەتكۈچنىڭ رەڭگى"
+
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
+msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+"قاپلاش(GTK نىڭ دەرەخسىمان كۆرۈنۈشىنىڭ ئۆرنىكى يوقىلىدۇ، بىراق سىزىش تېزلىكى "
+"تېزلىشىدۇ)"
+
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
+msgid "Even row"
+msgstr "جۈپ قۇر"
+
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
+msgid "Odd row"
+msgstr "تاق قۇر"
+
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
+msgid "Selected row"
+msgstr "تاللانغان قۇر"
+
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
+msgid "Selected text"
+msgstr "تاللانغان تېكىست"
+
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
+msgid "Cursor"
+msgstr "نۇربەلگە"
+
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
+msgid "Playlist colors"
+msgstr "قويۇش تىزىمىنىڭ رەڭلىرى"
+
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
+msgid "Colors"
+msgstr "رەڭلەر"
+
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
+msgid "Enable Proxy Server"
+msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئىناۋەتلىك قىلىش"
+
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
+msgid "Proxy Server Address:"
+msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئادرېسى:"
+
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
+msgid "Proxy Server Port:"
+msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئېغىزى:"
+
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
+msgid "Proxy Type:"
+msgstr "ۋاكالەتچىنىڭ تىپى:"
+
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
+msgid "Proxy Username:"
+msgstr "ۋاكالەتچىنىڭ ئىشلەتكۈچى ئاتى:"
+
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
+msgid "Proxy Password:"
+msgstr "ۋاكالەتچى ئىمى:"
+
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
+msgid "Network"
+msgstr "تور"
+
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "نەشرى: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "نەشر ھوقۇقى"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "قىستۇرما"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "گۇرۇپپىلاش"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "تەرتىپلەش…"
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "پىچىمى"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "ئۆسكۈچى"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "كېمەيگۈچى"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "DSP قىستۇرمىسىنى تاللاش"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "قىستۇرما"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "خەتكۈش يازغۇچ تەڭشىكى"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
+msgstr "ID3v2 نى يېزىش"
+
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
+msgstr "ID3v1 نى يېزىش"
+
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
+msgstr "APEv2 نى يېزىش"
+
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
+msgstr "ID3v2 نى ئۆچۈرۈۋېتىش"
+
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
+msgstr "ID3v1 نى ئۆچۈرۈۋېتىش"
+
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
+msgstr "APEv2 نى ئۆچۈرۈۋېتىش"
+
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
+msgstr "ID3v2 نەشرى"
+
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
+msgstr "2.3 (تەۋسىيە قىلىنىدۇ)"
+
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 ھەرپ كودلىشى (كۆڭۈلدىكى قىممىتى iso8859-1)"
+
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
+msgstr "ID3v2.4 نى يېزىش"
+
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
+msgid "Artist / Album"
+msgstr "ئورۇنلىغۇچى / ئالبوم"
+
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
+msgid "Track No"
+msgstr "نەغمە نومۇرى"
+
+#: ../plugins/gtkui/plcommon.c:338
+msgid "Delete files from disk"
+msgstr "دىسكىدىن ھۆججەت ئۆچۈرۈش"
+
+#: ../plugins/gtkui/plcommon.c:339
+msgid ""
+"Files will be lost. Proceed?\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+"ھۆججەتلەر يوقىلىپ كېتىدۇ. داۋاملاشتۇرسۇنمۇ؟\n"
+"(بۇ سۆزلەشكۈ GTKUI قىستۇرما تەڭشىكىدە ئۆچمەيدۇ)"
+
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
+msgid "Warning"
+msgstr "ئاگاھلاندۇرۇش"
+
+#: ../plugins/gtkui/plcommon.c:444
+msgid "Add to playback queue"
+msgstr "قويۇش قاتارىغا قوشۇش"
+
+#: ../plugins/gtkui/plcommon.c:449
+msgid "Remove from playback queue"
+msgstr "قويۇش قاتارىدىن چىقىرىۋېتىش"
+
+#: ../plugins/gtkui/plcommon.c:457
+msgid "Reload metadata"
+msgstr "مېتا سانلىق-مەلۇماتنى قايتا ئوقۇش"
+
+#: ../plugins/gtkui/plcommon.c:476
+msgid "Remove from disk"
+msgstr "دىسكىدىن چىقىرىۋېتىش"
+
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
+msgid "Add column"
+msgstr "ئىستون قوشۇش"
+
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
+msgid "Edit column"
+msgstr "ئىستون تەھرىرلەش"
+
+#: ../plugins/gtkui/plcommon.c:988
+msgid "Remove column"
+msgstr "ئىستوننى ئۆچۈر"
+
+#: ../plugins/gtkui/plcommon.c:998
+msgid "Group by"
+msgstr "گۇرۇپپىلاش"
+
+#: ../plugins/gtkui/plcommon.c:1005
+msgid "None"
+msgstr "يوق"
+
+#: ../plugins/gtkui/plcommon.c:1009
+msgid "Artist/Date/Album"
+msgstr "ئورۇنلىغۇچى/چېسلا/ئالبوم"
+
+#: ../plugins/gtkui/pluginconf.c:42
+msgid "Open file..."
+msgstr "ھۆججەت ئېچىش…"
+
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format
+msgid "Configure %s"
+msgstr "%s نى سەپلەش"
+
+#: ../plugins/gtkui/prefwin.c:82
+msgid "Default Audio Device"
+msgstr "كۆڭۈلدىكى ئۇن ئۈسكۈنىسى"
+
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
+msgid "Add"
+msgstr "قوش"
+
+#: ../plugins/gtkui/prefwin.c:328
+msgid "Global Hotkeys"
+msgstr "پۈتۈن دائىرىلىك ئىسسىق كۇنۇپكا"
+
+#: ../plugins/gtkui/prefwin.c:390
+msgid "Slot"
+msgstr "ئوقۇر"
+
+#: ../plugins/gtkui/prefwin.c:391
+msgid "Key combination"
+msgstr "كۇنۇپكا بىرىكمىسى"
+
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "ھۆججەتلەرنى قوشۇۋاتىدۇ…"
+
+#: ../plugins/gtkui/progress.c:90
+msgid "Initializing..."
+msgstr "دەسلەپلەشتۈرۈۋاتىدۇ…"
+
+#: ../plugins/gtkui/trkproperties.c:159
+msgid "You've modified data for this track."
+msgstr "بۇ نەغمىنىڭ سانلىق-مەلۇماتلىرىنى ئۆزگەرتتىڭىز."
+
+#: ../plugins/gtkui/trkproperties.c:161
+msgid "Really close the window?"
+msgstr "كۆزنەكنى راستلا ياپامسىز؟"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[بىر قانچە قىممەت] "
+
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "ئاچقۇچ"
+
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "قىممەت"
+
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "خەتكۈچلەرنى يېزىۋاتىدۇ…"
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "ئاتى:"
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "سوز بۆلىكى ئاتى : ياكى _ بىلەن باشلانماسلىقى كېرەك"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "سوز بۆلىكى قوشقىلى بولمىدى"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "بۇنداق ئاتى بار سوز بۆلىكى مەۋجۇت، باشقا ئاتنى سىناپ كۆرۈڭ."
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "تاللانغان سوز بۆلىكىنى راستلا چىقىرىۋېتەمسىز؟"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "سوز بۆلىكى قوشۇش"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "سوز بۆلىكىنى چىقىرىۋېتىش"
+
+#: ../main.c:91
+#, c-format
+msgid "Usage: deadbeef [options] [file(s)]\n"
+msgstr "ئىشلىتىش ئۇسۇلى: deadbeef [options] [file(s)]\n"
+
+#: ../main.c:92
+#, c-format
+msgid "Options:\n"
+msgstr "تاللانمىلار:\n"
+
+#: ../main.c:93
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ياكى -h مۇشۇ ياردەمنى كۆرسىتىپ ئاخىرلىشىدۇ\n"
+
+#: ../main.c:94
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit قويغۇنى ئاخىرلاشتۇرىدۇ\n"
+
+#: ../main.c:95
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version نەشر ئۇچۇرىنى بېسىپ چىقىرىپ ئاخىرلىشىدۇ\n"
+
+#: ../main.c:96
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play قويۇشنى باشلايدۇ\n"
+
+#: ../main.c:97
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop قويۇشنى توختىتىدۇ\n"
+
+#: ../main.c:98
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause قويۇشنى ۋاقىتلىق توختىتىدۇ\n"
+
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause ۋاقىتلىق توختىتىشنى ئالماشتۇرىدۇ\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+" --play-pause قويۇۋاتقان بولسا ۋاقىتلىق توختىتىدۇ، باشقا ھالەتنىمۇ "
+"ۋاقىتلىق توختىتىدۇ\n"
+
+#: ../main.c:101
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next قويۇش تىزىمىدىكى كېيىنكى ناخشا\n"
+
+#: ../main.c:102
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev قويۇش تىزىمىدىكى ئالدىنقى ناخشا\n"
+
+#: ../main.c:103
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random قويۇش تىزىمىدىكى ناخشىنى تەرتىپسىز قويىدۇ\n"
+
+#: ../main.c:104
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue ھۆججەت(لەر) نى قويۇش تىزىمىغا قوشىدۇ\n"
+
+#: ../main.c:105
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+" --nowplaying FMT پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش ئۈسكۈنىسى"
+"(stdout) غا چىقىرىدۇ\n"
+
+#: ../main.c:106
+#, c-format
+msgid ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+msgstr ""
+" FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
+" [l]ength, track[n]umber, [y]ear, [c]omment,\n"
+" copy[r]ight, [e]lapsed\n"
+
+#: ../main.c:109
+#, c-format
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+" تېخىمۇ كوپ ئۇچۇرلار ئۈچۈن http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting گە قاراڭ\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
+msgid "Default"
+msgstr "كۆڭۈلدىكى"
+
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "ياق"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+"2.3 (تەۋسىيە قىلىنىدۇ)\n"
+"2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "چوڭىيىش/كىچىكلەش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
+msgid ""
+"Disable\n"
+"Track\n"
+"Album"
+msgstr ""
+"ئىناۋەتسىز\n"
+"نەغمە\n"
+"ئالبوم"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56
+msgid ""
+"Item Index\n"
+"Playing\n"
+"Album Art\n"
+"Artist - Album\n"
+"Artist\n"
+"Album\n"
+"Title\n"
+"Duration\n"
+"Track Number\n"
+"Band / Album Artist\n"
+"Custom"
+msgstr ""
+"تۈر ئىندېكسى\n"
+"قويۇۋاتىدۇ\n"
+"ئالبوم مۇقاۋىسى\n"
+"ئورۇنلىغۇچى - ئالبوم\n"
+"ئورۇنلىغۇچى\n"
+"ئالبوم\n"
+"ماۋزۇ\n"
+"ئۇزۇنلۇقى\n"
+"نەغمە نومۇرى\n"
+"مۇزىكا ئەترىتى / ئورۇنلىغۇچى\n"
+"ئىختىيارىي"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68
+msgid ""
+"Left\n"
+"Right"
+msgstr ""
+"سول\n"
+"ئوڭ"
+
+#: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
+
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"سەپلىمە ھۆججەت(wildmidi: freepats دېگەن) تېپىلمىدى. timidity-freepats "
+"بوغچىسىنى ئورنىتىڭ ياكى freepats.cfg نىڭ يولىنى قىستۇرما تەڭشىكىدە كۆرسىتىپ "
+"بېرىڭ."
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "ئۈن CD نى قوشۇش"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "ئىزدەش (Last.fm) دىن"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "ئەۋرىشكىلەشكە ALSA ئىشلىتىش"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "توختىغاندا ئۈسكىنىنى قويۇۋېتىش"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "ئامراق يىغلەك چوڭلۇقى"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "ئامراق مەزگىل(period) چوڭلۇقى"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "scrobbler نى ئىناۋەتلىك قىلىش"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "nowplaying نى ئىناۋەتسىز قىلىش"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "ئىم"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "ئۈسكۈنە ھۆججىتى"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "غەملەك يېڭىلاش ئىنتېرۋالى(سائەت)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "سىڭدۈرۈلگەن خەتكۈچلەردىن ئېلىش"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "يەرلىك قىسقۇچتىن ئېلىش"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "يەرلىك مۇقاۋا ھۆججەت ماسكىسى"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "last.fm دىن ئېلىش"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "albumart.org دىن ئېلىش"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "CDDB/FreeDB نى ئىشلىتىش"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "CDDB تور ئادرېسى(URL)( ‹freedb.org› دېگەندەك)"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "CDDB ئېغىز نومۇرى( ‹888› دېگەندەك)"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "ئىناۋەتلىك قىلىش (NRG سۈرىتىنى قوللاشنى)"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "ئەۋرىشكىلەش سۈپىتى (0..2, چوڭ بولسا ياخشى)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "ئەڭ چوڭ ناخشا ئۇزۇنلۇقى( مىنۇت)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "ھۆججەتلەرنى دىسكىدىن ئۆچۈرىدىغان چاغدا سورىسۇن"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "ئاۋاز كونترول ھالەت سىنبەلگىسىنىڭ سەزگۈرلۈكى"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "ئىختىيارىي ھالەت سىنبەلگىسى"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "gtk_init نى --sync نىڭ بىلەن ئىجرا قىلىش(سازلاش ھالىتى)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "قىستۇرما مەزمۇن تۈرلىرىنىڭ ئارىسىغا ئايرىغۇچ قوشۇش"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "ئۇقتۇرۇش ماۋزۇسىنىڭ پىچىمى"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "ئۇقتۇرۇش مەزمۇنىنىڭ پىچىمى"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "ئالبوم مۇقاۋىسىنى كۆرسىتىش"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "ئالبوم مۇقاۋىسىنىڭ چوڭلۇقى"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "PulseAudio مۇلازىمېتىرى"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "ئەۋرىشكە تېزلىكى"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "نىسپىي ئىزدەش جەدۋىلىنىڭ يولى"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "مۇتلەق ئىزدەش جەدۋىلىنىڭ يولى"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "ئىناۋەتلىك قىلىش(HVSC Songlength DB نى)"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt ( HVSC نىڭدىن )"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "ھەر بىر ئەۋرىشكىدىكى بىت سانى(8 ياكى 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "كۆڭۈلدىكى ناخشا ئۇزۇنلۇقى (سېكۇنت)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ بانكا سەپلىمە ھۆججىتى"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "نەغمە ئاتى"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "ئورۇنلىغۇچى"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "جەمئىي نەغمە"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "ئېقىم"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "مۇزىكىسىنى ئىشلىگۈچى"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "دىسكا نومۇرى"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "ئىزاھات"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "كودلىغۇچ / تارقاتقۇچى"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "ئورنى"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "تارماق نەغمە ئىندېكسى"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "خەتكۈش تىپ(لىرى)ى"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "سىڭدۈرمە Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "كودلىغۇچ-كودسىزلۇغۇچ"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "ھۆججەت كېڭەيتىلگەن ئاتى(‹;› بىلەن ئايرىلىدۇ)"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "ئايلاندۇرۇش"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "نىشان ئەۋرىشكە تېزلىكى"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "سۈپەت / ئالگورىزىم"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "ئاپتوماتىك ئەۋرىشكە تېزلىكى (‹نىشان ئەۋرىشكە تېزلىكى›نى قاپلىنىدۇ)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "مەزكۇر ھۆججەت مەۋجۇت. قاپلامسىز؟"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "ئايلاندۇرغۇچ ئاگاھلاندۇرۇشى"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "كودلىغۇچ تاللاڭ"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "ئايلاندۇرغۇچ خاتالىقى"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "ئايلاندۇرۇۋاتىدۇ…"
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "قىسقۇچ تاللاش…"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"ئالدىن تەڭشەش قىسقۇچىنىڭ ئىمتىيازلىرىنى تەكشۈرۈڭ، باشقا ماۋزۇ تاللاڭ ياكى "
+"دىسكىنى ئازراق بىكارلاڭ"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "ئوخشاش ئاتلىق ئالدىن تەڭشەش مەۋجۇت. باشقا بىرنى تاللاڭ."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "خاتالىق"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "يېڭى كودلىغۇچ قوشۇش"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "كودلىغۇچ تەھرىرلەش"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "ئالدىن تەڭشەشنى چىقىرىۋېتىش"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "بۇ مەشغۇلاتتا تاللانغان ئالدىن تەڭشەش ئۆچۈرۈلىدۇ. راستلا ئۆچۈرەمسىز؟"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "كودلىغۇچ"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "يېڭى قىستۇرمىنى DSP زەنجىرىگە قوشۇش"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "DSP ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "يېڭى DSP ئالدىن تەڭشىشى"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "DSP ئالدىن تەڭشىشىنى تەھرىرلەش"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP ئالدىن تەڭشەشلىرى"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "چىقىرىش قىسقۇچى:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "چىقىرىش ھۆججىتىنىڭ ئاتى:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"كېڭەيتىلمە ئاتى (.mp3 دېگەندەك) ئاپتوماتىك قوشۇلىدۇ.\n"
+"قۇرۇق بولسا كۆڭۈلدىكىسى ئىشلىتىلىدۇ (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "كودلىغۇچ:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP ئالدىن تەڭشىشى"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "جەريان(threads) سانى:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "چىقىرىش ئەۋرىشكىسىنىڭ پىچىمى:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "مەنبەنىڭ پىچىمىدەك بولسۇن"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 بىتلىق لەيلىمە كەسىر سان"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "ھۆججەت مەۋجۇت بولسا:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "ئەسكەرتىش"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "قاپلاش"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى تەھرىرلەش"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "ماۋزۇسىز كودلىغۇچ"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "چىقىرىش ھۆججىتىنىڭ كېڭەيتىلمە ئاتى:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "يەنى mp3 دېگەندەك"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "بۇيرۇق قۇرى:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"مىسال: lame - %o\n"
+"%i كىرىش ھۆججىتى، %o چىقىرىش ھۆججىتى, - for stdin"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - چىقىرىش ھۆججىتىنىڭ ئاتى\n"
+"%i - ۋاقىتلىق كىرگۈزۈش ھۆججىتىنىڭ ئاتى"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "ئۇسۇل:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "تۇرۇبا"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "ۋاقىتلىق ھۆججەت"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "خەتكۈش يازغۇچ"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP ئالدىن تەڭشىكىنى تەھرىرلىگۈچ"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "نامسىز DSP ئالدىن تەڭشىشى"
+
+#~ msgid ""
+#~ "Keep source format\n"
+#~ "8 bit signed int\n"
+#~ "16 bit signed int\n"
+#~ "24 bit signed int\n"
+#~ "32 bit signed int\n"
+#~ "32 bit float"
+#~ msgstr ""
+#~ "مەنبە پىچىمى ئۆزگەرمىسۇن\n"
+#~ "8 بىتلىق ئالامەتلىك پۈتۈن سان\n"
+#~ "16 بىتلىق ئالامەتلىك پۈتۈن سان\n"
+#~ "24 بىتلىق ئالامەتلىك پۈتۈن سان\n"
+#~ "32 بىتلىق ئالامەتلىك پۈتۈن سان\n"
+#~ "32 بىتلىق لەيلىمە كەسىر سان"
+
+#~ msgid ""
+#~ "Pipe\n"
+#~ "Temporary file"
+#~ msgstr ""
+#~ "نەيچە\n"
+#~ "ۋاقىتلىق ھۆججەت"
+
+#~ msgid ""
+#~ "Prompt\n"
+#~ "Overwrite"
+#~ msgstr ""
+#~ "ئەسكەرتىش\n"
+#~ "قاپلاش"

deadbeef-0.5.1.tar.bz2/po/uk.po -> deadbeef-0.5.2.tar.bz2/po/uk.po Changed

@@ -2,13 +2,13 @@
 # Copyright (C) 2009-2001 Alexey Yakovenko <waker@users.sourceforge.net>
 # This file is distributed under the same license as the Deadbeef package.
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: deadbeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 04:36+0000\n"
-"PO-Revision-Date: 2011-04-15 16:05+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-11-23 18:50+0200\n"
 "Last-Translator: Y P <yupadmin@gmail.com>\n"
 "Language-Team: UKRAINIAN <translate@linux.org.ua>\n"
 "Language: uk\n"
@@ -22,872 +22,902 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: UKRAINE\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Формати аудіо, що підтримується"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "Інші файли (*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "Усі файли (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Відкрити файл(и)..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Додати файл(и) до списку програвання..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Додати теку(и) до списку програвання..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "Переходити за символьними посиланнями"
 
-#: ../plugins/gtkui/callbacks.c:667
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Невдача при читанні файлу допомоги"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Не можу прочитати файл допомоги"
 
-#: ../plugins/gtkui/callbacks.c:692
+#: ../plugins/gtkui/callbacks.c:736
 msgid "help.txt"
 msgstr "help.txt"
 
-#: ../plugins/gtkui/callbacks.c:693 ../plugins/gtkui/interface.c:1125
-#: ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Допомога"
 
-#: ../plugins/gtkui/callbacks.c:703
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Про DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:705
-msgid "about.txt"
-msgstr "about.txt"
-
-#: ../plugins/gtkui/callbacks.c:716
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s Список Змін"
 
-#: ../plugins/gtkui/callbacks.c:718
-msgid "ChangeLog"
-msgstr "Список змін"
-
-#: ../plugins/gtkui/callbacks.c:729
-msgid "COPYING.GPLv2"
-msgstr "COPYING.GPLv2"
-
-#: ../plugins/gtkui/callbacks.c:740
-msgid "COPYING.LGPLv2.1"
-msgstr "COPYING.LGPLv2.1"
-
-#: ../plugins/gtkui/callbacks.c:1080
+#: ../plugins/gtkui/callbacks.c:1116
 #, c-format
 msgid "DeaDBeeF Translators"
 msgstr "Перекладачі DeaDBeeF"
 
-#: ../plugins/gtkui/callbacks.c:1082
-msgid "translators.txt"
-msgstr "translators.txt"
-
-#: ../plugins/gtkui/ddbtabstrip.c:626
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Редагувати список програвання"
 
-#: ../plugins/gtkui/ddbtabstrip.c:701
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Назва:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Перейменувати список програвання"
 
-#: ../plugins/gtkui/ddbtabstrip.c:705
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Вилучити список програвання"
 
-#: ../plugins/gtkui/ddbtabstrip.c:709
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Додати новий список програвання"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Зберегти типові значення еквалайзера DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Файли типових значень еквалайзера DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Завантаження типові значення еквалайзера DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Типові значення еквалайзера DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Імпорт типових значень еквалайзера Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Типові значення еквалайзера Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "Зберегти типові значення"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "Завантажити типові значення"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "Імортувати типові значення Foobar2000"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Включити"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "Скинути все на нуль"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "Скинути підсилення на нуль"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "Скинути частоти на нуль"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Зберегти типові значення"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "Завантажити типові значення"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "Імортувати типові значення Foobar2000"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "Типові значення"
 
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 день %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d дні %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Зупинено | %d треків | %s повна тривалість програвання"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps"
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "На паузі |"
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
-msgid "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-msgstr "%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d треків | %s повна тривалість програвання"
+msgid ""
+"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+msgstr ""
+"%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d треків | %s повна тривалість "
+"програвання"
 
-#: ../plugins/gtkui/gtkui.c:661
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Зберегти список програвання як"
 
-#: ../plugins/gtkui/gtkui.c:670 ../plugins/gtkui/gtkui.c:731
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "Файли списків програвання DeaDBeeF (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:724
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Завантажити список програвання"
 
-#: ../plugins/gtkui/gtkui.c:864
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Інші файли (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Новий список програвання"
 
-#: ../plugins/gtkui/gtkui.c:867
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Новий список програвання (%d)"
 
-#: ../plugins/gtkui/interface.c:142 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:149 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Відкрити файл(и)"
 
-#: ../plugins/gtkui/interface.c:165 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Додати файл(и)"
 
-#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Додати теку(и)"
 
-#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/interface.c:2997
-#: ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
+#: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Додати URL-посилання"
 
-#: ../plugins/gtkui/interface.c:190 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Новий список програвання"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Завантажити список програвання"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Зберегти список програвання"
 
-#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "Save playlist as"
-msgstr "Зберегти список програвання як"
-
-#: ../plugins/gtkui/interface.c:214 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Закінчити"
 
-#: ../plugins/gtkui/interface.c:225 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#: ../plugins/gtkui/interface.c:232 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Очистити"
 
-#: ../plugins/gtkui/interface.c:240 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Вибрати все"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Забрати вибирання всього"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Інвертувати виділення"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Вибір"
 
-#: ../plugins/gtkui/interface.c:265 ../plugins/gtkui/plcommon.c:426
-#: ../plugins/gtkui/prefwin.c:334 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Вилучити"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Вилучити невиділене"
 
-#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Знайти"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/interface.c:1733
-#: ../plugins/gtkui/deadbeef.glade.h:96
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "Сортувати за"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Назва"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "Номер треку"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Альбом"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Виконавець"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "Дата"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Користувацьке"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../plugins/gtkui/interface.c:293 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Вигляд"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Рядок стану"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Заголовки колонок"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "Вкладки"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "Еквалайзер"
 
-#: ../plugins/gtkui/interface.c:316 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "_Програвання"
 
-#: ../plugins/gtkui/interface.c:323 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Порядок"
 
-#: ../plugins/gtkui/interface.c:330 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "Одне за одним"
 
-#: ../plugins/gtkui/interface.c:336 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Shuffle"
-msgstr "Перемішане"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "Перемішати треки"
 
-#: ../plugins/gtkui/interface.c:342 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "Перемішати треки"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Випадково"
 
-#: ../plugins/gtkui/interface.c:348 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Повторювати"
 
-#: ../plugins/gtkui/interface.c:355 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Повторювати все"
 
-#: ../plugins/gtkui/interface.c:361 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Повторювати тільки одну пісню"
 
-#: ../plugins/gtkui/interface.c:367 ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Не повторювати"
 
-#: ../plugins/gtkui/interface.c:373 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "Прокручувати поточну пісню"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "Виділяти поточну пісню"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "Зупинити піcля поточного"
 
-#: ../plugins/gtkui/interface.c:394 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
 msgid "Jump to current track"
 msgstr "Перескочити на поточний трек"
 
-#: ../plugins/gtkui/interface.c:401 ../plugins/gtkui/interface.c:408
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Допомога"
 
-#: ../plugins/gtkui/interface.c:416 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_Впроваджені зміни"
 
-#: ../plugins/gtkui/interface.c:425 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:429 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:438 ../plugins/gtkui/deadbeef.glade.h:145
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Про"
 
-#: ../plugins/gtkui/interface.c:446 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
 msgid "_Translators"
 msgstr "_Перекладачі"
 
-#: ../plugins/gtkui/interface.c:836 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:911 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../plugins/gtkui/interface.c:919 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Програвати"
 
-#: ../plugins/gtkui/interface.c:927 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../plugins/gtkui/interface.c:935 ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ../plugins/gtkui/interface.c:943 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Наступне"
 
-#: ../plugins/gtkui/interface.c:951 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Програвати випадково"
 
-#: ../plugins/gtkui/interface.c:960 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Про"
 
-#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../plugins/gtkui/interface.c:1045 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Adding files..."
-msgstr "Додавання файлів"
-
-#: ../plugins/gtkui/interface.c:1089 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "_Abort"
-msgstr "_Припинити"
-
-#: ../plugins/gtkui/interface.c:1189 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Властивості треків"
 
-#: ../plugins/gtkui/interface.c:1235 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "Налаштування"
+
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: ../plugins/gtkui/interface.c:1256 ../plugins/gtkui/interface.c:1302
-#: ../plugins/gtkui/interface.c:2525 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "З_акрити"
 
-#: ../plugins/gtkui/interface.c:1260 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "Метадані"
 
-#: ../plugins/gtkui/interface.c:1306 ../plugins/gtkui/plcommon.c:504
-#: ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Властивості"
 
-#: ../plugins/gtkui/interface.c:1391 ../plugins/gtkui/deadbeef.glade.h:163
-msgid "editcolumndlg"
-msgstr "Редагувати колонку"
-
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/interface.c:2897
-#: ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Title:"
-msgstr "Назва:"
-
-#: ../plugins/gtkui/interface.c:1414 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Введіть назву нової колонки тут"
 
-#: ../plugins/gtkui/interface.c:1422 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../plugins/gtkui/interface.c:1430
+#: ../plugins/gtkui/interface.c:1510
 msgid "Item Index"
 msgstr "Індекс"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1431 ../plugins/gtkui/mainplaylist.c:305
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Програвання"
 
-#: ../plugins/gtkui/interface.c:1432
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Обкладинка альбому"
 
-#: ../plugins/gtkui/interface.c:1433
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Виконавець - Альбом"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:1434 ../plugins/gtkui/plcommon.c:878
-#: ../translation/extra.c:55
-msgid "Artist"
-msgstr "Виконавець"
-
-#: ../plugins/gtkui/interface.c:1435 ../plugins/gtkui/interface.c:1822
-#: ../translation/extra.c:59
-msgid "Album"
-msgstr "Альбом"
-
-#: ../plugins/gtkui/interface.c:1436 ../plugins/gtkui/prefwin.c:612
-msgid "Title"
-msgstr "Назва"
-
-#: ../plugins/gtkui/interface.c:1437
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr "Тривалість"
 
-#: ../plugins/gtkui/interface.c:1438 ../plugins/gtkui/interface.c:1821
-msgid "Track"
-msgstr "Трек"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "Номер треку"
 
-#: ../plugins/gtkui/interface.c:1439 ../translation/extra.c:58
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "Гурт / Альбом Виконавець"
 
-#: ../plugins/gtkui/interface.c:1440 ../plugins/gtkui/plcommon.c:882
-msgid "Custom"
-msgstr "Користувацьке"
-
-#: ../plugins/gtkui/interface.c:1446 ../plugins/gtkui/interface.c:3124
-#: ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1461 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Вирівнювання:"
 
-#: ../plugins/gtkui/interface.c:1469
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "По лівому краю"
 
-#: ../plugins/gtkui/interface.c:1470
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "По правому краю"
 
-#: ../plugins/gtkui/interface.c:1472 ../plugins/gtkui/deadbeef.glade.h:35
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Перетворення формату (початок з %):\n"
-" [a]виконавець, [t]назва, [b]альбом, [B]гурт, [C]композитор\n"
-" [n]номер треку, [N] кількість всіх треків,\n"
-" [l]протяжність, [y]рік, [g]жанр, [c]коментар,\n"
-" [r]копірайт, [f]назва файлу, [F]повний шлях, [T]мітки\n"
-" [d]тека, [D]тека з шляхом\n"
-"Приклад: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1501 ../plugins/gtkui/interface.c:2928
-#: ../plugins/gtkui/interface.c:3040 ../plugins/gtkui/interface.c:3163
-#: ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../plugins/gtkui/interface.c:1522 ../plugins/gtkui/interface.c:2949
-#: ../plugins/gtkui/interface.c:3061 ../plugins/gtkui/interface.c:3184
-#: ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1753 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "Плагін виводу:"
 
-#: ../plugins/gtkui/interface.c:1766 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "Пристрій виводу:"
 
-#: ../plugins/gtkui/interface.c:1775 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Завжди конвертувати 8 біт аудіо до 16 біт"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1784 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Allow dynamic samplerate switching"
-msgstr "Дозволити перетворення частоти дискретизації"
-
-#: ../plugins/gtkui/interface.c:1792 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "Samplerate conversion quality:"
-msgstr "Алгоритм інтерполяції:"
-
-#: ../plugins/gtkui/interface.c:1811 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "Режим автовирівнювання гучності:"
 
-#: ../plugins/gtkui/interface.c:1820
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Виключити"
 
-#: ../plugins/gtkui/interface.c:1824 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Трек"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "Використовувати пікове значення"
 
-#: ../plugins/gtkui/interface.c:1832 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 дБ"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 дБ"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "Режим автовирівнювання гучності:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "Глобальне вирівнювання"
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Додати файли з командної стрічки (або менеджера файлів) до цього списку програвання:"
+msgstr ""
+"Додати файли з командної стрічки (або менеджера файлів) до цього списку "
+"програвання:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "Відновити попередню сесію на старті"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "Не додавати з архіву при додаванні тек"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "Програвання"
 
-#: ../plugins/gtkui/interface.c:1854 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Налаштувати"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "Типові значення ланцюга DSP"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "_Завантаження"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Закрити мінімізує до сист. лотка"
 
-#: ../plugins/gtkui/interface.c:1858 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Середня кнопка миші закриває список програвання"
 
-#: ../plugins/gtkui/interface.c:1862 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "Ховати іконку системного лотка"
 
-#: ../plugins/gtkui/interface.c:1866 ../plugins/gtkui/deadbeef.glade.h:138
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "Використовувати жирні шрифти для треку, що програється"
 
-#: ../plugins/gtkui/interface.c:1870 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "Ховати пункт контекстного меню \"Вилучити з диску\""
 
-#: ../plugins/gtkui/interface.c:1878 ../plugins/gtkui/deadbeef.glade.h:133
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Автоматично назвати список програвання при додаванні одної теки"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "Частота оновлення інтерфейсу (разів за секунду)"
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "Текст заголовку панелі під час програвання:"
 
-#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "Текст заголовку панелі під час призупинення:"
 
-#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Додаток GUI (для змін потрібно перезавантажити):"
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
-msgstr "Графічний інтерфейс"
+msgstr "GUI (Графічний інтерфейс)"
 
-#: ../plugins/gtkui/interface.c:1916 ../plugins/gtkui/interface.c:1960
-#: ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Перезаписати"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Передній план"
 
-#: ../plugins/gtkui/interface.c:1932 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Тло"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Кольори Рядка Пошуку/Регулятора Гучності"
 
-#: ../plugins/gtkui/interface.c:1969 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Середньо"
 
-#: ../plugins/gtkui/interface.c:1976 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Легко"
 
-#: ../plugins/gtkui/interface.c:1983 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Темно"
 
-#: ../plugins/gtkui/interface.c:2014 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "Основний"
 
-#: ../plugins/gtkui/interface.c:2021 ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Текст"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "Кольори смужки вкладок"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Перезаписати (втрачаються налаштування GTK, але пришвидшується візуалізація)"
+msgstr ""
+"Перезаписати (втрачаються налаштування GTK, але пришвидшується візуалізація)"
 
-#: ../plugins/gtkui/interface.c:2039 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Парний рядок"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Непарний рядок"
 
-#: ../plugins/gtkui/interface.c:2065 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2072 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Вибраний рядок"
 
-#: ../plugins/gtkui/interface.c:2091 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Вибраний текст"
 
-#: ../plugins/gtkui/interface.c:2104 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Курсор"
 
-#: ../plugins/gtkui/interface.c:2117 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Кольори списку програвання"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "Кольори"
 
-#: ../plugins/gtkui/interface.c:2130 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "Включити сервер проксі"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "Адреса сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2152 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "Порт сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "Тип проксі:"
 
-#: ../plugins/gtkui/interface.c:2185 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "Назва користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2198 ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "Пароль користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "Мережа"
 
-#: ../plugins/gtkui/interface.c:2236 ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "Версія: "
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "Авторські права"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "Додатки"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Групувати по"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "Сортувати за..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "Формат"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "В порядку зростання"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "В порядку спадання"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "Вибрати додаток DSP"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "Додаток"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "Налаштування записувача мітки"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "Вписати ID3v2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2367
-#: ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "Вписати ID3v1"
 
-#: ../plugins/gtkui/interface.c:2244 ../plugins/gtkui/interface.c:2323
-#: ../plugins/gtkui/interface.c:2363 ../plugins/gtkui/deadbeef.glade.h:140
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "Вписати APEv2"
 
-#: ../plugins/gtkui/interface.c:2252 ../plugins/gtkui/interface.c:2331
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "Вирізати ID3v2"
 
-#: ../plugins/gtkui/interface.c:2256 ../plugins/gtkui/interface.c:2379
-#: ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "Вирізати ID3v1"
 
-#: ../plugins/gtkui/interface.c:2260 ../plugins/gtkui/interface.c:2335
-#: ../plugins/gtkui/interface.c:2375 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "Вирізати APEv2"
 
-#: ../plugins/gtkui/interface.c:2268 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:2275
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Рекомендовано)"
 
-#: ../plugins/gtkui/interface.c:2276
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2282 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Кодування символів у ID3v1 (типово є iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2319 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "Вписати ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Tag writer"
-msgstr "Записувач мітки"
-
-#: ../plugins/gtkui/interface.c:2419 ../plugins/gtkui/deadbeef.glade.h:22
-msgid "Description:"
-msgstr "Опис:"
-
-#: ../plugins/gtkui/interface.c:2434 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "Author(s):"
-msgstr "Автор(и):"
-
-#: ../plugins/gtkui/interface.c:2449 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "Email:"
-msgstr "Електронна пошта:"
-
-#: ../plugins/gtkui/interface.c:2464 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Website:"
-msgstr "Веб-сторінка:"
-
-#: ../plugins/gtkui/interface.c:2495 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Configure"
-msgstr "Налаштувати"
-
-#: ../plugins/gtkui/interface.c:2499 ../plugins/gtkui/deadbeef.glade.h:95
-msgid "Plugins"
-msgstr "Додатки"
-
-#: ../plugins/gtkui/interface.c:2881 ../plugins/gtkui/deadbeef.glade.h:164
-msgid "editplaylistdlg"
-msgstr "Редагувати список програвання"
-
-#: ../plugins/gtkui/interface.c:3008 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3109 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "Group By"
-msgstr "Групувати по"
-
-#: ../plugins/gtkui/interface.c:3134 ../plugins/gtkui/deadbeef.glade.h:43
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Перетворення формату (початок з %):\n"
-" [a]виконавець, [t]назва, [b]альбом, [B]гурт, [C]композитор\n"
-" [n]номер треку, [N]всіх треків,\n"
-" [l]протяжність, [y]рік, [g]жанр, [c]коментар,\n"
-" [r]копірайт, [f]назва файлу, [T]мітки\n"
-"Приклад: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:306 ../plugins/gtkui/search.c:439
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Виконавець / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:307 ../plugins/gtkui/search.c:440
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Номер треку"
 
-#: ../plugins/gtkui/mainplaylist.c:308 ../plugins/gtkui/search.c:441
-msgid "Title / Track Artist"
-msgstr "Назва / Виконавець треку"
-
-#: ../plugins/gtkui/mainplaylist.c:309 ../plugins/gtkui/search.c:442
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Тривалість"
-
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Вилучити файли з диску"
 
-#: ../plugins/gtkui/plcommon.c:325
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -895,203 +925,221 @@
 "Файли буде втрачено. Продовжити?\n"
 "(Цей діалог можна виключити в налаштуваннях плагіна GTKUI)"
 
-#: ../plugins/gtkui/plcommon.c:326 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../plugins/gtkui/plcommon.c:402
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "Додати до черги програвання"
 
-#: ../plugins/gtkui/plcommon.c:407
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "Вилучити з черги програвання"
 
-#: ../plugins/gtkui/plcommon.c:415
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "Перезавантажити метадані"
 
-#: ../plugins/gtkui/plcommon.c:434
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Вилучити з диску"
 
-#: ../plugins/gtkui/plcommon.c:720 ../plugins/gtkui/plcommon.c:845
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Додати колонку"
 
-#: ../plugins/gtkui/plcommon.c:750 ../plugins/gtkui/plcommon.c:849
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Редагувати колонку"
 
-#: ../plugins/gtkui/plcommon.c:853
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Вилучити колонку"
 
-#: ../plugins/gtkui/plcommon.c:863
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Групувати по"
 
-#: ../plugins/gtkui/plcommon.c:870
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Нічого"
 
-#: ../plugins/gtkui/plcommon.c:874
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Виконавець/Дата/Альбом"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Відкрити файл..."
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
-msgstr "Встановлення %s"
+msgid "Configure %s"
+msgstr "Налаштувати %s"
 
-#: ../plugins/gtkui/prefwin.c:99
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Типовий пристрій Аудіо"
 
-#: ../plugins/gtkui/prefwin.c:329
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Додати"
 
-#: ../plugins/gtkui/prefwin.c:339
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Глоб. скор. клавіш"
 
-#: ../plugins/gtkui/prefwin.c:401
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "Слот"
 
-#: ../plugins/gtkui/prefwin.c:402
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Комбінації клавіш"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:481 ../plugins/gtkui/prefwin.c:693
-#: ../plugins.c:873
-msgid "ALSA output plugin"
-msgstr "Вихідний плагін ALSA"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Додавання файлів"
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Ініціалізація..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Ви змінили дані для цього треку."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Дійсно закрити вікно?"
 
-#: ../plugins/gtkui/trkproperties.c:169
-msgid "Location"
-msgstr "Розташування"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[Різні значення] "
 
-#: ../plugins/gtkui/trkproperties.c:172
-msgid "Subtrack Index"
-msgstr "Індекс субтреку"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
+msgstr "Клавіша"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "Тип(и) мітки"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
+msgstr "Значення"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "Вбудований список"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "Записую мітки..."
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Так"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "Назва:"
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Ні"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "Назви полів не повинні починатися з : або _"
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "Кодек"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "Неможливо додати поле"
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
-msgstr "Клавіша"
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "Поле з такою назвою вже існує, введіть іншу назву."
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
-msgstr "Значення"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "Дійсно вилучити вибране поле?"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF почав програвання"
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "Додати поле"
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "Вилучити поле"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Використання: deadbeef [опції] [файл(и)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "Опції:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help або -h Показати цю допомогу (це повідомлення) і вийти\n"
+msgstr ""
+" --help або -h Показати цю допомогу (це повідомлення) і вийти\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Вийти з програвача\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Показати інформацію про версію і вийти\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play Почати програвання\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Зупинити програвання\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Призупинити програвання\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause перемикання паузи\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Почати програвання якщо зупинено, включити паузу в "
+"протилежному випадку\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Наступна пісня в списку програвання\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Попередня пісня в списку програвання\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Випадкова пісня в списку програвання\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Додати файл(и) до існуючого списку програвання\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Показати форматовану назву треку до виводу\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1102,16 +1150,36 @@
 " [l]тривалість, [n]номер треку, [y]рік, [c]коментар,\n"
 " [r]копірайт, [e]час що пройшов\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
-msgid " e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
-msgstr " наприклад: --nowplaying \"%%a - %%t\" повинно показати \"виконавець - назва\"\n"
+msgid ""
+" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
+"- title\"\n"
+msgstr ""
+" наприклад: --nowplaying \"%%a - %%t\" повинно показати "
+"\"виконавець - назва\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " для більшої інформації дивитися http://sourceforge.net"
+"/apps/mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Типово"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Так"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Ні"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1119,7 +1187,15 @@
 "2.3 (Рекомендовано)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:24
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"В порядку зростання\n"
+"В порядку спадання"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1129,7 +1205,7 @@
 "Трек\n"
 "Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
 "Item Index\n"
 "Playing\n"
@@ -1138,8 +1214,8 @@
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1151,11 +1227,11 @@
 "Альбом\n"
 "Назва\n"
 "Тривалість\n"
-"Трек\n"
+"Номер треку\n"
 "Гурт / Альбом Виконавець\n"
 "Користувацьке"
 
-#: ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1164,14 +1240,20 @@
 "Справа"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Не можу знайти файл pixmap: %s"
 
 #: ../plugins/wildmidi/wildmidiplug.c:162
 #, c-format
-msgid "wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi: не знайдено файлу конфігурації freepats. Встановіть пакунок timidity-freepats, або вкажіть шлях до файлу freepats.cfg в настройках додатку."
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi: не знайдено файлу конфігурації freepats. Встановіть пакунок "
+"timidity-freepats, або вкажіть шлях до файлу freepats.cfg в настройках "
+"додатку."
 
 #. this file should list extra translatable strings that are not referenced
 #. directly in source code, e.g. scripted plugin configuration strings
@@ -1192,7 +1274,7 @@
 msgid "Release device while stopped"
 msgstr "Вивільняти пристрій під час зупинки"
 
-#: ../translation/extra.c:8 ../translation/extra.c:43
+#: ../translation/extra.c:8 ../translation/extra.c:51
 msgid "Preferred buffer size"
 msgstr "Бажаний розмір буфера"
 
@@ -1221,167 +1303,571 @@
 msgid "Scrobble URL"
 msgstr "Адреса для скроблера"
 
-#. Album Artwork plugin
+#. OSS output plugin
 #: ../translation/extra.c:17
+msgid "Device file"
+msgstr "Файл пристрою"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "Помилка OSS4 samplerate"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
 msgid "Cache update period (hr)"
 msgstr "Період оновлення кешу (год.)"
 
-#: ../translation/extra.c:18
+#: ../translation/extra.c:21
 msgid "Fetch from embedded tags"
 msgstr "Отримувати з вставлених тегів"
 
-#: ../translation/extra.c:19
+#: ../translation/extra.c:22
 msgid "Fetch from local folder"
 msgstr "Отримати з локальної теки"
 
-#: ../translation/extra.c:20
+#: ../translation/extra.c:23
 msgid "Local cover file mask"
 msgstr "Маска файлу для локальних обкладинок"
 
-#: ../translation/extra.c:21
+#: ../translation/extra.c:24
 msgid "Fetch from last.fm"
 msgstr "Отримати з last.fm"
 
-#: ../translation/extra.c:22
+#: ../translation/extra.c:25
 msgid "Fetch from albumart.org"
 msgstr "Отримати з albumart.org"
 
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "Скалювати обкладинку стосовно довшої сторони"
+
 #. Audio CD player
-#: ../translation/extra.c:24
+#: ../translation/extra.c:28
 msgid "Use CDDB/FreeDB"
 msgstr "Використовувати CDDB/FreeDB"
 
-#: ../translation/extra.c:25
+#: ../translation/extra.c:29
 msgid "Prefer CD-Text over CDDB"
 msgstr "Використовувати CD-Text замість CDDB"
 
-#: ../translation/extra.c:26
+#: ../translation/extra.c:30
 msgid "CDDB url (e.g. 'freedb.org')"
 msgstr "CDDB лінк (наприклад 'freedb.org')"
 
-#: ../translation/extra.c:27
+#: ../translation/extra.c:31
 msgid "CDDB port number (e.g. '888')"
 msgstr "Порт для CDDB (наприклад '888')"
 
-#: ../translation/extra.c:28
+#: ../translation/extra.c:32
 msgid "Prefer CDDB protocol over HTTP"
 msgstr "Використовувати CDDB замість HTTP"
 
-#: ../translation/extra.c:29
+#: ../translation/extra.c:33
 msgid "Enable NRG image support"
 msgstr "Включити підтримку образу NRG"
 
 #. DUMB module player plugin
-#: ../translation/extra.c:31
+#: ../translation/extra.c:35
 msgid "Resampling quality (0..2, higher is better)"
 msgstr "Якість передискретизації (0..2, більше-краще)"
 
 #. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:33
+#: ../translation/extra.c:37
 msgid "Max song length (in minutes)"
 msgstr "Максимальна довжина пісні (хв.)"
 
 #. Standard GTK2 user interface plugin
-#: ../translation/extra.c:35
+#: ../translation/extra.c:39
 msgid "Ask confirmation to delete files from disk"
 msgstr "Запистувати підтвердження перед вилученням файлів з диску"
 
-#: ../translation/extra.c:36
+#: ../translation/extra.c:40
 msgid "Status icon volume control sensitivity"
 msgstr "Чутливість регулятора гучності в значку статусу"
 
-#: ../translation/extra.c:37
+#: ../translation/extra.c:41
 msgid "Custom status icon"
 msgstr "Користувацький значок статусу"
 
-#: ../translation/extra.c:38
+#: ../translation/extra.c:42
 msgid "Run gtk_init with --sync (debug mode)"
 msgstr "Запустити gtk_init з --sync (режим наладки)"
 
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "Додати розділювачі між додатками контекстного меню"
+
 #. OSD Notify plugin
-#: ../translation/extra.c:40
-msgid "Notification format"
-msgstr "Формат повідомлення"
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "Формат назви повідомлення"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "Формат вмісту повідомлення"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "Показати обкладинку альбому"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "Розмір обкладинки (пікселі)"
 
 #. PulseAudio output plugin
-#: ../translation/extra.c:42
+#: ../translation/extra.c:50
 msgid "PulseAudio server"
 msgstr "Сервер PulseAudio"
 
-#: ../translation/extra.c:44
+#: ../translation/extra.c:52
 msgid "Samplerate"
 msgstr "Частота дискретизації"
 
 #. SHN player plugin
-#: ../translation/extra.c:46
+#: ../translation/extra.c:54
 msgid "Relative seek table path"
 msgstr "Відносний шлях таблиці пошуку"
 
-#: ../translation/extra.c:47
+#: ../translation/extra.c:55
 msgid "Absolute seek table path"
 msgstr "Абсолютний шлях таблиці пошуку"
 
-#: ../translation/extra.c:48
+#: ../translation/extra.c:56
 msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr "Переставити місцями аудіо байти"
 
 #. SID decoder plugin
-#: ../translation/extra.c:50
-msgid "Enable HVSC"
-msgstr "Включити HVSC"
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "Включити HVSC Songlength DB"
 
-#: ../translation/extra.c:51
-msgid "HVSC path"
-msgstr "Шлях HVSC"
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (з HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "Біт на зразок (8 або 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "Типова довжина пісні (сек)"
 
 #. WildMidi player plugin
-#: ../translation/extra.c:53
+#: ../translation/extra.c:63
 msgid "Timidity++ bank configuration file"
 msgstr "Файл налаштувань для банку Timidity++"
 
-#: ../translation/extra.c:56
+#: ../translation/extra.c:66
 msgid "Track Title"
 msgstr "Назва треку"
 
-#: ../translation/extra.c:57
+#: ../translation/extra.c:67
 msgid "Performer"
 msgstr "Виконавець"
 
-#: ../translation/extra.c:60
-msgid "Date"
-msgstr "Дата"
-
-#: ../translation/extra.c:61
-msgid "Track Number"
-msgstr "Номер треку"
-
-#: ../translation/extra.c:62
+#: ../translation/extra.c:72
 msgid "Total Tracks"
 msgstr "Всіх треків"
 
-#: ../translation/extra.c:63
+#: ../translation/extra.c:73
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../translation/extra.c:64
+#: ../translation/extra.c:74
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../translation/extra.c:65
+#: ../translation/extra.c:75
 msgid "Disc Number"
 msgstr "Номер диску"
 
-#: ../translation/extra.c:66
+#: ../translation/extra.c:76
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../translation/extra.c:67
+#: ../translation/extra.c:77
 msgid "Encoder / Vendor"
 msgstr "Кодер / Продавець"
 
-#: ../translation/extra.c:68
-msgid "Copyright"
-msgstr "Авторські права"
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "Розташування"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "Індекс субтреку"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "Тип(и) мітки"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "Вбудований список"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "Кодек"
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "Розширення файлу (розділити за допомогою ';')"
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "Конвертувати"
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "Частота дискретизація цілі"
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "Якість / Алгоритм"
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+"Автоматична частота дискретизації (перезапише Частоту дискретизації цілі)"
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "Файл вже існує. Перезаписати?"
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "Попередження конвертора"
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "Будь ласка, виберіть інший енкодер"
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "Помилка конвертора"
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "Конвертування..."
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "Вибрати теку..."
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "Не можна зберегти типові параметри енкодера"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+"Перевірте типові права доступу теки, спробуйте вибрати іншу назву, або "
+"звільніть трохи дискового простору"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+"Типові параметри з тою самою назвою вже існують. Спробуйте вибрати іншу "
+"назву."
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "Помилка"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "Додати новий енкодер"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "Редагувати енкодер"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "Вилучити типові значення"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ця дія вилучить вибрані типові значення. Ви впевнені?"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "Енкодери"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "Додати додаток до ланцюжка DSP"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "Не можу зберегти типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "Нові типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "Редагувати типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "Типові значення DSP"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "Тека виводу:"
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "Назва файла виводу:"
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"Розширення (наприклад .mp3) буде додано автоматично.\n"
+"Залишіть поле пустим для типових значень (%a - %t)."
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "Енкодер:"
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "Типові значення DSP"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "Кількість потоків:"
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "Формат зразка виводу:"
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "Зберегти формат джерела"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 біт ціле"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 біт ціле"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 біт ціле"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 біт ціле"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 біт плаваюче"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "Коли файл існує:"
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "Питати"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "Перезаписати"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "Зберігати структуру тек, починаючи з:"
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "Редагувати типові значення енкодера"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "Енкодер без назви"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "Розширення файла виводу:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "Наприклад mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "Командна стрічка:"
+
+#: ../plugins/converter/interface.c:436
+#, c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"Приклад: lame - %o\n"
+"%i для вхідного файлу, %o для вихідного файлу, - для потокових даних"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - назва вихідного файлу\n"
+"%i - назва тимчасового вхідного файлу"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "Метод:"
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "Трубка"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "Тимчасовий файл"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "Записувач мітки"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "Редактор типових значень DSP"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "Типові значення DSP без назви"
+
+#~ msgid "about.txt"
+#~ msgstr "about.txt"
+
+#~ msgid "ChangeLog"
+#~ msgstr "Список змін"
+
+#~ msgid "COPYING.GPLv2"
+#~ msgstr "COPYING.GPLv2"
+
+#~ msgid "COPYING.LGPLv2.1"
+#~ msgstr "COPYING.LGPLv2.1"
+
+#~ msgid "translators.txt"
+#~ msgstr "translators.txt"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Зберегти список програвання як"
+
+#~ msgid "_Abort"
+#~ msgstr "_Припинити"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "Редагувати колонку"
+
+#~ msgid "Length"
+#~ msgstr "Тривалість"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Перетворення формату (початок з %):\n"
+#~ " [a]виконавець, [t]назва, [b]альбом, [B]гурт, [C]композитор\n"
+#~ " [n]номер треку, [N] кількість всіх треків,\n"
+#~ " [l]протяжність, [y]рік, [g]жанр, [c]коментар,\n"
+#~ " [r]копірайт, [f]назва файлу, [F]повний шлях, [T]мітки\n"
+#~ " [d]тека, [D]тека з шляхом\n"
+#~ "Приклад: %a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Дозволити перетворення частоти дискретизації"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Алгоритм інтерполяції:"
+
+#~ msgid "Description:"
+#~ msgstr "Опис:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Автор(и):"
+
+#~ msgid "Email:"
+#~ msgstr "Електронна пошта:"
+
+#~ msgid "Website:"
+#~ msgstr "Веб-сторінка:"
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "Редагувати список програвання"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Перетворення формату (початок з %):\n"
+#~ " [a]виконавець, [t]назва, [b]альбом, [B]гурт, [C]композитор\n"
+#~ " [n]номер треку, [N]всіх треків,\n"
+#~ " [l]протяжність, [y]рік, [g]жанр, [c]коментар,\n"
+#~ " [r]копірайт, [f]назва файлу, [T]мітки\n"
+#~ "Приклад: %a - %t [%l]"
+
+#~ msgid "Title / Track Artist"
+#~ msgstr "Назва / Виконавець треку"
+
+#~ msgid "Setup %s"
+#~ msgstr "Встановлення %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "Вихідний плагін ALSA"
+
+#~ msgid "DeaDBeeF now playing"
+#~ msgstr "DeaDBeeF почав програвання"
+
+#~ msgid "HVSC path"
+#~ msgstr "Шлях HVSC"
 
 #~ msgid "Couldn't get enough memory for input buffering."
 #~ msgstr "Не можу отримати достатньо пам’яті для вхідного буфорування."
@@ -1393,7 +1879,9 @@
 #~ msgstr "Помилка читання початкового пакету заголовку."
 
 #~ msgid "Couldn't get enough memory to register new stream serial number."
-#~ msgstr "Не можу отримати достатньо пам’яті для реєстрації нового серійного номера потоку."
+#~ msgstr ""
+#~ "Не можу отримати достатньо пам’яті для реєстрації нового серійного номера "
+#~ "потоку."
 
 #~ msgid "Input truncated or empty."
 #~ msgstr "Вхідні дані спотворені або порожні."
@@ -1419,8 +1907,12 @@
 #~ msgid "Corrupt or missing data, continuing..."
 #~ msgstr "Пошкоджено або пропущено заголовки, продовжую..."
 
-#~ msgid "Error writing stream to output. Output stream may be corrupted or truncated."
-#~ msgstr "Помилка запису потоку до виходу. Вихідний потік, можливо, пошкоджено або спотворено."
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Помилка запису потоку до виходу. Вихідний потік, можливо, пошкоджено або "
+#~ "спотворено."
 
 #~ msgid ""
 #~ "WARNING: tag writing feature is still in development.\n"

deadbeef-0.5.1.tar.bz2/po/vi.po -> deadbeef-0.5.2.tar.bz2/po/vi.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0xDeadBeef\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2011-02-18 05:14+0200\n"
 "Last-Translator: Duy Hung <nguyentieuhau@gmail.com>\n"
 "Language-Team: English (United Kingdom) <yorvik.ubunto@gmail.com>\n"
@@ -21,889 +21,961 @@
 "X-Poedit-Language: English en_GB\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "Những định dạng âm thanh được hỗ trợ"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "Những tập tin khác (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "Mở tập tin..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "Thêm tập tin vào playlist..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "Thêm thư mục vào playlist..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "Lỗi trong khi đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "Không thể đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "Về DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, fuzzy, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, fuzzy, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF đang phát"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "Sửa playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "Tiêu đề:"
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "Đổi tên Playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "Xóa Playlist"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "Thêm Playlist Mới"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 #, fuzzy
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Save DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 #, fuzzy
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 #, fuzzy
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Load DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 #, fuzzy
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 #, fuzzy
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Import Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 #, fuzzy
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+#, fuzzy
+msgid "Save Preset"
+msgstr "Save Preset"
+
+#: ../plugins/gtkui/eq.c:324
+#, fuzzy
+msgid "Load Preset"
+msgstr "Load Preset"
+
+#: ../plugins/gtkui/eq.c:332
+#, fuzzy
+msgid "Import Foobar2000 Preset"
+msgstr "Import Foobar2000 Preset"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "Bật"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 #, fuzzy
 msgid "Zero All"
 msgstr "Zero All"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 #, fuzzy
 msgid "Zero Preamp"
 msgstr "Zero Preamp"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 #, fuzzy
 msgid "Zero Bands"
 msgstr "Zero Bands"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
 #, fuzzy
-msgid "Save Preset"
+msgid "Presets"
 msgstr "Save Preset"
 
-#: ../plugins/gtkui/eq.c:328
-#, fuzzy
-msgid "Load Preset"
-msgstr "Load Preset"
-
-#: ../plugins/gtkui/eq.c:335
-#, fuzzy
-msgid "Import Foobar2000 Preset"
-msgstr "Import Foobar2000 Preset"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 ngày %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d ngày %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "Dừng phát | %d bài | Tất cả %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 #, fuzzy
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 #, fuzzy
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "Tạm dừng | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d bài | Tất cả %s"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "Sao chép Playlist"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 #, fuzzy
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF playlist files (*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "Nạp Playlist"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "Những tập tin khác (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "Playlist Mới"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Playlist Mới (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "_Mở tập tin"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "Thêm tập tin"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "Thêm thư mục"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "Thêm vị trí"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "Tạo playlist mới"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "Nạp playlist"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "Lưu playlist"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "Sao chép playlist"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "_Thoát"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "_Xóa"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "Chọn tất cả"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "Bỏ chọn tất cả"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "Đảo lựa chọn"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "Lựa chọn"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "Xóa"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "Cắt"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "_Tìm"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "Tiêu đề"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+#, fuzzy
+msgid "Track number"
+msgstr "Thứ tự"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "Nghệ sĩ"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "Tùy chọn"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "Tùy chỉnh"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "_Hiển thị"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "Thanh trạng thái"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "Tiêu đề cột"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 #, fuzzy
 msgid "Tabs"
 msgstr "Thẻ"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 #, fuzzy
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 #, fuzzy
 msgid "_Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "Thứ tự phát"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 #, fuzzy
 msgid "Linear"
 msgstr "Theo thứ tự"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "Theo vòng tròn"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
 #, fuzzy
-msgid "Shuffle"
+msgid "Shuffle albums"
 msgstr "Theo vòng tròn"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "Ngẫu nhiên"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "Lặp lại"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "Lặp lại Tất cả"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "Lặp lại Một Bài"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "Không Lặp lại"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 #, fuzzy
 msgid "Scroll follows playback"
 msgstr "Trượt theo quá trình playback"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 #, fuzzy
 msgid "Cursor follows playback"
 msgstr "Trỏ chuột theo quá trình playback"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 #, fuzzy
 msgid "Stop after current"
 msgstr "Dừng sau khi kết thúc bài nhạc"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "_Trợ giúp"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 #, fuzzy
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "_Thông tin"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "Phát"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "Tạm dừng"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "Trước"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "Sau"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "Phát Ngẫu nhiên"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "Thông tin"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "Thêm tập tin..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "_Hủy"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "Thông tin Bài nhạc"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
-"CẢNH BÁO: chức năng lưu thẻ vẫn đang được phát triển.\n"
-"Hãy tạo bản sao dự phòng trước khi sử dụng."
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "_Áp dụng"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "_Đóng"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 #, fuzzy
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "editcolumndlg"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "Tiêu đề:"
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "Nhập tiêu đề cột mới tại đây"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "Loại:"
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "Thứ tự"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "Đang phát"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "Bìa Album"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "Nghệ sĩ - Album"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "Nghệ sĩ"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "Album"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "Tiêu đề"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "Độ dài"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "Thời lượng"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "Bài"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+#, fuzzy
+msgid "Track Number"
+msgstr "Bài Số"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 #, fuzzy
 msgid "Band / Album Artist"
 msgstr "Nhóm / Nghệ sĩ Chính"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "Tùy chọn"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "Định dạng:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "Canh chỉnh:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "Trái"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "Phải"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, fuzzy, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "_Hủy"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "_Đồng ý"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 #, fuzzy
 msgid "Output plugin:"
 msgstr "Output plugin:"
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 #, fuzzy
 msgid "Output device:"
 msgstr "Output device:"
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-#, fuzzy
-msgid "Allow dynamic samplerate switching"
-msgstr "Allow dynamic sample-rate switching"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-#, fuzzy
-msgid "Samplerate conversion quality:"
-msgstr "Sample-rate conversion quality:"
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 #, fuzzy
 msgid "Replaygain mode:"
 msgstr "Replay-gain mode:"
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "Tắt"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "Bài"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 #, fuzzy
 msgid "Replaygain peak scale"
 msgstr "Replay-gain peak scale"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+#, fuzzy
+msgid "Replaygain preamp:"
+msgstr "Replay-gain mode:"
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "Cấu hình"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "Save Preset"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "Thu nhỏ xuống khay hệ thống"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "Nút giữa của chuột đóng playlist"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 #, fuzzy
 msgid "GUI"
 msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "Ghi đè"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "Mặt trước"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "Mặt sau"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "Màu thanh trượt/thanh âm lượng"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "Giữa"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "Sáng"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "Tối"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 #, fuzzy
 msgid "Base"
 msgstr "Base"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "Văn bản"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 #, fuzzy
 msgid "Tab strip colors"
 msgstr "Tab strip colours"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 #, fuzzy
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "Override (loses GTK tree-view theming, but speeds up rendering)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "Dòng chẵn"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "Dòng lẻ"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "Văn bản"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "Dòng đã chọn"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "Văn bản đã chọn"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "Trỏ chuột"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "Màu playlist"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 #, fuzzy
 msgid "Enable Proxy Server"
 msgstr "Enable Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 #, fuzzy
 msgid "Proxy Server Address:"
 msgstr "Proxy Server Address:"
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 #, fuzzy
 msgid "Proxy Server Port:"
 msgstr "Proxy Server Port:"
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 #, fuzzy
 msgid "Proxy Type:"
 msgstr "Proxy Type:"
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 #, fuzzy
 msgid "Proxy Username:"
 msgstr "Proxy Username:"
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 #, fuzzy
 msgid "Proxy Password:"
 msgstr "Proxy Password:"
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 #, fuzzy
 msgid "Network"
 msgstr "Network"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+#, fuzzy
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "Nhóm bởi"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "Định dạng:"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "Lựa chọn"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+#, fuzzy
+msgid "Plugin"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+#, fuzzy
+msgid "Tag Writer Settings"
+msgstr "Ghi thẻ"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 #, fuzzy
 msgid "Write ID3v2"
 msgstr "Write ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 #, fuzzy
 msgid "Write ID3v1"
 msgstr "Write ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 #, fuzzy
 msgid "Write APEv2"
 msgstr "Write APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 #, fuzzy
 msgid "Strip ID3v2"
 msgstr "Strip ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 #, fuzzy
 msgid "Strip ID3v1"
 msgstr "Strip ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 #, fuzzy
 msgid "Strip APEv2"
 msgstr "Strip APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 #, fuzzy
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 #, fuzzy
 msgid "2.3 (Recommended)"
 msgstr "2.3 (Recommended)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 #, fuzzy
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 character encoding (default is iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 #, fuzzy
 msgid "Write ID3v2.4"
 msgstr "Write ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-#, fuzzy
-msgid "Tag writer"
-msgstr "Ghi thẻ"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "Miêu tả:"
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "Tác giả:"
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "Email:"
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "Website:"
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "Cấu hình"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-#, fuzzy
-msgid "Plugins"
-msgstr "Plugins"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-#, fuzzy
-msgid "editplaylistdlg"
-msgstr "editplaylistdlg"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "Nhóm bởi"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, fuzzy, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "Nghệ sĩ / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "Bài Số"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "Tiêu đề / Nghệ sĩ"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "Thời lượng"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "Xóa những tập tin trong đĩa"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 #, fuzzy
 msgid ""
 "Files will be lost. Proceed?\n"
@@ -912,203 +984,226 @@
 "Những tập tin sẽ bị xóa. Tiếp tục?\n"
 "(Hộp thoại này có thể được tắt trong những thiết lập GTKUI plugin)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 #, fuzzy
 msgid "Add to playback queue"
 msgstr "Thêm vào hàng đợi playback"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 #, fuzzy
 msgid "Remove from playback queue"
 msgstr "Xóa khỏi hàng đợi playback"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 #, fuzzy
 msgid "Reload metadata"
 msgstr "Reload metadata"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "Xóa khỏi đĩa"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "Thêm cột"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "Sửa cột"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "Xóa cột"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "Nhóm bởi"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "Không"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "Nghệ sĩ/Ngày/Album"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "Mở tập tin..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "Thiết lập %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "Cấu hình"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "Thiết bị Âm thanh Mặc định"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "Thêm"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "Những Phím nóng Toàn cục"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 #, fuzzy
 msgid "Slot"
 msgstr "Slot"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "Kết hợp phím"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-#, fuzzy
-msgid "ALSA output plugin"
-msgstr "ALSA output plugin"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "Thêm tập tin..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "Đang khởi tạo..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "Bạn đã thay đổi dữ liệu của bài nhạc này."
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "Bạn thật sự muốn đóng cửa sổ này?"
 
-#: ../plugins/gtkui/trkproperties.c:178
-#, fuzzy
-msgid "Tag Type(s)"
-msgstr "Loại Thẻ"
-
-#: ../plugins/gtkui/trkproperties.c:180
-#, fuzzy
-msgid "Embedded Cuesheet"
-msgstr "Embedded Cue-sheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "Có"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "Không"
-
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "Phím tắt"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "Giá trị"
 
-#: ../plugins/notify/notify.c:138
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:692
 #, fuzzy
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF đang phát"
+msgid "Really remove selected field?"
+msgstr "Bạn thật sự muốn đóng cửa sổ này?"
+
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "Thêm tập tin"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "Xóa"
 
-#: ../main.c:89
+#: ../main.c:91
 #, fuzzy, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "Usage: deadbeef [options] [file(s)]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, fuzzy, c-format
 msgid "Options:\n"
 msgstr "Options:\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, fuzzy, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help or -h Print help (this message) and exit\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, fuzzy, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit Quit player\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, fuzzy, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version Print version info and exit\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, fuzzy, c-format
 msgid " --play Start playback\n"
 msgstr " --play Start playback\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, fuzzy, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop Stop playback\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, fuzzy, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause Pause playback\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, fuzzy, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next Next song in playlist\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, fuzzy, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev Previous song in playlist\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, fuzzy, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random Random song in playlist\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, fuzzy, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue Append file(s) to existing playlist\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, fuzzy, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT Print formatted track name to stdout\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, fuzzy, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1119,7 +1214,7 @@
 " [l]ength, track[n]umber, [y]ear, [c]omment,\n"
 " copy[r]ight, [e]lapsed\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, fuzzy, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1128,11 +1223,26 @@
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "Có"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "Không"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 #, fuzzy
 msgid ""
 "2.3 (Recommended)\n"
@@ -1141,7 +1251,13 @@
 "2.3 (Recommended)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1151,17 +1267,18 @@
 "Bài\n"
 "Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
+#, fuzzy
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
@@ -1177,7 +1294,7 @@
 "Band / Nghệ sĩ Chính\n"
 "Tùy chọn"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1186,86 +1303,692 @@
 "Phải"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, fuzzy, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Không thể tìm tập tin pixmap: %s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "Thêm Audio CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+#, fuzzy
+msgid "Enable scrobbler"
+msgstr "Enable Proxy Server"
+
+#: ../translation/extra.c:12
+#, fuzzy
+msgid "Disable nowplaying"
+msgstr "DeaDBeeF đang phát"
+
+#: ../translation/extra.c:13
+#, fuzzy
+msgid "Username"
+msgstr "Proxy Username:"
+
+#: ../translation/extra.c:14
+#, fuzzy
+msgid "Password"
+msgstr "Proxy Password:"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+#, fuzzy
+msgid "Ask confirmation to delete files from disk"
+msgstr "Xóa những tập tin trong đĩa"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+#, fuzzy
+msgid "Show album art"
+msgstr "Bìa Album"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+#, fuzzy
+msgid "Track Title"
+msgstr "Bài Số"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+#, fuzzy
+msgid "Total Tracks"
+msgstr "Tiêu đề / Nghệ sĩ"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+#, fuzzy
+msgid "Disc Number"
+msgstr "Thứ tự"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "Thêm vị trí"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+#, fuzzy
+msgid "Tag Type(s)"
+msgstr "Loại Thẻ"
+
+#: ../translation/extra.c:82
 #, fuzzy
-msgid "Couldn't get enough memory for input buffering."
-msgstr "Couldn't get enough memory for input buffering."
+msgid "Embedded Cuesheet"
+msgstr "Embedded Cue-sheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr ""
+
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr ""
+
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr ""
+
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr ""
+
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
 #, fuzzy
-msgid "Error reading first page of Ogg bitstream."
-msgstr "Error reading first page of Ogg bitstream."
+msgid "Select folder..."
+msgstr "Chọn tất cả"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
 #, fuzzy
-msgid "Error reading initial header packet."
-msgstr "Error reading initial header packet."
+msgid "Edit encoder"
+msgstr "Sửa cột"
 
-#: ../plugins/vorbis/vcedit.c:237
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
 #, fuzzy
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "Couldn’t get enough memory to register new stream serial number."
+msgid "Remove preset"
+msgstr "Save Preset"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
 #, fuzzy
-msgid "Input truncated or empty."
-msgstr "Input truncated or empty."
+msgid "New DSP Preset"
+msgstr "Save Preset"
 
-#: ../plugins/vorbis/vcedit.c:507
+#: ../plugins/converter/convgui.c:1183
 #, fuzzy
-msgid "Input is not an Ogg bitstream."
-msgstr "Input is not an Ogg bit-stream."
+msgid "Edit DSP Preset"
+msgstr "Save Preset"
 
-#: ../plugins/vorbis/vcedit.c:565
+#: ../plugins/converter/convgui.c:1203
 #, fuzzy
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg bit-stream does not contain Vorbis data."
+msgid "DSP Presets"
+msgstr "Save Preset"
 
-#: ../plugins/vorbis/vcedit.c:578
+#: ../plugins/converter/interface.c:94
 #, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF before recognised stream."
+msgid "Output folder:"
+msgstr "Output device:"
 
-#: ../plugins/vorbis/vcedit.c:594
+#: ../plugins/converter/interface.c:115
 #, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg bit-stream does not contain a supported data-type."
+msgid "Output file name:"
+msgstr "Output plugin:"
 
-#: ../plugins/vorbis/vcedit.c:638
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
 #, fuzzy
-msgid "Corrupt secondary header."
-msgstr "Corrupt secondary header."
+msgid "DSP preset:"
+msgstr "Save Preset"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
 #, fuzzy
-msgid "EOF before end of Vorbis headers."
-msgstr "EOF before end of Vorbis headers."
+msgid "Overwrite"
+msgstr "Ghi đè"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
+#: ../plugins/converter/interface.c:379
 #, fuzzy
-msgid "Corrupt or missing data, continuing..."
-msgstr "Corrupt or missing data, continuing..."
+msgid "Edit Encoder Preset"
+msgstr "Load Preset"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/interface.c:410
 #, fuzzy
+msgid "Output file extension:"
+msgstr "Output plugin:"
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
+#, c-format
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
 msgstr ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/interface.c:446
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+#, fuzzy
+msgid "APEv2"
+msgstr "Write APEv2"
+
+#: ../plugins/converter/interface.c:486
+#, fuzzy
+msgid "ID3v1"
+msgstr "Write ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "Thêm Audio CD"
+#: ../plugins/converter/interface.c:510
+#, fuzzy
+msgid "ID3v2"
+msgstr "Write ID3v2"
+
+#: ../plugins/converter/interface.c:520
+#, fuzzy
+msgid "Tag writer"
+msgstr "Ghi thẻ"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#~ msgid "Save playlist as"
+#~ msgstr "Sao chép playlist"
+
+#~ msgid "_Abort"
+#~ msgstr "_Hủy"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "CẢNH BÁO: chức năng lưu thẻ vẫn đang được phát triển.\n"
+#~ "Hãy tạo bản sao dự phòng trước khi sử dụng."
+
+#~ msgid "editcolumndlg"
+#~ msgstr "editcolumndlg"
+
+#~ msgid "Length"
+#~ msgstr "Độ dài"
+
+#, fuzzy
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+
+#, fuzzy
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "Allow dynamic sample-rate switching"
+
+#, fuzzy
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "Sample-rate conversion quality:"
+
+#~ msgid "Description:"
+#~ msgstr "Miêu tả:"
+
+#~ msgid "Author(s):"
+#~ msgstr "Tác giả:"
+
+#~ msgid "Email:"
+#~ msgstr "Email:"
+
+#~ msgid "Website:"
+#~ msgstr "Website:"
+
+#, fuzzy
+#~ msgid "editplaylistdlg"
+#~ msgstr "editplaylistdlg"
+
+#, fuzzy
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "Thiết lập %s"
+
+#, fuzzy
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA output plugin"
+
+#, fuzzy
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "Couldn't get enough memory for input buffering."
+
+#, fuzzy
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "Error reading first page of Ogg bitstream."
+
+#, fuzzy
+#~ msgid "Error reading initial header packet."
+#~ msgstr "Error reading initial header packet."
+
+#, fuzzy
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "Couldn’t get enough memory to register new stream serial number."
+
+#, fuzzy
+#~ msgid "Input truncated or empty."
+#~ msgstr "Input truncated or empty."
+
+#, fuzzy
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "Input is not an Ogg bit-stream."
+
+#, fuzzy
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg bit-stream does not contain Vorbis data."
+
+#, fuzzy
+#~ msgid "EOF before recognised stream."
+#~ msgstr "EOF before recognised stream."
+
+#, fuzzy
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg bit-stream does not contain a supported data-type."
+
+#, fuzzy
+#~ msgid "Corrupt secondary header."
+#~ msgstr "Corrupt secondary header."
+
+#, fuzzy
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "EOF before end of Vorbis headers."
+
+#, fuzzy
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "Corrupt or missing data, continuing..."
+
+#, fuzzy
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
 
 #~ msgid "Sound (adv.)"
 #~ msgstr "Âm thanh (adv.)"

deadbeef-0.5.1.tar.bz2/po/zh_CN.po -> deadbeef-0.5.2.tar.bz2/po/zh_CN.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
-"PO-Revision-Date: 2010-10-19 13:46+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
+"PO-Revision-Date: 2011-11-24 05:01+0200\n"
 "Last-Translator: Yinghua_Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -18,833 +18,897 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "支持的声音格式"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
-msgstr "其他文件(*)"
+#: ../plugins/gtkui/callbacks.c:134
+msgid "All files (*)"
+msgstr "所有文件(*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "打开文件..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "向播放列表添加文件..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "向播放列表添加文件夹..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr "跟随符号链接"
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr "读取帮助文件时出错"
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr "加入帮助文件失败"
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr "帮助.txt"
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "帮助"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "关于 DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s 更新记录"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF 翻译者"
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "编辑播放列表"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr "标题："
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "重命名播放列表"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "移除播放列表"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "添加新播放列表"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "保存 DeaDBeeF EQ 预设置"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ 预设置文件(*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "加载 DeaDBeeF EQ 预设置..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ 预设置(*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "导入 Foobar2000 EQ 预设置..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ 预设置(*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "保存预设置"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "加载预设置"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "导入 Foobar2000 预设置"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "启用"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr "清零所有"
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr "清零前置放大"
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr "清零频段"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "保存预设置"
-
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "加载预设置"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+msgid "Presets"
+msgstr "预设置"
 
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "导入 Foobar2000 预设置"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d 天 %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr "已停止 | 音轨数 %d | 播放总时长 %s"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr "单声道"
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr "立体声"
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr "| %4d kbps "
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr "已暂停 | "
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | 音轨数 %d | 播放总时长 %s"
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "将播放列表保存为"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr "DeaDBeeF 播放列表文件(*.dbpl)"
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "载入播放列表"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "其他文件(*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "新播放列表"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新播放列表(%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "打开文件(_O)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "添加文件"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "添加文件夹"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "添加位置"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "新播放列表"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr "加载播放列表"
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr "保存播放列表"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr "将播放列表保存为"
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "选择所有"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "去选所有"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "反转选择"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "选择"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "移除"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "剪切"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "查找(_F)"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr "排序依据"
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr "标题"
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr "音轨号"
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr "专辑"
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr "艺人"
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr "日期"
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr "自定义"
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "状态栏"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "列标题"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "标签"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "均衡器"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "顺序"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "线性"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
-msgstr "打乱"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+msgid "Shuffle tracks"
+msgstr "打乱音轨"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+msgid "Shuffle albums"
+msgstr "打乱专辑"
+
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "随机"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "循环"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "全部循环"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "单曲循环"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "不循环"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr "随播放滚动列表"
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr "光标定位在播放的曲目"
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr "当前曲目后停止"
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr "跳到当前音轨"
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "更新记录(_C)"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr "翻译者(_T)"
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "搜索"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "暂停"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "上一曲"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "下一曲"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr "随机播放"
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr "关于"
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr "退出"
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr "正在添加文件..."
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr "中止(_A)"
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr "音轨属性"
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
-msgstr ""
-"警告：编辑标签功能尚在开发中。\n"
-"使用前请做好备份。"
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
+msgstr "设置"
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr "属性"
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr "编辑列对话框"
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr "标题："
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr "在此输入新的列标题"
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr "类型："
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
-msgstr "文件号"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
+msgstr "项目索引"
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr "正在播放"
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr "专辑封面"
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr "艺人 - 专辑"
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr "艺人"
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr "专辑"
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
-msgstr "标题"
-
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
-msgstr "长度"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
+msgstr "时长"
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr "音轨"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
+msgstr "音轨号"
 
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr "乐队 / 专辑艺人"
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr "自定义"
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "格式："
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "对齐："
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"格式规定(start with %)：\n"
-" [a]艺人, [t]标题, [b]专辑, [B]乐队, [C]作曲\n"
-" [n]音轨号, [N]总音轨数,\n"
-" [l]时长, [y]年份, [g]流派, [c]注释,\n"
-" [r]版权, [f]文件名, [F]完整路径, [T]标签,\n"
-" [d]目录, [D]带路径的目录\n"
-"例：%a - %t [%l]"
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr "输出插件："
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr "输出设备："
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "总是将 8 位音频转换为 16 位"
+
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
 msgid "Sound"
 msgstr "声音"
 
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
-msgstr "允许动态采样率切换"
-
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
-msgstr "采样率转换质量："
-
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr "回放增益方式："
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr "禁用"
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr "音轨"
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr "回放增益峰值均衡"
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr "回放预增益："
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr "全局预增益："
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "通过命令行(或文件管理器)向此播放列表添加文件："
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr "启动时恢复上一次会话"
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr "在添加文件夹时排除归档"
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 msgid "Playback"
 msgstr "回放"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr "配置"
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+msgid "DSP Chain Preset"
+msgstr "DSP 链预设置"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr "加载(_L)"
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr "DSP(数字信号处理)"
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr "点击关闭时最小化到托盘"
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr "鼠标中键关闭播放列表"
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr "隐藏系统托盘图标"
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr "用粗体显示当前正在播放的音轨"
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr "隐藏“从磁盘删除”右键菜单项"
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr "在添加单个文件夹时自动命名播放列表"
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr "界面刷新频率(每秒的次数)："
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr "播放时的标题栏文本："
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr "停止时的标题栏文本："
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr "图形用户界面插件(更改后需重启程序)："
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr "用户界面"
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr "覆盖"
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr "前景色"
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr "背景色"
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr "搜索条/音量条颜色"
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr "中"
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr "暗"
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr "基础"
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr "文本"
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr "标签条颜色"
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr "覆盖(不同于 GTK 树状视图风格，但渲染更快)"
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr "偶数行"
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr "奇数行"
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr "文本"
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr "选择的行"
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr "选择的文本"
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr "光标"
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr "播放列表颜色"
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr "颜色"
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr "启用代理服务器"
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr "代理服务器地址："
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr "代理服务器端口："
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr "代理类型："
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr "代理用户名："
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr "代理密码："
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr "网络"
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
+msgstr "版本："
+
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
+msgstr "版权"
+
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
+msgstr "插件"
+
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
+msgstr "URL："
+
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
+msgstr "分组依据"
+
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
+msgstr "排序依据..."
+
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+msgid "Format"
+msgstr "格式"
+
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
+msgstr "升序"
+
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
+msgstr "降序"
+
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+msgid "Select DSP Plugin"
+msgstr "选择 DSP 插件"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
+msgstr "插件"
+
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
+msgstr "标签编辑器设置"
+
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
 msgid "Write ID3v2"
 msgstr "写 ID3v2"
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
 msgid "Write ID3v1"
 msgstr "写 ID3v1"
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
 msgid "Write APEv2"
 msgstr "写 APEv2"
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
 msgid "Strip ID3v2"
 msgstr "清除 ID3v2"
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
 msgid "Strip ID3v1"
 msgstr "清除 ID3v1"
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
 msgid "Strip APEv2"
 msgstr "清除 APEv2"
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
 msgid "ID3v2 version"
 msgstr "ID3v2 版本"
 
-#: ../plugins/gtkui/interface.c:2247
+#: ../plugins/gtkui/interface.c:3531
 msgid "2.3 (Recommended)"
 msgstr "2.3 (推荐)"
 
-#: ../plugins/gtkui/interface.c:2248
+#: ../plugins/gtkui/interface.c:3532
 msgid "2.4"
 msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 字符编码(默认为 iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
 msgid "Write ID3v2.4"
 msgstr "写 ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
-msgstr "标签编辑器"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
-msgstr "描述："
-
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
-msgstr "作者："
-
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
-msgstr "电子邮箱："
-
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
-msgstr "网站："
-
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
-msgstr "配置"
-
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
-msgstr "插件"
-
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
-msgstr "编辑播放列表对话框"
-
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
-msgstr "URL："
-
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
-msgstr "分组依据"
-
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
-msgstr ""
-"格式规定(用 % 开头):\n"
-" [a]艺人, [t]标题, [b]专辑, [B]乐队, [C]作曲\n"
-" [n]音轨号, [N]总音轨数,\n"
-" [l]时长, [y]年份, [g]流派, [c]注释,\n"
-" [r]版权, [f]文件名, [T]标签\n"
-"例：%a - %t [%l]"
-
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr "艺人 / 专辑"
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr "音轨号"
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr "标题 / 音轨艺人"
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr "时长"
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr "从磁盘中删除文件"
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
@@ -852,195 +916,219 @@
 "文件将消失。继续吗？\n"
 "(可以在 GTKUI 插件设置中禁用此对话框)"
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr "添加到播放列表"
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr "从播放队列中移除"
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr "重新载入元数据"
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr "从磁盘中删除"
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr "添加列"
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr "编辑列"
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr "移除列"
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr "分组依据"
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr "无"
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr "艺人/日期/专辑"
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr "打开文件..."
 
-#: ../plugins/gtkui/pluginconf.c:142
-#, c-format
-msgid "Setup %s"
-msgstr "设置 %s"
+#: ../plugins/gtkui/pluginconf.c:217
+#, c-format, c-format
+msgid "Configure %s"
+msgstr "配置 %s"
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr "默认音频设备"
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr "添加"
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr "全局热键"
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr "槽"
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr "按键组合"
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
-msgstr "ALSA 输出插件"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
+msgstr "正在添加文件..."
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr "您修改了此音轨的数据。"
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr "真的关闭该窗口吗？"
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
-msgstr "标签类型"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
-msgstr "嵌入的 Cuesheet"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
-msgstr "是"
-
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
-msgstr "否"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
+msgstr "[多个值] "
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
-msgstr "编解码器"
-
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
 msgid "Key"
 msgstr "键"
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
 msgid "Value"
 msgstr "值"
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
-msgstr "DeaDBeeF 正在播放"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
+msgstr "正在写入标签..."
+
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
+msgstr "名称："
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
+msgstr "字段名称不能以 : 或 _ 开头"
+
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr "无法添加字段"
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
+msgstr "同名的字段已经存在，请尝试其他名称。"
+
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
+msgstr "真的移除所选字段吗？"
+
+#: ../plugins/gtkui/trkproperties.c:734
+msgid "Add field"
+msgstr "添加字段"
+
+#: ../plugins/gtkui/trkproperties.c:737
+msgid "Remove field"
+msgstr "移除字段"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr "用法：deadbeef [选项] [文件]\n"
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr "选项：\n"
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr " --help 或 -h 打印帮助(这条消息)并退出\n"
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr " --quit 退出播放器\n"
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr " --version 打印版本信息并退出\n"
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr " --play 开始播放\n"
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr " --stop 停止播放\n"
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr " --pause 暂停播放\n"
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause 切换暂停状态\n"
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause 若停止则开始播放，否则切换暂停状态\n"
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr " --next 播放列表中的下一首歌曲\n"
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr " --prev 播放列表中的上一首歌曲\n"
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr " --random 播放列表中的任一首歌曲\n"
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr " --queue 向现有的播放列表中追加文件\n"
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr " --nowplaying FMT 向标准输出打印格式化的音轨名称\n"
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1051,7 +1139,7 @@
 " [l]时长, [n]音轨号, [y]年代, [c]注释,\n"
 " [r]版权, [e]已播放时间\n"
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
@@ -1059,11 +1147,27 @@
 msgstr ""
 " 例：--nowplaying \"%%a - %%t\" 将打印“艺人 - 标题”\n"
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr " 更多信息请参阅 http://sourceforge.net/apps/mediawiki/deadbeef"
+"/index.php?title=Title_Formatting\n"
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr "默认"
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr "是"
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr "否"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
@@ -1071,7 +1175,15 @@
 "2.3 (推荐)\n"
 "2.4"
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+"升序\n"
+"降序"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
@@ -1081,21 +1193,21 @@
 "音轨\n"
 "专辑"
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
-"文件号\n"
+"项目序号\n"
 "正在播放\n"
 "专辑封面\n"
 "艺人 - 专辑\n"
@@ -1103,11 +1215,11 @@
 "专辑\n"
 "标题\n"
 "时长\n"
-"音轨\n"
+"音轨号\n"
 "乐队 / 专辑艺人\n"
 "自定义"
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
@@ -1116,67 +1228,649 @@
 "右"
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "找不到位图文件：%s"
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
-msgstr "无法获取足够的输入缓冲区内存。"
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+"wildmidi：找不到 freepats 配置文件。请安装 timidity-freepats 软件包，或在插件"
+"设置中指定 freepats.cfg 的路径。"
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "添加音频 CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr "在 Last.fm 上查找"
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr "使用 ALSA 重采样"
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr "停止时释放设备"
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr "首选的缓存大小"
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr "首选的周期长度"
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr "启用 scrobbler"
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr "禁用现在播放"
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr "用户名"
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr "密码"
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr "设备文件"
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr "修正 OSS4 采样率问题"
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr "缓存更新周期(小时)"
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr "从内嵌标签中提取"
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr "从本地文件夹提取"
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr "本地封面文件掩码"
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr "从 last.fm 获取"
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr "从 albumart.org 获取"
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr "按较长的边拉伸图片"
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr "使用 CDDB/FreeDB"
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr "首选 CD-Text 而非 CDDB"
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr "CDDB url (如“freedb.org”)"
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr "CDDB 端口号 (如“888”)"
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr "首选 CDDB 协议而非 HTTP"
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr "启用 NRG 图像支持"
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr "重采样品质(0~2，越大品质越好)"
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr "最大歌曲长度(分钟)"
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr "从磁盘中删除文件时让我确认"
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr "状态图标音量控制灵敏度"
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr "自定义状态图标"
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr "以 --sync 参数运行 gtk_init (调试模式)"
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr "在插件环境菜单项间添加分隔线"
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr "通知标题格式"
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr "通知内容格式"
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr "显示专辑封面"
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr "专辑封面尺寸(像素)"
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr "PulseAudio 服务器"
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr "采样率"
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr "相对搜寻表路径"
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr "绝对搜寻表路径"
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "交换音频字节(如果所听到的没有变化可切回)"
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr "启用 HVSC 歌曲长度数据库"
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr "Songlengths.txt (来自 HVSC)"
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr "采样位数(8 或 16)"
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr "默认歌曲长度(秒)"
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ 音色库配置文件"
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr "音轨标题"
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr "演奏/演唱"
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr "总音轨数"
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr "流派"
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr "作曲"
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr "盘片号"
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr "注释"
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr "编码器 / 厂商"
+
+#: ../translation/extra.c:79
+msgid "Location"
+msgstr "位置"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr "次音轨索引"
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
+msgstr "标签类型"
+
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
+msgstr "嵌入的 Cuesheet"
+
+#: ../translation/extra.c:83
+msgid "Codec"
+msgstr "编解码器"
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
-msgstr "读取 Ogg 位流第一页出错。"
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
+msgstr "文件扩展名(用;分隔)"
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
-msgstr "读取初始数据头包出错。"
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
+msgstr "转换"
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr "无法获取足够的内存来注册新的流序列号码。"
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
+msgstr "目标采样率"
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
-msgstr "输入被截断或为空。"
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
+msgstr "品质 / 算法"
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
-msgstr "输入不是一个 Ogg 位流。"
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
+msgstr "自动采样率(替代目标采样率)"
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
-msgstr "Ogg 位流不包含 Vorbis 数据。"
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
+msgstr "文件已存在。覆盖吗？"
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
-msgstr "在识别的流之前遇到了文件尾(EOF)。"
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
+msgstr "转换器警告"
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg 位流不包含支持的数据类型。"
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
+msgstr "请选择编码器"
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
-msgstr "损坏的次要数据头。"
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr "转换器错误"
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
-msgstr "在 Vorbis 数据头之前遇到了文件尾(EOF)。"
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr "正在转换..."
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
-msgstr "损坏或缺少数据，继续..."
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+msgid "Select folder..."
+msgstr "选择文件夹..."
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
+msgstr "保存编码器预设置失败"
+
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr "将流写入输出出错。输出流可能被损坏或截断。"
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "请检查预设置文件夹权限，选择其他标题或清理出一些磁盘空间"
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "同名的预设置已经存在。请另选一个标题。"
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr "错误"
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr "添加新编码器"
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr "编辑编码器"
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+msgid "Remove preset"
+msgstr "移除预设置"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "此操作将删除所选的预设置。您确定吗？"
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr "编码器"
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr "向 DSP 链上添加插件"
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr "保存 DSP 预设置失败"
+
+#: ../plugins/converter/convgui.c:1098
+msgid "New DSP Preset"
+msgstr "新建 DSP 预设置"
+
+#: ../plugins/converter/convgui.c:1183
+msgid "Edit DSP Preset"
+msgstr "编辑 DSP 预设置"
+
+#: ../plugins/converter/convgui.c:1203
+msgid "DSP Presets"
+msgstr "DSP 预设置"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr "输出文件夹："
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr "输出文件名："
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+"扩展名(如 .mp3)会自动追加。\n"
+"不填则使用默认(%a - %t)。"
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr "编码器："
+
+#: ../plugins/converter/interface.c:163
+msgid "DSP preset:"
+msgstr "DSP 预设置："
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr "线程数："
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr "输出采样格式："
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr "保持源格式"
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr "8 位有符号整型"
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr "16 位有符号整型"
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr "24 位有符号整型"
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr "32 位有符号整型"
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr "32 位浮点型"
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr "若文件存在："
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr "提示"
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr "保持文件夹结构，开始于："
+
+#: ../plugins/converter/interface.c:379
+msgid "Edit Encoder Preset"
+msgstr "编辑编码器预设置"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr "无标题编码器"
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr "输出文件扩展名："
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr "如 mp3"
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr "命令行："
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
-msgstr "wildmidi：找不到 freepats 配置文件。请安装 timidity-freepats 软件包，"
-"或在插件设置中指定 freepats.cfg 的路径。"
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+"例如：lame - %o\n"
+"%i 为输入文件，%o 为输出文件，- 为标准输入"
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+"%o - 输出文件名\n"
+"%i - 临时输入文件名"
+
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr "方法："
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr "管道"
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr "临时文件"
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr "标签编辑器"
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr "DSP 预设置编辑器"
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr "无标题的 DSP 预设置"
+
+#~ msgid "Save playlist as"
+#~ msgstr "将播放列表保存为"
+
+#~ msgid "_Abort"
+#~ msgstr "中止(_A)"
+
+#~ msgid ""
+#~ "WARNING: tag writing feature is still in development.\n"
+#~ "Make backup copies before using."
+#~ msgstr ""
+#~ "警告：编辑标签功能尚在开发中。\n"
+#~ "使用前请做好备份。"
+
+#~ msgid "editcolumndlg"
+#~ msgstr "编辑列对话框"
+
+#~ msgid "Length"
+#~ msgstr "长度"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
+#~ " [d]irectory, [D]irectoryWithPath\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "格式规定(start with %)：\n"
+#~ " [a]艺人, [t]标题, [b]专辑, [B]乐队, [C]作曲\n"
+#~ " [n]音轨号, [N]总音轨数,\n"
+#~ " [l]时长, [y]年份, [g]流派, [c]注释,\n"
+#~ " [r]版权, [f]文件名, [F]完整路径, [T]标签,\n"
+#~ " [d]目录, [D]带路径的目录\n"
+#~ "例：%a - %t [%l]"
+
+#~ msgid "Allow dynamic samplerate switching"
+#~ msgstr "允许动态采样率切换"
+
+#~ msgid "Samplerate conversion quality:"
+#~ msgstr "采样率转换质量："
+
+#~ msgid "Description:"
+#~ msgstr "描述："
+
+#~ msgid "Author(s):"
+#~ msgstr "作者："
+
+#~ msgid "Email:"
+#~ msgstr "电子邮箱："
+
+#~ msgid "Website:"
+#~ msgstr "网站："
+
+#~ msgid "editplaylistdlg"
+#~ msgstr "编辑播放列表对话框"
+
+#~ msgid ""
+#~ "Format conversions (start with %):\n"
+#~ " [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
+#~ " track[n]umber, [N]totaltracks,\n"
+#~ " [l]ength, [y]ear, [g]enre, [c]omment,\n"
+#~ " copy[r]ight, [f]ilename, [T]ags\n"
+#~ "Example: %a - %t [%l]"
+#~ msgstr ""
+#~ "格式规定(用 % 开头):\n"
+#~ " [a]艺人, [t]标题, [b]专辑, [B]乐队, [C]作曲\n"
+#~ " [n]音轨号, [N]总音轨数,\n"
+#~ " [l]时长, [y]年份, [g]流派, [c]注释,\n"
+#~ " [r]版权, [f]文件名, [T]标签\n"
+#~ "例：%a - %t [%l]"
+
+#~ msgid "Setup %s"
+#~ msgstr "设置 %s"
+
+#~ msgid "ALSA output plugin"
+#~ msgstr "ALSA 输出插件"
+
+#~ msgid "Couldn't get enough memory for input buffering."
+#~ msgstr "无法获取足够的输入缓冲区内存。"
+
+#~ msgid "Error reading first page of Ogg bitstream."
+#~ msgstr "读取 Ogg 位流第一页出错。"
+
+#~ msgid "Error reading initial header packet."
+#~ msgstr "读取初始数据头包出错。"
+
+#~ msgid "Couldn't get enough memory to register new stream serial number."
+#~ msgstr "无法获取足够的内存来注册新的流序列号码。"
+
+#~ msgid "Input truncated or empty."
+#~ msgstr "输入被截断或为空。"
+
+#~ msgid "Input is not an Ogg bitstream."
+#~ msgstr "输入不是一个 Ogg 位流。"
+
+#~ msgid "Ogg bitstream does not contain Vorbis data."
+#~ msgstr "Ogg 位流不包含 Vorbis 数据。"
+
+#~ msgid "EOF before recognised stream."
+#~ msgstr "在识别的流之前遇到了文件尾(EOF)。"
+
+#~ msgid "Ogg bitstream does not contain a supported data-type."
+#~ msgstr "Ogg 位流不包含支持的数据类型。"
+
+#~ msgid "Corrupt secondary header."
+#~ msgstr "损坏的次要数据头。"
+
+#~ msgid "EOF before end of Vorbis headers."
+#~ msgstr "在 Vorbis 数据头之前遇到了文件尾(EOF)。"
+
+#~ msgid "Corrupt or missing data, continuing..."
+#~ msgstr "损坏或缺少数据，继续..."
+
+#~ msgid ""
+#~ "Error writing stream to output. Output stream may be corrupted or "
+#~ "truncated."
+#~ msgstr "将流写入输出出错。输出流可能被损坏或截断。"

deadbeef-0.5.1.tar.bz2/po/zh_TW.po -> deadbeef-0.5.2.tar.bz2/po/zh_TW.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-10 15:02+0200\n"
+"POT-Creation-Date: 2011-11-23 14:16+0100\n"
 "PO-Revision-Date: 2010-05-30 16:19+0800\n"
 "Last-Translator: Hong Jen Yee <pcman.tw@gmail.com>\n"
 "Language-Team: zh_TW <zh@li.org>\n"
@@ -18,1013 +18,1125 @@
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 
-#: ../plugins/gtkui/callbacks.c:97
+#: ../plugins/gtkui/callbacks.c:123
 msgid "Supported sound formats"
 msgstr "支援的聲音格式"
 
-#: ../plugins/gtkui/callbacks.c:108
-msgid "Other files (*)"
+#: ../plugins/gtkui/callbacks.c:134
+#, fuzzy
+msgid "All files (*)"
 msgstr "其他檔案 (*)"
 
-#: ../plugins/gtkui/callbacks.c:118
+#: ../plugins/gtkui/callbacks.c:144
 msgid "Open file(s)..."
 msgstr "開啟檔案..."
 
-#: ../plugins/gtkui/callbacks.c:151
+#: ../plugins/gtkui/callbacks.c:179
 msgid "Add file(s) to playlist..."
 msgstr "加入檔案到播放清單..."
 
-#: ../plugins/gtkui/callbacks.c:190
+#: ../plugins/gtkui/callbacks.c:220
 msgid "Add folder(s) to playlist..."
 msgstr "加入資料夾到播放清單..."
 
-#: ../plugins/gtkui/callbacks.c:192
+#: ../plugins/gtkui/callbacks.c:225
 msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:677
+#: ../plugins/gtkui/callbacks.c:711
 msgid "Failed while reading help file"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:687
+#: ../plugins/gtkui/callbacks.c:721
 msgid "Failed to load help file"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:701 ../plugins/gtkui/interface.c:1090
-#: ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/callbacks.c:736
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:737 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/converter/convgui.c:1240
+#: ../plugins/converter/convgui.c:1248
 msgid "Help"
 msgstr "說明"
 
-#: ../plugins/gtkui/callbacks.c:711
+#: ../plugins/gtkui/callbacks.c:747
 #, c-format
 msgid "About DeaDBeeF %s"
 msgstr "關於 DeaDBeeF %s"
 
-#: ../plugins/gtkui/callbacks.c:722
+#: ../plugins/gtkui/callbacks.c:760
 #, c-format
 msgid "DeaDBeeF %s ChangeLog"
 msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/ddbtabstrip.c:527
+#: ../plugins/gtkui/callbacks.c:1116
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:755 ../plugins/gtkui/trkproperties.c:618
 msgid "Edit playlist"
 msgstr "編輯播放清單"
 
-#: ../plugins/gtkui/ddbtabstrip.c:604
+#: ../plugins/gtkui/ddbtabstrip.c:758 ../plugins/gtkui/interface.c:1486
+#: ../plugins/gtkui/interface.c:2922 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/converter/interface.c:395
+msgid "Title:"
+msgstr ""
+
+#: ../plugins/gtkui/ddbtabstrip.c:814
 msgid "Rename Playlist"
 msgstr "重新命名播放清單"
 
-#: ../plugins/gtkui/ddbtabstrip.c:608
+#: ../plugins/gtkui/ddbtabstrip.c:821
 msgid "Remove Playlist"
 msgstr "移除播放清單"
 
-#: ../plugins/gtkui/ddbtabstrip.c:612
+#: ../plugins/gtkui/ddbtabstrip.c:828
 msgid "Add New Playlist"
 msgstr "新增播放清單"
 
-#: ../plugins/gtkui/eq.c:113
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "儲存 DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:120
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeaDBeeF EQ preset 檔案 (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:151
+#: ../plugins/gtkui/eq.c:182
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "載入 DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:155
+#: ../plugins/gtkui/eq.c:186
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeaDBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:214
+#: ../plugins/gtkui/eq.c:247
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "匯入 Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:218
+#: ../plugins/gtkui/eq.c:251
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:292
+#: ../plugins/gtkui/eq.c:316
+msgid "Save Preset"
+msgstr "儲存 Preset"
+
+#: ../plugins/gtkui/eq.c:324
+msgid "Load Preset"
+msgstr "載入 Preset"
+
+#: ../plugins/gtkui/eq.c:332
+msgid "Import Foobar2000 Preset"
+msgstr "載入 Foobar2000 Preset"
+
+#: ../plugins/gtkui/eq.c:357
 msgid "Enable"
 msgstr "啟用"
 
-#: ../plugins/gtkui/eq.c:300
+#: ../plugins/gtkui/eq.c:366
 msgid "Zero All"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:307
+#: ../plugins/gtkui/eq.c:373
 msgid "Zero Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:314
+#: ../plugins/gtkui/eq.c:380
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
+#: ../plugins/gtkui/eq.c:387 ../plugins/converter/interface.c:820
+#, fuzzy
+msgid "Presets"
 msgstr "儲存 Preset"
 
-#: ../plugins/gtkui/eq.c:328
-msgid "Load Preset"
-msgstr "載入 Preset"
-
-#: ../plugins/gtkui/eq.c:335
-msgid "Import Foobar2000 Preset"
-msgstr "載入 Foobar2000 Preset"
-
-#: ../plugins/gtkui/gtkui.c:133
+#: ../plugins/gtkui/gtkui.c:137
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:136
+#: ../plugins/gtkui/gtkui.c:140
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:145
+#: ../plugins/gtkui/gtkui.c:149
 #, c-format
 msgid "Stopped | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Mono"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:158
+#: ../plugins/gtkui/gtkui.c:162
 msgid "Stereo"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:183
+#: ../plugins/gtkui/gtkui.c:187
 #, c-format
 msgid "| %4d kbps "
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:189
+#: ../plugins/gtkui/gtkui.c:193
 msgid "Paused | "
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:190
+#: ../plugins/gtkui/gtkui.c:198
 #, c-format
 msgid ""
 "%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:660
+#: ../plugins/gtkui/gtkui.c:644
 msgid "Save Playlist As"
 msgstr "另存播放清單"
 
-#: ../plugins/gtkui/gtkui.c:669 ../plugins/gtkui/gtkui.c:730
+#: ../plugins/gtkui/gtkui.c:655
 msgid "DeaDBeeF playlist files (*.dbpl)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:723
+#: ../plugins/gtkui/gtkui.c:773
 msgid "Load Playlist"
 msgstr "載入播放清單"
 
-#: ../plugins/gtkui/gtkui.c:863
+#: ../plugins/gtkui/gtkui.c:788
+msgid "Other files (*)"
+msgstr "其他檔案 (*)"
+
+#: ../plugins/gtkui/gtkui.c:926 ../plugins/gtkui/fileman.c:40
 msgid "New Playlist"
 msgstr "新增播放清單"
 
-#: ../plugins/gtkui/gtkui.c:866
+#: ../plugins/gtkui/gtkui.c:929
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "新增播放清單 (%d)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/interface.c:150 ../plugins/gtkui/deadbeef.glade.h:156
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../plugins/gtkui/interface.c:145 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/interface.c:157 ../plugins/gtkui/deadbeef.glade.h:163
 msgid "_Open file(s)"
 msgstr "開啟檔案(_O)"
 
-#: ../plugins/gtkui/interface.c:161 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/interface.c:173 ../plugins/gtkui/deadbeef.glade.h:6
 msgid "Add file(s)"
 msgstr "加入檔案"
 
-#: ../plugins/gtkui/interface.c:169 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/interface.c:181 ../plugins/gtkui/deadbeef.glade.h:8
 msgid "Add folder(s)"
 msgstr "加入資料夾"
 
-#: ../plugins/gtkui/interface.c:177 ../plugins/gtkui/interface.c:2969
+#: ../plugins/gtkui/interface.c:189 ../plugins/gtkui/interface.c:3022
 #: ../plugins/gtkui/deadbeef.glade.h:9
 msgid "Add location"
 msgstr "加入位址"
 
-#: ../plugins/gtkui/interface.c:186 ../plugins/gtkui/deadbeef.glade.h:83
+#: ../plugins/gtkui/interface.c:198 ../plugins/gtkui/deadbeef.glade.h:80
 msgid "New playlist"
 msgstr "新播放清單"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:75
+#: ../plugins/gtkui/interface.c:205 ../plugins/gtkui/deadbeef.glade.h:72
 msgid "Load playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:197 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/interface.c:209 ../plugins/gtkui/deadbeef.glade.h:110
 msgid "Save playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Save playlist as"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:210 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/interface.c:218 ../plugins/gtkui/deadbeef.glade.h:165
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: ../plugins/gtkui/interface.c:221 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/interface.c:229 ../plugins/gtkui/deadbeef.glade.h:155
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:153
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/interface.c:244 ../plugins/gtkui/deadbeef.glade.h:115
 msgid "Select all"
 msgstr "全選"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:32
 msgid "Deselect all"
 msgstr "全部取消選取"
 
-#: ../plugins/gtkui/interface.c:250 ../plugins/gtkui/deadbeef.glade.h:70
+#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/deadbeef.glade.h:55
 msgid "Invert selection"
 msgstr "反向選取"
 
-#: ../plugins/gtkui/interface.c:254 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:118
 msgid "Selection"
 msgstr "選取"
 
-#: ../plugins/gtkui/interface.c:261 ../plugins/gtkui/plcommon.c:425
-#: ../plugins/gtkui/prefwin.c:317 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/plcommon.c:468
+#: ../plugins/gtkui/prefwin.c:323 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/converter/interface.c:645
 msgid "Remove"
 msgstr "移除"
 
-#: ../plugins/gtkui/interface.c:269 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:277 ../plugins/gtkui/deadbeef.glade.h:24
 msgid "Crop"
 msgstr "剪裁"
 
-#: ../plugins/gtkui/interface.c:273 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/interface.c:281 ../plugins/gtkui/deadbeef.glade.h:157
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: ../plugins/gtkui/interface.c:285 ../plugins/gtkui/interface.c:1705
-#: ../plugins/gtkui/deadbeef.glade.h:97
+#: ../plugins/gtkui/interface.c:288 ../plugins/gtkui/deadbeef.glade.h:122
+msgid "Sort By"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/interface.c:1516
+#: ../plugins/gtkui/mainplaylist.c:318 ../plugins/gtkui/prefwin.c:626
+#: ../plugins/gtkui/search.c:393 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/converter/convgui.c:790 ../plugins/converter/convgui.c:1211
+#: ../plugins/converter/interface.c:622
+msgid "Title"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:299 ../plugins/gtkui/deadbeef.glade.h:140
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:303 ../plugins/gtkui/interface.c:1515
+#: ../plugins/gtkui/interface.c:1875 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../translation/extra.c:69
+msgid "Album"
+msgstr ""
+
+#. Track properties dialog
+#: ../plugins/gtkui/interface.c:307 ../plugins/gtkui/interface.c:1514
+#: ../plugins/gtkui/plcommon.c:1013 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../translation/extra.c:65
+msgid "Artist"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:311 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../translation/extra.c:70
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:315 ../plugins/gtkui/interface.c:1520
+#: ../plugins/gtkui/plcommon.c:1017 ../plugins/gtkui/deadbeef.glade.h:27
+msgid "Custom"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:324 ../plugins/gtkui/interface.c:1804
+#: ../plugins/gtkui/deadbeef.glade.h:95
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../plugins/gtkui/interface.c:289 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:167
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../plugins/gtkui/interface.c:296 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/interface.c:335 ../plugins/gtkui/deadbeef.glade.h:125
 msgid "Status bar"
 msgstr "狀態列"
 
-#: ../plugins/gtkui/interface.c:300 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/interface.c:339 ../plugins/gtkui/deadbeef.glade.h:21
 msgid "Column headers"
 msgstr "標題欄"
 
-#: ../plugins/gtkui/interface.c:304 ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/interface.c:343 ../plugins/gtkui/deadbeef.glade.h:132
 msgid "Tabs"
 msgstr "分頁"
 
-#: ../plugins/gtkui/interface.c:308 ../plugins/gtkui/deadbeef.glade.h:33
+#: ../plugins/gtkui/interface.c:347 ../plugins/gtkui/deadbeef.glade.h:40
 msgid "Equalizer"
 msgstr "等化器"
 
-#: ../plugins/gtkui/interface.c:312 ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:164
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:319 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/interface.c:358 ../plugins/gtkui/interface.c:3298
+#: ../plugins/gtkui/deadbeef.glade.h:83
 msgid "Order"
 msgstr "順序"
 
-#: ../plugins/gtkui/interface.c:326 ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:71
 msgid "Linear"
 msgstr "線性"
 
-#: ../plugins/gtkui/interface.c:332 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "Shuffle"
+#: ../plugins/gtkui/interface.c:370 ../plugins/gtkui/deadbeef.glade.h:121
+#, fuzzy
+msgid "Shuffle tracks"
+msgstr "洗牌"
+
+#: ../plugins/gtkui/interface.c:375 ../plugins/gtkui/deadbeef.glade.h:120
+#, fuzzy
+msgid "Shuffle albums"
 msgstr "洗牌"
 
-#: ../plugins/gtkui/interface.c:338 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/interface.c:380 ../plugins/gtkui/deadbeef.glade.h:104
 msgid "Random"
 msgstr "隨機"
 
-#: ../plugins/gtkui/interface.c:344 ../plugins/gtkui/deadbeef.glade.h:78
+#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:75
 msgid "Looping"
 msgstr "重複"
 
-#: ../plugins/gtkui/interface.c:351 ../plugins/gtkui/deadbeef.glade.h:76
+#: ../plugins/gtkui/interface.c:393 ../plugins/gtkui/deadbeef.glade.h:73
 msgid "Loop All"
 msgstr "重複全部"
 
-#: ../plugins/gtkui/interface.c:357 ../plugins/gtkui/deadbeef.glade.h:77
+#: ../plugins/gtkui/interface.c:398 ../plugins/gtkui/deadbeef.glade.h:74
 msgid "Loop Single Song"
 msgstr "重複單一曲目"
 
-#: ../plugins/gtkui/interface.c:363 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/deadbeef.glade.h:36
 msgid "Don't Loop"
 msgstr "不要重複播放"
 
-#: ../plugins/gtkui/interface.c:369 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/interface.c:409 ../plugins/gtkui/deadbeef.glade.h:111
 msgid "Scroll follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:374 ../plugins/gtkui/deadbeef.glade.h:22
+#: ../plugins/gtkui/interface.c:414 ../plugins/gtkui/deadbeef.glade.h:26
 msgid "Cursor follows playback"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:378 ../plugins/gtkui/deadbeef.glade.h:125
+#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:127
 msgid "Stop after current"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:385 ../plugins/gtkui/interface.c:392
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/interface.c:430 ../plugins/gtkui/deadbeef.glade.h:67
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:437 ../plugins/gtkui/interface.c:444
+#: ../plugins/gtkui/deadbeef.glade.h:159
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: ../plugins/gtkui/interface.c:400 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/interface.c:452 ../plugins/gtkui/deadbeef.glade.h:152
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:422 ../plugins/gtkui/deadbeef.glade.h:146
+#: ../plugins/gtkui/interface.c:461 ../plugins/gtkui/deadbeef.glade.h:158
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:465 ../plugins/gtkui/deadbeef.glade.h:160
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:474 ../plugins/gtkui/deadbeef.glade.h:149
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/interface.c:482 ../plugins/gtkui/deadbeef.glade.h:166
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:898 ../plugins/gtkui/deadbeef.glade.h:112
 msgid "Search"
 msgstr "搜尋"
 
-#: ../plugins/gtkui/interface.c:876 ../plugins/gtkui/deadbeef.glade.h:124
+#: ../plugins/gtkui/interface.c:973 ../plugins/gtkui/deadbeef.glade.h:126
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:884 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/interface.c:981 ../plugins/gtkui/deadbeef.glade.h:89
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:892 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/interface.c:989 ../plugins/gtkui/deadbeef.glade.h:88
 msgid "Pause"
 msgstr "暫停"
 
-#: ../plugins/gtkui/interface.c:900 ../plugins/gtkui/deadbeef.glade.h:98
+#: ../plugins/gtkui/interface.c:997 ../plugins/gtkui/deadbeef.glade.h:96
 msgid "Previous"
 msgstr "上一個"
 
-#: ../plugins/gtkui/interface.c:908 ../plugins/gtkui/deadbeef.glade.h:84
+#: ../plugins/gtkui/interface.c:1005 ../plugins/gtkui/deadbeef.glade.h:81
 msgid "Next"
 msgstr "下一首"
 
-#: ../plugins/gtkui/interface.c:916 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/interface.c:1013 ../plugins/gtkui/deadbeef.glade.h:90
 msgid "Play Random"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:925 ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/interface.c:1022 ../plugins/gtkui/deadbeef.glade.h:5
 msgid "About"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:938 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/interface.c:1035 ../plugins/gtkui/deadbeef.glade.h:103
 msgid "Quit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1010 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "Adding files..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1054 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "_Abort"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1155 ../plugins/gtkui/deadbeef.glade.h:136
+#: ../plugins/gtkui/interface.c:1225 ../plugins/gtkui/deadbeef.glade.h:139
 msgid "Track Properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1179 ../plugins/gtkui/deadbeef.glade.h:3
-msgid ""
-"WARNING: tag writing feature is still in development.\n"
-"Make backup copies before using."
+#: ../plugins/gtkui/interface.c:1270 ../plugins/gtkui/deadbeef.glade.h:119
+msgid "Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1206 ../plugins/gtkui/deadbeef.glade.h:147
+#: ../plugins/gtkui/interface.c:1296 ../plugins/gtkui/deadbeef.glade.h:150
 msgid "_Apply"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1227 ../plugins/gtkui/interface.c:1273
-#: ../plugins/gtkui/interface.c:2497 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/interface.c:1317 ../plugins/gtkui/interface.c:1363
+#: ../plugins/gtkui/deadbeef.glade.h:154
 msgid "_Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1231 ../plugins/gtkui/deadbeef.glade.h:79
+#: ../plugins/gtkui/interface.c:1321 ../plugins/gtkui/deadbeef.glade.h:76
 msgid "Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1277 ../plugins/gtkui/plcommon.c:503
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/interface.c:1367 ../plugins/gtkui/plcommon.c:618
+#: ../plugins/gtkui/deadbeef.glade.h:97
 msgid "Properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1363 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "editcolumndlg"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1378 ../plugins/gtkui/interface.c:2869
-#: ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Title:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1386 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/deadbeef.glade.h:39
 msgid "Enter new column title here"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1394 ../plugins/gtkui/deadbeef.glade.h:137
+#: ../plugins/gtkui/interface.c:1502 ../plugins/gtkui/deadbeef.glade.h:141
 msgid "Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1402
-msgid "File number"
+#: ../plugins/gtkui/interface.c:1510
+msgid "Item Index"
 msgstr ""
 
 #. create default set of columns
-#: ../plugins/gtkui/interface.c:1403 ../plugins/gtkui/mainplaylist.c:300
+#: ../plugins/gtkui/interface.c:1511 ../plugins/gtkui/mainplaylist.c:315
 msgid "Playing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1404
+#: ../plugins/gtkui/interface.c:1512
 msgid "Album Art"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1405
+#: ../plugins/gtkui/interface.c:1513
 msgid "Artist - Album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1406 ../plugins/gtkui/plcommon.c:877
-msgid "Artist"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1407 ../plugins/gtkui/interface.c:1794
-msgid "Album"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1408 ../plugins/gtkui/prefwin.c:595
-msgid "Title"
+#: ../plugins/gtkui/interface.c:1517 ../plugins/gtkui/mainplaylist.c:319
+#: ../plugins/gtkui/search.c:394
+msgid "Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1409
-msgid "Length"
+#: ../plugins/gtkui/interface.c:1518 ../translation/extra.c:71
+msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1410 ../plugins/gtkui/interface.c:1793
-msgid "Track"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1411
+#: ../plugins/gtkui/interface.c:1519 ../translation/extra.c:68
 msgid "Band / Album Artist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1412 ../plugins/gtkui/plcommon.c:881
-msgid "Custom"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1418 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/interface.c:1526 ../plugins/gtkui/interface.c:3150
+#: ../plugins/gtkui/deadbeef.glade.h:44
 msgid "Format:"
 msgstr "格式:"
 
-#: ../plugins/gtkui/interface.c:1433 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/interface.c:1551 ../plugins/gtkui/deadbeef.glade.h:11
 msgid "Alignment:"
 msgstr "對齊:"
 
-#: ../plugins/gtkui/interface.c:1441
+#: ../plugins/gtkui/interface.c:1559
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/gtkui/interface.c:1442
+#: ../plugins/gtkui/interface.c:1560
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/gtkui/interface.c:1444 ../plugins/gtkui/deadbeef.glade.h:48
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [F]ullPathname, [T]ags,\n"
-" [d]irectory, [D]irectoryWithPath\n"
-"Example: %a - %t [%l]"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1473 ../plugins/gtkui/interface.c:2900
-#: ../plugins/gtkui/interface.c:3012 ../plugins/gtkui/interface.c:3135
-#: ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/interface.c:1583 ../plugins/gtkui/interface.c:2953
+#: ../plugins/gtkui/interface.c:3065 ../plugins/gtkui/interface.c:3191
+#: ../plugins/gtkui/deadbeef.glade.h:151
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../plugins/gtkui/interface.c:1494 ../plugins/gtkui/interface.c:2921
-#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/interface.c:3156
-#: ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/interface.c:1604 ../plugins/gtkui/interface.c:2974
+#: ../plugins/gtkui/interface.c:3086 ../plugins/gtkui/interface.c:3212
+#: ../plugins/gtkui/deadbeef.glade.h:162
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../plugins/gtkui/interface.c:1725 ../plugins/gtkui/deadbeef.glade.h:88
+#: ../plugins/gtkui/interface.c:1825 ../plugins/gtkui/deadbeef.glade.h:85
 msgid "Output plugin:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1738 ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:84
 msgid "Output device:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1747 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Sound"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1756 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Allow dynamic samplerate switching"
+#: ../plugins/gtkui/interface.c:1847 ../plugins/gtkui/deadbeef.glade.h:12
+msgid "Always convert 8 bit audio to 16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1764 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "Samplerate conversion quality:"
+#: ../plugins/gtkui/interface.c:1851 ../plugins/gtkui/deadbeef.glade.h:124
+msgid "Sound"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1783 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:106
 msgid "Replaygain mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1792
+#: ../plugins/gtkui/interface.c:1873
 msgid "Disable"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1796 ../plugins/gtkui/deadbeef.glade.h:109
+#: ../plugins/gtkui/interface.c:1874
+msgid "Track"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1877 ../plugins/gtkui/deadbeef.glade.h:107
 msgid "Replaygain peak scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1804 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/interface.c:1892 ../plugins/gtkui/interface.c:1926
+#: ../plugins/gtkui/deadbeef.glade.h:2
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1902 ../plugins/gtkui/interface.c:1936
+#: ../plugins/gtkui/deadbeef.glade.h:1
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1906 ../plugins/gtkui/deadbeef.glade.h:108
+msgid "Replaygain preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1913 ../plugins/gtkui/deadbeef.glade.h:47
+msgid "Global preamp:"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1944 ../plugins/gtkui/deadbeef.glade.h:7
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1813 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/interface.c:1953 ../plugins/gtkui/deadbeef.glade.h:109
 msgid "Resume previous session on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1817 ../plugins/gtkui/deadbeef.glade.h:94
+#: ../plugins/gtkui/interface.c:1957 ../plugins/gtkui/deadbeef.glade.h:37
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1961 ../plugins/gtkui/deadbeef.glade.h:91
 #, fuzzy
 msgid "Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:1826 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:1982 ../plugins/gtkui/interface.c:2514
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/converter/interface.c:649
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2017 ../plugins/gtkui/deadbeef.glade.h:29
+#, fuzzy
+msgid "DSP Chain Preset"
+msgstr "儲存 Preset"
+
+#: ../plugins/gtkui/interface.c:2029 ../plugins/gtkui/deadbeef.glade.h:161
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2033 ../plugins/gtkui/deadbeef.glade.h:28
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2042 ../plugins/gtkui/deadbeef.glade.h:19
 msgid "Close minimizes to tray"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1830 ../plugins/gtkui/deadbeef.glade.h:81
+#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:78
 msgid "Middle mouse button closes playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1834 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/interface.c:2050 ../plugins/gtkui/deadbeef.glade.h:51
 msgid "Hide system tray icon"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1838 ../plugins/gtkui/deadbeef.glade.h:139
+#: ../plugins/gtkui/interface.c:2054 ../plugins/gtkui/deadbeef.glade.h:143
 msgid "Use bold font for currently playing track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1842 ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/interface.c:2058 ../plugins/gtkui/deadbeef.glade.h:50
 msgid "Hide \"Delete from disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1850 ../plugins/gtkui/deadbeef.glade.h:134
+#: ../plugins/gtkui/interface.c:2062 ../plugins/gtkui/deadbeef.glade.h:16
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:54
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2084 ../plugins/gtkui/deadbeef.glade.h:137
 msgid "Titlebar text while playing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1864 ../plugins/gtkui/deadbeef.glade.h:135
+#: ../plugins/gtkui/interface.c:2098 ../plugins/gtkui/deadbeef.glade.h:138
 msgid "Titlebar text while stopped:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/interface.c:2112 ../plugins/gtkui/deadbeef.glade.h:46
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2120 ../plugins/gtkui/deadbeef.glade.h:45
 msgid "GUI"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1888 ../plugins/gtkui/interface.c:1932
-#: ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/interface.c:2135 ../plugins/gtkui/interface.c:2179
+#: ../plugins/gtkui/deadbeef.glade.h:86
 msgid "Override"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1897 ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/interface.c:2144 ../plugins/gtkui/deadbeef.glade.h:42
 msgid "Foreground"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1904 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/interface.c:2151 ../plugins/gtkui/deadbeef.glade.h:17
 msgid "Background"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1923 ../plugins/gtkui/deadbeef.glade.h:116
+#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:113
 msgid "Seekbar/Volumebar colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1941 ../plugins/gtkui/deadbeef.glade.h:80
+#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:77
 msgid "Middle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1948 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/interface.c:2195 ../plugins/gtkui/deadbeef.glade.h:70
 msgid "Light"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../plugins/gtkui/interface.c:2202 ../plugins/gtkui/deadbeef.glade.h:30
 msgid "Dark"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1986 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/interface.c:2233 ../plugins/gtkui/deadbeef.glade.h:18
 msgid "Base"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1993 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/interface.c:2297
+#: ../plugins/gtkui/deadbeef.glade.h:134
+msgid "Text"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2253 ../plugins/gtkui/deadbeef.glade.h:131
 msgid "Tab strip colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2002 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:87
 msgid "Override (looses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2011 ../plugins/gtkui/deadbeef.glade.h:34
+#: ../plugins/gtkui/interface.c:2271 ../plugins/gtkui/deadbeef.glade.h:41
 msgid "Even row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2018 ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/interface.c:2278 ../plugins/gtkui/deadbeef.glade.h:82
 msgid "Odd row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2037 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Text"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:2044 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/interface.c:2304 ../plugins/gtkui/deadbeef.glade.h:116
 msgid "Selected row"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2063 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/interface.c:2323 ../plugins/gtkui/deadbeef.glade.h:117
 msgid "Selected text"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2076 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/interface.c:2336 ../plugins/gtkui/deadbeef.glade.h:25
 msgid "Cursor"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2089 ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/interface.c:2349 ../plugins/gtkui/deadbeef.glade.h:92
 msgid "Playlist colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2093 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/interface.c:2353 ../plugins/gtkui/deadbeef.glade.h:20
 msgid "Colors"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2102 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/interface.c:2362 ../plugins/gtkui/deadbeef.glade.h:38
 msgid "Enable Proxy Server"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2110 ../plugins/gtkui/deadbeef.glade.h:101
+#: ../plugins/gtkui/interface.c:2370 ../plugins/gtkui/deadbeef.glade.h:99
 msgid "Proxy Server Address:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2124 ../plugins/gtkui/deadbeef.glade.h:102
+#: ../plugins/gtkui/interface.c:2384 ../plugins/gtkui/deadbeef.glade.h:100
 msgid "Proxy Server Port:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2138 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/interface.c:2398 ../plugins/gtkui/deadbeef.glade.h:101
 msgid "Proxy Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2157 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/interface.c:2417 ../plugins/gtkui/deadbeef.glade.h:102
 msgid "Proxy Username:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2170 ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/interface.c:2430 ../plugins/gtkui/deadbeef.glade.h:98
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2180 ../plugins/gtkui/deadbeef.glade.h:82
+#: ../plugins/gtkui/interface.c:2440 ../plugins/gtkui/deadbeef.glade.h:79
 msgid "Network"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2208 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Write ID3v2"
+#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:144
+msgid "Version: "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2212 ../plugins/gtkui/interface.c:2339
-#: ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Write ID3v1"
+#: ../plugins/gtkui/interface.c:2535 ../plugins/gtkui/deadbeef.glade.h:23
+#: ../translation/extra.c:78
+msgid "Copyright"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2216 ../plugins/gtkui/interface.c:2295
-#: ../plugins/gtkui/interface.c:2335 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Write APEv2"
+#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:94
+msgid "Plugins"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2224 ../plugins/gtkui/interface.c:2303
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Strip ID3v2"
+#: ../plugins/gtkui/interface.c:3033 ../plugins/gtkui/deadbeef.glade.h:142
+msgid "URL:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2228 ../plugins/gtkui/interface.c:2351
-#: ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Strip ID3v1"
+#: ../plugins/gtkui/interface.c:3135 ../plugins/gtkui/deadbeef.glade.h:48
+msgid "Group By"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2232 ../plugins/gtkui/interface.c:2307
-#: ../plugins/gtkui/interface.c:2347 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Strip APEv2"
+#: ../plugins/gtkui/interface.c:3259 ../plugins/gtkui/deadbeef.glade.h:123
+msgid "Sort by..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2240 ../plugins/gtkui/deadbeef.glade.h:69
-msgid "ID3v2 version"
-msgstr ""
+#: ../plugins/gtkui/interface.c:3275 ../plugins/gtkui/deadbeef.glade.h:43
+#, fuzzy
+msgid "Format"
+msgstr "格式:"
 
-#: ../plugins/gtkui/interface.c:2247
-msgid "2.3 (Recommended)"
+#: ../plugins/gtkui/interface.c:3305
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2248
-msgid "2.4"
+#: ../plugins/gtkui/interface.c:3306
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2254 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/gtkui/interface.c:3359 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/converter/interface.c:750
+#, fuzzy
+msgid "Select DSP Plugin"
+msgstr "選取"
+
+#: ../plugins/gtkui/interface.c:3375 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/converter/convgui.c:1016 ../plugins/converter/interface.c:766
+#: ../plugins/gtkui/dspconfig.c:139
+msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2291 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Write ID3v2.4"
+#: ../plugins/gtkui/interface.c:3461 ../plugins/gtkui/deadbeef.glade.h:133
+msgid "Tag Writer Settings"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2360 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Tag writer"
+#: ../plugins/gtkui/interface.c:3492 ../plugins/gtkui/deadbeef.glade.h:147
+msgid "Write ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:24
-msgid "Description:"
+#: ../plugins/gtkui/interface.c:3496 ../plugins/gtkui/interface.c:3623
+#: ../plugins/gtkui/deadbeef.glade.h:146
+msgid "Write ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2406 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Author(s):"
+#: ../plugins/gtkui/interface.c:3500 ../plugins/gtkui/interface.c:3579
+#: ../plugins/gtkui/interface.c:3619 ../plugins/gtkui/deadbeef.glade.h:145
+msgid "Write APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2421 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Email:"
+#: ../plugins/gtkui/interface.c:3508 ../plugins/gtkui/interface.c:3587
+#: ../plugins/gtkui/deadbeef.glade.h:130
+msgid "Strip ID3v2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2436 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Website:"
+#: ../plugins/gtkui/interface.c:3512 ../plugins/gtkui/interface.c:3635
+#: ../plugins/gtkui/deadbeef.glade.h:129
+msgid "Strip ID3v1"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2467 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Configure"
+#: ../plugins/gtkui/interface.c:3516 ../plugins/gtkui/interface.c:3591
+#: ../plugins/gtkui/interface.c:3631 ../plugins/gtkui/deadbeef.glade.h:128
+msgid "Strip APEv2"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2471 ../plugins/gtkui/deadbeef.glade.h:96
-msgid "Plugins"
+#: ../plugins/gtkui/interface.c:3524 ../plugins/gtkui/deadbeef.glade.h:53
+msgid "ID3v2 version"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2853 ../plugins/gtkui/deadbeef.glade.h:162
-msgid "editplaylistdlg"
+#: ../plugins/gtkui/interface.c:3531
+msgid "2.3 (Recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2980 ../plugins/gtkui/deadbeef.glade.h:138
-msgid "URL:"
+#: ../plugins/gtkui/interface.c:3532
+msgid "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3081 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Group By"
+#: ../plugins/gtkui/interface.c:3538 ../plugins/gtkui/deadbeef.glade.h:52
+msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3106 ../plugins/gtkui/deadbeef.glade.h:56
-#, no-c-format
-msgid ""
-"Format conversions (start with %):\n"
-" [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n"
-" track[n]umber, [N]totaltracks,\n"
-" [l]ength, [y]ear, [g]enre, [c]omment,\n"
-" copy[r]ight, [f]ilename, [T]ags\n"
-"Example: %a - %t [%l]"
+#: ../plugins/gtkui/interface.c:3575 ../plugins/gtkui/deadbeef.glade.h:148
+msgid "Write ID3v2.4"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:301 ../plugins/gtkui/search.c:434
+#: ../plugins/gtkui/mainplaylist.c:316 ../plugins/gtkui/search.c:391
 msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:302 ../plugins/gtkui/search.c:435
+#: ../plugins/gtkui/mainplaylist.c:317 ../plugins/gtkui/search.c:392
 msgid "Track No"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:303 ../plugins/gtkui/search.c:436
-msgid "Title / Track Artist"
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:304 ../plugins/gtkui/search.c:437
-#: ../plugins/gtkui/trkproperties.c:175
-msgid "Duration"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:323
+#: ../plugins/gtkui/plcommon.c:338
 msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:324
+#: ../plugins/gtkui/plcommon.c:339
 msgid ""
 "Files will be lost. Proceed?\n"
 "(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:325 ../plugins/gtkui/trkproperties.c:56
+#: ../plugins/gtkui/plcommon.c:340 ../plugins/gtkui/trkproperties.c:162
+#: ../plugins/gtkui/trkproperties.c:693 ../plugins/converter/convgui.c:759
+#: ../plugins/converter/convgui.c:1136
 msgid "Warning"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:401
+#: ../plugins/gtkui/plcommon.c:444
 msgid "Add to playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:406
+#: ../plugins/gtkui/plcommon.c:449
 msgid "Remove from playback queue"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:414
+#: ../plugins/gtkui/plcommon.c:457
 msgid "Reload metadata"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:433
+#: ../plugins/gtkui/plcommon.c:476
 msgid "Remove from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:719 ../plugins/gtkui/plcommon.c:844
+#: ../plugins/gtkui/plcommon.c:855 ../plugins/gtkui/plcommon.c:980
 msgid "Add column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:749 ../plugins/gtkui/plcommon.c:848
+#: ../plugins/gtkui/plcommon.c:885 ../plugins/gtkui/plcommon.c:984
 msgid "Edit column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:852
+#: ../plugins/gtkui/plcommon.c:988
 msgid "Remove column"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:862
+#: ../plugins/gtkui/plcommon.c:998
 msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:869
+#: ../plugins/gtkui/plcommon.c:1005
 msgid "None"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:873
+#: ../plugins/gtkui/plcommon.c:1009
 msgid "Artist/Date/Album"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:41
+#: ../plugins/gtkui/pluginconf.c:42
 msgid "Open file..."
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:142
+#: ../plugins/gtkui/pluginconf.c:217
 #, c-format
-msgid "Setup %s"
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:98
+#: ../plugins/gtkui/prefwin.c:82
 msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:312
+#: ../plugins/gtkui/prefwin.c:318 ../plugins/converter/interface.c:641
 msgid "Add"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:322
+#: ../plugins/gtkui/prefwin.c:328
 msgid "Global Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:384
+#: ../plugins/gtkui/prefwin.c:390
 msgid "Slot"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:385
+#: ../plugins/gtkui/prefwin.c:391
 msgid "Key combination"
 msgstr ""
 
-#. output plugin selection
-#: ../plugins/gtkui/prefwin.c:464 ../plugins/gtkui/prefwin.c:676
-#: ../plugins.c:872
-msgid "ALSA output plugin"
+#: ../plugins/gtkui/progress.c:56
+msgid "Adding files..."
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:64
+#: ../plugins/gtkui/progress.c:90
 msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:53
+#: ../plugins/gtkui/trkproperties.c:159
 msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:55
+#: ../plugins/gtkui/trkproperties.c:161
 msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:178
-msgid "Tag Type(s)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:254
+msgid "[Multiple values] "
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Embedded Cuesheet"
+#: ../plugins/gtkui/trkproperties.c:407 ../plugins/gtkui/trkproperties.c:419
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "Yes"
+#: ../plugins/gtkui/trkproperties.c:408 ../plugins/gtkui/trkproperties.c:420
+msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:180
-msgid "No"
+#: ../plugins/gtkui/trkproperties.c:594
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:182
-msgid "Codec"
+#: ../plugins/gtkui/trkproperties.c:621
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:250 ../plugins/gtkui/trkproperties.c:262
-msgid "Key"
+#: ../plugins/gtkui/trkproperties.c:633
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:251 ../plugins/gtkui/trkproperties.c:263
-msgid "Value"
+#: ../plugins/gtkui/trkproperties.c:634 ../plugins/gtkui/trkproperties.c:668
+msgid "Cannot add field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:667
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/notify/notify.c:138
-msgid "DeaDBeeF now playing"
+#: ../plugins/gtkui/trkproperties.c:692
+msgid "Really remove selected field?"
 msgstr ""
 
-#: ../main.c:89
+#: ../plugins/gtkui/trkproperties.c:734
+#, fuzzy
+msgid "Add field"
+msgstr "加入檔案"
+
+#: ../plugins/gtkui/trkproperties.c:737
+#, fuzzy
+msgid "Remove field"
+msgstr "移除"
+
+#: ../main.c:91
 #, c-format
 msgid "Usage: deadbeef [options] [file(s)]\n"
 msgstr ""
 
-#: ../main.c:90
+#: ../main.c:92
 #, c-format
 msgid "Options:\n"
 msgstr ""
 
-#: ../main.c:91
+#: ../main.c:93
 #, c-format
 msgid " --help or -h Print help (this message) and exit\n"
 msgstr ""
 
-#: ../main.c:92
+#: ../main.c:94
 #, c-format
 msgid " --quit Quit player\n"
 msgstr ""
 
-#: ../main.c:93
+#: ../main.c:95
 #, c-format
 msgid " --version Print version info and exit\n"
 msgstr ""
 
-#: ../main.c:94
+#: ../main.c:96
 #, c-format
 msgid " --play Start playback\n"
 msgstr ""
 
-#: ../main.c:95
+#: ../main.c:97
 #, c-format
 msgid " --stop Stop playback\n"
 msgstr ""
 
-#: ../main.c:96
+#: ../main.c:98
 #, c-format
 msgid " --pause Pause playback\n"
 msgstr ""
 
-#: ../main.c:97
+#: ../main.c:99
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../main.c:100
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../main.c:101
 #, c-format
 msgid " --next Next song in playlist\n"
 msgstr ""
 
-#: ../main.c:98
+#: ../main.c:102
 #, c-format
 msgid " --prev Previous song in playlist\n"
 msgstr ""
 
-#: ../main.c:99
+#: ../main.c:103
 #, c-format
 msgid " --random Random song in playlist\n"
 msgstr ""
 
-#: ../main.c:100
+#: ../main.c:104
 #, c-format
 msgid " --queue Append file(s) to existing playlist\n"
 msgstr ""
 
-#: ../main.c:101
+#: ../main.c:105
 #, c-format
 msgid " --nowplaying FMT Print formatted track name to stdout\n"
 msgstr ""
 
-#: ../main.c:102
+#: ../main.c:106
 #, c-format
 msgid ""
 " FMT %%-syntax: [a]rtist, [t]itle, al[b]um,\n"
@@ -1032,115 +1144,597 @@
 " copy[r]ight, [e]lapsed\n"
 msgstr ""
 
-#: ../main.c:105
+#: ../main.c:109
 #, c-format
 msgid ""
 " e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
 "- title\"\n"
 msgstr ""
 
-#: ../playlist.c:377 ../playlist.c:2289
+#: ../main.c:110
+#, c-format
+msgid ""
+" for more info, see http://sourceforge.net/apps/"
+"mediawiki/deadbeef/index.php?title=Title_Formatting\n"
+msgstr ""
+
+#: ../playlist.c:454 ../playlist.c:2398
 msgid "Default"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:1
+#: ../playlist.c:3664
+msgid "Yes"
+msgstr ""
+
+#: ../playlist.c:3664
+msgid "No"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:3
 msgid ""
 "2.3 (Recommended)\n"
 "2.4"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:14
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33
 msgid ""
 "Disable\n"
 "Track\n"
 "Album"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:35
+#: ../plugins/gtkui/deadbeef.glade.h:56
 msgid ""
-"File number\n"
+"Item Index\n"
 "Playing\n"
 "Album Art\n"
 "Artist - Album\n"
 "Artist\n"
 "Album\n"
 "Title\n"
-"Length\n"
-"Track\n"
+"Duration\n"
+"Track Number\n"
 "Band / Album Artist\n"
 "Custom"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:71
+#: ../plugins/gtkui/deadbeef.glade.h:68
 msgid ""
 "Left\n"
 "Right"
 msgstr ""
 
 #: ../plugins/gtkui/support.c:90 ../plugins/gtkui/support.c:114
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:129 ../plugins/vorbis/vcedit.c:155
-msgid "Couldn't get enough memory for input buffering."
+#: ../plugins/wildmidi/wildmidiplug.c:162
+#, c-format
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
+
+#. this file should list extra translatable strings that are not referenced
+#. directly in source code, e.g. scripted plugin configuration strings
+#: ../translation/extra.c:3
+msgid "Add Audio CD"
+msgstr "加入音樂 CD"
+
+#: ../translation/extra.c:4
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#. ALSA output plugin
+#: ../translation/extra.c:6
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/extra.c:7
+msgid "Release device while stopped"
+msgstr ""
+
+#: ../translation/extra.c:8 ../translation/extra.c:51
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/extra.c:9
+msgid "Preferred period size"
+msgstr ""
+
+#. Last.fm plugin
+#: ../translation/extra.c:11
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/extra.c:12
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/extra.c:13
+msgid "Username"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Password"
+msgstr ""
+
+#: ../translation/extra.c:15
+msgid "Scrobble URL"
+msgstr ""
+
+#. OSS output plugin
+#: ../translation/extra.c:17
+msgid "Device file"
+msgstr ""
+
+#: ../translation/extra.c:18
+msgid "OSS4 samplerate bug workaround"
+msgstr ""
+
+#. Album Artwork plugin
+#: ../translation/extra.c:20
+msgid "Cache update period (hr)"
+msgstr ""
+
+#: ../translation/extra.c:21
+msgid "Fetch from embedded tags"
+msgstr ""
+
+#: ../translation/extra.c:22
+msgid "Fetch from local folder"
+msgstr ""
+
+#: ../translation/extra.c:23
+msgid "Local cover file mask"
+msgstr ""
+
+#: ../translation/extra.c:24
+msgid "Fetch from last.fm"
+msgstr ""
+
+#: ../translation/extra.c:25
+msgid "Fetch from albumart.org"
+msgstr ""
+
+#: ../translation/extra.c:26
+msgid "Scale artwork towards longer side"
+msgstr ""
+
+#. Audio CD player
+#: ../translation/extra.c:28
+msgid "Use CDDB/FreeDB"
+msgstr ""
+
+#: ../translation/extra.c:29
+msgid "Prefer CD-Text over CDDB"
+msgstr ""
+
+#: ../translation/extra.c:30
+msgid "CDDB url (e.g. 'freedb.org')"
+msgstr ""
+
+#: ../translation/extra.c:31
+msgid "CDDB port number (e.g. '888')"
+msgstr ""
+
+#: ../translation/extra.c:32
+msgid "Prefer CDDB protocol over HTTP"
+msgstr ""
+
+#: ../translation/extra.c:33
+msgid "Enable NRG image support"
+msgstr ""
+
+#. DUMB module player plugin
+#: ../translation/extra.c:35
+msgid "Resampling quality (0..2, higher is better)"
+msgstr ""
+
+#. Game_Music_Emu decoder plugin
+#: ../translation/extra.c:37
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#. Standard GTK2 user interface plugin
+#: ../translation/extra.c:39
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/extra.c:40
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/extra.c:41
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/extra.c:42
+msgid "Run gtk_init with --sync (debug mode)"
+msgstr ""
+
+#: ../translation/extra.c:43
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#. OSD Notify plugin
+#: ../translation/extra.c:45
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/extra.c:46
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/extra.c:47
+msgid "Show album art"
+msgstr ""
+
+#: ../translation/extra.c:48
+msgid "Album art size (px)"
+msgstr ""
+
+#. PulseAudio output plugin
+#: ../translation/extra.c:50
+msgid "PulseAudio server"
+msgstr ""
+
+#: ../translation/extra.c:52
+msgid "Samplerate"
+msgstr ""
+
+#. SHN player plugin
+#: ../translation/extra.c:54
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/extra.c:55
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/extra.c:56
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. SID decoder plugin
+#: ../translation/extra.c:58
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/extra.c:59
+msgid "Songlengths.txt (from HVSC)"
+msgstr ""
+
+#: ../translation/extra.c:60
+msgid "Bits per sample (8 or 16)"
+msgstr ""
+
+#: ../translation/extra.c:61
+msgid "Default song length (sec)"
+msgstr ""
+
+#. WildMidi player plugin
+#: ../translation/extra.c:63
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#: ../translation/extra.c:66
+msgid "Track Title"
+msgstr ""
+
+#: ../translation/extra.c:67
+msgid "Performer"
+msgstr ""
+
+#: ../translation/extra.c:72
+msgid "Total Tracks"
+msgstr ""
+
+#: ../translation/extra.c:73
+msgid "Genre"
+msgstr ""
+
+#: ../translation/extra.c:74
+msgid "Composer"
+msgstr ""
+
+#: ../translation/extra.c:75
+msgid "Disc Number"
+msgstr ""
+
+#: ../translation/extra.c:76
+msgid "Comment"
+msgstr ""
+
+#: ../translation/extra.c:77
+msgid "Encoder / Vendor"
+msgstr ""
+
+#: ../translation/extra.c:79
+#, fuzzy
+msgid "Location"
+msgstr "加入位址"
+
+#: ../translation/extra.c:80
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:81
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:179 ../plugins/vorbis/vcedit.c:550
-msgid "Error reading first page of Ogg bitstream."
+#: ../translation/extra.c:82
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:185 ../plugins/vorbis/vcedit.c:557
-msgid "Error reading initial header packet."
+#: ../translation/extra.c:83
+msgid "Codec"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:237
-msgid "Couldn't get enough memory to register new stream serial number."
+#. FFmpeg deocder plugin
+#: ../translation/extra.c:85
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:505
-msgid "Input truncated or empty."
+#. Converter GUI
+#: ../translation/extra.c:87
+msgid "Convert"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:507
-msgid "Input is not an Ogg bitstream."
+#. Resampler (Secret Rabbit Code)
+#: ../translation/extra.c:89
+msgid "Target Samplerate"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:565
-msgid "Ogg bitstream does not contain Vorbis data."
+#: ../translation/extra.c:90
+msgid "Quality / Algorythm"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:578
-msgid "EOF before recognised stream."
+#: ../translation/extra.c:91
+msgid "Automatic Samplerate (overrides Target Samplerate)"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:594
-msgid "Ogg bitstream does not contain a supported data-type."
+#: ../plugins/converter/convgui.c:108
+msgid "The file already exists. Overwrite?"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:638
-msgid "Corrupt secondary header."
+#: ../plugins/converter/convgui.c:110
+msgid "Converter warning"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:659
-msgid "EOF before end of Vorbis headers."
+#: ../plugins/converter/convgui.c:222
+msgid "Please select encoder"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:834
-msgid "Corrupt or missing data, continuing..."
+#: ../plugins/converter/convgui.c:224
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:248
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:394 ../plugins/converter/convgui.c:496
+#, fuzzy
+msgid "Select folder..."
+msgstr "全選"
+
+#: ../plugins/converter/convgui.c:635
+msgid "Failed to save encoder preset"
 msgstr ""
 
-#: ../plugins/vorbis/vcedit.c:874
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
 msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:162
+#: ../plugins/converter/convgui.c:637 ../plugins/converter/convgui.c:1035
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:638 ../plugins/converter/convgui.c:1036
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:692
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:724
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:756 ../plugins/converter/convgui.c:1133
+#, fuzzy
+msgid "Remove preset"
+msgstr "儲存 Preset"
+
+#: ../plugins/converter/convgui.c:758 ../plugins/converter/convgui.c:1135
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:782
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:838 ../plugins/gtkui/dspconfig.c:183
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1034
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1098
+#, fuzzy
+msgid "New DSP Preset"
+msgstr "儲存 Preset"
+
+#: ../plugins/converter/convgui.c:1183
+#, fuzzy
+msgid "Edit DSP Preset"
+msgstr "儲存 Preset"
+
+#: ../plugins/converter/convgui.c:1203
+#, fuzzy
+msgid "DSP Presets"
+msgstr "儲存 Preset"
+
+#: ../plugins/converter/interface.c:94
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:115
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:126
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%a - %t)."
+msgstr ""
+
+#: ../plugins/converter/interface.c:139
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:163
+#, fuzzy
+msgid "DSP preset:"
+msgstr "儲存 Preset"
+
+#: ../plugins/converter/interface.c:186
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:199
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:206
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:207
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:208
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:209
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:210
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:211
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:217
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:224
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:225
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:227
+msgid "Preserve folder structure, starting from:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:379
+#, fuzzy
+msgid "Edit Encoder Preset"
+msgstr "載入 Preset"
+
+#: ../plugins/converter/interface.c:402
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/interface.c:410
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:417
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/interface.c:425
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:436
 #, c-format
 msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/interface.c:446
+#, c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
 msgstr ""
 
-#~ msgid "Add Audio CD"
-#~ msgstr "加入音樂 CD"
+#: ../plugins/converter/interface.c:455
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/interface.c:462
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:463
+msgid "Temporary file"
+msgstr ""
+
+#: ../plugins/converter/interface.c:480
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/interface.c:492
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/interface.c:498
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/interface.c:510
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/interface.c:520
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/interface.c:606
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/interface.c:629
+msgid "Untitled DSP Preset"
+msgstr ""

deadbeef-0.5.1.tar.bz2/premix.c -> deadbeef-0.5.2.tar.bz2/premix.c Changed

deadbeef-0.5.1.tar.bz2/premix.h -> deadbeef-0.5.2.tar.bz2/premix.h Changed

deadbeef-0.5.1.tar.bz2/replaygain.c -> deadbeef-0.5.2.tar.bz2/replaygain.c Changed

@@ -1,7 +1,7 @@
 
 /*
 DeaDBeeF - ultimate music player for GNU/Linux systems with X11
- Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -24,13 +24,16 @@
 static int conf_replaygain_mode = 0;
 static int conf_replaygain_scale = 1;
 static float conf_replaygain_preamp = 0;
+static float conf_global_preamp = 0;
 
 static float rg_albumgain = 1;
 static float rg_albumpeak = 1;
 static float rg_trackgain = 1;
 static float rg_trackpeak = 1;
-static float rg_albumgain_preamp = 1;
-static float rg_trackgain_preamp = 1;
+static float rg_albumgain_full_preamp = 1;
+static float rg_trackgain_full_preamp = 1;
+static float rg_albumgain_global_preamp = 1;
+static float rg_trackgain_global_preamp = 1;
 
 void
 replaygain_apply (ddb_waveformat_t *fmt, playItem_t *it, char *bytes, int bytesread) {
@@ -53,12 +56,15 @@
 }
 
 void
-replaygain_set (int mode, int scale, float preamp) {
+replaygain_set (int mode, int scale, float preamp, float global_preamp) {
 conf_replaygain_mode = mode;
 conf_replaygain_scale = scale;
 conf_replaygain_preamp = db_to_amp (preamp);
- rg_albumgain_preamp = rg_albumgain * conf_replaygain_preamp;
- rg_trackgain_preamp = rg_trackgain * conf_replaygain_preamp;
+ conf_global_preamp = db_to_amp (global_preamp);
+ rg_albumgain_full_preamp = rg_albumgain * conf_replaygain_preamp * conf_global_preamp;
+ rg_trackgain_full_preamp = rg_trackgain * conf_replaygain_preamp * conf_global_preamp;
+ rg_albumgain_global_preamp = rg_albumgain * conf_global_preamp;
+ rg_trackgain_global_preamp = rg_trackgain * conf_global_preamp;
 }
 
 void
@@ -76,8 +82,10 @@
 }
 rg_albumgain = db_to_amp (albumgain);
 rg_trackgain = db_to_amp (trackgain);
- rg_albumgain_preamp = rg_albumgain * conf_replaygain_preamp;
- rg_trackgain_preamp = rg_trackgain * conf_replaygain_preamp;
+ rg_albumgain_full_preamp = rg_albumgain * conf_replaygain_preamp * conf_global_preamp;
+ rg_trackgain_full_preamp = rg_trackgain * conf_replaygain_preamp * conf_global_preamp;
+ rg_albumgain_global_preamp = rg_albumgain * conf_global_preamp;
+ rg_trackgain_global_preamp = rg_trackgain * conf_global_preamp;
 rg_albumpeak = albumpeak;
 rg_trackpeak = trackpeak;
 }
@@ -87,9 +95,10 @@
 int vol = 1000;
 if (conf_replaygain_mode == 1) {
 if (rg_trackgain == 1) {
- return -1;
+ vol = rg_trackgain_global_preamp * 1000;
+ } else {
+ vol = rg_trackgain_full_preamp * 1000;
 }
- vol = rg_trackgain_preamp * 1000;
 if (conf_replaygain_scale) {
 if (vol * rg_trackpeak > 1000) {
 vol = 1000 / rg_trackpeak;
@@ -98,9 +107,10 @@
 }
 else if (conf_replaygain_mode == 2) {
 if (rg_albumgain == 1) {
- return -1;
+ vol = rg_albumgain_global_preamp * 1000;
+ } else {
+ vol = rg_albumgain_full_preamp * 1000;
 }
- vol = rg_albumgain_preamp * 1000;
 if (conf_replaygain_scale) {
 if (vol * rg_albumpeak > 1000) {
 vol = 1000 / rg_albumpeak;
@@ -213,9 +223,10 @@
 float vol = 1.f;
 if (conf_replaygain_mode == 1) {
 if (rg_trackgain == 1) {
- return;
+ vol = rg_trackgain_global_preamp;
+ } else {
+ vol = rg_trackgain_full_preamp;
 }
- vol = rg_trackgain_preamp;
 if (conf_replaygain_scale) {
 if (vol * rg_trackpeak > 1.f) {
 vol = 1.f / rg_trackpeak;
@@ -224,9 +235,10 @@
 }
 else if (conf_replaygain_mode == 2) {
 if (rg_albumgain == 1) {
- return;
+ vol = rg_albumgain_global_preamp;
+ } else {
+ vol = rg_albumgain_full_preamp;
 }
- vol = rg_albumgain_preamp;
 if (conf_replaygain_scale) {
 if (vol * rg_albumpeak > 1.f) {
 vol = 1.f / rg_albumpeak;

deadbeef-0.5.1.tar.bz2/replaygain.h -> deadbeef-0.5.2.tar.bz2/replaygain.h Changed

deadbeef-0.5.1.tar.bz2/ringbuf.c -> deadbeef-0.5.2.tar.bz2/ringbuf.c Changed

deadbeef-0.5.1.tar.bz2/ringbuf.h -> deadbeef-0.5.2.tar.bz2/ringbuf.h Changed

deadbeef-0.5.1.tar.bz2/streamer.c -> deadbeef-0.5.2.tar.bz2/streamer.c Changed

deadbeef-0.5.1.tar.bz2/streamer.h -> deadbeef-0.5.2.tar.bz2/streamer.h Changed

deadbeef-0.5.1.tar.bz2/threading.h -> deadbeef-0.5.2.tar.bz2/threading.h Changed

deadbeef-0.5.1.tar.bz2/threading_pthread.c -> deadbeef-0.5.2.tar.bz2/threading_pthread.c Changed

deadbeef-0.5.1.tar.bz2/translators.txt -> deadbeef-0.5.2.tar.bz2/translators.txt Changed

@@ -11,6 +11,9 @@
 Catalan
 sisco <sisco.garcia@ubuntu.cat>
 
+Czech
+ Vašek Kovářík <l3d9z6@seznam.cz>
+
 Chinese (Simplified)
 Yinghua_Wang <wantinghard@gmail.com>
 
@@ -30,12 +33,21 @@
 English (United Kingdom)
 Steve (Yorvyk) Cook <yorvik.ubunto@googlemail.com>
 
+Esperanto
+ Kristjan <kristjan.schmidt@googlemail.com>
+
 Spanish
 depaz <depazzz@gmail.com>
 
+Estonian
+ Anari <anari.jalakas@gmail.com>
+
 Persian
 Ali <aysabzevar@gmail.com>
 
+Finnish
+ Juhani <juhaninumminen0@gmail.com>
+
 French
 Cilyan Olowen <gaknar@gmail.com>
 
@@ -60,12 +72,18 @@
 Kazakh
 Baurzhan Muftakhidinov <baurthefirst@gmail.com>
 
-Khmer
+Central Khmer
 SatyaN <satyathavy@gmail.com>
 
-Luganda
+Ganda
 kizito <kbirabwa@yahoo.co.uk>
 
+Lithuanian
+ Julius <zadintuvas@gmail.com>
+
+Bokmal, Norwegian
+ Sam <wilsonsamm@hotmail.com>
+
 Dutch
 depaz <depazzz@gmail.com>
 
@@ -80,12 +98,21 @@
 Henrique P. Machado <hpmachado@gnome.org>
 Sérgio Cipolla <secipolla@gmail.com>
 
+Romanian
+ Mișu Moldovan <dumol@xfce.org>
+
 Russian
 Dmitriy Simbiriatin <slpiv@mail.ru>
 
+Sinhala
+ danishka <danishka@gmail.com>
+
 Slovak
 Ivan Masár <helix84@centrum.sk>
 
+Slovenian
+ Klemen Košir <klemen.kosir@gmx.com>
+
 Serbian
 Jay A. Fleming <tito.nehru.naser@gmail.com>
 
@@ -95,8 +122,14 @@
 Swedish
 Martin <brother@bsnet.se>
 
+Telugu
+ PraveenIlla <mail2ipn@gmail.com>
+
 Turkish
- bahadiroglu <bahadiroglu33@gmail.com>
+ decent <bahadiroglu33@gmail.com>
+
+Uighur
+ Gheyret Kenji <gheyret@gmail.com>
 
 Ukrainian
 Yarema aka Knedlyk <yupadmin@gmail.com>

deadbeef-0.5.1.tar.bz2/utf8.c -> deadbeef-0.5.2.tar.bz2/utf8.c Changed

deadbeef-0.5.1.tar.bz2/utf8.h -> deadbeef-0.5.2.tar.bz2/utf8.h Changed

deadbeef-0.5.1.tar.bz2/vfs.c -> deadbeef-0.5.2.tar.bz2/vfs.c Changed

deadbeef-0.5.1.tar.bz2/vfs.h -> deadbeef-0.5.2.tar.bz2/vfs.h Changed

deadbeef-0.5.1.tar.bz2/vfs_stdio.c -> deadbeef-0.5.2.tar.bz2/vfs_stdio.c Changed

deadbeef-0.5.1.tar.bz2/volume.c -> deadbeef-0.5.2.tar.bz2/volume.c Changed

deadbeef-0.5.1.tar.bz2/volume.h -> deadbeef-0.5.2.tar.bz2/volume.h Changed

deadbeef-0.5.2.tar.bz2/yasmwrapper.sh Added